feat: enhance resource handling by adding currentValue support and optimizing foreign data loading

Author: SerVitasik

adminforth/modules/restApi.ts

@@ -362,6 +362,9 @@ const getResourceForeignDataRequestSchema: AnySchemaObject = {
     search: { type: 'string' },
     filters: commonFiltersSchema,
     sort: commonSortSchema,
+    currentValue: {
+      description: 'When set, guarantees this PK value appears in the returned items even if it falls outside the requested page.',
+    },
   },
   additionalProperties: true,
 };
@@ -1635,7 +1638,7 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI {
       request_schema: getResourceForeignDataRequestSchema,
       response_schema: getResourceForeignDataResponseSchema,
       handler: async ({ body, adminUser, headers, query, cookies, requestUrl }) => {
-        const { resourceId, column, search } = body;
+        const { resourceId, column, search, currentValue } = body;
         if (!this.adminforth.statuses.dbDiscover) {
           return { error: 'Database discovery not started' };
         }
@@ -1746,6 +1749,12 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI {
                   normalizedFilters.subFilters.push(searchFilters[0]);
                 }
               }
+              if (currentValue !== undefined && currentValue !== null && currentValue !== '') {
+                const pkField = targetResource.columns.find((col) => col.primaryKey);
+                if (pkField) {
+                  normalizedFilters.subFilters.push({ field: pkField.name, operator: AdminForthFilterOperators.EQ, value: currentValue });
+                }
+              }
               const dbDataItems = await this.adminforth.connectors[targetResource.dataSource].getData({
                 resource: targetResource,
                 limit,

adminforth/spa/src/components/ResourceForm.vue

@@ -281,6 +281,21 @@ watch(() => props.resource.columns, async (newColumns) => {
         columnEmptyResultsCount[column.name] = 0;
         
         await loadMoreOptions(column.name);
+
+        const currentFkValue = props.record?.[column.name];
+        if (currentFkValue != null && currentFkValue !== '') {
+          const inOptions = columnOptions.value[column.name]?.some((opt: any) => opt.value == currentFkValue);
+          if (!inOptions) {
+            const result = await callAdminForthApi({
+              method: 'POST',
+              path: '/get_resource_foreign_data',
+              body: { resourceId: router.currentRoute.value.params.resourceId, column: column.name, limit: 1, offset: 0, currentValue: currentFkValue },
+            });
+            if (result?.items?.length) {
+              columnOptions.value[column.name].unshift(...result.items);
+            }
+          }
+        }
       }
     }
   }
@@ -325,7 +340,7 @@ async function loadMoreOptions(columnName: string, searchTerm = '') {
     columnOptions,
     columnLoadingState,
     columnOffsets,
-    columnEmptyResultsCount
+    columnEmptyResultsCount,
   });
 }
 

adminforth/spa/src/utils/utils.ts

@@ -452,7 +452,8 @@ export async function loadMoreForeignOptions({
     if (!columnOptions.value[columnName]) {
       columnOptions.value[columnName] = [];
     }
-    columnOptions.value[columnName].push(...list.items);
+    const existingValues = new Set(columnOptions.value[columnName].map((o: any) => o.value));
+    columnOptions.value[columnName].push(...list.items.filter((o: any) => !existingValues.has(o.value)));
 
     columnOffsets[columnName] += 100;