Merge pull request #111 from devforth/foreign-resource-unset-label

feat: add unsetLabel field to foreign resources

Author: ivictbor

adminforth/modules/configValidator.ts

@@ -471,6 +471,15 @@ export default class ConfigValidator implements IConfigValidator {
             errors.push(`Resource "${res.resourceId}" column "${col.name}" has foreignResource resourceId which is not in resources: "${col.foreignResource.resourceId}". 
             ${similar ? `Did you mean "${similar}" instead of "${col.foreignResource.resourceId}"?` : ''}`);
           }
+
+          if (col.foreignResource.unsetLabel) {
+            if (typeof col.foreignResource.unsetLabel !== 'string') {
+              errors.push(`Resource "${res.resourceId}" column "${col.name}" has foreignResource unsetLabel which is not a string`);
+            }
+          } else {
+            // set default unset label
+            col.foreignResource.unsetLabel = 'Unset';
+          }
           const befHook = col.foreignResource.hooks?.dropdownList?.beforeDatasourceRequest;
           if (befHook) {
             if (!Array.isArray(befHook)) {

adminforth/modules/restApi.ts

@@ -515,6 +515,9 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI {
                     if (col.editingNote?.edit) {
                       col.editingNote.edit = await tr(col.editingNote.edit, `resource.${resource.resourceId}.editingNote.edit`);
                     }
+                    if (col.foreignResource?.unsetLabel) {
+                      col.foreignResource.unsetLabel = await tr(col.foreignResource.unsetLabel, `resource.${resource.resourceId}.foreignResource.unsetLabel`);
+                    }
 
                     return {
                       ...col,

adminforth/spa/src/components/ResourceForm.vue

@@ -263,7 +263,7 @@ const columnOptions = computedAsync(async () => {
           },
         });
 
-        if (!column.required[props.source]) list.items.push({ value: null, label: t('Unset') });
+        if (!column.required[props.source]) list.items.push({ value: null, label: column.foreignResource.unsetLabel });
 
         return { [column.name]: list.items };
       }

adminforth/types/Common.ts

@@ -543,6 +543,7 @@ export type ShowInResolved = {
 
 export interface AdminForthForeignResourceCommon {
   resourceId: string,
+  unsetLabel?: string,
 }
 
 /**