adminforth 1.2.87 → 1.2.89

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

@@ -1,137 +1,113 @@
 <template>
-  <div class="rounded-default">
+  <div>
+    
     <div 
-      class="relative shadow-resourseFormShadow dark:shadow-darkResourseFormShadow sm:rounded-lg dark:shadow-2xl  rounded-default"
+      class="relative shadow-md sm:rounded-lg dark:shadow-2xl"
     >
       <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-lightFormHeading dark:bg-gray-700 dark:text-gray-400 block md:table-row-group">
+        <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">
               <tr>
-                  <th scope="col" class="px-6 py-3 hidden md:table-cell">
+                  <th scope="col" class="px-6 py-3">
                       Field
                   </th>
-                  <th scope="col" class="px-6 py-3 w-5/6 hidden md:table-cell">
+                  <th scope="col" class="px-6 py-3 w-4/6">
                       Value
                   </th>
-
-                 
               </tr>
           </thead>
           <tbody>
               <tr v-for="column, i in editableColumns" :key="column.name"
-                  v-if="currentValues !== null"
-                  class="bg-ligftForm dark:bg-gray-800 border-b dark:border-gray-700 block md:table-row"
+                  class="odd:bg-white odd:dark:bg-gray-900 even:bg-gray-50 even:dark:bg-gray-800 border-b dark:border-gray-700"
               >
-                    <td class="px-6 py-4 sm:pb-0 whitespace-nowrap flex items-center block md:table-cell"> <!--align-top-->
-                      {{ column.label }}
-                      <span :data-tooltip-target="`tooltip-show-${i}`" class="ml-1 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="ml-1 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 block md:table-cell">
-                    <template v-if="column?.components?.[props.source]?.file">
-                      <component
-                        :is="getCustomComponent(column.components[props.source])"
-                        :column="column"
-                        :value="currentValues[column.name]"
-                        @update:value="setCurrentValue(column.name, $event)"
-                        :meta="column.components[props.source].meta"
-                        :record="currentValues"
-                        @update:inValidity="customComponentsInValidity[column.name] = $event"
-                        @update:emptiness="customComponentsEmptiness[column.name] = $event"
-                      />
-                    </template>
-                    <template v-else>
-                      <Dropdown
-                          single
-                          v-if="column.foreignResource"
-                          :options="columnOptions[column.name] || []"
-                          :placeholder = "columnOptions[column.name]?.length ?'Select...': 'There are no options available'"
-                          :modelValue="currentValues[column.name]"
-                          @update:modelValue="setCurrentValue(column.name, $event)"
-                      ></Dropdown>
-                      <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]"
-                          auto-hide
-                          @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', 'richtext'].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>
-                    </template>
-                    <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 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.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>
               </tr>
               
@@ -145,55 +121,33 @@
 
 <script setup>
 
-import CustomDatePicker from "@/components/CustomDatePicker.vue";
-import Dropdown from '@/components/Dropdown.vue';
+import { ref, computed, onMounted, watch } from 'vue';
 import { useCoreStore } from '@/stores/core';
-import { callAdminForthApi, getCustomComponent } 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();
+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";
 
 const props = defineProps({
   loading: Boolean,
-  resource: Object,
+  resourceColumns: Object,
   record: Object,
   validating: Boolean,
-  source: String,
 });
 
+
 const unmasked = ref({});
 
 const mode = computed(() => props.record  && Object.keys(props.record).length ? 'edit' : 'create');
 
 const emit = defineEmits(['update:record', 'update:isValid']);
 
-const currentValues = ref(null);
-
-const customComponentsInValidity = ref({});
-const customComponentsEmptiness = ref({});
-
+const currentValues = ref({});
 
 const columnError = (column) => {
   const val = computed(() => {
-    if (!currentValues.value) {
-      return null;
-    }
-    if (customComponentsInValidity.value[column.name]) {
-      return customComponentsInValidity.value[column.name];
-    }
-
-    if ( 
-      column.required[mode.value] && 
-      (currentValues.value[column.name] === undefined || currentValues.value[column.name] === null || currentValues.value[column.name] === '') && 
-      // if component is custum it might tell other criteria for emptiness by emitting 'update:emptiness'
-      // components which do not emit 'update:emptiness' will have undefined value in customComponentsEmptiness
-      (customComponentsEmptiness.value[column.name] !== false)
-    
-    ) {
+    if ( column.required[mode.value] && (currentValues.value[column.name] === undefined || currentValues.value[column.name] === null || currentValues.value[column.name] === '') ) {
       return 'This field is required';
     }
     if ( column.type === 'string' || column.type === 'text' ) {
@@ -205,82 +159,39 @@ const columnError = (column) => {
       }
     }
     if ( ['integer', 'decimal', 'float'].includes(column.type) ) {
-      if ( column.minValue !== undefined 
-        && currentValues.value[column.name] !== null 
-        && currentValues.value[column.name] < column.minValue 
-      ) {
+      if ( column.minValue !== undefined && currentValues.value[column.name] < column.minValue ) {
         return `This field must be greater than ${column.minValue}`;
       }
       if ( column.maxValue !== undefined && currentValues.value[column.name] > column.maxValue ) {
         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);
-          let value = currentValues.value[column.name];
-          if (value === undefined || value === null) {
-            value = '';
-          }
-          if (!regExp.test(value)) {
-            return validationArray[i].message;
-          }
-        }
-      }
-
-    }
     return null;
   });
   return val.value;
 };
 
 
+
+
 const setCurrentValue = (key, value) => {
-  const col = props.resource.columns.find((column) => column.name === key);
-  if (['integer', 'float'].includes(col.type) && (value || value === 0)) {
-    currentValues.value[key] = +value;
-  } else {
-    currentValues.value[key] = value;
-  }
-  currentValues.value = { ...currentValues.value };
-  console.log('3️⃣ setCurrentValue', key, value);
+  currentValues.value[key] = value;
+
   emit('update:record', currentValues.value);
 };
 
 onMounted(() => {
-  currentValues.value = Object.assign({}, props.record);
-  console.log('2️⃣ currentValues', JSON.stringify(currentValues.value));
+  Object.keys(props.record).forEach((key) => {
+    currentValues.value[key] = props.record[key];
+  });
   initFlowbite();
-  emit('update:isValid', isValid.value);
 });
 
-const columnOptions = computedAsync(async () => { 
-  return (await Promise.all(
-    Object.values(props.resource.columns).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(() => {
   const mode = props.record ? 'edit' : 'create';
-  return props.resource?.columns?.filter(column => column.showIn.includes(mode));
+  return props.resourceColumns?.filter(column => column.showIn.includes(mode));
 });
 
 const isValid = computed(() => {

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

@@ -1,30 +1,18 @@
 <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 } }">
-        {{ record[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="record[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-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>
     <span v-else-if="column.enum">
-      {{ checkEmptyValues(column.enum.find(e => e.value === record[column.name])?.label,route.meta.type) }}
-    </span>
-    <span v-else-if="column.type === 'datetime'" class="whitespace-nowrap">
-      {{ checkEmptyValues(formatDate(record[column.name]),route.meta.type) }}
+      {{ column.enum.find(e => e.value === row[column.name])?.label }}
     </span>
-    <span v-else-if="column.type === 'richtext'">
-      <div v-html="protectAgainstXSS(record[column.name])"></div>
+    <span v-else-if="column.type === 'datetime'">
+      {{ formatDate(row[column.name]) }}
+      
     </span>
     <span v-else>
-      {{ checkEmptyValues(record[column.name],route.meta.type) }}
+      {{ row[column.name] }}
     </span>
   </div>
 </template>
@@ -35,29 +23,19 @@
 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 sanitizeHtml from 'sanitize-html';
-
 
 import { useCoreStore } from '@/stores/core';
 
 const coreStore = useCoreStore();
-const route = useRoute();
-
 
 dayjs.extend(utc);
 dayjs.extend(timezone);
 
 const props = defineProps({
   column: Object,
-  record: Object
+  row: Object
 });
 
-function protectAgainstXSS(value) {
-  return sanitizeHtml(value);
-}
-
 
 function formatDate(date) {
   if (!date) return '';

package/dist/spa/src/index.scss

@@ -23,5 +23,4 @@
 //   ::-webkit-scrollbar-thumb:hover {
 //     @apply bg-gray-700
 //   }
-// }
-
+// }

package/dist/spa/src/main.ts

@@ -6,10 +6,10 @@ import { createPinia } from 'pinia'
 import App from './App.vue'
 import router from './router'
 
-export const app = createApp(App)
+const app = createApp(App)
 /* IMPORTANT:ADMINFORTH COMPONENT REGISTRATIONS */
 
- 
+
 app.use(createPinia())
 app.use(router)
 

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

@@ -1,23 +1,23 @@
 import { createRouter, createWebHistory } from 'vue-router'
+import HomeView from '../views/HomeView.vue'
 import ResourceParent from '@/views/ResourceParent.vue'
-import { useUserStore } from '@/stores/user'
-/* IMPORTANT:ADMINFORTH ROUTES IMPORTS */
+import ListView from '@/views/ListView.vue'
+import ShowView from '@/views/ShowView.vue'
+import EditView from '@/views/EditView.vue'
+import CreateView from '@/views/CreateView.vue'
 
 const router = createRouter({
   history: createWebHistory(import.meta.env.BASE_URL),
   routes: [
+    {
+      path: '/',
+      name: 'home',
+      component: HomeView
+    },
     {
       path: '/login',
       name: 'login',
-      component: () => import('@/views/LoginView.vue'),
-      meta: { title: 'login' },
-      beforeEnter: async (to, from, next) => {
-        if(localStorage.getItem('isAuthorized') === 'true'){
-          next({name: 'home'})
-        } else {
-          next()
-        }
-      }
+      component: () => import('@/views/LoginView.vue')
     },
     {
       path: '/resource/:resourceId',
@@ -26,29 +26,23 @@ const router = createRouter({
       children: [
         {
           path: '',
-          component: () => import('@/views/ListView.vue'),
-          name: 'resource-list',
-          meta: { title: 'list',type: 'list' }
+          component: ListView,
+          name: 'resource-list'
         },
         {
           path: 'show/:primaryKey',
-          component: () => import('@/views/ShowView.vue'),
-          name: 'resource-show',
-          meta: { title: 'show', type: 'show'}
-
+          component: ShowView,
+          name: 'resource-show'
         },
         {
           path: 'edit/:primaryKey',
-          component: () => import('@/views/EditView.vue'),
-          name: 'resource-edit',
-          meta: { title: 'edit', type: 'edit'}
+          component: EditView,
+          name: 'resource-edit'
         },
         {
           path: 'create',
-          component: () => import('@/views/CreateView.vue'),
-          name: 'resource-create',
-          meta: { title: 'create', type: 'create'}
-
+          component: CreateView,
+          name: 'resource-create'
         },
       ]
     }, 
@@ -56,8 +50,4 @@ const router = createRouter({
   ]
 })
 
-
-
-
-
 export default router