adminforth 2.4.0-next.70 → 2.4.0-next.72

package/commands/createCustomComponent/configLoader.js

@@ -2,7 +2,10 @@ import fs from 'fs/promises';
 import path from 'path';
 import chalk from 'chalk';
 import jiti from 'jiti';
+import dotenv from "dotenv";
 
+dotenv.config({ path: '.env.local', override: true });
+dotenv.config({ path: '.env', override: true });
 
 export async function loadAdminForthConfig() {
   const configFileName = 'index.ts';

package/dist/spa/src/App.vue

@@ -77,11 +77,11 @@
       aria-label="Sidebar"
     >
       <div class="h-full px-3 pb-4 overflow-y-auto bg-lightSidebar dark:bg-darkSidebar border-r border-lightSidebarBorder dark:border-darkSidebarBorder">
-        <div class="flex ms-2 m-4">
-          <img :src="loadFile(coreStore.config?.brandLogo || '@/assets/logo.svg')" :alt="`${ coreStore.config?.brandName } Logo`" class="h-8 me-3"  />
+        <div class="af-logo-title-wrapper flex ms-2 m-4">
+          <img :src="loadFile(coreStore.config?.brandLogo || '@/assets/logo.svg')" :alt="`${ coreStore.config?.brandName } Logo`" class="af-logo h-8 me-3"  />
           <span 
             v-if="coreStore.config?.showBrandNameInSidebar"
-            class="self-center text-lightNavbarText-size font-semibold sm:text-lightNavbarText-size whitespace-nowrap dark:text-darkSidebarText text-lightSidebarText"
+            class="af-title self-center text-lightNavbarText-size font-semibold sm:text-lightNavbarText-size whitespace-nowrap dark:text-darkSidebarText text-lightSidebarText"
           >
             {{ coreStore.config?.brandName }}
           </span>

package/dist/spa/src/types/Back.ts

@@ -1346,13 +1346,13 @@ export interface AdminForthResource extends Omit<AdminForthResourceInput, 'optio
     },
     create?: {
       /**
-       * Should return ok: true to continue saving pipeline and allow creating record in database, and ok: false to interrupt pipeline and prevent record creation.
-       * If you need to show error on UI, set error: <error message> in response.
+       * Should return `ok: true` to continue saving pipeline and allow creating record in database, and `ok: false` to interrupt pipeline and prevent record creation.
+       * If you need to show error on UI, set `error: \<error message\>` in response.
        * 
        * Typical use-cases:
-       * - Create record by custom code (return  `{ ok: false, newRecordId: <id of created record from custom code>}`)
-       * - Validate record before saving to database and interrupt execution if validation failed (return `{ok: false, error: <validation error>}`), though `allowedActions.create` should be preferred in most cases
-       * - fill-in adminUser as creator of record (set record.<some field> = x; return {ok: true})
+       * - Create record by custom code (return `{ ok: false, newRecordId: <id of created record from custom code> }`)
+       * - Validate record before saving to database and interrupt execution if validation failed (return `{ ok: false, error: <validation error> }`), though `allowedActions.create` should be preferred in most cases
+       * - fill-in adminUser as creator of record (set `record.<some field> = x; return \{ ok: true \}`) 
        * - Attach additional data to record before saving to database (mostly fillOnCreate should be used instead)
        */
       beforeSave?: Array<BeforeCreateSaveFunction>,

package/dist/spa/src/views/CreateView.vue

@@ -154,7 +154,7 @@ async function saveRecord() {
       record: record.value,
     },
   });
-  if (response?.error == true) {
+  if (response?.error && response?.error !== 'Operation aborted by hook') {
     showErrorTost(response.error);
   }
   saving.value = false;

package/dist/spa/src/views/EditView.vue

@@ -177,7 +177,7 @@ async function saveRecord() {
       record: updates,
     },
   });
-  if (resp.error) {
+  if (resp.error && resp.error !== 'Operation aborted by hook') {
     showErrorTost(resp.error);
   } else {
     adminforth.alert({

package/dist/spa/src/views/ResourceParent.vue

@@ -1,5 +1,5 @@
 <template>
-  <div :key="`${$route?.params.resourceId}---${$route?.params.primaryKey}`" class="p-4 flex" 
+  <div :key="`${$route?.params.resourceId}---${$route?.params.primaryKey}`" class="af-resource-parent p-4 flex" 
     :class="limitHeightToPage ? 'h-[calc(100dvh-3.5rem)]': undefined"
   >
     <RouterView/>

package/dist/types/Back.d.ts

@@ -1191,13 +1191,13 @@ export interface AdminForthResource extends Omit<AdminForthResourceInput, 'optio
         };
         create?: {
             /**
-             * Should return ok: true to continue saving pipeline and allow creating record in database, and ok: false to interrupt pipeline and prevent record creation.
-             * If you need to show error on UI, set error: <error message> in response.
+             * Should return `ok: true` to continue saving pipeline and allow creating record in database, and `ok: false` to interrupt pipeline and prevent record creation.
+             * If you need to show error on UI, set `error: \<error message\>` in response.
              *
              * Typical use-cases:
-             * - Create record by custom code (return  `{ ok: false, newRecordId: <id of created record from custom code>}`)
-             * - Validate record before saving to database and interrupt execution if validation failed (return `{ok: false, error: <validation error>}`), though `allowedActions.create` should be preferred in most cases
-             * - fill-in adminUser as creator of record (set record.<some field> = x; return {ok: true})
+             * - Create record by custom code (return `{ ok: false, newRecordId: <id of created record from custom code> }`)
+             * - Validate record before saving to database and interrupt execution if validation failed (return `{ ok: false, error: <validation error> }`), though `allowedActions.create` should be preferred in most cases
+             * - fill-in adminUser as creator of record (set `record.<some field> = x; return \{ ok: true \}`)
              * - Attach additional data to record before saving to database (mostly fillOnCreate should be used instead)
              */
             beforeSave?: Array<BeforeCreateSaveFunction>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminforth",
-  "version": "2.4.0-next.70",
+  "version": "2.4.0-next.72",
   "description": "OpenSource Vue3 powered forth-generation admin panel",
   "main": "dist/index.js",
   "module": "dist/index.js",