Merge pull request #3488 from nwmac/resource-not-found

Catch resource not found on ResourceDetail view

assets/translations/en-us.yaml

@@ -16,6 +16,7 @@ generic:
   disabled: Disabled
   done: Done
   enabled: Enabled
+  id: ID
   ignored: Ignored
   invalidCron: Invalid cron schedule
   labelsAndAnnotations: Labels & Annotations

components/IconMessage.vue

@@ -52,6 +52,7 @@ export default {
     align-items: center;
     justify-content: center;
     flex: 1;
+    flex-direction: column;
 
     > I {
       font-size: 64px;

components/ResourceDetail/index.vue

@@ -11,6 +11,7 @@ import { createYaml } from '@/utils/create-yaml';
 import Masthead from '@/components/ResourceDetail/Masthead';
 import DetailTop from '@/components/DetailTop';
 import { clone, set, diff } from '@/utils/object';
+import IconMessage from '@/components/IconMessage';
 
 function modeFor(route) {
   if ( route.query?.mode === _IMPORT ) {
@@ -41,6 +42,7 @@ export default {
     DetailTop,
     ResourceYaml,
     Masthead,
+    IconMessage,
   },
 
   mixins: [CreateEditView],
@@ -84,6 +86,7 @@ export default {
     // As determines what component will be rendered
     const requested = route.query[AS];
     let as;
+    let notFound = false;
 
     if ( mode === _VIEW && hasCustomDetail && (!requested || requested === _DETAIL) ) {
       as = _DETAIL;
@@ -129,11 +132,16 @@ export default {
         fqid = `${ namespace }/${ fqid }`;
       }
 
-      originalModel = await store.dispatch(`${ inStore }/find`, {
+      try {
-        type: resource,
+        originalModel = await store.dispatch(`${ inStore }/find`, {
-        id:   fqid,
+          type: resource,
-        opt:  { watch: true }
+          id:   fqid,
-      });
+          opt:  { watch: true }
+        });
+      } catch (e) {
+        originalModel = {};
+        notFound = fqid;
+      }
 
       if (realMode === _VIEW) {
         model = originalModel;
@@ -173,6 +181,7 @@ export default {
       originalModel,
       mode,
       value: model,
+      notFound,
     };
 
     for ( const key in out ) {
@@ -296,6 +305,17 @@ export default {
 
 <template>
   <Loading v-if="$fetchState.pending" />
+  <div v-else-if="notFound">
+    <IconMessage icon="icon-warning">
+      <template v-slot:message>
+        {{ t('generic.notFound') }}
+        <div>
+          <div>{{ t('generic.type') }}: {{ resource }}</div>
+          <div>{{ t('generic.id') }}: {{ notFound }}</div>
+        </div>
+      </template>
+    </IconMessage>
+  </div>
   <div v-else>
     <Masthead
       :resource="resource"