adminforth 1.3.27 → 1.3.29

package/spa/src/components/ResourceForm.vue

@@ -145,7 +145,7 @@
 
 import CustomDatePicker from "@/components/CustomDatePicker.vue";
 import Dropdown from '@/components/Dropdown.vue';
-import { callAdminForthApi, getCustomComponent } from '@/utils';
+import { applyRegexValidation, callAdminForthApi, getCustomComponent } from '@/utils';
 import { IconExclamationCircleSolid, IconEyeSlashSolid, IconEyeSolid } from '@iconify-prerendered/vue-flowbite';
 import { computedAsync } from '@vueuse/core';
 import { initFlowbite } from 'flowbite';
@@ -172,7 +172,7 @@ const currentValues = ref(null);
 
 const customComponentsInValidity = ref({});
 const customComponentsEmptiness = ref({});
-
+  
 
 const columnError = (column) => {
   const val = computed(() => {
@@ -197,7 +197,13 @@ const columnError = (column) => {
       if ( column.maxLength && currentValues.value[column.name]?.length > column.maxLength ) {
         return `This field must be shorter than ${column.maxLength} characters`;
       }
+      
       if ( column.minLength && currentValues.value[column.name]?.length < column.minLength ) {
+        // if column.required[mode.value] is false, then we check if the field is empty
+        let needToCheckEmpty = column.required[mode.value] || currentValues.value[column.name]?.length > 0;
+        if (!needToCheckEmpty) {
+          return null;
+        }
         return `This field must be longer than ${column.minLength} characters`;
       }
     }
@@ -212,22 +218,14 @@ const columnError = (column) => {
         return `This field must be less than ${column.maxValue}`;
       }
     }
-    if ( column.validation && column.validation.length ) {
-      const validationArray = column.validation;
-      for (let i = 0; i < validationArray.length; i++) {
-        if (validationArray[i].regExp) {
-          const regExp = new RegExp(validationArray[i].regExp);
-          let value = currentValues.value[column.name];
-          if (value === undefined || value === null) {
-            value = '';
-          }
-          if (!regExp.test(value)) {
-            return validationArray[i].message;
-          }
-        }
+    console.log('column.validation: ', JSON.stringify(column), 'aa', JSON.stringify(currentValues.value[column.name]));
+    if (currentValues.value[column.name] && column.validation) {
+      const error = applyRegexValidation(currentValues.value[column.name], column.validation);
+      if (error) {
+        return error;
       }
-
     }
+
     return null;
   });
   return val.value;

package/spa/src/utils.ts

@@ -1,5 +1,7 @@
 import { onMounted, ref, resolveComponent } from 'vue';
-import type {  CoreConfig } from './spa_types/core';
+import type { CoreConfig } from './spa_types/core';
+import type { ValidationObject } from './types/AdminForthConfig';
+
 
 import router from "./router";
 import { useCoreStore } from './stores/core';
@@ -113,4 +115,35 @@ export function initThreeDotsDropdown() {
       dd.hide();
     }
   }
+}
+
+export function applyRegexValidation(value: any, validation: ValidationObject[] | undefined) {
+
+  if ( validation?.length ) {
+    const validationArray = validation;
+    for (let i = 0; i < validationArray.length; i++) {
+      if (validationArray[i].regExp) {
+        let flags = '';
+        if (validationArray[i].caseSensitive) {
+          flags += 'i';
+        }
+        if (validationArray[i].multiline) {
+          flags += 'm';
+        }
+        if (validationArray[i].global) {
+          flags += 'g';
+        }
+
+        const regExp = new RegExp(validationArray[i].regExp, flags);
+        if (value === undefined || value === null) {
+          value = '';
+        }
+        let valueS = `${value}`;
+
+        if (!regExp.test(valueS)) {
+          return validationArray[i].message;
+        }
+      }
+    }
+  }
 }

package/spa/src/views/CreateView.vue

@@ -18,7 +18,8 @@
         Cancel
       </button>
 
-      <button  @click="saveRecord"
+      <button  
+        @click="saveRecord"
         class="flex items-center py-1 px-3 text-sm font-medium rounded-default text-red-600 focus:outline-none bg-white rounded border border-gray-300 hover:bg-gray-100 hover:text-red-700 focus:z-10 focus:ring-4 focus:ring-gray-100 dark:focus:ring-gray-700 dark:bg-gray-800 dark:text-red-500 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700 disabled:opacity-50"
         :disabled="saving || (validating && !isValid)"
       > 

package/spa/src/views/EditView.vue

@@ -17,8 +17,9 @@
         Cancel
       </button>
 
-      <button  @click="saveRecord"
-        class="flex items-center py-1 px-3 text-sm font-medium  rounded-default text-red-600 focus:outline-none bg-white rounded border border-gray-300 hover:bg-gray-100 hover:text-red-700 focus:z-10 focus:ring-4 focus:ring-gray-100 dark:focus:ring-gray-700 dark:bg-gray-800 dark:text-red-500 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700"
+      <button
+        @click="saveRecord"
+        class="flex items-center py-1 px-3 text-sm font-medium  rounded-default text-red-600 focus:outline-none bg-white rounded border border-gray-300 hover:bg-gray-100 hover:text-red-700 focus:z-10 focus:ring-4 focus:ring-gray-100 dark:focus:ring-gray-700 dark:bg-gray-800 dark:text-red-500 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700 disabled:opacity-50"
         :disabled="saving || (validating && !isValid)"
       >
         <IconFloppyDiskSolid class="w-4 h-4" />

package/types/AdminForthConfig.ts

@@ -189,14 +189,12 @@ export interface IAdminForthDataSourceConnector {
   createRecordOriginalValues({ resource, record }: { resource: AdminForthResource, record: any }): Promise<void>;
 
   /**
-   * Used to update record in database.
+   * Update record in database. newValues might have not all fields in record, but only changed ones.
    * recordId is value of field which is marked as {@link AdminForthResourceColumn.primaryKey}
-   * newValues is array of fields which should be updated (might be not all fields in record, but only changed fields).
    */
-  updateRecord({ resource, recordId, newValues }:
-    { resource: AdminForthResource, recordId: string, newValues: any }
-  ): Promise<void>;
-  
+  updateRecordOriginalValues({ resource, recordId, newValues }: { resource: AdminForthResource; recordId: string; newValues: any; }): Promise<void>;
+
+
   /**
    * Used to delete record in database.
    */
@@ -228,12 +226,18 @@ export interface IAdminForthDataSourceConnectorBase extends IAdminForthDataSourc
     adminUser: AdminUser
   }): Promise<{ok: boolean, error?: string, createdRecord?: any}>;
 
+  updateRecord({ resource, recordId, newValues }: { 
+    resource: AdminForthResource, 
+    recordId: string, 
+    newValues: any, 
+  }): Promise<{ok: boolean, error?: string}>;
+
   getMinMaxForColumns({ resource, columns }: { resource: AdminForthResource, columns: AdminForthResourceColumn[] }): Promise<{ [key: string]: { min: any, max: any } }>;
 }
 
 
 export interface IAdminForthDataSourceConnectorConstructor {
-  new ({ url }: { url: string }): IAdminForthDataSourceConnector;
+  new ({ url }: { url: string }): IAdminForthDataSourceConnectorBase;
 }
 
 export interface IAdminForthAuth {
@@ -266,7 +270,15 @@ export interface IAdminForth {
 
   createResourceRecord(
     params: { resource: AdminForthResource, record: any, adminUser: AdminUser }
-  ): Promise<{ ok: boolean, error?: string, createdRecord?: any }>;
+  ): Promise<{ error?: string, createdRecord?: any }>;
+
+  updateResourceRecord(
+    params: { resource: AdminForthResource, recordId: any, record: any, oldRecord: any, adminUser: AdminUser }
+  ): Promise<{ error?: string }>;
+
+  deleteResourceRecord(
+    params: { resource: AdminForthResource, recordId: string, adminUser: AdminUser, record: any }
+  ): Promise<{ error?: string }>;
 
   auth: IAdminForthAuth;
 
@@ -701,13 +713,13 @@ export type AfterDataSourceResponseFunction = (params: {resource: AdminForthReso
  * Modify record to change how data is saved to database.
  * Return ok: false and error: string to stop execution and show error message to user. Return ok: true to continue execution.
  */
-export type BeforeSaveFunction = (params: {resource: AdminForthResource, recordId: any, adminUser: AdminUser, record: any}) => Promise<{ok: boolean, error?: string}>;
+export type BeforeSaveFunction = (params: {resource: AdminForthResource, recordId: any, adminUser: AdminUser, record: any, oldRecord?: any}) => Promise<{ok: boolean, error?: string}>;
 
 /**
  * Modify record to change how data is saved to database.
  * Return ok: false and error: string to stop execution and show error message to user. Return ok: true to continue execution.
  */
-export type AfterSaveFunction = (params: {resource: AdminForthResource, recordId: any, adminUser: AdminUser, record: any}) => Promise<{ok: boolean, error?: string}>;
+export type AfterSaveFunction = (params: {resource: AdminForthResource, recordId: any, adminUser: AdminUser, record: any, oldRecord?: any}) => Promise<{ok: boolean, error?: string}>;
 
 /**
  * Allow to get user data before login confirmation, will triger when user try to login.
@@ -1508,6 +1520,21 @@ export type ValidationObject = {
      * Example: "Invalid email format"
      */
     message: string,
+
+    /**
+     * Whether to check case sensitivity (i flag)
+     */
+    caseSensitive?: boolean,
+    
+    /**
+     * Whether to check Multiline strings (m flag)
+     */
+    multiline?: boolean, 
+    
+    /**
+     * Whether to check global strings (g flag)
+     */
+    global?: boolean
   }
 
 export type AdminForthComponentDeclarationFull = {