From b74b0e850e36efe45623888be5bb812f694ddfd9 Mon Sep 17 00:00:00 2001
From: Pavlo Kulyk <pkulyk@devforth.io>
Date: Fri, 13 Mar 2026 14:29:08 +0200
Subject: [PATCH 1/2] fix: update error for wrong resource id

---
 .../spa/src/components/BreadcrumbsWithButtons.vue      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/adminforth/spa/src/components/BreadcrumbsWithButtons.vue b/adminforth/spa/src/components/BreadcrumbsWithButtons.vue
index fb86752bd..ac9ee6deb 100644
--- a/adminforth/spa/src/components/BreadcrumbsWithButtons.vue
+++ b/adminforth/spa/src/components/BreadcrumbsWithButtons.vue
@@ -6,17 +6,17 @@
         <slot></slot>
       </div>
     </div>
-    <div class="flex items-center justify-between mb-3 flex-wrap gap-y-2 gap-2" v-if="coreStore.resourceColumnsError">
-      <div class="p-4 mb-4 text-sm text-red-800 rounded-lg bg-red-50 dark:bg-gray-800 dark:text-red-400" role="alert">
-        <span class="font-medium">{{ $t('Error!')}}</span> {{ coreStore.resourceColumnsError }}
-      </div>
+   
+    <div class="absolute inset-0 z-50 bg-white " v-if="coreStore.resourceColumnsError">
+      <PageNotFound/>
     </div>
   </div>
 
 </template>
 
 <script setup>
-import Breadcrumbs from '@/components/Breadcrumbs.vue';
+import Breadcrumbs from '@/components/Breadcrumbs.vue'; 
+import PageNotFound from '@/views/PageNotFound.vue';
 
 import { useCoreStore } from '@/stores/core';
 

From 08bd85882bcb8e5b71d7d9e2ea0d330207a3d769 Mon Sep 17 00:00:00 2001
From: Pavlo Kulyk <pkulyk@devforth.io>
Date: Mon, 16 Mar 2026 10:43:43 +0200
Subject: [PATCH 2/2] fix: add check for correct error

---
 .../spa/src/components/BreadcrumbsWithButtons.vue    | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/adminforth/spa/src/components/BreadcrumbsWithButtons.vue b/adminforth/spa/src/components/BreadcrumbsWithButtons.vue
index ac9ee6deb..333ae7e83 100644
--- a/adminforth/spa/src/components/BreadcrumbsWithButtons.vue
+++ b/adminforth/spa/src/components/BreadcrumbsWithButtons.vue
@@ -6,9 +6,15 @@
         <slot></slot>
       </div>
     </div>
-   
-    <div class="absolute inset-0 z-50 bg-white " v-if="coreStore.resourceColumnsError">
-      <PageNotFound/>
+    <div class="flex items-center justify-between mb-3 flex-wrap gap-y-2 gap-2" v-if="coreStore.resourceColumnsError">
+      <div class="p-4 mb-4 text-sm text-red-800 rounded-lg bg-red-50 dark:bg-gray-800 dark:text-red-400" role="alert">
+        <span class="font-medium">{{ $t('Error!') }}</span>
+        {{ coreStore.resourceColumnsError }}
+      </div>
+    </div>
+
+    <div class="absolute inset-0 z-50 bg-white " v-if="coreStore.resourceColumnsError?.includes('not found')">
+      <PageNotFound />
     </div>
   </div>