feat: Able to view the list of users associated with an Organization #8511

MonalikaPatnaik · 2023-06-03T18:40:51Z

What

Iterated over the keys of the members hash reference in $user_or_org_ref and the reference to @org_members is assigned to the org_members key of the $user_template_data_ref hash reference in order to access the list within the template.

Screenshot

Currently the table is looking like this without CSS :') will try adding a generic CSS to the tables in a separate PR..for smaller screens the table contents are hidden from right.

Related issue(s) and discussion

Fixes Being able to view the list of users attached to an organisation on the pro platform #6978

stephanegigandet · 2023-06-05T07:19:30Z

lib/ProductOpener/Display.pm

@@ -3898,6 +3898,11 @@ HTML
 						$user_template_data_ref->{edit_profile} = 1;
 						$user_template_data_ref->{orgid} = $orgid;
 					}
+					my @org_members;
+					foreach my $member_id (keys %{$user_or_org_ref->{members}}) {


In this loop, you will need to load the user file that contains details such as the e-mail, language, country etc.

In Users.pm and Display.pm, we have code like this to do that:

`my $user_file = "$data_root/users/" . get_string_id_for_lang("no_language", $user_id) . ".sto";

if (-e $user_file) { $user_ref = retrieve($user_file);`

It would be a good thing to create a retrieve_user($user_id) function in Users.pm to do that.

Okay..doing it!
Thankyou so much <3

stephanegigandet · 2023-06-05T07:21:49Z

lib/ProductOpener/Display.pm

@@ -3898,6 +3898,11 @@ HTML
 						$user_template_data_ref->{edit_profile} = 1;
 						$user_template_data_ref->{orgid} = $orgid;
 					}
+					my @org_members;


This feature should be available only to moderator of the pro platform, so we should have a condition on the value of $User{pro_moderator}, if the user is not a moderator, we don't create the structure with org members details.

MonalikaPatnaik · 2023-06-06T10:07:58Z

I think it should work fine..only issues with the translatable string( make build_lang is not working in pro shell maybe)..Also, pls lmk when I have to add CSS to the table..will do that<3

stephanegigandet · 2023-06-06T12:46:35Z

For the table styling, we can use the same styles than we have for the packagings table when you edit a product:

Currently we have specific styles for the packaging edition, but maybe we can make those styles more generic, and apply them to both the packaging edition and your table.

`#packagings_components_edit_header {
background-color:$macchiato;
border-radius:20px;
color:white;
font-weight:600;
margin:0;
padding:1rem;
}

.packagings_components_edit_row {
border-radius:20px;
margin:0 !important;
padding:1rem;
}
.packagings_components_edit_row:nth-of-type(even) {
background-color:$latte;
}
`

lib/ProductOpener/Display.pm

stephanegigandet · 2023-06-06T12:52:11Z

po/common/common.pot

+msgid "S.No"
+msgstr "S.No"
+
+msgctxt "member_userid"


We already have strings for "Name", "Email", "Country", "Language" etc. in the .po file, so we can reuse them without adding new translation strings.

Okayy..will make the changes👍

Instead of "member_userid" can you use the existing "username" string?

templates/web/pages/org_profile/org_profile.tt.html

Co-authored-by: Stéphane Gigandet <stephane@openfoodfacts.org>

MonalikaPatnaik · 2023-06-08T21:15:34Z

For the table styling, we can use the same styles than we have for the packagings table when you edit a product:

Currently we have specific styles for the packaging edition, but maybe we can make those styles more generic, and apply them to both the packaging edition and your table.

`#packagings_components_edit_header { background-color:$macchiato; border-radius:20px; color:white; font-weight:600; margin:0; padding:1rem; }

.packagings_components_edit_row { border-radius:20px; margin:0 !important; padding:1rem; } .packagings_components_edit_row:nth-of-type(even) { background-color:$latte; } `

Thankyou so much...but the thing is I am not able to see the CSS changes in my localhost even after running make restart( tho not req but still)..not able to verify the CSS changes as it is not showing up :')

stephanegigandet · 2023-06-09T07:27:24Z

Thankyou so much...but the thing is I am not able to see the CSS changes in my localhost even after running make restart( tho not req but still)..not able to verify the CSS changes as it is not showing up :')

I believe this is because the po_pro-dynamicfront that watches for scss changes is not started on the pro platform:

(pro) docker-compose start [+] Running 6/7 ✔ Container po_pro-mongodb-1 Started 0.6s ⠧ Container po_pro-dynamicfront-1 Starting 1.8s ✔ Container po_pro-memcached-1 Started 0.3s ✔ Container po_pro-minion-1 Started 1.0s ✔ Container po_pro-incron-1 Started 0.5s ✔ Container po_pro-backend-1 Started 1.1s ✔ Container po_pro-frontend-1 Started 0.4s Error response from daemon: failed to create task for container: failed to create shim task: OCI runtime create failed: runc create failed: unable to start container process: error during container init: error mounting "/home/stephane/openfoodfacts-server/gulpfile.js" to rootfs at "/opt/product-opener/gulpfile.js": mount /home/stephane/openfoodfacts-server/gulpfile.js:/opt/product-opener/gulpfile.js (via /proc/self/fd/6), flags: 0x5000: not a directory: unknown: Are you trying to mount a directory onto a file (or vice-versa)? Check if the specified host path exists and is the expected type

Short term: as this feature should also be accessible on the public platform (not only the pro platform), you could test it in a non-pro environment.

Longer term: we need to fix the po_pro-dynamicfront bug.

stephanegigandet · 2023-06-12T07:33:46Z

lib/ProductOpener/Display.pm

+					if (defined $User{pro_moderator}) {
+						my @org_members;
+						foreach my $member_id (sort keys %{$user_or_org_ref->{members}}) {
+							my $member_details = retrieve_user($member_id);


As a convention, when a variable is an object reference, we suffix it with _ref. Coul you rename $member_details to $member_user_ref or similar?

stephanegigandet · 2023-06-12T07:40:04Z

templates/web/pages/org_profile/org_profile.tt.html

+	</thead>
+		[% SET count = 1 %]
+		[% FOREACH users IN org_members %]
+		<tbody id="org_table_body">


the tbody element should be outside the FOREACH loop, otherwise you will have a table with more than 1 tbody.

stephanegigandet · 2023-06-12T07:41:31Z

templates/web/pages/org_profile/org_profile.tt.html

+		[% FOREACH users IN org_members %]
+		<tbody id="org_table_body">
+		<tr>
+			<td data-cell =[% lang("serial_no") %]>[% count %].</td>


What is "data-cell =[% lang("serial_no") %]" for?

The data-cell is a custom attribute used to store additional data or metadata related to the HTML element. This attribute is being used by CSS to manipulate the element for smaller screens--

td::before { content:attr(data-cell) ": "; float:left; text-transform: capitalize; font-weight: 600; }

It would add : after the data cell value i.e serial no in this case when the screen width is small

I understand, thanks for the explanation.

stephanegigandet · 2023-06-12T07:53:49Z

scss/_off.scss

@@ -1451,3 +1451,50 @@ a.panel_title {
    background-color: scale-color($button-bg-color, $lightness: -$button-function-factor / 2);
    color: #fff;
 }
+// organization members table in producers platform


We can do it in a separate PR, but it would be a good thing to see if we can make the CSS code that we have for packagings generic, so that it can be applied to any table, instead of having similar separate CSS code for each table.

Yes..It would be good to make the CSS generic for these tables👍...would open a separate PR for CSS things..will do it asap!

sonarqubecloud · 2023-06-13T10:43:29Z

SonarCloud Quality Gate failed.

1 Bug
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

No Coverage information
0.0% Duplication

stephanegigandet

Looks good, thank you very much for the PR and incorporating all the feedback and suggestions!

MonalikaPatnaik and others added 2 commits June 3, 2023 23:20

initial-commit

d37f3b9

Merge branch 'openfoodfacts:main' into view-org-users

ce67c27

github-actions bot added Display 🏭 Producers Platform https://wiki.openfoodfacts.org/Platform_for_producers Template::Toolkit The templating toolkit used by product opener. The starting point for HTML/JS/CSS fixes. labels Jun 3, 2023

github-actions bot assigned MonalikaPatnaik Jun 3, 2023

stephanegigandet reviewed Jun 5, 2023

View reviewed changes

added-translatable-string

c79f8ab

github-actions bot added the Translations We use a non-standard version of GetText, lack language variants support translate.openfoodfacts.org label Jun 5, 2023

MonalikaPatnaik added 2 commits June 5, 2023 20:19

minor-changes

f38f44a

updated

c7f8112

github-actions bot added the 👥 Users label Jun 5, 2023

MonalikaPatnaik and others added 3 commits June 5, 2023 21:45

translatable-strings

b6d01a6

perltidy-bugs

449130c

Merge branch 'main' into view-org-users

81f4afc

MonalikaPatnaik marked this pull request as ready for review June 6, 2023 10:09

MonalikaPatnaik requested a review from a team as a code owner June 6, 2023 10:09

stephanegigandet reviewed Jun 6, 2023

View reviewed changes

lib/ProductOpener/Display.pm Outdated Show resolved Hide resolved

stephanegigandet reviewed Jun 6, 2023

View reviewed changes

templates/web/pages/org_profile/org_profile.tt.html Outdated Show resolved Hide resolved

MonalikaPatnaik and others added 2 commits June 6, 2023 18:26

Update lib/ProductOpener/Display.pm

c615682

Co-authored-by: Stéphane Gigandet <stephane@openfoodfacts.org>

Update templates/web/pages/org_profile/org_profile.tt.html

992c89d

Co-authored-by: Stéphane Gigandet <stephane@openfoodfacts.org>

added-css

b7d0f55

github-actions bot added the CSS label Jun 10, 2023

stephanegigandet reviewed Jun 12, 2023

View reviewed changes

css-removed

b6ecf8a

stephanegigandet approved these changes Jun 13, 2023

View reviewed changes

stephanegigandet merged commit 2472419 into openfoodfacts:main Jun 14, 2023

openfoodfacts-bot mentioned this pull request Jun 14, 2023

chore(main): release 2.14.0 #8497

Merged

manon-corneille mentioned this pull request Jun 30, 2023

Should producers be able to self-delete accounts from the Pro Platform ? #8638

Closed

MonalikaPatnaik mentioned this pull request Jul 19, 2023

feat: Allow Org admins to Remove Users from their Organization #8705

Merged

MonalikaPatnaik deleted the view-org-users branch January 4, 2024 14:56

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Able to view the list of users associated with an Organization #8511

feat: Able to view the list of users associated with an Organization #8511

MonalikaPatnaik commented Jun 3, 2023 •

edited

Loading

stephanegigandet Jun 5, 2023

MonalikaPatnaik Jun 5, 2023

stephanegigandet Jun 5, 2023

MonalikaPatnaik commented Jun 6, 2023

stephanegigandet commented Jun 6, 2023

stephanegigandet Jun 6, 2023

MonalikaPatnaik Jun 6, 2023

stephanegigandet Jun 12, 2023

MonalikaPatnaik commented Jun 8, 2023

stephanegigandet commented Jun 9, 2023

stephanegigandet Jun 12, 2023

stephanegigandet Jun 12, 2023

stephanegigandet Jun 12, 2023

MonalikaPatnaik Jun 12, 2023

stephanegigandet Jun 12, 2023

stephanegigandet Jun 12, 2023

MonalikaPatnaik Jun 12, 2023

sonarqubecloud bot commented Jun 13, 2023

stephanegigandet left a comment

feat: Able to view the list of users associated with an Organization #8511

feat: Able to view the list of users associated with an Organization #8511

Conversation

MonalikaPatnaik commented Jun 3, 2023 • edited Loading

What

Screenshot

Related issue(s) and discussion

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MonalikaPatnaik commented Jun 6, 2023

stephanegigandet commented Jun 6, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MonalikaPatnaik commented Jun 8, 2023

stephanegigandet commented Jun 9, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sonarqubecloud bot commented Jun 13, 2023

stephanegigandet left a comment

Choose a reason for hiding this comment

MonalikaPatnaik commented Jun 3, 2023 •

edited

Loading