@7365admin1/layer-common 3.2.2-staging.198 → 3.2.2-staging.199

package/components/AttendanceSettingsDialog.vue

@@ -169,6 +169,7 @@ const {
   data: getAttendanceSettingsReq,
   refresh: getAttendanceSettingsRefresh,
   pending: loading,
+  error: getAttendanceSettingsError,
 } = await useLazyAsyncData(
   `attendance-settings-${props.site}`,
   () => getAttendanceSettings(props.site, props.serviceType),
@@ -179,6 +180,22 @@ const {
 );
 
 watchEffect(() => {
+  // A failed read used to be indistinguishable from a site with no settings
+  // saved: the dialog just opened with geofencing off and blank fields, and
+  // the operator had no way to tell it was showing them nothing rather than
+  // the truth. Worse, a request answered by the SPA fallback resolves with a
+  // 200 and a STRING, so nothing threw - every field read off it was simply
+  // undefined. Anything that is not an object is a failure, and it is said.
+  const res: any = getAttendanceSettingsReq.value;
+  if (
+    getAttendanceSettingsError.value ||
+    (res !== null && res !== undefined && typeof res !== "object")
+  ) {
+    error.value =
+      "Could not load the saved settings - what you see below is not what is saved. Close and reopen to try again.";
+    return;
+  }
+
   if (getAttendanceSettingsReq.value) {
     isGeofencingEnabled.value =
       getAttendanceSettingsReq.value.isGeofencingEnabled || false;

package/components/ServiceProviderMain.vue

@@ -208,6 +208,16 @@
               </v-list>
             </v-menu>
           </template>
+          <!--
+            "There are none" and "we could not fetch them" are not the same
+            sentence, and this table drew the first for both: a failed request
+            left `items` at [] and the default no-data row read "No data
+            available". That is what hid the Pending tab being unreachable in
+            six apps for months. `loadFailed` splits them.
+          -->
+          <template #no-data>
+            <DashboardEmptyState :error="loadFailed" />
+          </template>
         </v-data-table>
       </div>
 
@@ -812,6 +822,8 @@ const messageColor = ref("");
 
 const items = ref<TableRow[]>([]);
 const loading = ref(false);
+/** The last load failed, as opposed to genuinely returning nothing. */
+const loadFailed = ref(false);
 
 const validServiceProvider = ref(false);
 const disableServiceProvider = ref(false);
@@ -1244,6 +1256,18 @@ async function loadList() {
   // }
 
   loading.value = true;
+  loadFailed.value = false;
+  // A request that never reaches the API can still resolve: a path with no
+  // proxy rule is answered by the SPA fallback with 200 text/html, and ofetch
+  // hands that back as a STRING. `.items` on a string is undefined, so
+  // `?? []` used to turn that into a clean empty table. Anything that is not
+  // an array is a failure, not a zero - say so.
+  const rowsOf = (data: any) => {
+    if (!Array.isArray(data?.items)) {
+      throw new Error("The server did not return a list. Please try again.");
+    }
+    return data.items;
+  };
   try {
     if (listTab.value === "pending") {
       // Everything that is not a finished engagement, so a rejection or a
@@ -1256,7 +1280,7 @@ async function loadList() {
         search: searchText.value?.trim() || "",
         limit: pageSize,
       });
-      items.value = mapInviteRows(data.items ?? []);
+      items.value = mapInviteRows(rowsOf(data));
       pages.value = data.pages ?? 0;
       pageRange.value = data.pageRange ?? "-- - -- of --";
       return;
@@ -1270,10 +1294,11 @@ async function loadList() {
       limit: pageSize,
       status: statusParam,
     });
-    items.value = mapProviderRows(data.items ?? []);
+    items.value = mapProviderRows(rowsOf(data));
     pages.value = data.pages ?? 0;
     pageRange.value = data.pageRange ?? "-- - -- of --";
   } catch (error: any) {
+    loadFailed.value = true;
     showMessage(errorConverter(error), "error");
     items.value = [];
     pages.value = 0;

package/package.json

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