Merge branch 'next' of github.com:devforth/adminforth into next

Author: SerVitasik

adminforth/dataConnectors/baseConnector.ts

@@ -253,13 +253,13 @@ export default class AdminForthBaseConnector implements IAdminForthDataSourceCon
     resource: AdminForthResource; record: any; adminUser: any;
   }): Promise<{ error?: string; ok: boolean; createdRecord?: any; }> {
     // transform value using setFieldValue and call createRecordOriginalValues
-
+    
     const filledRecord = {...record};
     const recordWithOriginalValues = {...record};
 
     for (const col of resource.dataSourceColumns) {
       if (col.fillOnCreate) {
-        if (filledRecord[col.name] === undefined) {
+        if (filledRecord[col.name] === undefined || (Array.isArray(filledRecord[col.name]) && filledRecord[col.name].length === 0)) {
           filledRecord[col.name] = col.fillOnCreate({
             initialRecord: record, 
             adminUser

adminforth/modules/restApi.ts

@@ -64,6 +64,11 @@ async function isShown(
   return true;
 }
 
+async function isFilledOnCreate(  col: AdminForthResource['columns'][number] ): Promise<boolean> {
+  const fillOnCreate = !!col.fillOnCreate;
+  return fillOnCreate;
+}
+
 export async function interpretResource(
   adminUser: AdminUser, 
   resource: AdminForthResource, 
@@ -1190,9 +1195,10 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI {
             for (const column of resource.columns) {
               const fieldName = column.name;
               if (fieldName in record) {
-                const shown = await isShown(column, 'create', ctxCreate);
+                const shown = await isShown(column, 'create', ctxCreate); //
                 const bo = await isBackendOnly(column, ctxCreate);
-                if (!shown || bo) {
+                const filledOnCreate = await isFilledOnCreate(column);
+                if ((!shown && !filledOnCreate) || bo) {
                   return { error: `Field "${fieldName}" cannot be modified as it is restricted from creation (backendOnly or showIn.create is false, please set it to true)`, ok: false };
                 }
               }

adminforth/spa/src/App.vue

@@ -201,6 +201,7 @@ const expandedWidth = computed(() => coreStore.config?.iconOnlySidebar?.expanded
 const theme = ref('light');
 
 const userMenuComponents = computed(() => {
+  console.log('🪲🆕 userMenuComponents recomputed', coreStore?.config?.globalInjections?.userMenu);
   return coreStore?.config?.globalInjections?.userMenu || [];
 })
 

adminforth/spa/src/afcl/Table.vue

@@ -110,15 +110,15 @@
             <!-- <IconChevronDoubleLeftOutline class="w-4 h-4" /> -->
             1
           </button>
-          <div
-            :contenteditable="!isLoading && !props.isLoading"
+          <input
+            type="text"
+            v-model="pageInput"
+            :style="{ width: `${Math.max(1, pageInput.length+4)}ch` }"
             class="min-w-10 outline-none inline-block w-auto py-1.5 px-3 text-sm text-center text-lightTablePaginationInputText border border-lightTablePaginationInputBorder bg-lightTablePaginationInputBackground dark:border-darkTablePaginationInputBorder dark:text-darkTablePaginationInputText dark:bg-darkTablePaginationInputBackground z-10"
             @keydown="onPageKeydown($event)"
-            @input="onPageInput($event)"
             @blur="validatePageInput()"
           >
-            {{ pageInput }}
-          </div>
+          </input>
 
           <button
             class="flex items-center py-1 px-3 text-sm font-medium text-lightUnactivePaginationButtonText focus:outline-none bg-lightUnactivePaginationButtonBackground border-l-0  border border-lightUnactivePaginationButtonBorder hover:bg-lightUnactivePaginationButtonHoverBackground hover:text-lightUnactivePaginationButtonHoverText dark:bg-darkUnactivePaginationButtonBackground dark:text-darkUnactivePaginationButtonText dark:border-darkUnactivePaginationButtonBorder dark:hover:text-darkUnactivePaginationButtonHoverText dark:hover:bg-darkUnactivePaginationButtonHoverBackground disabled:opacity-50"
@@ -245,10 +245,6 @@
     'sort-change',
     'clickTableRow'
   ]);
-  
-  function onPageInput(event: any) {
-    pageInput.value = event.target.innerText;
-  }
 
   function validatePageInput() {
     const newPage = parseInt(pageInput.value) || 1;

adminforth/spa/src/components/ResourceListTable.vue

@@ -241,15 +241,14 @@
           <!-- <IconChevronDoubleLeftOutline class="w-4 h-4" /> -->
           1
         </button>
-        <div
-          contenteditable="true" 
-          class="af-pagination-input min-w-10 outline-none inline-block w-auto py-1.5 px-3 text-sm text-center text-lightListTablePaginationCurrentPageText border border-lightListTablePaginationBorder dark:border-darkListTablePaginationBorder dark:text-darkListTablePaginationCurrentPageText dark:bg-darkListTablePaginationBackgoround z-10"
+        <input
+          type="text"
+          v-model="pageInput"
+          :style="{ width: `${Math.max(1, pageInput.length+4)}ch` }"
+          class="af-pagination-input min-w-10 outline-none inline-block py-1.5 px-3 text-sm text-center text-lightListTablePaginationCurrentPageText border border-lightListTablePaginationBorder dark:border-darkListTablePaginationBorder dark:text-darkListTablePaginationCurrentPageText dark:bg-darkListTablePaginationBackgoround z-10"
           @keydown="onPageKeydown($event)"
-          @input="onPageInput($event)"
           @blur="validatePageInput()"
-        >
-          {{ pageInput }}
-        </div>
+        />
 
         <button
           class="af-pagination-last-page-button flex items-center py-1 px-3 text-sm font-medium text-lightListTablePaginationText focus:outline-none bg-lightListTablePaginationBackgoround border-l-0  border border-lightListTablePaginationBorder hover:bg-lightListTablePaginationBackgoroundHover hover:text-lightListTablePaginationTextHover focus:z-10 focus:ring-4 focus:ring-lightListTablePaginationFocusRing dark:focus:ring-darkListTablePaginationFocusRing dark:bg-darkListTablePaginationBackgoround dark:text-darkListTablePaginationText dark:border-darkListTablePaginationBorder dark:hover:text-white dark:hover:bg-darkListTablePaginationBackgoroundHover disabled:opacity-50"
@@ -599,10 +598,6 @@ async function startCustomAction(actionId: string, row: any) {
   }
 }
 
-function onPageInput(event: any) {
-  pageInput.value = event.target.innerText;
-}
-
 function validatePageInput() {
   const newPage = parseInt(pageInput.value) || 1;
   const validPage = Math.max(1, Math.min(newPage, totalPages.value));

adminforth/spa/src/components/ResourceListTableVirtual.vue

@@ -262,15 +262,15 @@
           <!-- <IconChevronDoubleLeftOutline class="w-4 h-4" /> -->
           1
         </button>
-        <div
-          contenteditable="true" 
+        <input
+          type="text"
+          v-model="pageInput"
+          :style="{ width: `${Math.max(1, pageInput.length+4)}ch` }"
           class="af-pagination-input min-w-10 outline-none inline-block w-auto py-1.5 px-3 text-sm text-center text-lightListTablePaginationCurrentPageText border border-lightListTablePaginationBorder dark:border-darkListTablePaginationBorder dark:text-darkListTablePaginationCurrentPageText dark:bg-darkListTablePaginationBackgoround z-10"
           @keydown="onPageKeydown($event)"
-          @input="onPageInput($event)"
           @blur="validatePageInput()"
         >
-          {{ pageInput }}
-        </div>
+        </input>
 
         <button
           class="af-pagination-last-page-button flex items-center py-1 px-3 text-sm font-medium text-lightListTablePaginationText focus:outline-none bg-lightListTablePaginationBackgoround border-l-0  border border-lightListTablePaginationBorder hover:bg-lightListTablePaginationBackgoroundHover hover:text-lightListTablePaginationTextHover focus:z-10 focus:ring-4 focus:ring-lightListTablePaginationFocusRing dark:focus:ring-darkListTablePaginationFocusRing dark:bg-darkListTablePaginationBackgoround dark:text-darkListTablePaginationText dark:border-darkListTablePaginationBorder dark:hover:text-white dark:hover:bg-darkListTablePaginationBackgoroundHover disabled:opacity-50"
@@ -623,9 +623,6 @@ async function startCustomAction(actionId: string, row: any) {
   }
 }
 
-function onPageInput(event: any) {
-  pageInput.value = event.target.innerText;
-}
 
 function validatePageInput() {
   const newPage = parseInt(pageInput.value) || 1;

adminforth/types/adapters/StorageAdapter.ts

@@ -39,15 +39,17 @@ export interface StorageAdapter {
    * This method should work even if the file does not exist yet (e.g. only presigned URL was generated).
    * @param key - The key of the file to be uploaded e.g. "uploads/file.txt"
    */
-  markKeyForDeletation(key: string): Promise<void>;
+  markKeyForDeletation(key: string): Promise<void>; //TODO delete after one year
+  markKeyForDeletion(key: string): Promise<void>;
 
 
   /**
    * This method should mark the file to not be deleted.
    * This method should be used to cancel the deletion of the file if it was marked for deletion.
    * @param key - The key of the file to be uploaded e.g. "uploads/file.txt"
    */
-  markKeyForNotDeletation(key: string): Promise<void>;
+  markKeyForNotDeletation(key: string): Promise<void>; //TODO delete after one year
+  markKeyForNotDeletion(key: string): Promise<void>;
 
 
   /**

dev-demo/resources/apartments.ts

@@ -522,7 +522,6 @@ export default {
         meta: any;
         source: ActionCheckSource;
       }): Promise<boolean | string> => {
-        console.log("edit aa check 🔒", meta, source, adminUser);
         return adminUser.dbUser.role === "superadmin";
         // return true;
         // if (source === ActionCheckSource.DisplayButtons) {
@@ -542,7 +541,6 @@ export default {
         return true;
       },
       show: async ({ adminUser, meta, source, adminforth }: any) => {
-        console.log("show aa check 🔒", meta);
         // if (source === 'showRequest' || source === 'editLoadRequest') {
         //   const record = await adminforth.resource('aparts').get(Filters.EQ('id', meta.pk));
         //   return record.user_id === adminUser.dbUser.id;

live-demo/app/package-lock.json

@@ -32,7 +32,7 @@
     "@adminforth/two-factors-auth": "^1.1.2",
     "@adminforth/upload": "^2.3.6",
     "@prisma/client": "^6.6.0",
-    "adminforth": "^2.4.0-next.298",
+    "adminforth": "^2.4.0-next.313",
     "better-sqlite3": "^10.0.0",
     "express": "^4.19.2"
   },