adminforth 1.1.74 → 1.1.76

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

@@ -1,16 +1,16 @@
 <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 group items-center py-2 text-lightSidebarText dark:text-darkSidebarText rounded-default  hover:bg-lightSidebarItemHover hover:text-lightSidebarTextHover dark:hover:bg-darkSidebarItemHover dark:hover:text-darkSidebarTextHover active:bg-lightSidebarActive dark:active:bg-darkSidebarHover" role="menuitem"
       :class="{ 
         'px-4': isChild,
         'px-2': !isChild,
-        'bg-nav-menu-bg-active dark:bg-gray-700': item.resourceId ?
+        'bg-sidebarActive dark:bg-gray-700': item.resourceId ?
         ($route.params.resourceId === item.resourceId && $route.name === 'resource-list') :
         ($route.name === item.path)
       }"
   >
-    <component v-if="item.icon" :is="getIcon(item.icon)" class="w-5 h-5 text-gray-500 transition duration-75 dark:text-gray-400 group-hover:text-gray-900 dark:group-hover:text-white" ></component>
+    <component v-if="item.icon" :is="getIcon(item.icon)" class="w-5 h-5 text-lightSidebarIcons dark:text-darkSidebarIcons  transition duration-75  group-hover:text-lightSidebarIconsHover dark:group-hover:text-darkSidebarIconsHover" ></component>
     <span class="ms-3">{{ item.label }}</span>
   </RouterLink>
 </template>

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

@@ -2,11 +2,11 @@
   <div class="rounded-default">
     
     <div 
-      class="relative shadow-resourse-form-shadow sm:rounded-lg dark:shadow-2xl dark:shadow-black rounded-default"
+      class="relative shadow-resourseFormShadow sm:rounded-lg dark:shadow-2xl dark:shadow-black rounded-default"
     >
       <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">
+          <thead class="text-xs text-gray-700 uppercase bg-lightormHeading dark:bg-gray-700 dark:text-gray-400">
               <tr>
                   <th scope="col" class="px-6 py-3">
                       Field
@@ -18,18 +18,8 @@
           </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="bg-ligftForm 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)"
-                    />
-                </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">
@@ -44,88 +34,99 @@
                       </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>
+                    <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"
+                        />
+                    </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'].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');"
+                      >
 
-                    <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>
+                      <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>
+                    </template>
+                </td>
               </tr>
               
           </tbody>
@@ -141,7 +142,7 @@
 import CustomDatePicker from "@/components/CustomDatePicker.vue";
 import Dropdown from '@/components/Dropdown.vue';
 import { useCoreStore } from '@/stores/core';
-import { callAdminForthApi } from '@/utils';
+import { callAdminForthApi, getCustomComponent } from '@/utils';
 import { IconExclamationCircleSolid, IconEyeSlashSolid, IconEyeSolid } from '@iconify-prerendered/vue-flowbite';
 import { computedAsync } from '@vueuse/core';
 import { initFlowbite } from 'flowbite';
@@ -155,10 +156,9 @@ const props = defineProps({
   resource: Object,
   record: Object,
   validating: Boolean,
-  customComponentsPerColumn: Object,
+  source: String,
 });
 
-
 const unmasked = ref({});
 
 const mode = computed(() => props.record  && Object.keys(props.record).length ? 'edit' : 'create');

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

@@ -1,42 +1,29 @@
 <template>
   <!-- table -->
-  <div class="relative overflow-x-auto shadow-list-table-shadow dark:shadow-black	overflow-y-hidden rounded-default">
+  <div class="relative overflow-x-auto shadow-listTableShadow dark:shadow-black	overflow-y-hidden rounded-default">
 
     <!-- skelet loader -->
     <div role="status" v-if="!resource || !resource.columns"
         class="max-w p-4 space-y-4 divide-y divide-gray-200 rounded shadow animate-pulse dark:divide-gray-700 md:p-6 dark:border-gray-700">
-      <div class="flex items-center justify-between h-16">
-        <div>
-          <div class="h-2.5 bg-gray-300 rounded-full dark:bg-gray-600 w-24 mb-2.5"></div>
-          <div class="w-32 h-2 bg-gray-200 rounded-full dark:bg-gray-700"></div>
-        </div>
-        <div class="h-2.5 bg-gray-300 rounded-full dark:bg-gray-700 w-12"></div>
-      </div>
-
-      <div class="flex items-center justify-between  h-16 pt-4" v-for="i in new Array(10)">
-        <div>
-          <div class="h-2.5 bg-gray-300 rounded-full dark:bg-gray-600 w-24 mb-2.5"></div>
-          <div class="w-32 h-2 bg-gray-200 rounded-full dark:bg-gray-700"></div>
-        </div>
-        <div class="h-2.5 bg-gray-300 rounded-full dark:bg-gray-700 w-12"></div>
-      </div>
-      <span class="sr-only">Loading...</span>
+      
     </div>
 
     <table v-else class="w-full text-sm text-left rtl:text-right text-gray-500 dark:text-gray-400 rounded-default">
-      <thead class="text-xs text-view-table-heading-text bg-list-view-table-heading dark:bg-gray-700 dark:text-gray-400">
+      <thead class="text-xs text-view-table-heading-text bg-lightListTableHeading dark:bg-darkListTableHeading dark:text-gray-400">
       <tr>
         <th scope="col" class="p-4">
           <div v-if="rows && rows.length" class="flex items-center">
-            <input id="checkbox-all-search" type="checkbox" :checked="allFromThisPageChecked" @change="selectAll()"
-                  class="w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 rounded focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 dark:focus:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600">
+            <input id="checkbox-all-search" type="checkbox" :checked="allFromThisPageChecked" @change="selectAll()" 
+                  class="w-4 h-4 cursor-pointer text-blue-600 bg-gray-100 border-gray-300 rounded focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 dark:focus:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600">
             <label for="checkbox-all-search" class="sr-only">checkbox</label>
           </div>
         </th>
 
         <th v-for="c in columnsListed" scope="col" class="px-6 py-3">
+         
           <div @click="() => c.sortable && onSortButtonClick(c.name)" class="flex items-center " :class="{'cursor-pointer':c.sortable}">
             {{ c.label }}
+            
 
             <div v-if="c.sortable"
                 :style="{ 'color':ascArr.includes(c.name)?'green':descArr.includes(c.name)?'red':'currentColor'}">
@@ -52,6 +39,12 @@
                   d="M8.574 11.024h6.852a2.075 2.075 0 0 0 1.847-1.086 1.9 1.9 0 0 0-.11-1.986L13.736 2.9a2.122 2.122 0 0 0-3.472 0L6.837 7.952a1.9 1.9 0 0 0-.11 1.986 2.074 2.074 0 0 0 1.847 1.086Zm6.852 1.952H8.574a2.072 2.072 0 0 0-1.847 1.087 1.9 1.9 0 0 0 .11 1.985l3.426 5.05a2.123 2.123 0 0 0 3.472 0l3.427-5.05a1.9 1.9 0 0 0 .11-1.985 2.074 2.074 0 0 0-1.846-1.087Z"/>
               </svg>
             </div>
+            <span
+             class="bg-red-100 text-red-800 text-xs font-medium me-1 px-1 py-0.5 rounded dark:bg-gray-700 dark:text-red-400 border border-red-400"
+             v-if="sort.findIndex((s) => s.field === c.name) !== -1">
+            {{ sort.findIndex((s) => s.field === c.name) + 1 }}
+            </span>
+
           </div>
         </th>
 
@@ -61,51 +54,8 @@
       </tr>
       </thead>
       <tbody>
-      <tr v-if="!rows" class="bg-list-view-table-bg border-b dark:bg-gray-800 dark:border-gray-700">
-        <td :colspan="resource?.columns.length + 2">
-
-          <div role="status"
-              class="max-w p-4 space-y-4 divide-y divide-gray-200 rounded animate-pulse dark:divide-gray-700 md:p-6 dark:border-gray-700">
-            <div class="flex items-center justify-between">
-              <div>
-                <div class="h-2.5 bg-gray-300 rounded-full dark:bg-gray-600 w-24 mb-2.5"></div>
-                <div class="w-32 h-2 bg-gray-200 rounded-full dark:bg-gray-700"></div>
-              </div>
-              <div class="h-2.5 bg-gray-300 rounded-full dark:bg-gray-700 w-12"></div>
-            </div>
-            <div class="flex items-center justify-between pt-4">
-              <div>
-                <div class="h-2.5 bg-gray-300 rounded-full dark:bg-gray-600 w-24 mb-2.5"></div>
-                <div class="w-32 h-2 bg-gray-200 rounded-full dark:bg-gray-700"></div>
-              </div>
-              <div class="h-2.5 bg-gray-300 rounded-full dark:bg-gray-700 w-12"></div>
-            </div>
-            <div class="flex items-center justify-between pt-4">
-              <div>
-                <div class="h-2.5 bg-gray-300 rounded-full dark:bg-gray-600 w-24 mb-2.5"></div>
-                <div class="w-32 h-2 bg-gray-200 rounded-full dark:bg-gray-700"></div>
-              </div>
-              <div class="h-2.5 bg-gray-300 rounded-full dark:bg-gray-700 w-12"></div>
-            </div>
-            <div class="flex items-center justify-between pt-4">
-              <div>
-                <div class="h-2.5 bg-gray-300 rounded-full dark:bg-gray-600 w-24 mb-2.5"></div>
-                <div class="w-32 h-2 bg-gray-200 rounded-full dark:bg-gray-700"></div>
-              </div>
-              <div class="h-2.5 bg-gray-300 rounded-full dark:bg-gray-700 w-12"></div>
-            </div>
-            <div class="flex items-center justify-between pt-4">
-              <div>
-                <div class="h-2.5 bg-gray-300 rounded-full dark:bg-gray-600 w-24 mb-2.5"></div>
-                <div class="w-32 h-2 bg-gray-200 rounded-full dark:bg-gray-700"></div>
-              </div>
-              <div class="h-2.5 bg-gray-300 rounded-full dark:bg-gray-700 w-12"></div>
-            </div>
-            <span class="sr-only">Loading...</span>
-          </div>
-        </td>
-      </tr>
-      <tr v-else-if="rows.length === 0" class="bg-list-view-table-bg border-b dark:bg-gray-800 dark:border-gray-700">
+        <SkeleteLoader v-if="!rows" :columns="3" :rows="resource?.columns.length + 2"/>  
+      <tr v-else-if="rows.length === 0" class="bg-lightListTable border-b dark:bg-darkListTable dark:border-darkListTableBorder">
         <td :colspan="resource?.columns.length + 2">
 
           <div id="toast-simple"
@@ -118,16 +68,17 @@
         </td>
       </tr>
 
-      <tr v-else v-for="(row, rowI) in rows" :key="row.id"
-          class="bg-list-view-table-bg border-b dark:bg-gray-800 border-list-view-border-color dark:border-gray-700 hover:bg-list-view-table-row-hover dark:hover:bg-gray-600">
-        <td class="w-4 p-4">
-          <div class="flex items center">
+      <tr @click="onClick($event,row)"   v-else v-for="(row, rowI) in rows" :key="row.id"
+          class="bg-lightListTable border-b dark:bg-darkListTable border-lightListBorder dark:border-gray-700 hover:bg-lightListTableRowHover dark:hover:bg-darkListTableRowHover cursor-pointer">
+        <td class="w-4 p-4 cursor-default" @click="(e)=>{e.stopPropagation()}">
+          <div class="flex items center ">
             <input
+              @click="(e)=>{e.stopPropagation()}"
               id="checkbox-table-search-1"
               type="checkbox"
               :checked="checkboxesInternal.includes(row.id)"
               @change="(e)=>{addToCheckedValues(row.id)}"
-              class="w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 rounded focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 dark:focus:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600">
+              class="w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 rounded focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 dark:focus:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600 cursor-pointer">
             <label for="checkbox-table-search-1" class="sr-only">checkbox</label>
           </div>
         </td>
@@ -135,14 +86,14 @@
           <!-- if c.name in listComponentsPerColumn, render it. If not, render ValueRenderer -->
           <component
             :is="c?.components?.list ? getCustomComponent(c.components.list) : ValueRenderer"
-            :meta="c?.components?.list.meta"
+            :meta="c?.components?.list?.meta"
             :column="c"
             :record="row"
             :adminUser="coreStore.adminUser"
             :resource="resource"
           />
         </td>
-        <td class=" items-center px-6 py-4">
+        <td class=" items-center px-6 py-4 cursor-default" @click="(e)=>{e.stopPropagation()}">
           <div class="flex">
           <RouterLink
             v-if="resource.options?.allowedActions.show"
@@ -278,6 +229,7 @@ import ValueRenderer from '@/components/ValueRenderer.vue';
 import { getCustomComponent } from '@/utils';
 import { useCoreStore } from '@/stores/core';
 import { showSuccesTost } from '@/composables/useFrontendApi';
+import SkeleteLoader from '@/components/SkeleteLoader.vue';
 
 import {
 IconInboxOutline,
@@ -291,6 +243,7 @@ IconFilterOutline,
 IconPenSolid,
 IconTrashBinSolid
 } from '@iconify-prerendered/vue-flowbite';
+import router from '@/router';
 
 const coreStore = useCoreStore();
 
@@ -299,7 +252,8 @@ const props = defineProps([
   'rows',
   'totalRows',
   'pageSize',
-  'checkboxes'
+  'checkboxes',
+  'sort'
 ])
 
 // emits, update page
@@ -335,6 +289,10 @@ watch(() => props.checkboxes, (newCheckboxes) => {
   checkboxesInternal.value = newCheckboxes;
 });
 
+watch(() => props.sort, (newSort) => {
+  sort.value = newSort;
+});
+
 function addToCheckedValues(id) {
   if (checkboxesInternal.value.includes(id)) {
     checkboxesInternal.value = checkboxesInternal.value.filter((item) => item !== id);
@@ -347,15 +305,18 @@ function addToCheckedValues(id) {
 const columnsListed = computed(() => props.resource?.columns?.filter(c => c.showIn.includes('list')));
 
 async function selectAll(value) {
-  props.rows.forEach((r) => {
-    if (!checkboxesInternal.value.includes(r.id)) {
-      checkboxesInternal.value.push(r.id)
-    } else {
-      checkboxesInternal.value = checkboxesInternal.value.filter((item) => item !== r.id)
-    }
-  });
-  checkboxesInternal.value = [ ...checkboxesInternal.value ]
-  // checkboxes.value = rows.value.map((v) => v.id);
+  if (!allFromThisPageChecked.value) {
+    props.rows.forEach((r) => {
+      if (!checkboxesInternal.value.includes(r.id)) {
+        checkboxesInternal.value.push(r.id)
+      } 
+    });
+  }
+  else {
+    props.rows.forEach((r) => {
+      checkboxesInternal.value = checkboxesInternal.value.filter((item) => item !== r.id);
+    });
+  }
 }
 
 const totalPages = computed(() => Math.ceil(props.totalRows / props.pageSize));
@@ -365,7 +326,7 @@ const totalPages = computed(() => Math.ceil(props.totalRows / props.pageSize));
 
 const allFromThisPageChecked = computed(() => {
   if (!props.rows) return false;
-  return props.rows.every((r) => props.checkboxes.includes(r.id));
+  return props.rows.every((r) => checkboxesInternal.value.includes(r.id));
 });
 const ascArr = computed(() => sort.value.filter((s) => s.direction === 'asc').map((s) => s.field));
 const descArr = computed(() => sort.value.filter((s) => s.direction === 'desc').map((s) => s.field));
@@ -374,7 +335,7 @@ const descArr = computed(() => sort.value.filter((s) => s.direction === 'desc').
 function onSortButtonClick(field) {
   const sortIndex = sort.value.findIndex((s) => s.field === field);
   if (sortIndex === -1) {
-    sort.value = [{field, direction: 'asc'}, ...sort.value];
+    sort.value = [...sort.value,{field, direction: 'asc'}];
   } else {
     const sortField = sort.value[sortIndex];
     if (sortField.direction === 'asc') {
@@ -385,6 +346,30 @@ function onSortButtonClick(field) {
   }
 }
 
+
+const clickTarget = ref(null);
+async function onClick(e,row) {
+  if(clickTarget.value === e.target) return;
+  clickTarget.value = e.target;
+  await new Promise((resolve) => setTimeout(resolve, 300));
+  if (window.getSelection().toString()) return;
+  else {router.push({
+    name: 'resource-show',
+    params: {
+      resourceId: props.resource.resourceId,
+      primaryKey: row._primaryKeyValue,
+    },
+  })}
+}
+  
+
+
+
+
+
+
+
+
 async function deleteRecord(row) {
   const data = await window.adminforth.confirm({
     message: 'Are you sure you want to delete this item?',

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

@@ -0,0 +1,23 @@
+<template>
+    <tr v-for="c in new Array(props.columns)" class="bg-lightListTable border-b dark:bg-darkListTable dark:border-darkListBorder">
+         <td v-for="r in new Array(props.rows)" class="items-center px-6 py-8 cursor-default" >
+            <div role="status" class="max-w-sm animate-pulse">
+                <div class="h-2 bg-gray-200 rounded-full dark:bg-gray-700 max-w-[360px]"></div>
+            </div>
+        </td>
+    </tr>
+</template>
+
+<script setup>
+
+const props = defineProps({
+    columns:Number,
+    rows:Number
+});
+
+
+</script>
+
+<style lang="scss" scoped>
+
+</style>

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

@@ -1,7 +1,7 @@
 <template>
   <div>
     
-    <span v-if="column.foreignResource">
+    <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 }}
@@ -18,9 +18,8 @@
     <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'">
+    <span v-else-if="column.type === 'datetime'" class="whitespace-nowrap">
       {{ checkEmptyValues(formatDate(record[column.name]),route.meta.type) }}
-      
     </span>
     <span v-else>
       {{ checkEmptyValues(record[column.name],route.meta.type) }}

package/dist/spa/src/composables/useStores.ts

@@ -1,4 +1,5 @@
-import type { FrontendAPIInterface, ConfirmParams, AlertParams, FilterParams,Operator } from '../types/FrontendAPI';
+import type { FrontendAPIInterface, ConfirmParams, AlertParams, } from '../types/FrontendAPI';
+import type { AdminForthFilterOperators } from '@/types/AdminForthConfig';
 import { useToastStore } from '../stores/toast';
 import { useModalStore } from '../stores/modal';
 import { useCoreStore } from '@/stores/core';
@@ -6,9 +7,20 @@ import { useFiltersStore } from '@/stores/filters';
 import router from '@/router'
 import type { AdminForthResourceColumn } from '@/types/AdminForthConfig';
 
-
-
-
+ type FilterParams = {
+  /**
+   * Field of resource to filter
+   */
+  field: string;
+  /**
+   * Operator of filter
+   */
+  operator: AdminForthFilterOperators;
+  /**
+   * Value of filter
+   */
+  value: string | number | boolean ;
+}
 
 declare global {
   interface Window {
@@ -23,7 +35,6 @@ declare global {
 }
 
 export class FrontendAPI implements FrontendAPIInterface {
-  private validOperators: Operator[] = ['lte', 'gte', 'in','ilike'];
   private toastStore:any
   private modalStore:any
   private filtersStore:any  
@@ -70,12 +81,8 @@ export class FrontendAPI implements FrontendAPIInterface {
       const filterField = this.coreStore.resourceColumnsWithFilters.find((col: AdminForthResourceColumn) => col.name === filter.field)
       if(!filterField){
           throw new Error(`Field ${filter.field} is not available for filtering`)
-        }
-      if(filterField) {
-        if(!this.validOperators.includes(filter.operator)){
-          throw new Error(`Operator ${filter.operator} is not valid`)
-        } 
       }
+      
     }
     return true
   }
@@ -103,7 +110,13 @@ export class FrontendAPI implements FrontendAPIInterface {
       if(index === -1) {
         this.filtersStore.setFilter(filter)
       } else {
-      this.filtersStore.setFilters([...this.filtersStore.filters.slice(0, index), filter, ...this.filtersStore.filters.slice(index + 1)])
+        const filters = [...this.filtersStore.filters];
+        if (filter.value === undefined) {
+          filters.splice(index, 1);
+        } else {
+          filters[index] = filter;
+        }
+        this.filtersStore.setFilters(filters);
       }
     }
   }

package/dist/spa/src/main.ts

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

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

@@ -12,7 +12,6 @@ const router = createRouter({
       component: () => import('@/views/LoginView.vue'),
       meta: { title: 'login' },
       beforeEnter: async (to, from, next) => {
-        const userStore = useUserStore()
         if(localStorage.getItem('isAuthorized') === 'true'){
           next({name: 'home'})
         } else {