CLDR-14788 Hide TC and manager level menu items from vetters (#3871)

unicode-org · Jul 24, 2024 · 061c679 · 061c679
1 parent b1ec8a6
commit 061c679
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 11 deletions.
diff --git a/tools/cldr-apps/js/src/esm/cldrAccount.mjs b/tools/cldr-apps/js/src/esm/cldrAccount.mjs
@@ -270,7 +270,7 @@ function getHtml(json) {
       html += getOrgFilterMenu();
     }
   }
-  if (justUser) {
+  if (justUser && canListMultipleUsers()) {
     html += "<p>" + listMultipleUsersButton + "</p>\n";
   }
   if (!isJustMe) {
@@ -345,7 +345,9 @@ function getTableStart() {
 function getTableEnd(json) {
   let html = "</tbody></table>" + "<br />\n";
   if (justUser) {
-    html += listMultipleUsersButton;
+    if (canListMultipleUsers()) {
+      html += listMultipleUsersButton;
+    }
   } else {
     html += numberOfUsersShown(shownUsers ? shownUsers.length : 0);
     html += getEmailControls(json);
@@ -354,6 +356,10 @@ function getTableEnd(json) {
   return html;
 }
 
+function canListMultipleUsers() {
+  return !!cldrStatus.getPermissions()?.userIsManager;
+}
+
 function numberOfUsersShown(number) {
   return (
     "<div style='font-size: 70%'>Number of users shown: " + number + "</div>\n"

diff --git a/tools/cldr-apps/js/src/views/MainMenu.vue b/tools/cldr-apps/js/src/views/MainMenu.vue
@@ -35,7 +35,19 @@
           </li>
         </ul>
       </li>
-      <li class="section-header">My Organization ({{ org }})</li>
+      <li
+        class="section-header"
+        v-if="
+          canUseVettingSummary ||
+          canListUsers ||
+          canMonitorForum ||
+          canMonitorVetting ||
+          accountLocked ||
+          isAdmin
+        "
+      >
+        My Organization ({{ org }})
+      </li>
       <li v-if="canUseVettingSummary">
         <ul>
           <li><a href="#vsummary///">Priority Items Summary</a></li>
@@ -84,7 +96,7 @@
           </li>
         </ul>
       </li>
-      <li v-if="isUnofficial">
+      <li v-if="canSeeUnofficialEmail">
         <ul>
           <li>
             <a href="#mail///">Simulate Email Notifications (SMOKETEST ONLY)</a>
@@ -135,7 +147,7 @@ export default {
       canUseVettingSummary: false,
       isAdmin: false,
       isTC: false,
-      isUnofficial: false,
+      canSeeUnofficialEmail: false,
       loggedIn: false,
       org: null,
       recentActivityUrl: null,
@@ -153,13 +165,13 @@ export default {
       const perm = cldrStatus.getPermissions();
       this.accountLocked = perm && perm.userIsLocked;
       this.canImportOldVotes = perm && perm.userCanImportOldVotes;
-      this.canListUsers = this.canMonitorVetting =
-        perm && (perm.userIsTC || perm.userIsVetter);
+      this.canListUsers = this.canMonitorVetting = !!perm?.userIsManager;
       this.canMonitorForum = perm && perm.userCanMonitorForum;
       // this.canSeeStatistics will be false until there is a new implementation
       this.canUseVettingSummary = perm && perm.userCanUseVettingSummary;
       this.isAdmin = perm && perm.userIsAdmin;
-      this.isUnofficial = cldrStatus.getIsUnofficial();
+      this.canSeeUnofficialEmail =
+        cldrStatus.getIsUnofficial() && !!perm?.userIsManager;
       this.isTC = perm && perm.userIsTC;
 
       const user = cldrStatus.getSurveyUser();

diff --git a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyAjax.java b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyAjax.java
@@ -482,7 +482,7 @@ private void processRequest(
                         mySession.userDidAction();
                         SurveyJSONWrapper r = newJSONStatus(request, sm);
                         r.put("what", what);
-                        if (UserRegistry.userIsVetter(mySession.user)) {
+                        if (UserRegistry.userIsManagerOrStronger(mySession.user)) {
                             String org = mySession.user.org;
                             if (UserRegistry.userCreateOtherOrgs(mySession.user)) {
                                 org = null; // all

diff --git a/tools/cldr-apps/src/test/resources/org/unicode/cldr/web/TestUserLevel.csv b/tools/cldr-apps/src/test/resources/org/unicode/cldr/web/TestUserLevel.csv
@@ -57,7 +57,7 @@ adlam, anonymous, canImportOldVotesSUBMISSION, false, ,
 adlam, admin,userCanDoList, true, ,
 adlam, tc,userCanDoList, true, ,
 adlam, manager,userCanDoList, true, ,
-adlam, vetter,userCanDoList, true, ,
+adlam, vetter,userCanDoList, false, ,
 adlam, guest,userCanDoList, false, ,
 adlam, locked,userCanDoList, false, ,
 adlam, anonymous,userCanDoList, false, ,

diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/util/VoteResolver.java b/tools/cldr-code/src/main/java/org/unicode/cldr/util/VoteResolver.java
@@ -381,7 +381,7 @@ public boolean canImportOldVotes(CheckCLDR.Phase inPhase) {
         }
 
         public boolean canDoList() {
-            return isVetter();
+            return isManagerOrStronger();
         }
 
         public boolean canCreateUsers() {