adminforth 1.1.21 → 1.1.23

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

@@ -2,11 +2,11 @@
   <div>
     
     <div 
-      class="relative shadow-md sm:rounded-lg dark:shadow-2xl"
+      class="relative shadow-resourse-form-shadow sm:rounded-lg dark:shadow-2xl dark:shadow-black"
     >
       <form autocomplete="off" @submit.prevent>
         <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-gray-50 dark:bg-gray-700 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">
                       Field
@@ -18,97 +18,116 @@
           </thead>
           <tbody>
               <tr v-for="column, i in editableColumns" :key="column.name"
-                  class="odd:bg-white odd:dark:bg-gray-900 even:bg-gray-50 even:dark:bg-gray-800 border-b dark:border-gray-700"
+                  class="bg-form-view-bg dark:bg-gray-800 border-b dark:border-gray-700"
               >
-                <td class="px-6 py-4 whitespace-nowrap">
-                  {{ column.label }}
-                  <span :data-tooltip-target="`tooltip-show-${i}`" class="relative inline-block">
-                    <IconExclamationCircleSolid v-if="column.required[mode]" class="w-4 h-4" 
-                      :class="(columnError(column) && validating) ? 'text-red-500 dark:text-red-400' : 'text-gray-400 dark:text-gray-500'"
+                <!-- if column is in customComponentsPerColumn, use this component. If not, use this code -->
+                <template v-if="customComponentsPerColumn[column.name]">
+                    <component
+                        :is="customComponentsPerColumn[column.name]"
+                        :column="column"
+                        :value="currentValues[column.name]"
+                        @update:value="setCurrentValue(column.name, $event)"
                     />
-                  </span>
-                  <div :id="`tooltip-show-${i}`"
-                    role="tooltip" class="absolute z-10 invisible inline-block px-3 py-2 text-sm font-medium text-white transition-opacity duration-300 bg-gray-900 rounded-lg shadow-sm opacity-0 tooltip dark:bg-gray-700">
-                      Required field
-                      <div class="tooltip-arrow" data-popper-arrow></div>
-                  </div>
-                </td>
-                <td class="px-6 py-4 whitespace-nowrap whitespace-pre-wrap relative">
-                  <Dropdown
-                    single
-                    v-if="column.enum"
-                    :options="column.enum"
-                    :modelValue="currentValues[column.name]"
-                    @update:modelValue="setCurrentValue(column.name, $event)"
-                  />
-                  <Dropdown
-                    single
-                    v-else-if="column.type === 'boolean'"
-                    :options="[{ label: 'Yes', value: true }, { label: 'No', value: false }, { label: 'Unset', value: null }]"
-                    :modelValue="currentValues[column.name]"
-                    @update:modelValue="setCurrentValue(column.name, $event)"
-                  />
-                  <input 
-                    v-else-if="['integer'].includes(column.type)"
-                    type="number" 
-                    step="1"
-                    class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-40 p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
-                    placeholder="0"
-                    :value="currentValues[column.name]"
-                    @input="setCurrentValue(column.name, $event.target.value)"
-                  >
-                  <CustomDatePicker
-                    v-else-if="['datetime'].includes(column.type)"
-                    :column="column"
-                    :valueStart="currentValues[column.name]"
-                    @update:valueStart="setCurrentValue(column.name, $event)"
-                  />
-                  <input
-                    v-else-if="['decimal', 'float'].includes(column.type)"
-                    type="number"
-                    step="0.1"
-                    class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-40 p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
-                    placeholder="0.0"
-                    :value="currentValues[column.name]"
-                    @input="setCurrentValue(column.name, $event.target.value)"
-                  />
-                  <textarea
-                    v-else-if="['text'].includes(column.type)"
-                    class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
-                    placeholder="Text"
-                    :value="currentValues[column.name]"
-                    @input="setCurrentValue(column.name, $event.target.value)"
-                  >
-                  </textarea>
-                  <input
-                    v-else
-                    :type="!column.masked || unmasked[column.name] ? 'text' : 'password'"
-                    class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
-                    placeholder="Text"
-                    :value="currentValues[column.name]"
-                    @input="setCurrentValue(column.name, $event.target.value)"
-                    autocomplete="false"
-                    data-lpignore="true"
-                    readonly
-                    onfocus="this.removeAttribute('readonly');"
-                  >
-
-                  <button
-                    v-if="column.masked"
-                    type="button"
-                    @click="unmasked[column.name] = !unmasked[column.name]"
-                    class="h-6 absolute inset-y-2 top-6 right-6 flex items-center pr-2 z-index-100 focus:outline-none"
-                  >
-                    <IconEyeSolid class="w-6 h-6 text-gray-400"  v-if="!unmasked[column.name]" />
-                    <IconEyeSlashSolid class="w-6 h-6 text-gray-400" v-else />
-                  </button>
-
-
-
-                  <div v-if="columnError(column) && validating" class="mt-1 text-xs text-red-500 dark:text-red-400">{{ columnError(column) }}</div>
-
-                  <div v-if="column.editingNote && column.editingNote[mode]" class="mt-1 text-xs text-gray-400 dark:text-gray-500">{{ column.editingNote[mode] }}</div>
-                </td>
+                </template>
+                <template v-else>
+                    <td class="px-6 py-4 whitespace-nowrap">
+                    {{ column.label }}
+                    <span :data-tooltip-target="`tooltip-show-${i}`" class="relative inline-block">
+                        <IconExclamationCircleSolid v-if="column.required[mode]" class="w-4 h-4" 
+                        :class="(columnError(column) && validating) ? 'text-red-500 dark:text-red-400' : 'text-gray-400 dark:text-gray-500'"
+                        />
+                    </span>
+                    <div :id="`tooltip-show-${i}`"
+                        role="tooltip" class="absolute z-10 invisible inline-block px-3 py-2 text-sm font-medium text-white transition-opacity duration-300 bg-gray-900 rounded-lg shadow-sm opacity-0 tooltip dark:bg-gray-700">
+                        Required field
+                        <div class="tooltip-arrow" data-popper-arrow></div>
+                    </div>
+                    </td>
+                    <td class="px-6 py-4 whitespace-nowrap whitespace-pre-wrap relative">
+
+                    <Dropdown
+                        single
+                        v-if="column.foreignResource"
+                        :options="columnOptions[column.name] || []"
+                        :modelValue="currentValues[column.name]"
+                        @update:modelValue="setCurrentValue(column.name, $event)"
+                    />
+                    <Dropdown
+                        single
+                        v-else-if="column.enum"
+                        :options="column.enum"
+                        :modelValue="currentValues[column.name]"
+                        @update:modelValue="setCurrentValue(column.name, $event)"
+                    />
+                    <Dropdown
+                        single
+                        v-else-if="column.type === 'boolean'"
+                        :options="[{ label: 'Yes', value: true }, { label: 'No', value: false }, { label: 'Unset', value: null }]"
+                        :modelValue="currentValues[column.name]"
+                        @update:modelValue="setCurrentValue(column.name, $event)"
+                    />
+                    <input 
+                        v-else-if="['integer'].includes(column.type)"
+                        type="number" 
+                        step="1"
+                        class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-40 p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
+                        placeholder="0"
+                        :value="currentValues[column.name]"
+                        @input="setCurrentValue(column.name, $event.target.value)"
+                    >
+                    <CustomDatePicker
+                        v-else-if="['datetime'].includes(column.type)"
+                        :column="column"
+                        :valueStart="currentValues[column.name]"
+                        @update:valueStart="setCurrentValue(column.name, $event)"
+                    />
+                    <input
+                        v-else-if="['decimal', 'float'].includes(column.type)"
+                        type="number"
+                        step="0.1"
+                        class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-40 p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
+                        placeholder="0.0"
+                        :value="currentValues[column.name]"
+                        @input="setCurrentValue(column.name, $event.target.value)"
+                    />
+                    <textarea
+                        v-else-if="['text'].includes(column.type)"
+                        class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
+                        placeholder="Text"
+                        :value="currentValues[column.name]"
+                        @input="setCurrentValue(column.name, $event.target.value)"
+                    >
+                    </textarea>
+                    <input
+                        v-else
+                        :type="!column.masked || unmasked[column.name] ? 'text' : 'password'"
+                        class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
+                        placeholder="Text"
+                        :value="currentValues[column.name]"
+                        @input="setCurrentValue(column.name, $event.target.value)"
+                        autocomplete="false"
+                        data-lpignore="true"
+                        readonly
+                        onfocus="this.removeAttribute('readonly');"
+                    >
+
+                    <button
+                        v-if="column.masked"
+                        type="button"
+                        @click="unmasked[column.name] = !unmasked[column.name]"
+                        class="h-6 absolute inset-y-2 top-6 right-6 flex items-center pr-2 z-index-100 focus:outline-none"
+                    >
+                        <IconEyeSolid class="w-6 h-6 text-gray-400"  v-if="!unmasked[column.name]" />
+                        <IconEyeSlashSolid class="w-6 h-6 text-gray-400" v-else />
+                    </button>
+
+
+
+                    <div v-if="columnError(column) && validating" class="mt-1 text-xs text-red-500 dark:text-red-400">{{ columnError(column) }}</div>
+
+                    <div v-if="column.editingNote && column.editingNote[mode]" class="mt-1 text-xs text-gray-400 dark:text-gray-500">{{ column.editingNote[mode] }}</div>
+                    </td>
+                </template>
               </tr>
               
           </tbody>
@@ -121,19 +140,24 @@
 
 <script setup>
 
-import { ref, computed, onMounted, watch } from 'vue';
-import { useCoreStore } from '@/stores/core';
-import Dropdown from '@/components/Dropdown.vue';
-import { IconExclamationCircleSolid } from '@iconify-prerendered/vue-flowbite';
-import { initFlowbite } from 'flowbite'
-import { IconEyeSolid, IconEyeSlashSolid } from '@iconify-prerendered/vue-flowbite';
 import CustomDatePicker from "@/components/CustomDatePicker.vue";
+import Dropdown from '@/components/Dropdown.vue';
+import { useCoreStore } from '@/stores/core';
+import { callAdminForthApi } from '@/utils';
+import { IconExclamationCircleSolid, IconEyeSlashSolid, IconEyeSolid } from '@iconify-prerendered/vue-flowbite';
+import { computedAsync } from '@vueuse/core';
+import { initFlowbite } from 'flowbite';
+import { computed, onMounted, ref, watch } from 'vue';
+import { useRouter } from 'vue-router';
+
+const router = useRouter();
 
 const props = defineProps({
   loading: Boolean,
   resourceColumns: Object,
   record: Object,
   validating: Boolean,
+  customComponentsPerColumn: Object,
 });
 
 
@@ -145,6 +169,7 @@ const emit = defineEmits(['update:record', 'update:isValid']);
 
 const currentValues = ref({});
 
+
 const columnError = (column) => {
   const val = computed(() => {
     if ( column.required[mode.value] && (currentValues.value[column.name] === undefined || currentValues.value[column.name] === null || currentValues.value[column.name] === '') ) {
@@ -166,14 +191,24 @@ const columnError = (column) => {
         return `This field must be less than ${column.maxValue}`;
       }
     }
+    if ( column.validation && column.validation.length ){
+      const validationArray = column.validation;
+      for (let i = 0; i < validationArray.length; i++) {
+        if (validationArray[i].regExp) {
+          const regExp = new RegExp(validationArray[i].regExp);
+          if (!regExp.test(currentValues.value[column.name])) {
+            return validationArray[i].message;
+          }
+        }
+      }
+
+    }
     return null;
   });
   return val.value;
 };
 
 
-
-
 const setCurrentValue = (key, value) => {
   currentValues.value[key] = value;
 
@@ -185,8 +220,31 @@ onMounted(() => {
     currentValues.value[key] = props.record[key];
   });
   initFlowbite();
+
+  
 });
 
+const columnOptions = computedAsync(async () => { 
+  return (await Promise.all(
+    Object.values(props.resourceColumns).map(async (column) => {
+      if (column.foreignResource) {
+        const list = await callAdminForthApi({
+          method: 'POST',
+          path: `/get_resource_foreign_data`,
+          body: {
+            resourceId: router.currentRoute.value.params.resourceId,
+            column: column.name,
+            limit: 1000,
+            offset: 0,
+          },
+        });
+        return { [column.name]: list.items };
+      }
+    })
+  )).reduce((acc, val) => Object.assign(acc, val), {})
+
+}, {});
+
 const coreStore = useCoreStore();
 
 const editableColumns = computed(() => {

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

@@ -1,6 +1,16 @@
 <template>
   <div>
-    <span v-if="column.type === 'boolean'">
+    <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 } }">
+        {{ row[column.name].label }}
+      </RouterLink>
+      <div v-else>
+        <span class="text-gray-400">-</span>
+      </div>
+    </span>
+        
+    <span v-else-if="column.type === 'boolean'">
       <span v-if="row[column.name]" class="bg-green-100 text-green-800 text-xs font-medium me-2 px-2.5 py-0.5 rounded dark:bg-gray-700 dark:text-green-400 border border-green-400">Yes</span>
       <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>

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

@@ -1,5 +1,4 @@
 import { createRouter, createWebHistory } from 'vue-router'
-import HomeView from '../views/HomeView.vue'
 import ResourceParent from '@/views/ResourceParent.vue'
 import ListView from '@/views/ListView.vue'
 import ShowView from '@/views/ShowView.vue'
@@ -12,7 +11,9 @@ const router = createRouter({
     {
       path: '/',
       name: 'home',
-      component: HomeView
+      //redirect to login 
+      /* IMPORTANT:ADMINFORTH REDIRECT */
+
     },
     {
       path: '/login',

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

@@ -1,22 +1,6 @@
 import { ref, computed } from 'vue'
 import { defineStore } from 'pinia'
 import { callAdminForthApi } from '@/utils';
-import router from '@/router';
-
-async function findHomepage(menu) {
-  for (const item of menu) {
-    if (item.homepage) {
-      return item;
-    }
-    if (item.children) {
-      const res = findHomepage(item.children);
-      if (res) {
-        return res;
-      }
-    }
-  }
-  return null;
-}
 
 export const useCoreStore = defineStore('core', () => {
   const resourceById = ref([]);
@@ -40,35 +24,40 @@ export const useCoreStore = defineStore('core', () => {
     }, {});
     config.value = resp.config;
     user.value = resp.user;
+    console.log('🌍 AdminForth v', resp.version);
 
     // find homepage:true in menu recuresively
-    if (import.meta.env.DEV){
-      return
-    } else {
-      const homepage = await findHomepage(menu.value);
-      if (homepage) {
-        if (homepage.resourceId) {
-          // redirect to homepage
-          router.push({ name: 'resource-list', params: { resourceId: homepage.resourceId } });
-        } else {
-          // redirect to path
-          router.push(homepage.path);
-        }
-      }
-    }
+    
   }
 
   async function fetchRecord({ resourceId, primaryKey }) {
     record.value = null;
+    
+    if (!resourceColumns.value) {
+      throw new Error('Columns not fetched yet');
+    }
 
-    record.value = await callAdminForthApi({
-      path: '/get_record',
+    const respData = await callAdminForthApi({
+      path: '/get_resource_data',
       method: 'POST',
       body: {
+        source: 'show',
         resourceId: resourceId,
-        primaryKey: primaryKey,
+        filters: [
+          {
+            field: resourceColumns.value.find((col) => col.primaryKey).name,
+            operator: 'eq',
+            value: primaryKey
+          }
+        ],
+        sort: [],
+        limit: 1,
+        offset: 0
       }
     });
+
+    console.log('📦 record', respData);
+    record.value = respData.data[0];
   }
 
   async function fetchColumns({ resourceId }) {

package/dist/spa/src/utils.ts

@@ -29,9 +29,11 @@ export async function callAdminForthApi({ path, method, body=undefined }) {
   }
 }
 
-
-
-
+export function getCustomComponent(filePath: string) {
+  const name = filePath.replace(/@/g, '').replace(/\./g, '').replace(/\//g, '');
+  console.log('resolving name', name);
+  return resolveComponent(name);
+}
 
 export function getIcon(icon: string) {
   // icon format is "feather:icon-name". We need to get IconName in pascal case

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

@@ -31,6 +31,7 @@
       @update:record="onUpdateRecord"
       @update:isValid="isValid = $event"
       :validating="validating"
+      :customComponentsPerColumn="createComponentsPerColumn"
     >
     </ResourceForm>
 
@@ -40,14 +41,14 @@
 
 <script setup>
 
-import { ref, computed, onMounted } from 'vue';  
-import { useRoute, useRouter } from 'vue-router';
-import { useCoreStore } from '@/stores/core';
-import { callAdminForthApi } from '@/utils';
-import ResourceForm from '@/components/ResourceForm.vue';
 import BreadcrumbsWithButtons from '@/components/BreadcrumbsWithButtons.vue';
-import { IconFloppyDiskSolid } from '@iconify-prerendered/vue-flowbite';
+import ResourceForm from '@/components/ResourceForm.vue';
 import SingleSkeletLoader from '@/components/SingleSkeletLoader.vue';
+import { useCoreStore } from '@/stores/core';
+import { callAdminForthApi, getCustomComponent } from '@/utils';
+import { IconFloppyDiskSolid } from '@iconify-prerendered/vue-flowbite';
+import { onMounted, ref } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
 
 const isValid = ref(false);
 const validating = ref(false);
@@ -59,6 +60,7 @@ const route = useRoute();
 const router = useRouter();
 
 const record = ref({});
+let createComponentsPerColumn = {};
 
 const coreStore = useCoreStore();
 
@@ -69,9 +71,15 @@ async function onUpdateRecord(newRecord) {
 
 onMounted(async () => {
   loading.value = true;
-  coreStore.fetchColumns({
+  await coreStore.fetchColumns({
     resourceId: route.params.resourceId
   });
+  createComponentsPerColumn = coreStore.resourceColumns.reduce((acc, column) => {
+      if (column.component?.create) {
+          acc[column.name] = getCustomComponent(column.component.create);
+      }
+      return acc;
+    }, {});
   loading.value = false;
 });
 

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

@@ -23,11 +23,12 @@
 
     <ResourceForm 
       v-else
-      :record="coreStore.record"
+      :record="editableRecord"
       :resourceColumns="coreStore.resourceColumns"
       @update:record="onUpdateRecord"
       @update:isValid="isValid = $event"
       :validating="validating"
+      :customComponentsPerColumn="editComponentsPerColumn"
     >
     </ResourceForm>
   </div>
@@ -36,14 +37,14 @@
 
 <script setup>
 
-import { ref, computed, onMounted } from 'vue';  
-import { useRoute, useRouter } from 'vue-router';
-import { useCoreStore } from '@/stores/core';
-import ResourceForm from '@/components/ResourceForm.vue';
 import BreadcrumbsWithButtons from '@/components/BreadcrumbsWithButtons.vue';
-import { IconFloppyDiskSolid } from '@iconify-prerendered/vue-flowbite';
+import ResourceForm from '@/components/ResourceForm.vue';
 import SingleSkeletLoader from '@/components/SingleSkeletLoader.vue';
-import { callAdminForthApi } from '@/utils';
+import { useCoreStore } from '@/stores/core';
+import { callAdminForthApi, getCustomComponent } from '@/utils';
+import { IconFloppyDiskSolid } from '@iconify-prerendered/vue-flowbite';
+import { computed, onMounted, ref } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
 
 const coreStore = useCoreStore();
 
@@ -58,11 +59,24 @@ const loading = ref(false);
 const saving = ref(false);
 
 const record = ref({});
+let editComponentsPerColumn = {};
 
 async function onUpdateRecord(newRecord) {
   record.value = newRecord;
 }
 
+const editableRecord = computed(() => {
+  const newRecord = { ...coreStore.record };
+  if (!coreStore.resourceColumns) {
+    return {};
+  }
+  coreStore.resourceColumns.forEach(column => {
+    if (column.foreignResource) {
+      newRecord[column.name] = newRecord[column.name]?.pk
+    }
+  });
+  return newRecord;
+})
 
 onMounted(async () => {
   loading.value = true;
@@ -75,6 +89,12 @@ onMounted(async () => {
     primaryKey: route.params.primaryKey,
   });
 
+  editComponentsPerColumn = coreStore.resourceColumns.reduce((acc, column) => {
+      if (column.component?.edit) {
+          acc[column.name] = getCustomComponent(column.component.edit);
+      }
+      return acc;
+    }, {});
   loading.value = false;
 });
 
@@ -87,13 +107,21 @@ async function saveRecord() {
   }
 
   saving.value = true;
+
+  const updates = {};
+  for (const key in record.value) {
+    if (record.value[key] !== coreStore.record[key]) {
+      updates[key] = record.value[key];
+    }
+  }
+
   await callAdminForthApi({
     method: 'POST',
     path: `/update_record`,
     body: {
       resourceId: route.params.resourceId,
       recordId: route.params.primaryKey,
-      record: record.value,
+      record: updates,
     },
   });
   saving.value = false;