adminforth 1.1.68 → 1.1.70

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

@@ -2,11 +2,11 @@
   <!-- drawer component -->
   <div id="drawer-navigation" 
   
-      class="fixed  right-0 z-50 p-4 overflow-y-auto transition-transform translate-x-full bg-white w-80 dark:bg-gray-800 shadow-xl dark:shadow-black"
+      class="fixed top-14 right-0 z-40 p-4 overflow-y-auto transition-transform translate-x-full bg-white w-80 dark:bg-gray-800 shadow-xl"
 
       :class="show ? 'top-0 transform-none' : ''"
       tabindex="-1" aria-labelledby="drawer-navigation-label"
-      :style="{ height: `calc(100vh ` }"
+      :style="{ height: `calc(100vh - 3.5rem)` }"
   >
     <h5 id="drawer-navigation-label" class="text-base font-semibold text-gray-500 uppercase dark:text-gray-400">
       Filters
@@ -22,17 +22,11 @@
          <li v-for="c in columnsWithFilter" :key="c">
             <p class="dark:text-gray-400">{{ c.label }}</p>
 
-            <Dropdown
-              v-if="c.foreignResource"
-              :options="columnOptions[c.name] || []"
-              @update:modelValue="setFilterItem({ column: c, operator: 'in', value: $event })"
-              :modelValue="filtersStore.filters.find(f => f.field === c.name && f.operator === 'in')?.value || []"
-            />
-            <Dropdown
-              v-else-if="c.type === 'boolean'"
+            <Dropdown 
+              v-if="c.type === 'boolean'" 
               :options="[{ label: 'Yes', value: true }, { label: 'No', value: false }, { label: 'Unset', value: null }]"
               @update:modelValue="setFilterItem({ column: c, operator: 'in', value: $event })"
-              :modelValue="filtersStore.filters.find(f => f.field === c.name && f.operator === 'in')?.value || []"
+              :modelValue="filters.find(f => f.field === c.name && f.operator === 'in')?.value || []"
             />
             
             <Dropdown 
@@ -40,7 +34,7 @@
               :options="c.enum"
               :allowCustom="c.allowCustom"
               @update:modelValue="setFilterItem({ column: c, operator: 'in', value: $event })"
-              :modelValue="filtersStore.filters.find(f => f.field === c.name && f.operator === 'in')?.value || []"
+              :modelValue="filters.find(f => f.field === c.name && f.operator === 'in')?.value || []"
             />
 
            <input
@@ -54,9 +48,9 @@
            <CustomDateRangePicker
              v-else-if="['datetime'].includes(c.type)"
              :column="c"
-             :valueStart="filtersStore.filters.find(f => f.field === c.name && f.operator === 'gte')?.value || undefined"
+             :valueStart="filters.find(f => f.field === c.name && f.operator === 'gte')?.value || undefined"
              @update:valueStart="setFilterItem({ column: c, operator: 'gte', value: $event || undefined })"
-             :valueEnd="filtersStore.filters.find(f => f.field === c.name && f.operator === 'lte')?.value || undefined"
+             :valueEnd="filters.find(f => f.field === c.name && f.operator === 'lte')?.value || undefined"
              @update:valueEnd="setFilterItem({ column: c, operator: 'lte', value: $event || undefined })"
            />
 
@@ -68,32 +62,22 @@
              :value="getFilterItem({ column: c, operator: 'ilike' })"
            >
 
-           <CustomRangePicker
-             v-else-if="['integer', 'decimal', 'float'].includes(c.type) && c.allowMinMaxQuery"
-             :min="c.min"
-             :max="c.max"
-             :valueStart="getFilterItem({ column: c, operator: 'gte' })"
-             @update:valueStart="setFilterItem({ column: c, operator: 'gte', value: $event || undefined })"
-             :valueEnd="getFilterItem({ column: c, operator: 'lte' })"
-             @update:valueEnd="setFilterItem({ column: c, operator: 'lte', value: $event || undefined })"
-           />
-
-           <div v-else-if="['integer', 'decimal', 'float'].includes(c.type)" class="flex gap-2">
-             <input
-               type="number" aria-describedby="helper-text-explanation"
-               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-20 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="From"
-               @input="setFilterItem({ column: c, operator: 'gte', value: $event.target.value || undefined })"
-               :value="getFilterItem({ column: c, operator: 'gte' })"
-             >
-             <input
-               type="number" aria-describedby="helper-text-explanation"
-               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-20 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="To"
-               @input="setFilterItem({ column: c, operator: 'lte', value: $event.target.value || undefined})"
-               :value="getFilterItem({ column: c, operator: 'lte' })"
-             >
-           </div>
+            <div v-else-if="['integer', 'decimal', 'float'].includes(c.type)" class="flex gap-2">
+              <input 
+                type="number" aria-describedby="helper-text-explanation" 
+                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-20 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="From"
+                @input="setFilterItem({ column: c, operator: 'gte', value: $event.target.value || undefined })"
+                :value="getFilterItem({ column: c, operator: 'gte' })"
+              >
+              <input 
+                type="number" aria-describedby="helper-text-explanation" 
+                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-20 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="To"
+                @input="setFilterItem({ column: c, operator: 'lte', value: $event.target.value || undefined})"
+                :value="getFilterItem({ column: c, operator: 'lte' })"
+              >
+            </div>
             
          </li>
       </ul>
@@ -101,71 +85,33 @@
 
    <div class="flex justify-end gap-2">
       <button 
-        :disabled="!filtersStore.filters.length"
+        :disabled="!filters.length"
         type="button" 
-        class="flex items-center py-1 px-3 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 disabled:opacity-50 disabled:cursor-not-allowed"
+        class="flex items-center py-1 px-3  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 disabled:opacity-50 disabled:cursor-not-allowed"
         @click="clear">Clear all</button>
 
    </div>
   </div>
 
-  <div v-if="show"  class="bg-gray-900/50 dark:bg-gray-900/80 fixed inset-0  z-30"
+  <div v-if="show" drawer-backdrop="" class="bg-gray-900/50 dark:bg-gray-900/80 fixed inset-0 z-30"
     @click="$emit('hide')">
   </div>
 </template>
 
 <script setup>
-import { watch, computed, ref, onMounted } from 'vue'
+import { watch, computed } from 'vue'
 import Dropdown from '@/components/Dropdown.vue';
 import CustomDateRangePicker from '@/components/CustomDateRangePicker.vue';
-import { callAdminForthApi } from '@/utils';
-import { useRouter } from 'vue-router';
-import { computedAsync } from '@vueuse/core'
-import CustomRangePicker from "@/components/CustomRangePicker.vue";
-import { useFiltersStore } from '@/stores/filters';
-
-const filtersStore = useFiltersStore();
-
 
 // props: columns
 // add support for v-model:filers
 const props = defineProps(['columns', 'filters', 'show', 'columnsMinMax']);
 const emits = defineEmits(['update:filters', 'hide']);
 
-const router = useRouter();
-
-
-const columnsWithFilter = computed(
+const columnsWithFilter = computed( 
   () => props.columns?.filter(column => column.showIn.includes('filter')) || []
 );
 
-const columnOptions = computedAsync(async () => {
-  const ret = {};
-  if (!props.columns) {
-    return ret;
-  }
-  await Promise.all(
-    Object.values(props.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,
-          },
-        });
-        ret[column.name] = list.items;
-      }
-    })
-  );
-
-  return ret;
-}, {});
-
-
 // sync 'body' class 'overflow-hidden' with show prop show
 watch(() => props.show, (show) => {
   if (show) {
@@ -184,28 +130,28 @@ watch(() => props.show, (show) => {
 
 function setFilterItem({ column, operator, value }) {
 
-  const index = filtersStore.filters.findIndex(f => f.field === column.name && f.operator === operator);
+  const index = props.filters.findIndex(f => f.field === column.name && f.operator === operator);
   if (value === undefined) {
     if (index !== -1) {
-      filtersStore.filters.splice(index, 1);
+      props.filters.splice(index, 1);
     }
-    emits('update:filters', [...filtersStore.filters]);
+    emits('update:filters', [...props.filters]);
     return;
   } else {
     if (index === -1) {
-      filtersStore.setFilter({ field: column.name, value, operator });
+      props.filters.push({ field: column.name, value, operator });
     } else {
-      filtersStore.setFilters([...filtersStore.filters.slice(0, index), { field: column.name, value, operator }, ...filtersStore.filters.slice(index + 1)])
+      props.filters[index].value = value;
     }
   }
-  emits('update:filters', [...filtersStore.filters]);
+  emits('update:filters', [...props.filters]);
 }
 
 function getFilterItem({ column, operator }) {
-  return filtersStore.filters.find(f => f.field === column.name && f.operator === operator)?.value || '';
+  return props.filters.find(f => f.field === column.name && f.operator === operator)?.value || '';
 }
 
 async function clear() {
-  filtersStore.clearFilters();
+  emits('update:filters', []);
 }
 </script>

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

@@ -1,11 +1,11 @@
 <template>
   <RouterLink 
       :to="{name: item.resourceId ? 'resource-list' : item.path, params: item.resourceId ? { resourceId: item.resourceId }: {}}" 
-      class="flex items-center py-2 text-nav-menu-text rounded-default  hover:bg-nav-menu-bg-hover active:bg-nav-menu-bg-active" role="menuitem"
+      class="flex items-center py-2 text-sm text-gray-700 hover:bg-gray-100 dark:text-gray-300 dark:hover:bg-gray-600 dark:hover:text-white" role="menuitem"
       :class="{ 
         'px-4': isChild,
         'px-2': !isChild,
-        'bg-nav-menu-bg-active dark:bg-gray-700': item.resourceId ?
+        'bg-blue-100 dark:bg-gray-700': item.resourceId ?
         ($route.params.resourceId === item.resourceId && $route.name === 'resource-list') :
         ($route.name === item.path)
       }"

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

@@ -1,12 +1,12 @@
 <template>
-  <div class="rounded-default">
+  <div>
     
     <div 
-      class="relative shadow-resourse-form-shadow sm:rounded-lg dark:shadow-2xl dark:shadow-black 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-form-view-heading dark:bg-gray-700 dark:text-gray-400">
+        <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">
                       Field
@@ -18,114 +18,97 @@
           </thead>
           <tbody>
               <tr v-for="column, i in editableColumns" :key="column.name"
-                  class="bg-form-view-bg dark:bg-gray-800 border-b dark:border-gray-700"
+                  class="odd:bg-white odd:dark:bg-gray-900 even:bg-gray-50 even:dark:bg-gray-800 border-b dark:border-gray-700"
               >
-                <!-- 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)"
+                <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'"
                     />
-                </template>
-                <template v-else>
-                    <td class="px-6 py-4 whitespace-nowrap "> <!--align-top-->
-                      {{ 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] || []"
-                        :placeholder = "columnOptions[column.name]?.length || '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'].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>
+                  </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>
               
           </tbody>
@@ -138,24 +121,19 @@
 
 <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 } 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,
-  customComponentsPerColumn: Object,
 });
 
 
@@ -167,7 +145,6 @@ 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] === '') ) {
@@ -189,28 +166,14 @@ 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);
-          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) => {
   currentValues.value[key] = value;
 
@@ -222,36 +185,13 @@ onMounted(() => {
     currentValues.value[key] = props.record[key];
   });
   initFlowbite();
-
-  
 });
 
-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,29 +1,18 @@
 <template>
   <div>
-    
-    <span 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) }}
+      {{ column.enum.find(e => e.value === row[column.name])?.label }}
     </span>
     <span v-else-if="column.type === 'datetime'">
-      {{ checkEmptyValues(formatDate(record[column.name]),route.meta.type) }}
+      {{ formatDate(row[column.name]) }}
       
     </span>
     <span v-else>
-      {{ checkEmptyValues(record[column.name],route.meta.type) }}
+      {{ row[column.name] }}
     </span>
   </div>
 </template>
@@ -34,22 +23,17 @@
 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);
 
 const props = defineProps({
   column: Object,
-  record: Object
+  row: Object
 });
 
 

package/dist/spa/src/main.ts

@@ -9,7 +9,7 @@ import router from './router'
 const app = createApp(App)
 /* IMPORTANT:ADMINFORTH COMPONENT REGISTRATIONS */
 
- 
+
 app.use(createPinia())
 app.use(router)