adminforth 1.0.75 → 1.0.77

package/dist/index.js

@@ -73,6 +73,9 @@ class AdminForth {
             }
             console.log('\n ⚠️⚠️⚠️ [INSECURE ALERT] config.rootUser is set, please create a new user and remove config.rootUser from config before going to production\n');
         }
+        if (!this.config.customization.customComponentsDir) {
+            this.config.customization.customComponentsDir = './custom';
+        }
         if (this.config.auth) {
             if (!this.config.auth.resourceId) {
                 throw new Error('No config.auth.resourceId defined');
@@ -94,9 +97,6 @@ class AdminForth {
         if (!this.config.customization) {
             this.config.customization = {};
         }
-        if (!this.config.customization.customComponentsDir) {
-            this.config.customization.customComponentsDir = './custom';
-        }
         if (!this.config.baseUrl) {
             this.config.baseUrl = '';
         }
@@ -484,7 +484,7 @@ class AdminForth {
                         auth: this.config.auth,
                         usernameField: this.config.auth.usernameField,
                         title: (_h = this.config.customization) === null || _h === void 0 ? void 0 : _h.title,
-                        emtyFieldPlaceholder: (_j = this.config.customization) === null || _j === void 0 ? void 0 : _j.emtyFieldPlaceholder,
+                        emptyFieldPlaceholder: (_j = this.config.customization) === null || _j === void 0 ? void 0 : _j.emptyFieldPlaceholder,
                     },
                     adminUser,
                     version: ADMINFORTH_VERSION,

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

@@ -1,5 +1,6 @@
 <template>
   <div>
+    
     <span v-if="column.foreignResource">
       <RouterLink v-if="row[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: row[column.name].pk } }">
@@ -15,14 +16,14 @@
       <span v-else class="bg-red-100 text-red-800 text-xs font-medium me-2 px-2.5 py-0.5 rounded dark:bg-gray-700 dark:text-red-400 border border-red-400">No</span>
     </span>
     <span v-else-if="column.enum">
-      {{ column.enum.find(e => e.value === row[column.name])?.label }}
+      {{ checkEmptyValues(column.enum.find(e => e.value === row[column.name])?.label,route.meta.type) }}
     </span>
     <span v-else-if="column.type === 'datetime'">
-      {{ formatDate(row[column.name]) }}
+      {{ checkEmptyValues(formatDate(row[column.name]),route.meta.type) }}
       
     </span>
     <span v-else>
-      {{ row[column.name] }}
+      {{ checkEmptyValues(row[column.name],route.meta.type) }}
     </span>
   </div>
 </template>
@@ -33,10 +34,15 @@
 import dayjs from 'dayjs';
 import utc from 'dayjs/plugin/utc';
 import timezone from 'dayjs/plugin/timezone';
+import {checkEmptyValues} from '@/utils';
+import { useRoute, useRouter } from 'vue-router';
+
 
 import { useCoreStore } from '@/stores/core';
 
 const coreStore = useCoreStore();
+const  route = useRoute();
+
 
 dayjs.extend(utc);
 dayjs.extend(timezone);

package/dist/spa/spa/src/router/index.ts

@@ -20,26 +20,26 @@ const router = createRouter({
           path: '',
           component: () => import('@/views/ListView.vue'),
           name: 'resource-list',
-          meta: { title: 'list' }
+          meta: { title: 'list',type: 'list' }
         },
         {
           path: 'show/:primaryKey',
           component: () => import('@/views/ShowView.vue'),
           name: 'resource-show',
-          meta: { title: 'show' }
+          meta: { title: 'show', type: 'show'}
 
         },
         {
           path: 'edit/:primaryKey',
           component: () => import('@/views/EditView.vue'),
           name: 'resource-edit',
-          meta: { title: 'edit' }
+          meta: { title: 'edit', type: 'edit'}
         },
         {
           path: 'create',
           component: () => import('@/views/CreateView.vue'),
           name: 'resource-create',
-          meta: { title: 'create' }
+          meta: { title: 'create', type: 'create'}
 
         },
       ]

package/dist/spa/spa/src/spa_types/core.ts

@@ -0,0 +1,51 @@
+import type { AdminForthResource, AdminForthResourceColumn } from '../types/AdminForthConfig';
+
+export type resourceById = {
+    [key: string]: AdminForthResource;
+}
+
+export type Menu = {
+    label: string,
+    icon: string,
+    resourceId: string,
+    children?: Array<Menu>,
+}
+
+export type Record = {
+    [key: string]: any;
+}
+
+export type ResourceColumns = {
+    [key: string]: Array<AdminForthResourceColumn>;
+}
+
+export type CoreConfig = {
+    brandName: string,
+    brandLogo: string,
+    title: string,
+    datesFormat: string,
+    usernameField: string,
+    usernameFieldName?: string,
+    deleteConfirmation?: boolean,
+    auth?: {
+        resourceId: string,
+        usernameField: string,
+        passwordHashField: string,
+        loginBackgroundImage: string,
+        userFullnameField: string,
+    },
+    emptyFieldPlaceholder?: {
+        show: string,
+        list: string,
+       
+    } | string,
+}
+
+
+export type AllowedActions = {
+    show: boolean,
+    create: boolean,
+    edit: boolean,
+    delete: boolean,
+}
+

package/dist/spa/spa/src/stores/core.ts

@@ -30,8 +30,7 @@ export const useCoreStore = defineStore('core', () => {
     user.value = resp.user;
     console.log('🌍 AdminForth v', resp.version);
 
-    // find homepage:true in menu recuresively
-    
+      
   }
 
   async function fetchRecord({ resourceId, primaryKey }) {

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

@@ -1,4 +1,5 @@
 import { onMounted, ref, resolveComponent } from 'vue';
+import type {  CoreConfig } from './spa_types/core';
 
 import router from "./router";
 import { useCoreStore } from './stores/core';
@@ -64,12 +65,18 @@ export const loadFile = (file: string) => {
   return baseUrl;
 }
 
-// export function checkEmptyValues(value: any, viewType:'show' | 'list' | 'create' | 'edit') {
-//   const config: = useCoreStore().config;
-//   const emptyFieldPlaceholder = config.emptyFieldPlaceholder?.[viewType] || '---';
-
-//   if (value === null || value === undefined || value === '') {
-//     return emptyFieldPlaceholder;
-//   }
-//   return value;
-// }
+export function checkEmptyValues(value: any, viewType:'show' | 'list' ) {
+  const config: CoreConfig | {} = useCoreStore().config;
+  let emptyFieldPlaceholder = '';
+  if (config.emptyFieldPlaceholder) {
+    if(typeof config.emptyFieldPlaceholder === 'string') {
+      emptyFieldPlaceholder = config.emptyFieldPlaceholder;
+    } else {
+       emptyFieldPlaceholder = config.emptyFieldPlaceholder?.[viewType] || '';
+    }
+    if (value === null || value === undefined || value === '') {
+      return emptyFieldPlaceholder;
+    }
+  }
+  return value;
+}

package/index.ts

@@ -93,6 +93,10 @@ class AdminForth implements AdminForthClass {
 
       console.log('\n ⚠️⚠️⚠️ [INSECURE ALERT] config.rootUser is set, please create a new user and remove config.rootUser from config before going to production\n');
     }
+    
+    if (!this.config.customization.customComponentsDir) {
+      this.config.customization.customComponentsDir = './custom';
+    }
 
     if (this.config.auth) {
       if (!this.config.auth.resourceId) {
@@ -117,10 +121,6 @@ class AdminForth implements AdminForthClass {
       this.config.customization = {};
     }
 
-    if (!this.config.customization.customComponentsDir) {
-      this.config.customization.customComponentsDir = './custom';
-    }
-
 
     if (!this.config.baseUrl) {
       this.config.baseUrl = '';
@@ -557,7 +557,7 @@ class AdminForth implements AdminForthClass {
             auth: this.config.auth,
             usernameField: this.config.auth.usernameField,
             title: this.config.customization?.title,
-            emtyFieldPlaceholder: this.config.customization?.emtyFieldPlaceholder,
+            emptyFieldPlaceholder: this.config.customization?.emptyFieldPlaceholder,
           },
           adminUser,
           version: ADMINFORTH_VERSION,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminforth",
-  "version": "1.0.75",
+  "version": "1.0.77",
   "description": "OpenSource Vue3 powered forth-generation admin panel",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -22,6 +22,7 @@
     "fs-extra": "^11.2.0",
     "jsonwebtoken": "^9.0.2",
     "mongodb": "6.6",
+    "node-fetch": "^3.3.2",
     "pg": "^8.11.5",
     "request": "^2.88.2",
     "uuid": "^9.0.1"

package/spa/src/components/ValueRenderer.vue

@@ -1,5 +1,6 @@
 <template>
   <div>
+    
     <span v-if="column.foreignResource">
       <RouterLink v-if="row[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: row[column.name].pk } }">
@@ -15,14 +16,14 @@
       <span v-else class="bg-red-100 text-red-800 text-xs font-medium me-2 px-2.5 py-0.5 rounded dark:bg-gray-700 dark:text-red-400 border border-red-400">No</span>
     </span>
     <span v-else-if="column.enum">
-      {{ column.enum.find(e => e.value === row[column.name])?.label }}
+      {{ checkEmptyValues(column.enum.find(e => e.value === row[column.name])?.label,route.meta.type) }}
     </span>
     <span v-else-if="column.type === 'datetime'">
-      {{ formatDate(row[column.name]) }}
+      {{ checkEmptyValues(formatDate(row[column.name]),route.meta.type) }}
       
     </span>
     <span v-else>
-      {{ row[column.name] }}
+      {{ checkEmptyValues(row[column.name],route.meta.type) }}
     </span>
   </div>
 </template>
@@ -33,10 +34,15 @@
 import dayjs from 'dayjs';
 import utc from 'dayjs/plugin/utc';
 import timezone from 'dayjs/plugin/timezone';
+import {checkEmptyValues} from '@/utils';
+import { useRoute, useRouter } from 'vue-router';
+
 
 import { useCoreStore } from '@/stores/core';
 
 const coreStore = useCoreStore();
+const  route = useRoute();
+
 
 dayjs.extend(utc);
 dayjs.extend(timezone);

package/spa/src/router/index.ts

@@ -20,26 +20,26 @@ const router = createRouter({
           path: '',
           component: () => import('@/views/ListView.vue'),
           name: 'resource-list',
-          meta: { title: 'list' }
+          meta: { title: 'list',type: 'list' }
         },
         {
           path: 'show/:primaryKey',
           component: () => import('@/views/ShowView.vue'),
           name: 'resource-show',
-          meta: { title: 'show' }
+          meta: { title: 'show', type: 'show'}
 
         },
         {
           path: 'edit/:primaryKey',
           component: () => import('@/views/EditView.vue'),
           name: 'resource-edit',
-          meta: { title: 'edit' }
+          meta: { title: 'edit', type: 'edit'}
         },
         {
           path: 'create',
           component: () => import('@/views/CreateView.vue'),
           name: 'resource-create',
-          meta: { title: 'create' }
+          meta: { title: 'create', type: 'create'}
 
         },
       ]

package/spa/src/spa_types/core.ts

@@ -0,0 +1,51 @@
+import type { AdminForthResource, AdminForthResourceColumn } from '../types/AdminForthConfig';
+
+export type resourceById = {
+    [key: string]: AdminForthResource;
+}
+
+export type Menu = {
+    label: string,
+    icon: string,
+    resourceId: string,
+    children?: Array<Menu>,
+}
+
+export type Record = {
+    [key: string]: any;
+}
+
+export type ResourceColumns = {
+    [key: string]: Array<AdminForthResourceColumn>;
+}
+
+export type CoreConfig = {
+    brandName: string,
+    brandLogo: string,
+    title: string,
+    datesFormat: string,
+    usernameField: string,
+    usernameFieldName?: string,
+    deleteConfirmation?: boolean,
+    auth?: {
+        resourceId: string,
+        usernameField: string,
+        passwordHashField: string,
+        loginBackgroundImage: string,
+        userFullnameField: string,
+    },
+    emptyFieldPlaceholder?: {
+        show: string,
+        list: string,
+       
+    } | string,
+}
+
+
+export type AllowedActions = {
+    show: boolean,
+    create: boolean,
+    edit: boolean,
+    delete: boolean,
+}
+

package/spa/src/stores/core.ts

@@ -30,8 +30,7 @@ export const useCoreStore = defineStore('core', () => {
     user.value = resp.user;
     console.log('🌍 AdminForth v', resp.version);
 
-    // find homepage:true in menu recuresively
-    
+      
   }
 
   async function fetchRecord({ resourceId, primaryKey }) {

package/spa/src/utils.ts

@@ -1,4 +1,5 @@
 import { onMounted, ref, resolveComponent } from 'vue';
+import type {  CoreConfig } from './spa_types/core';
 
 import router from "./router";
 import { useCoreStore } from './stores/core';
@@ -64,12 +65,18 @@ export const loadFile = (file: string) => {
   return baseUrl;
 }
 
-// export function checkEmptyValues(value: any, viewType:'show' | 'list' | 'create' | 'edit') {
-//   const config: = useCoreStore().config;
-//   const emptyFieldPlaceholder = config.emptyFieldPlaceholder?.[viewType] || '---';
-
-//   if (value === null || value === undefined || value === '') {
-//     return emptyFieldPlaceholder;
-//   }
-//   return value;
-// }
+export function checkEmptyValues(value: any, viewType:'show' | 'list' ) {
+  const config: CoreConfig | {} = useCoreStore().config;
+  let emptyFieldPlaceholder = '';
+  if (config.emptyFieldPlaceholder) {
+    if(typeof config.emptyFieldPlaceholder === 'string') {
+      emptyFieldPlaceholder = config.emptyFieldPlaceholder;
+    } else {
+       emptyFieldPlaceholder = config.emptyFieldPlaceholder?.[viewType] || '';
+    }
+    if (value === null || value === undefined || value === '') {
+      return emptyFieldPlaceholder;
+    }
+  }
+  return value;
+}

package/types/AdminForthConfig.ts

@@ -134,12 +134,11 @@ export  type AdminForthConfig = {
       datesFormat?: string,
       title?: string,
       brandLogo?: string,
-      emtyFieldPlaceholder?: {
+      emptyFieldPlaceholder?: {
         show?: string,
         list?: string,
-        create?: string,
-        edit?: string,
-      },
+        
+      } | string,
     },
     baseUrl?: string,