@7365admin1/layer-common 4.2.4 → 4.2.5-staging.270

package/components/BulletinBoardForm.vue

@@ -193,7 +193,6 @@ const today = computed(() => {
   const yyyy = d.getFullYear();
   const mm = String(d.getMonth() + 1).padStart(2, "0");
   const dd = String(d.getDate()).padStart(2, "0");
-  console.log("${yyyy}-${mm}-${dd}", `${yyyy}-${mm}-${dd}`);
   return `${yyyy}-${mm}-${dd}`;
 });
 

package/components/VehicleForm.vue

@@ -58,7 +58,7 @@
             <InputLabel class="text-capitalize" title="Block" required />
             <v-autocomplete
               v-model="vehicle.block"
-              :items="blocksArray"
+              :items="blockItems"
               autocomplete="off"
               :key="
                 blockListDataPending ? 'block-list-pending' : 'block-list-ready'
@@ -76,7 +76,7 @@
             <InputLabel class="text-capitalize" title="Level" required />
             <v-autocomplete
               v-model="vehicle.level"
-              :items="levelsArray"
+              :items="levelItems"
               autocomplete="off"
               :key="
                 levelListDataPending ? 'level-list-pending' : 'level-list-ready'
@@ -93,7 +93,7 @@
             <InputLabel class="text-capitalize" title="Unit" required />
             <v-autocomplete
               v-model="vehicle.unit"
-              :items="unitsArray"
+              :items="unitItems"
               autocomplete="off"
               :key="
                 unitListDataPending ? 'unit-list-pending' : 'unit-list-ready'
@@ -532,10 +532,78 @@ const shouldShowField = (fieldKey: string): boolean => {
   return visibleFields?.includes(fieldKey);
 };
 
+/**
+ * Block / Level / Unit are ids bound to autocompletes whose `:items` come from
+ * the site's own lists. Vuetify renders the RAW model value when it is not in
+ * that list, which is how the Season Pass edit dialog came to show
+ * `6a31fd37917fb18ef1a21a0a` in all three fields instead of names.
+ *
+ * Two different causes end in the same place, and neither is fixable in the
+ * repository: the site list has simply not arrived yet, and - measured on
+ * staging - a stored unit id that points at a building unit which has since
+ * been DELETED, so it can NEVER appear in the list however the row is fetched.
+ *
+ * So the fix is here, at the display layer: an id with no name gets an explicit
+ * item saying why there is no name. A Mongo id is not a name, and a blank field
+ * with no explanation is not better than one.
+ *
+ * The stored value is left untouched - the field still submits the same id, so
+ * saving an unrelated edit does not silently rewrite someone's unit.
+ */
+function withUnresolved(
+  items: TDefaultOptionObj[],
+  value: unknown,
+  pending: boolean,
+  noun: string
+): TDefaultOptionObj[] {
+  const id =
+    typeof value === "string" ? value : ((value as any)?._id ?? "");
+  if (!id || items.some((item) => item.value === id)) return items;
+
+  return [
+    {
+      title: pending
+        ? `Loading ${noun}…`
+        : `This ${noun} is no longer on the site list (${id})`,
+      value: id,
+    },
+    ...items,
+  ];
+}
+
+const blockItems = computed(() =>
+  withUnresolved(
+    blocksArray.value,
+    vehicle.block,
+    blockListDataPending.value,
+    "block"
+  )
+);
+
+const levelItems = computed(() =>
+  withUnresolved(
+    levelsArray.value,
+    vehicle.level,
+    levelListDataPending.value,
+    "level"
+  )
+);
+
+const unitItems = computed(() =>
+  withUnresolved(
+    unitsArray.value,
+    vehicle.unit,
+    unitListDataPending.value,
+    "unit"
+  )
+);
+
 const searchUnitName = computed(() => {
+  // Same rule as the fields: never put a raw id in front of a person. The
+  // dialog title used to fall through to `vehicle.unit`, so a deleted unit
+  // titled the panel with its ObjectId.
   return (
-    unitsArray.value.find((u) => u.value === vehicle.unit)?.title ||
-    vehicle.unit
+    unitsArray.value.find((u) => u.value === vehicle.unit)?.title || "-"
   );
 });
 
@@ -1047,10 +1115,12 @@ const resetVehicleDetails = () => {
 };
 
 function handleCloseMatchDialog() {
+  // Close only. This used to null `vehicle.unit` whenever the panel had found
+  // matches, so backing out of the picker with the header X wiped a Unit the
+  // user had chosen BEFORE opening it and painted the field required-in-red.
+  // The panel's own close button never did that; the two now agree. Backing out
+  // of a picker is not a decision to discard what you already had.
   showMatchingPeopleDialog.value = false;
-  if (matchingPeople.value.length > 0) {
-    vehicle.unit = null;
-  }
 }
 
 onMounted(() => {

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "4.2.4",
+  "version": "4.2.5-staging.270",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "//files": "What a consumer extending this layer actually loads. Without this npm ships the whole working tree - the changesets, the CI workflows, the render harness in tools/ and any scratch directory that happened to exist at publish time. Nuxt resolves a layer by directory, so every runtime directory below has to stay listed; adding a new top-level runtime directory means adding it here too.",