Merge branch 'main' of github.com:devforth/adminforth

Author: yaroslav8765

adminforth/spa/src/components/Filters.vue

@@ -195,6 +195,7 @@ const props = defineProps<{
   filters?: AdminforthFilterStore['filters'],
   show: Boolean,
   columnsMinMax: ColumnMinMaxValue,
+  resourceId?: string,
   filtersStore: AdminforthFilterStoreUnwrapped
 }>();
 
@@ -235,7 +236,7 @@ async function loadMoreOptions(columnName: string, searchTerm = '') {
     columnName,
     searchTerm,
     columns: props.columns,
-    resourceId: router.currentRoute.value.params.resourceId as string,
+    resourceId: props.resourceId ?? router.currentRoute.value.params.resourceId as string,
     columnOptions,
     columnLoadingState,
     columnOffsets,

adminforth/spa/src/views/ListView.vue

@@ -7,6 +7,7 @@
         :show="filtersShow"
         @hide="filtersShow = false"
         :filtersStore="filtersStore"
+        :resourceId="coreStore.resource?.resourceId"
       />
     </Teleport>