CLDR-18610 VettingParticipation separate E/M/P; Vetters only; further improvements (#4925)

Author: btangmu

tools/cldr-apps/js/src/esm/cldrInfo.mjs

@@ -11,7 +11,6 @@ import * as cldrStatus from "./cldrStatus.mjs";
 import * as cldrSurvey from "./cldrSurvey.mjs";
 import * as cldrTable from "./cldrTable.mjs";
 import * as cldrText from "./cldrText.mjs";
-import * as cldrUserLevels from "./cldrUserLevels.mjs";
 import * as cldrVote from "./cldrVote.mjs";
 import * as cldrVoteTable from "./cldrVoteTable.mjs";
 import * as cldrVue from "./cldrVue.mjs";

tools/cldr-apps/js/src/esm/cldrVettingParticipation.mjs

@@ -36,8 +36,9 @@ const COLUMN_TITLE_COVERAGE_LEVEL = "Coverage";
 const COLUMN_TITLE_LEVEL = "Level";
 const COLUMN_TITLE_PROGRESS_PERCENT = "Done";
 const COLUMN_TITLE_ABSTAIN_COUNT = "Abst.";
-const COLUMN_TITLE_EMP = "EMP";
-const COLUMN_TITLE_MP = "MP";
+const COLUMN_TITLE_ERROR_COUNT = "Err.";
+const COLUMN_TITLE_MISSING_COUNT = "Miss.";
+const COLUMN_TITLE_PROVISIONAL_COUNT = "Prov.";
 const COLUMN_TITLE_USER_ID = "User#";
 const COLUMN_TITLE_USER_EMAIL = "Email";
 const COLUMN_TITLE_USER_NAME = "Name";
@@ -66,13 +67,18 @@ const COLUMNS = [
     default: 0,
   },
   {
-    title: COLUMN_TITLE_EMP,
-    comment: "Sum of errors + missing + provisional (for locale)",
+    title: COLUMN_TITLE_ERROR_COUNT,
+    comment: "Number of errors (for locale)",
     default: 0,
   },
   {
-    title: COLUMN_TITLE_MP,
-    comment: "Sum of missing + provisional (for locale)",
+    title: COLUMN_TITLE_MISSING_COUNT,
+    comment: "Number of missing paths (for locale)",
+    default: 0,
+  },
+  {
+    title: COLUMN_TITLE_PROVISIONAL_COUNT,
+    comment: "Number of provisional paths (for locale)",
     default: 0,
   },
   {
@@ -161,6 +167,7 @@ function makeRequest(req) {
         "cldrVettingParticipation.makeRequest, fetching initial data"
       );
     }
+    vpData.startTime = Date.now();
     const p = new URLSearchParams();
     p.append("what", "vetting_participation");
     p.append("s", cldrStatus.getSessionId());
@@ -187,6 +194,8 @@ function loadHandler(json) {
     console.dir({ json });
     cldrNotify.error("Error loading vetting participation", json.err);
   } else if (callbackToSetData) {
+    vpData.firstResponseTime = Date.now();
+
     // This json is the response to the initial request to what=vetting_participation
     storeInitialResponseData(json);
 
@@ -268,10 +277,13 @@ function preloadVotingResults() {
     if (wasCancelled()) {
       return;
     }
-    // "user" here is an object; id = user.id
-    if (!isRegularVetter(user)) {
+    if (!user.locales || !user.locales.length) {
+      if (VP_DEBUG) {
+        console.log("user.locales is missing or empty for user id " + id);
+      }
       continue;
     }
+    // "user" here is an object; id = user.id
     user.data = {};
     for (const locale of user.locales.sort()) {
       if (VP_DEBUG) {
@@ -322,6 +334,7 @@ function preloadVotingResults() {
 
 async function createTable() {
   const columnIndex = getIndexOfColumnsByTitle();
+  vpData.accountColumnIndex = columnIndex[COLUMN_TITLE_USER_ID];
   const rowMap = {};
   for (const [id, user] of Object.entries(vpData.uidToUser)) {
     if (VP_DEBUG) {
@@ -366,9 +379,9 @@ async function createTable() {
         daysAgo = "♾️";
       }
       row[columnIndex[COLUMN_TITLE_LAST_MOD]] = daysAgo;
-      row[columnIndex[COLUMN_TITLE_EMP]] =
-        errorCount + missingCount + provisionalCount;
-      row[columnIndex[COLUMN_TITLE_MP]] = missingCount + provisionalCount;
+      row[columnIndex[COLUMN_TITLE_ERROR_COUNT]] = errorCount;
+      row[columnIndex[COLUMN_TITLE_MISSING_COUNT]] = missingCount;
+      row[columnIndex[COLUMN_TITLE_PROVISIONAL_COUNT]] = provisionalCount;
       const sortKey = localeName + " " + user.org + " " + id;
       rowMap[sortKey] = [...row]; // clone the array since table will retain a reference
     }
@@ -387,7 +400,8 @@ function showResults() {
     console.log("showResults, done, 100%");
   }
   const viewData = {
-    message: "Done",
+    accountColumnIndex: vpData.accountColumnIndex,
+    message: getDoneMessage(),
     percent: 100,
     status: Status.SUCCEEDED,
     tableHeader: getHeaderRow(),
@@ -397,6 +411,27 @@ function showResults() {
   callbackToSetData(viewData);
 }
 
+// Tell the time (in minutes) it took to wait, and the time it took to finish (after the wait ended)
+function getDoneMessage() {
+  const finishTime = Date.now();
+  const minutesWaiting = Math.floor(
+    (vpData.firstResponseTime - vpData.startTime) / 1000
+  );
+  const minutesFurther = Math.floor(
+    (finishTime - vpData.firstResponseTime) / 1000
+  );
+  const minutesTotal = minutesWaiting + minutesFurther;
+  return (
+    "Done. Time elapsed = " +
+    minutesTotal +
+    " minutes (" +
+    minutesWaiting +
+    " waiting for first response + " +
+    minutesFurther +
+    " additional)"
+  );
+}
+
 function wasCancelled() {
   return latestReq === RequestType.CANCEL;
 }
@@ -538,12 +573,4 @@ function addColumnComments(worksheet) {
   }
 }
 
-/** are we tracking this user? */
-function isRegularVetter(user) {
-  if (user.allLocales || !user.locales) {
-    return false;
-  }
-  return user.userlevelName === "vetter" || user.userlevelName === "guest";
-}
-
 export { Status, cancel, hasPermission, saveAsSheet, start, viewMounted };

tools/cldr-apps/js/src/views/VettingParticipation.vue

@@ -12,6 +12,7 @@ let status = ref(STATUS.INIT);
 let tableBody = null;
 let tableHeader = null;
 let tableComments = null;
+let accountColumnIndex = ref(-1);
 
 function mounted() {
   cldrVettingParticipation.viewMounted(setData);
@@ -47,14 +48,11 @@ function setData(data) {
   if (data.status) {
     status.value = data.status;
   }
-  if (data.tableHeader) {
+  if (data.tableHeader && data.tableBody && data.tableComments) {
     tableHeader = reactive(data.tableHeader);
-  }
-  if (data.tableBody) {
     tableBody = reactive(data.tableBody);
-  }
-  if (data.tableComments) {
     tableComments = reactive(data.tableComments);
+    accountColumnIndex.value = data.accountColumnIndex;
   }
 }
 
@@ -71,6 +69,10 @@ function progressBarStatus() {
   }
 }
 
+function accountRecentActivityLink(cell) {
+  return "#recent_activity///" + cell;
+}
+
 function saveAsSheet() {
   return cldrVettingParticipation.saveAsSheet();
 }
@@ -111,8 +113,15 @@ defineExpose({
         </thead>
         <tbody>
           <tr v-for="row of tableBody" :key="row">
-            <td v-for="cell of row" :key="cell">
-              {{ cell }}
+            <td v-for="(cell, index) of row" :key="cell">
+              <div v-if="accountColumnIndex == index">
+                <a-tooltip title="Show recent activity ↗">
+                  <a :href="accountRecentActivityLink(cell)" target="_blank">{{ cell }}</a>
+                </a-tooltip>
+              </div>
+              <div v-else>
+                {{ cell }}
+              </div>
             </td>
           </tr>
         </tbody>

tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyVettingParticipation.java

@@ -71,27 +71,22 @@ public void getJson(SurveyJSONWrapper r)
             while (rsu.next()) {
                 int theirId = rsu.getInt("id");
                 final User theUser = sm.reg.getInfo(theirId);
-
-                if (UserRegistry.userIsLocked(theUser)
-                        || UserRegistry.userIsManagerOrStronger(theUser)
-                        || !UserRegistry.userIsGuestOrStronger(theUser)) {
-                    continue; // skip these
+                if (!UserRegistry.userIsExactlyVetter(theUser)) {
+                    continue;
+                }
+                LocaleSet localeSet = getVettingParticipationLocales(theUser);
+                if (localeSet == null || localeSet.isEmpty()) {
+                    continue;
                 }
                 // Note: this json includes some data not currently (2025-07) used by the
                 // client for vetting participation, such as user.emailHash and user.time.
                 final JSONObject json = SurveyJSONWrapper.wrap(theUser);
                 userObj.put(json);
-
-                final LocaleSet intSet = theUser.getInterestLocales();
-                if (intSet == null || intSet.isEmpty() || intSet.isAllLocales()) {
-                    json.put("allLocales", true);
-                } else {
-                    JSONArray intArr = new JSONArray();
-                    for (final CLDRLocale l : intSet.getSet()) {
-                        intArr.put(l.getBaseName());
-                    }
-                    json.put("locales", intArr);
+                JSONArray intArr = new JSONArray();
+                for (final CLDRLocale l : localeSet.getSet()) {
+                    intArr.put(l.getBaseName());
                 }
+                json.put("locales", intArr);
             }
 
             rs = psParticipation.executeQuery();
@@ -118,4 +113,23 @@ public void getJson(SurveyJSONWrapper r)
         r.put("users", userObj);
         r.put("participation", participationObj);
     }
+
+    /**
+     * Basically, get the authorized locale set for the given user; however, if that set is "all
+     * locales", return null unless the user's org has just one language, in which case get that
+     * language
+     *
+     * @param theUser the user in question
+     * @return the set of locales, or null, but not "all locales"
+     */
+    private LocaleSet getVettingParticipationLocales(User theUser) {
+        LocaleSet set = theUser.getAuthorizedLocaleSet();
+        if (set != null && set.isAllLocales()) {
+            set = theUser.getOrganization().getCoveredLocales();
+            if (set.isAllLocales() || set.getSet().size() != 1) {
+                return null;
+            }
+        }
+        return set;
+    }
 }

tools/cldr-apps/src/main/java/org/unicode/cldr/web/UserRegistry.java

@@ -1834,6 +1834,10 @@ public static boolean userIsManagerOrStronger(User u) {
         return (u != null) && u.getLevel().isManagerOrStronger();
     }
 
+    public static boolean userIsExactlyVetter(User u) {
+        return (u != null) && u.getLevel().isExactlyVetter();
+    }
+
     public static boolean userIsVetterOrStronger(User u) {
         return (u != null) && u.getLevel().isVetterOrStronger();
     }

tools/cldr-code/src/main/java/org/unicode/cldr/util/VoteResolver.java

@@ -356,6 +356,10 @@ public boolean isManagerOrStronger() {
             return stlevel <= manager.stlevel;
         }
 
+        public boolean isExactlyVetter() {
+            return stlevel == vetter.stlevel;
+        }
+
         public boolean isVetterOrStronger() {
             return stlevel <= vetter.stlevel;
         }