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

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'
@@ -433,6 +433,13 @@ const prop = defineProps({
     type: Object as PropType<Partial<TVehicle> | null>,
     default: null,
   },
+  // Id -> name for this record's block/level/unit, taken from the list row,
+  // which the API already resolved. Lets the dialog name a value its own
+  // dropdown cannot offer, instead of falling through to the raw id.
+  nameHints: {
+    type: Object as PropType<Record<string, string>>,
+    default: () => ({}),
+  },
   plateNumberId: {
     type: String,
     default: "",
@@ -532,10 +539,110 @@ 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.
+ *
+ * A Mongo id is never shown to a person. The name is available: the vehicle
+ * LIST resolves it server-side (`getVehicles` $lookup's buildings /
+ * building-levels / building-units) while the edit dialog's own fetch
+ * (`getSpecificVehicleById`, a plain findOne) returns raw ids. `VehicleManagement`
+ * therefore hands the already-resolved names down as `nameHints`, an id -> name
+ * map taken from the list row - no extra request, no change to what is stored.
+ *
+ * Three cases, in order:
+ *   - the list has not arrived yet          -> "Loading unit..."
+ *   - a name is known but not in the list   -> "Tower Ten (no longer selectable)"
+ *   - no name can be found at all           -> plain sentence, still no id
+ *
+ * Measured on staging, both non-loading cases are real. A block drops out of
+ * the picker once it has no ACTIVE units left (`getBuildingWithUnitsList` lists
+ * only buildings that still have units), so "Tower Ten" is a live building the
+ * form cannot offer; and a stored unit id can point at a building unit that has
+ * since been deleted, which no name lookup can answer.
+ *
+ * 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,
+  nameHints: Record<string, string>
+): TDefaultOptionObj[] {
+  const id = idOf(value);
+  if (!id || items.some((item) => item.value === id)) return items;
+
+  const name = nameHints[id];
+
+  // The id belongs in a log, not on screen. Support needs it; the property
+  // manager does not.
+  if (!pending && !name) {
+    console.warn(`[VehicleForm] no name resolved for ${noun} id ${id}`);
+  }
+
+  return [
+    {
+      title: pending
+        ? `Loading ${noun}...`
+        : name
+          ? `${name} (no longer selectable)`
+          : `This ${noun} is no longer on the site list`,
+      value: id,
+    },
+    ...items,
+  ];
+}
+
+/** Block/level/unit arrive either as a raw id string or as a `{_id, name}` object. */
+function idOf(value: unknown): string {
+  return typeof value === "string"
+    ? value
+    : String((value as any)?._id ?? "");
+}
+
+const blockItems = computed(() =>
+  withUnresolved(
+    blocksArray.value,
+    vehicle.block,
+    blockListDataPending.value,
+    "block",
+    prop.nameHints
+  )
+);
+
+const levelItems = computed(() =>
+  withUnresolved(
+    levelsArray.value,
+    vehicle.level,
+    levelListDataPending.value,
+    "level",
+    prop.nameHints
+  )
+);
+
+const unitItems = computed(() =>
+  withUnresolved(
+    unitsArray.value,
+    vehicle.unit,
+    unitListDataPending.value,
+    "unit",
+    prop.nameHints
+  )
+);
+
 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.
+  const id = idOf(vehicle.unit);
   return (
-    unitsArray.value.find((u) => u.value === vehicle.unit)?.title ||
-    vehicle.unit
+    unitsArray.value.find((u) => u.value === id)?.title ||
+    prop.nameHints[id] ||
+    "-"
   );
 });
 
@@ -1047,10 +1154,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/components/VehicleManagement.vue

@@ -85,13 +85,13 @@
 
     <v-dialog v-model="dialog.createVehicle" v-if="vehicleType" width="450" persistent>
       <VehicleForm :type="vehicleType" :mode="mode" :vehicle-data="selectedVehicleObject"
-        :plate-number-id="selectedPlateNumberId" @back="handleBackToSelection" @done="handleAddVehicleComplete"
+        :plate-number-id="selectedPlateNumberId" :name-hints="nameHints" @back="handleBackToSelection" @done="handleAddVehicleComplete"
         :org="org" :site="props.site" @close:all="handleCloseAll" />
     </v-dialog>
 
     <v-dialog v-model="dialog.updateVehicle" v-if="vehicleType" width="450" persistent>
       <VehicleForm :type="vehicleType" :mode="mode" :vehicle-data="selectedPlateNumberObject"
-        :plate-number-id="selectedPlateNumberId" @back="handleBackToSelection" @done="handleAddVehicleComplete"
+        :plate-number-id="selectedPlateNumberId" :name-hints="nameHints" @back="handleBackToSelection" @done="handleAddVehicleComplete"
         :org="org" :site="props.site" @close:all="handleCloseAll" @close="handleCloseAll" />
     </v-dialog>
 
@@ -371,6 +371,34 @@ const selectedVehicleObject = computed(() => {
   return items.value.find(item => item?._id === selectedVehicleId.value) || {}
 })
 
+/**
+ * The edit dialog fetches its record with `getSpecificVehicleById`, a plain
+ * findOne, so block/level/unit come back as raw ObjectIds. The LIST does the
+ * work already - `getVehicles` $lookup's buildings, building-levels and
+ * building-units, which is why this table can print "Tower Ten" for the same
+ * record. Hand those resolved names down so the dialog never has to fall back
+ * to an id it cannot name.
+ *
+ * Id -> name, not the objects themselves: the form binds ids, and passing a
+ * `{_id, name}` object into its autocompletes is what broke it before.
+ */
+const nameHints = computed<Record<string, string>>(() => {
+  const plateId = selectedPlateNumberId.value;
+  const row: any =
+    items.value.find(
+      (r: any) =>
+        r?._id === plateId ||
+        (Array.isArray(r?.plates) && r.plates.some((p: any) => p?._id === plateId))
+    ) || selectedVehicleObject.value;
+
+  const hints: Record<string, string> = {};
+  for (const key of ["block", "level", "unit"]) {
+    const field = row?.[key];
+    if (field?._id && field?.name) hints[String(field._id)] = String(field.name);
+  }
+  return hints;
+})
+
 const { data: getVehiclesReq, refresh: getVehiclesRefresh, pending: getVehiclesPending } =
   await useLazyAsyncData(
     `get-all-vehicles-${props.site}`,

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "4.2.4",
+  "version": "4.2.5-staging.271",
   "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.",