fix: allow required and editingNote types to have scalar (non-object) value

Author: ivictbor

adminforth/modules/configValidator.ts

@@ -437,7 +437,11 @@ export default class ConfigValidator implements IConfigValidator {
         res.columns = [];
       }
       res.columns = resInput.columns.map((inCol: AdminForthResourceColumnInput, inColIndex) => {
-        const col: Partial<AdminForthResourceColumn> = { ...inCol, showIn: undefined, editingNote: undefined };
+        const col: Partial<AdminForthResourceColumn> = { 
+          ...inCol, showIn: undefined, editingNote: undefined, required: undefined, 
+        };
+
+        col.required = typeof inCol.required === 'boolean' ? { create: inCol.required, edit: inCol.required } : inCol.required;
 
         // check for duplicate column names
         if (resInput.columns.findIndex((c) => c.name === col.name) !== inColIndex) {
@@ -705,6 +709,14 @@ export default class ConfigValidator implements IConfigValidator {
             col.components[key] = this.validateComponent(comp, errors);
           }
         }
+        
+        // fixes issues after discover when result of this validation applied to discovered column
+        Object.keys(col).forEach((key) => {
+          if (col[key] === undefined) {
+            delete col[key];
+          }
+        });
+
         return col as AdminForthResourceColumn;
       })
 

adminforth/types/Back.ts

@@ -13,6 +13,7 @@ import { ActionCheckSource, AdminForthFilterOperators, AdminForthSortDirections,
   AdminForthConfigMenuItem,
   AnnouncementBadgeResponse,
   AdminForthResourcePages,
+  AdminForthResourceColumnInputCommon,
 } from './Common.js';
 import { AnyCnameRecord } from 'dns';
 
@@ -1420,12 +1421,12 @@ export type ShowIn = {
   [key in AdminForthResourcePages]: AllowedActionValue
 }
 
-export interface AdminForthResourceColumnInput extends Omit<AdminForthResourceColumnCommon, 'showIn'> {
+export interface AdminForthResourceColumnInput extends Omit<AdminForthResourceColumnInputCommon, 'showIn'> {
   showIn?: ShowInInput,
   foreignResource?: AdminForthForeignResource,
 }
 
-export interface AdminForthResourceColumn extends Omit<AdminForthResourceColumnInput, 'showIn'> {
+export interface AdminForthResourceColumn extends Omit<AdminForthResourceColumnCommon, 'showIn'> {
   showIn?: ShowIn,
   foreignResource?: AdminForthForeignResource,
 }

dev-demo/resources/translation.ts

@@ -4,7 +4,7 @@ import AdminForth, {
 } from "../../adminforth";
 import CompletionAdapterOpenAIChatGPT from "../../adapters/adminforth-completion-adapter-open-ai-chat-gpt";
 import I18nPlugin from "../../plugins/adminforth-i18n";
-import { v1 as uuid } from "uuid";
+import { randomUUID } from "crypto";
 
 
 export default {
@@ -75,14 +75,16 @@ export default {
   columns: [
     {
       name: "id",
-      fillOnCreate: ({ initialRecord, adminUser }: any) => uuid(),
+      fillOnCreate: ({ initialRecord, adminUser }: any) => randomUUID(),
       primaryKey: true,
       showIn: [],
     },
     {
       name: "en_string",
       type: AdminForthDataTypes.STRING,
       label: "English",
+      required: true,
+      editingNote: "This is the original string in English. It will be used as a reference for translation.",
     },
     {
       name: "created_at",