fix: update create record logic for the fields, where showIf used

Author: yaroslav8765

adminforth/modules/restApi.ts

@@ -15,7 +15,7 @@ import {
   Filters,
 } from "../types/Back.js";
 
-import { ADMINFORTH_VERSION, listify, md5hash, getLoginPromptHTML, checkShowIf } from './utils.js';
+import { ADMINFORTH_VERSION, listify, md5hash, getLoginPromptHTML } from './utils.js';
 
 import AdminForthAuth from "../auth.js";
 import { ActionCheckSource, AdminForthConfigMenuItem, AdminForthDataTypes, AdminForthFilterOperators, AdminForthResourceColumnInputCommon, AdminForthResourceCommon, AdminForthResourcePages,
@@ -1171,7 +1171,7 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI {
               return { error };
             }
 
-            const { record } = body;
+            const { record, requiredColumnsToSkip } = body;
 
             // todo if showIn.create is function, code below will be buggy (will not detect required fact)
             for (const column of resource.columns) {
@@ -1180,8 +1180,8 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI {
                   record[column.name] === undefined &&
                   column.showIn.create
               ) {
-                  const isColumnShownWithShowIf = await checkShowIf(column as AdminForthResourceColumnInputCommon, record) ;
-                  if (isColumnShownWithShowIf === true) {
+                  const shouldWeSkipColumn = requiredColumnsToSkip.find(reqColumnToSkip => reqColumnToSkip.name === column.name);
+                  if (!shouldWeSkipColumn) {
                     return { error: `Column '${column.name}' is required`, ok: false };
                   }
               }
@@ -1206,8 +1206,8 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI {
             for (const column of resource.columns) {
               if ((column.required as { create?: boolean })?.create) {
                 const shown = await isShown(column, 'create', ctxCreate);
-                const isColumnShownWithShowIf = await checkShowIf(column as AdminForthResourceColumnInputCommon , record) ;
-                if (isColumnShownWithShowIf === true) {
+                const shouldWeSkipColumn = requiredColumnsToSkip.find(reqColumnToSkip => reqColumnToSkip.name === column.name);
+                if (!shouldWeSkipColumn) {
                   if (shown && record[column.name] === undefined) {
                     return { error: `Column '${column.name}' is required`, ok: false };
                   }

adminforth/modules/utils.ts

@@ -479,59 +479,3 @@ export function slugifyString(str: string): string {
     .replace(/\s+/g, '-')
     .replace(/[^a-z0-9-_]/g, '-');
 }
-
-export function checkShowIf(c: AdminForthResourceColumnInputCommon, record: Record<string, any>) {
-  if (!c.showIf) return true;
-
-  const evaluatePredicate = (predicate: Predicate): boolean => {
-    const results: boolean[] = [];
-
-    if ("$and" in predicate) {
-      results.push(predicate.$and.every(evaluatePredicate));
-    }
-
-    if ("$or" in predicate) {
-      results.push(predicate.$or.some(evaluatePredicate));
-    }
-
-    const fieldEntries = Object.entries(predicate).filter(([key]) => !key.startsWith('$'));
-    if (fieldEntries.length > 0) {
-      const fieldResult = fieldEntries.every(([field, condition]) => {
-        const recordValue = record[field];
-
-        if (condition === undefined) {
-          return true;
-        }
-        if (typeof condition !== "object" || condition === null) {
-          return recordValue === condition;
-        }
-
-        if ("$eq" in condition) return recordValue === condition.$eq;
-        if ("$not" in condition) return recordValue !== condition.$not;
-        if ("$gt" in condition) return recordValue > condition.$gt;
-        if ("$gte" in condition) return recordValue >= condition.$gte;
-        if ("$lt" in condition) return recordValue < condition.$lt;
-        if ("$lte" in condition) return recordValue <= condition.$lte;
-        if ("$in" in condition) return (Array.isArray(condition.$in) && condition.$in.includes(recordValue));
-        if ("$nin" in condition) return (Array.isArray(condition.$nin) && !condition.$nin.includes(recordValue));
-        if ("$includes" in condition)
-          return (
-            Array.isArray(recordValue) &&
-            recordValue.includes(condition.$includes)
-          );
-        if ("$nincludes" in condition)
-          return (
-            Array.isArray(recordValue) &&
-            !recordValue.includes(condition.$nicludes)
-          );
-
-        return true;
-      });
-      results.push(fieldResult);
-    }
-
-    return results.every(result => result);
-  };
-
-  return evaluatePredicate(c.showIf);
-}

adminforth/spa/src/views/CreateView.vue

@@ -97,7 +97,7 @@ import BreadcrumbsWithButtons from '@/components/BreadcrumbsWithButtons.vue';
 import ResourceForm from '@/components/ResourceForm.vue';
 import SingleSkeletLoader from '@/components/SingleSkeletLoader.vue';
 import { useCoreStore } from '@/stores/core';
-import { callAdminForthApi, getCustomComponent,checkAcessByAllowedActions, initThreeDotsDropdown } from '@/utils';
+import { callAdminForthApi, getCustomComponent,checkAcessByAllowedActions, initThreeDotsDropdown, checkShowIf } from '@/utils';
 import { IconFloppyDiskSolid } from '@iconify-prerendered/vue-flowbite';
 import { onMounted, ref, watch, nextTick } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
@@ -190,13 +190,16 @@ async function saveRecord(opts?: { confirmationResult?: any }) {
   } else {
     validating.value = false;
   }
+  const requiredColumns = coreStore.resource?.columns.filter(c => c.required?.create === true) || [];
+  const requiredColumnsToSkip = requiredColumns.filter(c => checkShowIf(c, record.value) === false);  
   saving.value = true;
   const response = await callAdminForthApi({
     method: 'POST',
     path: `/create_record`,
     body: {
       resourceId: route.params.resourceId,
       record: record.value,
+      requiredColumnsToSkip,
       meta: {
         ...(opts?.confirmationResult ? { confirmationResult: opts.confirmationResult } : {}),
       },