@jskit-ai/shell-web 0.1.94 → 0.1.96

package/package.descriptor.mjs

@@ -1,7 +1,7 @@
 export default Object.freeze({
   packageVersion: 1,
   packageId: "@jskit-ai/shell-web",
-  version: "0.1.94",
+  version: "0.1.96",
   kind: "runtime",
   description: "Web shell layout runtime with outlet-based placement contributions.",
   dependsOn: [],
@@ -28,6 +28,13 @@ export default Object.freeze({
     }
   },
   metadata: {
+    client: {
+      optimizeDeps: {
+        exclude: [
+          "@jskit-ai/shell-web/client"
+        ]
+      }
+    },
     apiSummary: {
       surfaces: [
         {
@@ -300,7 +307,7 @@ export default Object.freeze({
     dependencies: {
       runtime: {
         "@mdi/js": "^7.4.47",
-        "@jskit-ai/kernel": "0.1.95"
+        "@jskit-ai/kernel": "0.1.97"
       },
       dev: {}
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/shell-web",
-  "version": "0.1.94",
+  "version": "0.1.96",
   "type": "module",
   "scripts": {
     "test": "node --test"
@@ -28,7 +28,7 @@
   },
   "dependencies": {
     "@mdi/js": "^7.4.47",
-    "@jskit-ai/kernel": "0.1.95"
+    "@jskit-ai/kernel": "0.1.97"
   },
   "peerDependencies": {
     "pinia": "^3.0.4",

package/src/client/components/ShellMenuLinkItem.vue

@@ -61,6 +61,7 @@ const resolvedIcon = computed(() =>
 <template>
   <v-list-item
     v-if="resolvedTarget.href"
+    class="shell-menu-link-item"
     :title="props.label"
     :to="resolvedTarget.sameOrigin ? resolvedTarget.href : undefined"
     :href="resolvedTarget.sameOrigin ? undefined : resolvedTarget.href"
@@ -69,3 +70,9 @@ const resolvedIcon = computed(() =>
     :exact="props.exact"
   />
 </template>
+
+<style scoped>
+.shell-menu-link-item {
+  min-height: 48px;
+}
+</style>

package/src/client/components/ShellSurfaceAwareMenuLinkItem.vue

@@ -106,6 +106,7 @@ const resolvedIcon = computed(() =>
 <template>
   <v-list-item
     v-if="resolvedTarget.href"
+    class="shell-menu-link-item"
     :title="props.label"
     :to="resolvedTarget.sameOrigin ? resolvedTarget.href : undefined"
     :href="resolvedTarget.sameOrigin ? undefined : resolvedTarget.href"
@@ -114,3 +115,9 @@ const resolvedIcon = computed(() =>
     :exact="props.exact"
   />
 </template>
+
+<style scoped>
+.shell-menu-link-item {
+  min-height: 48px;
+}
+</style>

package/src/client/requestRecovery/runtime.js

@@ -277,29 +277,54 @@ function installRecoverableQueryObserver({
 
   const reportedErrorUpdateByQueryHash = new Map();
 
+  function dismissReportedQueryRecovery(queryHash = "") {
+    const reported = reportedErrorUpdateByQueryHash.get(queryHash);
+    if (!reported) {
+      return;
+    }
+
+    reportedErrorUpdateByQueryHash.delete(queryHash);
+    if (reported.presentationId && typeof runtime.dismiss === "function") {
+      runtime.dismiss(reported.presentationId, {
+        presenterId: reported.presenterId
+      });
+    }
+  }
+
+  function dismissReportedQueryRecoveries() {
+    for (const queryHash of [...reportedErrorUpdateByQueryHash.keys()]) {
+      dismissReportedQueryRecovery(queryHash);
+    }
+  }
+
   function inspectQuery(query = null) {
+    const queryHash = resolveQueryHash(query);
     if (
       !query ||
       isRequestRecoveryDisabled(query) ||
       !isSafeQueryRecoveryMethod(query) ||
       !isActiveQuery(query)
     ) {
+      if (queryHash) {
+        dismissReportedQueryRecovery(queryHash);
+      }
       return;
     }
 
     const error = recoverableQueryError(query);
-    const queryHash = resolveQueryHash(query);
     if (!error || !queryHash) {
-      reportedErrorUpdateByQueryHash.delete(queryHash);
+      if (queryHash) {
+        dismissReportedQueryRecovery(queryHash);
+      }
       return;
     }
 
     const errorUpdateCount = Number(query?.state?.errorUpdateCount || 0);
     const reportKey = `${errorUpdateCount}:${errorMessage(error)}`;
-    if (reportedErrorUpdateByQueryHash.get(queryHash) === reportKey) {
+    const reported = reportedErrorUpdateByQueryHash.get(queryHash);
+    if (reported?.reportKey === reportKey) {
       return;
     }
-    reportedErrorUpdateByQueryHash.set(queryHash, reportKey);
 
     const source = resolveQueryRecoverySource(query);
     const dedupeKey = resolveQueryRecoveryDedupeKey(
@@ -307,7 +332,7 @@ function installRecoverableQueryObserver({
       `shell-web.request-recovery.query.${queryHash}.${errorUpdateCount}`
     );
     const dedupeWindowMs = resolveQueryRecoveryDedupeWindowMs(query);
-    runtime.report(error, {
+    const result = runtime.report(error, {
       label: resolveQueryRecoveryLabel(query),
       retry: createQueryRetry(queryClient, query),
       source,
@@ -315,6 +340,17 @@ function installRecoverableQueryObserver({
       dedupeKey,
       ...(dedupeWindowMs !== null ? { dedupeWindowMs } : {})
     });
+
+    const presentationId = normalizeText(result?.presentationId || reported?.presentationId);
+    const presenterId = normalizeText(result?.decision?.presenterId || reported?.presenterId);
+    if (reported?.presentationId && reported.presentationId !== presentationId) {
+      dismissReportedQueryRecovery(queryHash);
+    }
+    reportedErrorUpdateByQueryHash.set(queryHash, {
+      reportKey,
+      presentationId,
+      presenterId
+    });
   }
 
   try {
@@ -347,7 +383,7 @@ function installRecoverableQueryObserver({
 
   return Object.freeze({
     dispose() {
-      reportedErrorUpdateByQueryHash.clear();
+      dismissReportedQueryRecoveries();
       if (typeof unsubscribe === "function") {
         unsubscribe();
       }
@@ -427,6 +463,14 @@ function createShellRequestRecoveryRuntime({
     };
   }
 
+  function dismiss(presentationId = "", options = {}) {
+    const runtime = errorRuntime();
+    if (!runtime || typeof runtime.dismiss !== "function") {
+      return 0;
+    }
+    return runtime.dismiss(presentationId, options);
+  }
+
   function report(error = null, options = {}) {
     if (!isRecoverableRequestError(error) && options.force !== true) {
       return null;
@@ -496,6 +540,7 @@ function createShellRequestRecoveryRuntime({
   }
 
   const api = Object.freeze({
+    dismiss,
     dispose,
     install,
     isRecoverableRequestError,

package/test/linkItemScaffoldContract.test.js

@@ -151,8 +151,12 @@ test("shell-web generic link items support the expected shared route and icon be
 
   assert.match(shellMenuSource, /exact:\s*\{/);
   assert.match(shellMenuSource, /:exact="props\.exact"/);
+  assert.match(shellMenuSource, /class="shell-menu-link-item"/);
+  assert.match(shellMenuSource, /min-height:\s*48px/);
   assert.match(shellSurfaceAwareSource, /exact:\s*\{/);
   assert.match(shellSurfaceAwareSource, /:exact="props\.exact"/);
+  assert.match(shellSurfaceAwareSource, /class="shell-menu-link-item"/);
+  assert.match(shellSurfaceAwareSource, /min-height:\s*48px/);
   assert.match(shellTabSource, /icon:\s*\{/);
   assert.match(shellTabSource, /resolveMenuLinkIcon/);
   assert.match(shellTabSource, /<v-btn/);

package/test/provider.test.js

@@ -428,6 +428,64 @@ test("shell request recovery reports active query transport failures with retry
   });
 });
 
+test("shell request recovery dismisses query presentations after recovery", async () => {
+  await withFetchStub({ surfaceAccess: {} }, async () => {
+    const queryCache = createQueryCacheDouble();
+    const queryClient = {
+      getQueryCache() {
+        return queryCache;
+      },
+      async refetchQueries() {}
+    };
+    const app = createAppDouble({ queryClient });
+    const provider = new ShellWebClientProvider();
+    provider.register(app);
+    await provider.boot(app);
+
+    const query = {
+      queryHash: "[\"project-access\"]",
+      queryKey: ["project-access"],
+      meta: {
+        jskit: {
+          requestRecoveryLabel: "Project access",
+          requestRecoverySource: "project-access.panel",
+          requestRecoveryDedupeKey: "project-access",
+          requestRecoveryMethod: "GET"
+        }
+      },
+      state: {
+        status: "error",
+        fetchStatus: "idle",
+        error: {
+          status: 0,
+          message: "Network request failed."
+        },
+        errorUpdateCount: 1
+      },
+      isActive() {
+        return true;
+      }
+    };
+    queryCache.emit({ type: "updated", query });
+
+    const errorStore = app.make("runtime.web-error.presentation-store.client");
+    assert.equal(errorStore.getState().channels.banner.length, 1);
+
+    query.state = {
+      status: "success",
+      fetchStatus: "idle",
+      data: {
+        ok: true
+      },
+      error: null,
+      errorUpdateCount: 1
+    };
+    queryCache.emit({ type: "updated", query });
+
+    assert.equal(errorStore.getState().channels.banner.length, 0);
+  });
+});
+
 test("shell request recovery ignores query transport failures without a safe read method", async () => {
   await withFetchStub({ surfaceAccess: {} }, async () => {
     const queryCache = createQueryCacheDouble();

package/test/settingsPlacementContract.test.js

@@ -316,6 +316,10 @@ test("shell-web placement topology seeds global actions as a semantic shell plac
 });
 
 test("shell-web descriptor metadata advertises adaptive shell outlets, default links, and installs the scaffold page", () => {
+  assert.deepEqual(descriptor?.metadata?.client?.optimizeDeps?.exclude, [
+    "@jskit-ai/shell-web/client"
+  ]);
+
   assert.deepEqual(readClientContainerTokens(), [
     "runtime.web-placement.client",
     "runtime.web-bootstrap.client",