adminforth 1.1.106 → 1.2.1

package/dataConnectors/baseConnector.ts

@@ -50,6 +50,7 @@ export default class AdminForthBaseConnector implements IAdminForthDataSourceCon
     for (const col of resource.dataSourceColumns) {
         newRecord[col.name] = this.setFieldValue(col, record[col.name]);
     }
+    process.env.HEAVY_DEBUG && console.log('🪲🪲🪲🪲 creating record', newRecord);
     return this.createRecordOriginalValues({ resource, record: newRecord });
   }
 

package/dist/dataConnectors/baseConnector.js

@@ -43,6 +43,7 @@ export default class AdminForthBaseConnector {
         for (const col of resource.dataSourceColumns) {
             newRecord[col.name] = this.setFieldValue(col, record[col.name]);
         }
+        process.env.HEAVY_DEBUG && console.log('🪲🪲🪲🪲 creating record', newRecord);
         return this.createRecordOriginalValues({ resource, record: newRecord });
     }
     updateRecord({ resource, recordId, newValues }) {

package/dist/index.js

@@ -101,7 +101,7 @@ class AdminForth {
         catch (e) {
             this.config.customization.customComponentsDir = undefined;
         }
-        if (!this.config.auth) {
+        if (this.config.auth) {
             if (!this.config.auth.resourceId) {
                 throw new Error('No config.auth.resourceId defined');
             }
@@ -520,7 +520,9 @@ class AdminForth {
                         });
                     }
                 }
-                if (((_c = column.required) === null || _c === void 0 ? void 0 : _c.create) && record[column.name] === undefined) {
+                if (((_c = column.required) === null || _c === void 0 ? void 0 : _c.create) &&
+                    record[column.name] === undefined &&
+                    column.showIn.includes(AdminForthResourcePages.create)) {
                     return { error: `Column '${column.name}' is required` };
                 }
                 if (column.isUnique) {
@@ -553,6 +555,7 @@ class AdminForth {
                 }
             }
             const connector = this.connectors[resource.dataSource];
+            process.env.HEAVY_DEBUG && console.log('🪲🪲🪲🪲 creating record createResourceRecord', record);
             yield connector.createRecord({ resource, record });
             // execute hook if needed
             for (const hook of listify((_g = (_f = resource.hooks) === null || _f === void 0 ? void 0 : _f.create) === null || _g === void 0 ? void 0 : _g.afterSave)) {
@@ -565,6 +568,7 @@ class AdminForth {
                     return { error: resp.error };
                 }
             }
+            return { ok: true };
         });
     }
     setupEndpoints(server) {
@@ -1024,10 +1028,13 @@ class AdminForth {
                     return { error };
                 }
                 const { record } = body;
-                yield this.createResourceRecord({ resource, record, adminUser });
+                const response = yield this.createResourceRecord({ resource, record, adminUser });
+                if (response.error) {
+                    return { error: response.error };
+                }
                 const connector = this.connectors[resource.dataSource];
                 return {
-                    newRecordId: body['record'][connector.getPrimaryKey(resource)]
+                    newRecordId: record[connector.getPrimaryKey(resource)]
                 };
             })
         });

package/dist/modules/codeInjector.js

@@ -227,6 +227,7 @@ class CodeInjector {
                     }
                     yield fsExtra.copy(src, to, {
                         recursive: true,
+                        dereference: true,
                     });
                 }
             }
@@ -405,7 +406,7 @@ class CodeInjector {
                 let customPackgeNames = [];
                 if (usersPackage && usersLock) {
                     customPackgeNames = [
-                        ...Object.keys(usersPackage.dependencies),
+                        ...Object.keys(usersPackage.dependencies || []),
                         ...Object.keys(usersPackage.devDependencies || [])
                     ].reduce((acc, packageName) => {
                         const version = usersLock.packages[`node_modules/${packageName}`].version;

package/dist/spa/spa/src/components/ValueRenderer.vue

@@ -1,6 +1,5 @@
 <template>
   <div>
-    
     <span @click="(e)=>{e.stopPropagation()}" v-if="column.foreignResource">
       <RouterLink v-if="record[column.name]" class="font-medium text-blue-600 dark:text-blue-500 hover:brightness-110"
         :to="{ name: 'resource-show', params: { resourceId: column.foreignResource.resourceId, primaryKey: record[column.name].pk } }">

package/dist/spa/spa/src/utils.ts

@@ -74,7 +74,7 @@ export const loadFile = (file: string) => {
   return baseUrl;
 }
 
-export function checkEmptyValues(value: any, viewType:'show' | 'list' ) {
+export function checkEmptyValues(value: any, viewType: 'show' | 'list' ) {
   const config: CoreConfig | {} = useCoreStore().config;
   let emptyFieldPlaceholder = '';
   if (config.emptyFieldPlaceholder) {

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

@@ -43,7 +43,7 @@
         <span class="sr-only">Loading...</span>
     </div>
     <div 
-      v-else
+      v-else-if="coreStore.record"
       class="relative overflow-x-auto shadow-resourseFormShadow "
     >
      <table class="w-full text-sm text-left rtl:text-right text-gray-500 dark:text-gray-400 rounded-default">
@@ -90,7 +90,12 @@
               </template>
             </tr>
         </tbody>
-    </table>
+     </table>
+    </div>
+
+    <div v-else class="text-center text-gray-500 dark:text-gray-400 mt-10">
+      Ooops. Record not found
+    </div>
 
     <component 
       v-for="c in coreStore?.resourceOptions?.pageInjections?.show?.bottom || []"
@@ -101,7 +106,6 @@
       :resource="coreStore.resource"
       :adminUser="coreStore.adminUser"
     />
-</div>
 
 
   </div>

package/index.ts

@@ -138,7 +138,7 @@ class AdminForth implements IAdminForth {
       this.config.customization.customComponentsDir = undefined;
     }
 
-    if (!this.config.auth) {
+    if (this.config.auth) {
       if (!this.config.auth.resourceId) {
         throw new Error('No config.auth.resourceId defined');
       }
@@ -605,7 +605,11 @@ class AdminForth implements IAdminForth {
                  });
             }
         }
-        if ((column.required as {create?: boolean, edit?: boolean}) ?.create && record[column.name] === undefined) {
+        if (
+            (column.required as {create?: boolean, edit?: boolean}) ?.create &&
+            record[column.name] === undefined &&
+            column.showIn.includes(AdminForthResourcePages.create)
+        ) {
             return { error: `Column '${column.name}' is required` };
         }
 
@@ -625,15 +629,15 @@ class AdminForth implements IAdminForth {
 
     // execute hook if needed
     for (const hook of listify(resource.hooks?.create?.beforeSave as BeforeSaveFunction[])) {
-        const resp = await hook({ resource, record, adminUser });
-        if (!resp || (!resp.ok && !resp.error)) {
-          throw new Error(`Hook beforeSave must return object with {ok: true} or { error: 'Error' } `);
-        }
+      const resp = await hook({ resource, record, adminUser });
+      if (!resp || (!resp.ok && !resp.error)) {
+        throw new Error(`Hook beforeSave must return object with {ok: true} or { error: 'Error' } `);
+      }
 
-        if (resp.error) {
-          return { error: resp.error };
-        }
+      if (resp.error) {
+        return { error: resp.error };
       }
+    }
 
     // remove virtual columns from record
     for (const column of resource.columns.filter((col) => col.virtual)) {
@@ -642,6 +646,7 @@ class AdminForth implements IAdminForth {
         }
     }
     const connector = this.connectors[resource.dataSource];
+    process.env.HEAVY_DEBUG && console.log('🪲🪲🪲🪲 creating record createResourceRecord', record);
     await connector.createRecord({ resource, record });
     // execute hook if needed
     for (const hook of listify(resource.hooks?.create?.afterSave as AfterSaveFunction[])) {
@@ -655,6 +660,8 @@ class AdminForth implements IAdminForth {
         return { error: resp.error };
       }
     }
+
+    return { ok: true };
 }
 
   setupEndpoints(server: IHttpServer) {
@@ -1168,11 +1175,14 @@ class AdminForth implements IAdminForth {
 
             const { record } = body;
 
-            await this.createResourceRecord({ resource, record, adminUser });
+            const response = await this.createResourceRecord({ resource, record, adminUser });
+            if (response.error) {
+              return { error: response.error };
+            }
             const connector = this.connectors[resource.dataSource];
 
             return {
-              newRecordId: body['record'][connector.getPrimaryKey(resource)]
+              newRecordId: record[connector.getPrimaryKey(resource)]
             }
         }
     });

package/modules/codeInjector.ts

@@ -248,6 +248,7 @@ class CodeInjector implements ICodeInjector {
 
         await fsExtra.copy(src, to, {
           recursive: true,
+          dereference: true,
         });
       }
     }
@@ -459,7 +460,7 @@ class CodeInjector implements ICodeInjector {
     let customPackgeNames = [];
     if (usersPackage && usersLock) {
       customPackgeNames = [
-        ...Object.keys(usersPackage.dependencies),
+        ...Object.keys(usersPackage.dependencies || []),
         ...Object.keys(usersPackage.devDependencies || [])
       ].reduce(
           (acc, packageName) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminforth",
-  "version": "1.1.106",
+  "version": "1.2.1",
   "description": "OpenSource Vue3 powered forth-generation admin panel",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/spa/src/components/ValueRenderer.vue

@@ -1,6 +1,5 @@
 <template>
   <div>
-    
     <span @click="(e)=>{e.stopPropagation()}" v-if="column.foreignResource">
       <RouterLink v-if="record[column.name]" class="font-medium text-blue-600 dark:text-blue-500 hover:brightness-110"
         :to="{ name: 'resource-show', params: { resourceId: column.foreignResource.resourceId, primaryKey: record[column.name].pk } }">

package/spa/src/utils.ts

@@ -74,7 +74,7 @@ export const loadFile = (file: string) => {
   return baseUrl;
 }
 
-export function checkEmptyValues(value: any, viewType:'show' | 'list' ) {
+export function checkEmptyValues(value: any, viewType: 'show' | 'list' ) {
   const config: CoreConfig | {} = useCoreStore().config;
   let emptyFieldPlaceholder = '';
   if (config.emptyFieldPlaceholder) {

package/spa/src/views/ShowView.vue

@@ -43,7 +43,7 @@
         <span class="sr-only">Loading...</span>
     </div>
     <div 
-      v-else
+      v-else-if="coreStore.record"
       class="relative overflow-x-auto shadow-resourseFormShadow "
     >
      <table class="w-full text-sm text-left rtl:text-right text-gray-500 dark:text-gray-400 rounded-default">
@@ -90,7 +90,12 @@
               </template>
             </tr>
         </tbody>
-    </table>
+     </table>
+    </div>
+
+    <div v-else class="text-center text-gray-500 dark:text-gray-400 mt-10">
+      Ooops. Record not found
+    </div>
 
     <component 
       v-for="c in coreStore?.resourceOptions?.pageInjections?.show?.bottom || []"
@@ -101,7 +106,6 @@
       :resource="coreStore.resource"
       :adminUser="coreStore.adminUser"
     />
-</div>
 
 
   </div>

package/types/AdminForthConfig.ts

@@ -1003,9 +1003,11 @@ export type AdminForthConfig = {
        * }
        * ```
        * 
-       * Install HighCharts:
+       * Install HighCharts into custom folder:
        * 
-       * ```bash
+       * ```bashcreating rec
+       * cd custom
+       * npm init -y
        * npm install highcharts highcharts-vue
        * ```
        *