adminforth 1.1.62 → 1.1.64

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

@@ -1,38 +1,21 @@
 <template>
   <div class="relative">
-    <component 
-      v-for="c in coreStore?.resourceOptions?.pageInjections?.show?.beforeBreadcrumbs || []"
-      :is="getCustomComponent(c)"
-      :meta="c.meta"
-      :record="coreStore.record"
-      :resource="coreStore.resource"
-      :adminUser="coreStore.adminUser"
-    />
     <BreadcrumbsWithButtons>
-      <RouterLink v-if="coreStore?.resourceOptions?.allowedActions?.edit" :to="{ name: 'resource-edit', params: { resourceId: $route.params.resourceId, primaryKey: $route.params.primaryKey } }" 
-        class="flex items-center py-1 px-3 text-sm font-medium text-gray-900 focus:outline-none bg-white rounded-default border border-gray-300 hover:bg-gray-100 hover:text-blue-700 focus:z-10 focus:ring-4 focus:ring-gray-100 dark:focus:ring-gray-700 dark:bg-gray-800 dark:text-gray-400 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700"
+      <RouterLink :to="{ name: 'resource-edit', params: { resourceId: $route.params.resourceId, primaryKey: $route.params.primaryKey } }" 
+        class="flex items-center py-1 px-3 me-2 mb-2 text-sm font-medium text-gray-900 focus:outline-none bg-white rounded border border-gray-300 hover:bg-gray-100 hover:text-blue-700 focus:z-10 focus:ring-4 focus:ring-gray-100 dark:focus:ring-gray-700 dark:bg-gray-800 dark:text-gray-400 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700"
       >
         <IconPenSolid class="w-4 h-4" />
         Edit
       </RouterLink>
 
-      <button v-if="coreStore?.resourceOptions?.allowedActions?.delete"  @click="deleteRecord"
-        class="flex items-center py-1 px-3 text-sm font-medium rounded-default text-red-600 focus:outline-none bg-white  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="deleteRecord"
+        class="flex items-center py-1 px-3 mb-2 text-sm font-medium 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"
       >
         <IconTrashBinSolid class="w-4 h-4" />
         Delete
       </button>
     </BreadcrumbsWithButtons>
 
-    <component 
-      v-for="c in coreStore?.resourceOptions?.pageInjections?.show?.afterBreadcrumbs || []"
-      :is="getCustomComponent(c)"
-      :meta="c.meta"
-      :record="coreStore.record"
-      :resource="coreStore.resource"
-      :adminUser="coreStore.adminUser"
-    />
-
     <div v-if="loading" role="status" class="max-w-sm animate-pulse">
         <div class="h-2.5 bg-gray-200 rounded-full dark:bg-gray-700 w-48 mb-4"></div>
         <div class="h-2 bg-gray-200 rounded-full dark:bg-gray-700 max-w-[360px] mb-2.5"></div>
@@ -46,7 +29,7 @@
       v-else
       class="relative overflow-x-auto shadow-resourse-form-shadow "
     >
-     <table class="w-full text-sm text-left rtl:text-right text-gray-500 dark:text-gray-400 rounded-default">
+     <table class="w-full text-sm text-left rtl:text-right text-gray-500 dark:text-gray-400">
         <thead class="text-xs text-gray-700 uppercase bg-form-view-heading dark:bg-gray-700 dark:text-gray-400">
             <tr>
                 <th scope="col" class="px-6 py-3">
@@ -58,49 +41,23 @@
             </tr>
         </thead>
         <tbody>
-            <tr v-for="column in coreStore.resource?.columns.filter(c => c.showIn.includes('show'))" :key="column.name"
+            <tr v-for="column in coreStore.resourceColumns?.filter(c => c.showIn.includes('show'))" :key="column.name"
                 class="bg-form-view-bg odd:dark:bg-gray-900  even:dark:bg-gray-800 border-b  dark:border-gray-700"
             >
-              <component
-                v-if="column.components?.showRow"
-                  :is="getCustomComponent(column.components.showRow)"
-                  :meta="column.components.showRow.meta"
-                  :column="column"
-                  :resource="coreStore.resource"
-                  :record="coreStore.record"
-              />
-              <template v-else>
-                <td class="px-6 py-4 whitespace-nowrap "> <!--align-top-->
-                  {{ column.label }}
+                <td class="px-6 py-4 whitespace-nowrap">
+                    {{ column.label }}
                 </td>
                 <td class="px-6 py-4 whitespace-nowrap whitespace-pre-wrap">
-                  <component
-                    v-if="showComponentsPerColumn[column.name]"
-                    :is="showComponentsPerColumn[column.name]"
-                    :resource="coreStore.resource"
-                    :meta="column.components.show.meta"
-                    :column="column"
-                    :record="coreStore.record"
-                  />
-                  <ValueRenderer v-else 
-                    :column="column" 
-                    :record="coreStore.record"
-                  />
+                    <component
+                        :is="showComponentsPerColumn[column.name] || ValueRenderer"
+                        :column="column"
+                        :row="coreStore.record"
+                    />
                 </td>
-              </template>
             </tr>
+            
         </tbody>
     </table>
-
-    <component 
-      v-for="c in coreStore?.resourceOptions?.pageInjections?.show?.bottom || []"
-      :is="getCustomComponent(c)"
-      :meta="c.meta"
-      :column="column"
-      :record="coreStore.record"
-      :resource="coreStore.resource"
-      :adminUser="coreStore.adminUser"
-    />
 </div>
 
 
@@ -111,78 +68,37 @@
 <script setup>
 
 import BreadcrumbsWithButtons from '@/components/BreadcrumbsWithButtons.vue';
-
 import ValueRenderer from '@/components/ValueRenderer.vue';
 import { useCoreStore } from '@/stores/core';
-import { useModalStore } from '@/stores/modal';
-import { getCustomComponent, checkAcessByAllowedActions } from '@/utils';
+import { getCustomComponent } from '@/utils';
 import { IconPenSolid, IconTrashBinSolid } from '@iconify-prerendered/vue-flowbite';
 import { onMounted, ref } from 'vue';
-import { useRoute,useRouter } from 'vue-router';
-import {callAdminForthApi} from '@/utils';
-import {showSuccesTost} from '@/composables/useFrontendApi';
+import { useRoute } from 'vue-router';
 
 
 const item = ref(null);
 const route = useRoute();
-const router = useRouter();
 const loading = ref(false);
 let showComponentsPerColumn = {};
 
-console.log(route.params,'showWiev');
-
-
 const coreStore = useCoreStore();
-const modalStore = useModalStore();
 
 onMounted(async () => {
   loading.value = true;
-  await coreStore.fetchResourceFull({
+  await coreStore.fetchColumns({
     resourceId: route.params.resourceId
   });
   await coreStore.fetchRecord({
     resourceId: route.params.resourceId, 
     primaryKey: route.params.primaryKey,
   });
-  checkAcessByAllowedActions(coreStore.resourceOptions.allowedActions,'show');
-
-  showComponentsPerColumn = coreStore.resource.columns.reduce((acc, column) => {
-      if (column.components?.show) {
-          acc[column.name] = getCustomComponent(column.components.show);
+  showComponentsPerColumn = coreStore.resourceColumns.reduce((acc, column) => {
+      if (column.component?.show) {
+          acc[column.name] = getCustomComponent(column.component.show);
       }
       return acc;
-  }, {});
+    }, {});
   loading.value = false;
 });
 
-async function deleteRecord(row) {
-  const data = await window.adminforth.confirm({
-    message: 'Are you sure you want to delete this item?',
-    yes: 'Delete',
-    no: 'Cancel',
-  });
-  if (data) {
-    try {
-      const res = await callAdminForthApi({
-      path: '/delete_record',
-      method: 'POST',
-      body: {
-        resourceId: route.params.resourceId,
-        primaryKey: route.params.primaryKey,
-      }});
-      if (!res.error){
-        router.push({ name: 'resource-list', params: { resourceId: route.params.resourceId } });
-        showSuccesTost('Record deleted successfully')
-      } else {
-        console.error(res.error)
-      }
-
-    } catch (e) {
-      console.error(e);
-      };
-    }
-
-    
-}
-
 </script>

package/dist/spa/tailwind.config.js

@@ -1,6 +1,6 @@
 /** @type {import('tailwindcss').Config} */
 export default {
-  content:  ["./src/**/*.{vue, js, ts, tsx}","./src/*.{vue, js, ts, tsx}", "./index.html", "./node_modules/flowbite/**/*.js"],
+  content:  ["./src/**/*.{vue, js}","./src/*.{vue, js}", "./index.html", "./node_modules/flowbite/**/*.js"],
   theme: {
     extend: {
       /* IMPORTANT:ADMINFORTH TAILWIND STYLES */

package/dist/spa/vite.config.ts

@@ -11,12 +11,6 @@ const customLogger = {
       console.log(msg);
     }
   },
-  warnOnce(msg: string) {
-    console.warn('warn once', msg);
-    if (!this.hasWarned) {
-      this.hasWarned = true;
-    }
-  },
   warn(msg: string) {
     console.warn(msg);
   },

package/dist/types.js

@@ -0,0 +1,30 @@
+// typical types which AdminForth supports
+//
+export const AdminForthTypes = {
+    STRING: 'string',
+    INTEGER: 'integer',
+    FLOAT: 'float',
+    DECIMAL: 'decimal',
+    BOOLEAN: 'boolean',
+    DATE: 'date',
+    DATETIME: 'datetime',
+    TIME: 'time',
+    TEXT: 'text',
+    JSON: 'json',
+};
+export const AdminForthFilterOperators = {
+    EQ: 'eq',
+    NE: 'ne',
+    GT: 'gt',
+    LT: 'lt',
+    GTE: 'gte',
+    LTE: 'lte',
+    LIKE: 'like',
+    ILIKE: 'ilike',
+    IN: 'in',
+    NIN: 'nin',
+};
+export const AdminForthSortDirections = {
+    ASC: 'asc',
+    DESC: 'desc',
+};

package/index.ts

@@ -725,8 +725,10 @@ class AdminForth implements AdminForthClass {
         let userFullName = ''
         if (adminUser.isRoot) {
             username = this.config.rootUser.username;
+            console.log(username, 'this is the root')
         } else {
             const dbUser = adminUser.dbUser;
+            console.log(dbUser,'this is the db user',adminUser,'this is the admin user')
             username = dbUser[this.config.auth.usernameField]; 
             userFullName =dbUser[this.config.auth.userFullNameField];
         }
@@ -766,6 +768,7 @@ class AdminForth implements AdminForthClass {
           }
           newMenu.push(newMenuItem)
         }
+        console.log(userData,'this is the user data')
 
         return {
           user: userData,

package/package.json

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