CLDR-16835 Non-TC locales and extended locales remain open longer

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

@@ -1049,10 +1049,30 @@ function getLocaleDir(locale) {
   return localeDir;
 }
 
+/** @returns true if locmap has been loaded from data */
+function localeMapReady() {
+  return !!locmap.locmap;
+}
+
+/** event ID for localeMap changes */
+const LOCALEMAP_EVENT = "localeMapReady";
+
+/**
+ * Calls the callback when the localeMap is ready (with real data).
+ * Calls right away if the localeMap was already loaded.
+ */
+function onLocaleMapReady(callback) {
+  if (localeMapReady()) {
+    callback();
+  } else {
+    cldrStatus.on(LOCALEMAP_EVENT, callback);
+  }
+}
+
 function setTheLocaleMap(lm) {
   locmap = lm;
+  cldrStatus.dispatchEvent(new Event(LOCALEMAP_EVENT));
 }
-
 /**
  * Convenience for calling getTheLocaleMap().getLocaleName(loc)
  * @param {String} loc
@@ -1062,6 +1082,10 @@ function getLocaleName(loc) {
   return locmap.getLocaleName(loc);
 }
 
+function getLocaleInfo(loc) {
+  return locmap.getLocaleInfo(loc);
+}
+
 /**
  * Get the window location hash
  *
@@ -1145,13 +1169,15 @@ export {
   flipToOtherDiv,
   getHash,
   getLocaleDir,
+  getLocaleInfo,
   getLocaleName,
   getTheLocaleMap,
   handleCoverageChanged,
   insertLocaleSpecialNote,
   linkToLocale,
   localeSpecialNote,
   myLoad,
+  onLocaleMapReady,
   parseHashAndUpdate,
   reloadV,
   replaceHash,

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

@@ -49,6 +49,10 @@ function on(type, callback) {
   getStatusTarget().addEventListener(type, callback);
 }
 
+/**
+ * Fire off an event manually
+ * @param type the type to dispatch
+ */
 function dispatchEvent(type) {
   return getStatusTarget().dispatchEvent(type);
 }
@@ -75,6 +79,9 @@ function updateAll(status) {
   if (status.phase) {
     setPhase(status.phase);
   }
+  if (status.ddlPhase) {
+    setDdlPhase(status.ddlPhase);
+  }
   if (status.specialHeader) {
     setSpecialHeader(status.specialHeader);
   }
@@ -296,9 +303,17 @@ function getPhase() {
   return phase;
 }
 
+let ddlPhase = "";
 function setPhase(p) {
   phase = p;
 }
+function getDdlPhase() {
+  return ddlPhase;
+}
+
+function setDdlPhase(p) {
+  ddlPhase = p;
+}
 
 /**
  * Is this a "beta" phase of Survey Tool? (Boolean)
@@ -466,6 +481,7 @@ function setAutoImportBusy(busy) {
 }
 
 export {
+  dispatchEvent,
   getAutoImportBusy,
   getContextPath,
   getCurrentId,
@@ -479,6 +495,7 @@ export {
   getNewVersion,
   getOrganizationName,
   getPermissions,
+  getDdlPhase,
   getPhase,
   getRunningStamp,
   getSessionId,
@@ -507,6 +524,7 @@ export {
   setOrganizationName,
   setPermissions,
   setPhase,
+  setDdlPhase,
   setSessionId,
   setSessionMessage,
   setSpecialHeader,

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

@@ -1,7 +1,12 @@
 <template>
   <header id="st-header">
+    <a-spin v-if="!loaded" :delay="250" />
     <ul>
-      <li>{{ stVersionPhase }}</li>
+      <li>{{ stVersion }} {{ stPhase }}
+        <span class="ddlException" v-if="ddlException" title="Note: As a non-TC DDL locale, this phase has been extended.">
+          (extended)
+        </span>
+      </li>
       <li>
         <a href="#menu///"><span class="main-menu-icon">☰</span></a>
       </li>
@@ -79,6 +84,7 @@
 <script>
 import * as cldrAnnounce from "../esm/cldrAnnounce.mjs";
 import * as cldrCoverage from "../esm/cldrCoverage.mjs";
+import * as cldrLoad from "../esm/cldrLoad.mjs";
 import * as cldrMenu from "../esm/cldrMenu.mjs";
 import * as cldrStatus from "../esm/cldrStatus.mjs";
 import * as cldrText from "../esm/cldrText.mjs";
@@ -87,6 +93,7 @@ import * as cldrVote from "../esm/cldrVote.mjs";
 export default {
   data() {
     return {
+      loaded: false,
       announcementsTitle: null,
       coverageLevel: null,
       coverageMenu: [],
@@ -96,7 +103,10 @@ export default {
       orgCoverage: null,
       sessionMessage: null,
       specialHeader: null,
-      stVersionPhase: null,
+      stPhase: null,
+      stVersion: null,
+      tcLocale: true,
+      ddlException: false,
       unreadAnnouncementCount: 0,
       userName: null,
       voteCountMenu: null,
@@ -105,7 +115,12 @@ export default {
   },
 
   mounted() {
-    this.updateData();
+    // load after the localemap is ready
+    cldrLoad.onLocaleMapReady(() => {
+      this.updateData();
+    });
+    // reload if locale changes
+    cldrStatus.on("locale", () => this.updateData());
   },
 
   methods: {
@@ -114,9 +129,9 @@ export default {
      * This function is called both locally, to initialize, and from other module(s), to update.
      */
     updateData() {
-      const orgCoverage = cldrCoverage.getSurveyOrgCov(
-        cldrStatus.getCurrentLocale()
-      );
+      this.loaded = true;
+      const loc = cldrStatus.getCurrentLocale();
+      const orgCoverage = cldrCoverage.getSurveyOrgCov(loc);
       if (orgCoverage != this.orgCoverage) {
         this.orgCoverage = orgCoverage;
       }
@@ -155,11 +170,19 @@ export default {
       }
       this.sessionMessage = cldrStatus.getSessionMessage();
       this.specialHeader = cldrStatus.getSpecialHeader();
-      this.stVersionPhase =
-        "Survey Tool " +
-        cldrStatus.getNewVersion() +
-        " " +
-        cldrStatus.getPhase();
+      this.stVersion = "Survey Tool " + cldrStatus.getNewVersion();
+      this.tcLocale = cldrLoad?.getLocaleInfo(loc)?.tc;
+      if (!loc || this.tcLocale) {
+        this.stPhase = cldrStatus.getPhase();
+        this.ddlException = false;
+      } else {
+        this.stPhase = cldrStatus.getDdlPhase();
+        if (cldrStatus.getDdlPhase() != cldrStatus.getPhase()) {
+          this.ddlException = true;
+        } else {
+          this.ddlException = false;
+        }
+      }
       cldrAnnounce.getUnreadCount(this.setUnreadCount);
     },
 
@@ -261,4 +284,9 @@ label {
 #coverageLevel {
   width: 16ch;
 }
+
+.ddlException {
+  background-color: yellow;
+}
+
 </style>

tools/cldr-apps/src/main/java/org/unicode/cldr/util/CLDRConfigImpl.java

@@ -460,6 +460,11 @@ public CheckCLDR.Phase getPhase() {
         return SurveyMain.phase().getCPhase();
     }
 
+    @Override
+    public CheckCLDR.Phase getDDLPhase() {
+        return SurveyMain.getDDLPhase().getCPhase();
+    }
+
     @Override
     public CLDRURLS internalGetUrls() {
         if (contextUrl == null) contextUrl = CLDRURLS.DEFAULT_PATH;

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

@@ -988,8 +988,7 @@ public Map<String, String> getNonDistinguishingAttributes() {
          */
         public StatusAction getStatusAction(InputMethod inputMethod) {
             // null because this is for display.
-            return SurveyMain.phase()
-                    .getCPhase()
+            return SurveyMain.getCPhase(locale)
                     .getShowRowAction(this, inputMethod, getPathHeader(), userForVotelist);
         }
 

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

@@ -1092,6 +1092,7 @@ private static JSONObject createJSONLocMap(SurveyMain sm) throws JSONException {
         // locales will have info about each locale, including name
         JSONObject locales = new JSONObject();
         SupplementalDataInfo sdi = sm.getSupplementalDataInfo();
+        final StandardCodes sc = StandardCodes.make();
 
         Factory disk = sm.getDiskFactory();
 
@@ -1118,6 +1119,7 @@ private static JSONObject createJSONLocMap(SurveyMain sm) throws JSONException {
             locale.put("highestParent", loc.getHighestNonrootParent());
             locale.put("dcParent", dcParent);
             locale.put("dcChild", dcChild);
+            locale.put("tc", SubmissionLocales.isTcLocale(loc));
             locale.put(
                     "type",
                     Factory.getSourceTreeType(disk.getSourceDirectoryForLocale(loc.getBaseName())));
@@ -2656,7 +2658,7 @@ public static void handleBulkSubmit(
         final List<CheckCLDR.CheckStatus> checkResult = new ArrayList<>();
         TestCache.TestResultBundle cc = stf.getTestResult(loc, DataPage.getOptions(cs, loc));
         UserRegistry.User u = theirU;
-        CheckCLDR.Phase cPhase = CLDRConfig.getInstance().getPhase();
+        CheckCLDR.Phase cPhase = SurveyMain.getCPhase(loc);
         Set<String> allValidPaths = stf.getPathsForFile(loc);
         CLDRProgressTask progress = sm.openProgress("Bulk:" + loc, all.size());
         CLDRFile cldrUnresolved = cf.getUnresolved();

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

@@ -65,6 +65,7 @@
 import org.unicode.cldr.test.CheckCLDR;
 import org.unicode.cldr.test.ExampleGenerator;
 import org.unicode.cldr.test.HelpMessages;
+import org.unicode.cldr.test.SubmissionLocales;
 import org.unicode.cldr.util.CLDRCacheDir;
 import org.unicode.cldr.util.CLDRConfig;
 import org.unicode.cldr.util.CLDRConfigImpl;
@@ -209,6 +210,7 @@ public String display() {
 
     // ===== Configuration state
     private static Phase currentPhase = Phase.VETTING;
+    private static Phase currentDdlPhase = Phase.VETTING;
     /** set by CLDR_PHASE property. * */
     private static String oldVersion = "OLDVERSION";
 
@@ -2077,9 +2079,9 @@ public String getLocaleLink(WebContext ctx, CLDRLocale locale, String n) {
         if (canModify) {
             rv = rv + (modifyThing(ctx));
             int odisp;
-            if ((SurveyMain.phase() == Phase.VETTING
-                            || SurveyMain.phase() == Phase.SUBMIT
-                            || isPhaseVettingClosed())
+            if ((SurveyMain.phase(locale) == Phase.VETTING
+                            || SurveyMain.phase(locale) == Phase.SUBMIT
+                            || isPhaseVettingClosed(locale))
                     && ((odisp = DisputePageManager.getOrgDisputeCount(ctx)) > 0)) {
                 rv = rv + ctx.iconHtml("disp", "(" + odisp + " org disputes)");
             }
@@ -2823,6 +2825,24 @@ private void doStartup() {
                                     + phaseString);
                 }
                 currentPhase = newPhase;
+                String ddlPhaseString = survprops.getProperty("CLDR_DDL_PHASE", null);
+                Phase ddlPhase = null;
+                try {
+                    if (ddlPhaseString != null && !ddlPhaseString.isEmpty()) {
+                        if (currentPhase == Phase.READONLY) {
+                            busted(
+                                    "Error: Cannot have a CLDR_DDL_PHASE when CLDR_PHASE=READONLY. Remove the CLDR_DDL_PHASE.");
+                        }
+                        ddlPhase = (Phase.valueOf(ddlPhaseString));
+                    }
+                } catch (IllegalArgumentException iae) {
+                    logger.warning("Error trying to parse CLDR_DDL_PHASE: " + iae);
+                }
+                if (ddlPhase == null) {
+                    ddlPhase = newPhase;
+                    logger.warning("CLDR_DDL_PHASE matches main phase " + ddlPhase);
+                }
+                currentDdlPhase = ddlPhase;
             }
             logger.info("Phase: " + phase() + ", cPhase: " + phase().getCPhase());
             progress.update("Setup props..");
@@ -3554,8 +3574,8 @@ public static String localhost() {
 
     // ============= Following have to do with phases
 
-    public static boolean isPhaseVettingClosed() {
-        return phase() == Phase.VETTING_CLOSED;
+    public static boolean isPhaseVettingClosed(CLDRLocale locale) {
+        return phase(locale) == Phase.VETTING_CLOSED;
     }
 
     public static boolean isPhaseReadonly() {
@@ -3570,6 +3590,21 @@ public static Phase phase() {
         return currentPhase;
     }
 
+    public static Phase phase(CLDRLocale locale) {
+        return (SubmissionLocales.isTcLocale(locale) ? phase() : getDDLPhase());
+    }
+
+    /**
+     * @returns the current phase for the locale. This is the preferred API.
+     */
+    public static CheckCLDR.Phase getCPhase(CLDRLocale loc) {
+        return phase(loc).getCPhase();
+    }
+
+    public static Phase getDDLPhase() {
+        return currentDdlPhase;
+    }
+
     public static String getOldVersion() {
         return oldVersion;
     }
@@ -3642,6 +3677,7 @@ private class StatusForFrontEnd implements JSONString {
         private final int pages = SurveyMain.pages;
         private Object permissions = null;
         private final Phase phase = phase();
+        private final Phase ddlPhase = getDDLPhase();
         private String sessionId = null;
         private final String specialHeader = getSpecialHeaderText();
         private final long surveyRunningStamp = SurveyMain.surveyRunningStamp.current();
@@ -3675,6 +3711,7 @@ private JSONObject toJSONObject() throws JSONException {
                     .put("pages", pages)
                     .put("permissions", permissions)
                     .put("phase", phase)
+                    .put("ddlPhase", ddlPhase)
                     .put("sessionId", sessionId)
                     .put("sessionMessage", sessionMessage)
                     .put("specialHeader", specialHeader)

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

@@ -1978,7 +1978,7 @@ public static ModifyDenial userCanModifyLocaleWhy(User u, CLDRLocale locale) {
         if (userIsAdmin(u) || userIsTC(u)) return null;
 
         // Otherwise, if closed, deny
-        if (SurveyMain.isPhaseVettingClosed()) return ModifyDenial.DENY_PHASE_CLOSED;
+        if (SurveyMain.isPhaseVettingClosed(locale)) return ModifyDenial.DENY_PHASE_CLOSED;
         if (SurveyMain.isPhaseReadonly()) return ModifyDenial.DENY_PHASE_READONLY;
 
         return null;