adminforth 1.1.59 → 1.1.60

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

@@ -101,9 +101,6 @@ const endDate = ref('');
 const startTime = ref('');
 const endTime = ref('');
 
-const datepickerStartObject = ref('')
-const datepickerEndObject = ref('')
-
 const start = computed(() => {
   if (!startDate.value) {
     return;
@@ -165,9 +162,9 @@ watch(end, () => {
 
 function initDatepickers() {
 
-  datepickerStartObject.value = new Datepicker(datepickerStartEl.value, {format: 'dd M yyyy'});
+  new Datepicker(datepickerStartEl.value, {format: 'dd M yyyy'});
 
-  datepickerEndObject.value = new Datepicker(datepickerEndEl.value, {format: 'dd M yyyy'});
+  new Datepicker(datepickerEndEl.value, {format: 'dd M yyyy'});
   addChangeDateListener();
 }
 
@@ -181,11 +178,6 @@ function removeChangeDateListener() {
   datepickerEndEl.value.removeEventListener('changeDate', setEndDate);
 }
 
-function destroyDatepickerElement() {
-  datepickerStartObject.value.destroy();
-  datepickerEndObject.value.destroy();
-}
-
 function setStartDate(event) {
   startDate.value = event.detail.date
 }
@@ -213,6 +205,5 @@ onMounted(() => {
 
 onBeforeUnmount(() => {
   removeChangeDateListener();
-  destroyDatepickerElement();
 })
 </script>

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

@@ -6,7 +6,7 @@
         v-model="search"
         @focus="showDropdown = true"
         class="block w-full pl-3 pr-10 py-2 border border-gray-300 rounded-md leading-5 bg-white placeholder-gray-500 focus:outline-none focus:shadow-outline-blue focus:border-blue-300 sm:text-sm transition duration-150 ease-in-out 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="selectedItems.length ? '' : placeholder || 'Select...'"
+        :placeholder="selectedItems.length ? '' : 'Select...'"
       />
       <div class="absolute inset-y-0 left-2 flex items-center pr-2 flex-wrap">
         {{  }}
@@ -67,11 +67,6 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
-  placeholder: {
-    type: String,
-    default: '',
-
-  },
 });
 
 const emit = defineEmits(['update:modelValue']);

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 dark:shadow-black"
 
       :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
@@ -26,13 +26,13 @@
               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 || []"
+              :modelValue="filters.find(f => f.field === c.name && f.operator === 'in')?.value || []"
             />
             <Dropdown
               v-else-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 +40,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 +54,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 })"
            />
 
@@ -69,7 +69,7 @@
            >
 
            <CustomRangePicker
-             v-else-if="['integer', 'decimal', 'float'].includes(c.type) && c.allowMinMaxQuery"
+             v-else-if="['integer', 'decimal', 'float'].includes(c.type)"
              :min="c.min"
              :max="c.max"
              :valueStart="getFilterItem({ column: c, operator: 'gte' })"
@@ -77,23 +77,6 @@
              :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>
             
          </li>
       </ul>
@@ -101,15 +84,15 @@
 
    <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-50"
     @click="$emit('hide')">
   </div>
 </template>
@@ -122,10 +105,6 @@ 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
@@ -184,28 +163,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/ResourceForm.vue

@@ -1,11 +1,11 @@
 <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-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 ">
+        <table class="w-full text-sm text-left rtl:text-right text-gray-500 dark:text-gray-400">
           <thead class="text-xs text-gray-700 uppercase bg-form-view-heading dark:bg-gray-700 dark:text-gray-400">
               <tr>
                   <th scope="col" class="px-6 py-3">
@@ -30,28 +30,28 @@
                     />
                 </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 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] || []"
-                        :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"
@@ -79,7 +79,6 @@
                         v-else-if="['datetime'].includes(column.type)"
                         :column="column"
                         :valueStart="currentValues[column.name]"
-                        auto-hide
                         @update:valueStart="setCurrentValue(column.name, $event)"
                     />
                     <input
@@ -121,6 +120,9 @@
                         <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>
@@ -152,7 +154,7 @@ const router = useRouter();
 
 const props = defineProps({
   loading: Boolean,
-  resource: Object,
+  resourceColumns: Object,
   record: Object,
   validating: Boolean,
   customComponentsPerColumn: Object,
@@ -194,11 +196,7 @@ const columnError = (column) => {
       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)) {
+          if (!regExp.test(currentValues.value[column.name])) {
             return validationArray[i].message;
           }
         }
@@ -228,7 +226,7 @@ onMounted(() => {
 
 const columnOptions = computedAsync(async () => { 
   return (await Promise.all(
-    Object.values(props.resource.columns).map(async (column) => {
+    Object.values(props.resourceColumns).map(async (column) => {
       if (column.foreignResource) {
         const list = await callAdminForthApi({
           method: 'POST',
@@ -251,7 +249,7 @@ 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,10 +1,9 @@
 <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 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>
@@ -12,18 +11,18 @@
     </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="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 +33,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)
 

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

@@ -1,24 +1,24 @@
 import { createRouter, createWebHistory } from 'vue-router'
 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',
+      //redirect to login 
+      /* IMPORTANT:ADMINFORTH REDIRECT */
+
+    },
     {
       path: '/login',
       name: 'login',
-      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 {
-          next()
-        }
-      }
+      component: () => import('@/views/LoginView.vue')
     },
     {
       path: '/resource/:resourceId',
@@ -27,29 +27,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'
         },
       ]
     }, 
@@ -57,8 +51,4 @@ const router = createRouter({
   ]
 })
 
-
-
-
-
 export default router

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

@@ -1,50 +1,39 @@
 import { ref, computed } from 'vue'
 import { defineStore } from 'pinia'
 import { callAdminForthApi } from '@/utils';
-import type { AdminForthResource, AdminForthResourceColumn } from '@/types/AdminForthConfig';
-import type { Ref } from 'vue'
 
 export const useCoreStore = defineStore('core', () => {
-  const resourceById: Ref<Object> = ref({});
+  const resourceById = ref([]);
   const menu = ref([]);
   const config = ref({});
-  const record: Ref<any | null> = ref({});
-  const resource: Ref<AdminForthResource | null> = ref(null);
-
-  const resourceColumnsWithFilters = computed(() => {
-    if (!resource.value) {
-      return [];
-    }
-    return resource.value.columns.filter((col: AdminForthResourceColumn) => col.showIn?.includes('filter'));
-  })
-
-  const resourceOptions = ref(null);
+  const record = ref({});
+  const resourceColumns = ref(null);
   const resourceColumnsError = ref('');
   const resourceColumnsId = ref(null);
-  const adminUser = ref(null);
+  const user = ref(null);
 
   async function fetchMenuAndResource() {
     const resp = await callAdminForthApi({
       path: '/get_base_config',
       method: 'GET',
     });
-    if(!resp){
-      return
-    }
     menu.value = resp.menu;
-    resourceById.value = resp.resources.reduce((acc: Object, resource: AdminForthResource) => {
+    resourceById.value = resp.resources.reduce((acc, resource) => {
       acc[resource.resourceId] = resource;
       return acc;
     }, {});
     config.value = resp.config;
-    adminUser.value = resp.user;
+    user.value = resp.user;
     console.log('🌍 AdminForth v', resp.version);
+
+    // find homepage:true in menu recuresively
+    
   }
 
   async function fetchRecord({ resourceId, primaryKey }) {
     record.value = null;
     
-    if (!resource.value) {
+    if (!resourceColumns.value) {
       throw new Error('Columns not fetched yet');
     }
 
@@ -56,7 +45,7 @@ export const useCoreStore = defineStore('core', () => {
         resourceId: resourceId,
         filters: [
           {
-            field: resource.value.columns.find((col: AdminForthResourceColumn) => col.primaryKey).name,
+            field: resourceColumns.value.find((col) => col.primaryKey).name,
             operator: 'eq',
             value: primaryKey
           }
@@ -67,39 +56,30 @@ export const useCoreStore = defineStore('core', () => {
       }
     });
 
-    if (respData.error) {
-      window.adminforth.alert({
-        message: respData.error,
-        variant: 'danger',
-        timeout: 'unlimited'
-      });
-      record.value = {};
-    } else {
-      record.value = respData.data[0];
-    }
-
+    console.log('📦 record', respData);
+    record.value = respData.data[0];
   }
 
-  async function fetchResourceFull({ resourceId }: { resourceId: string }) {
-    if (resourceColumnsId.value === resourceId && resource.value) {
+  async function fetchColumns({ resourceId }) {
+    if (resourceColumnsId.value === resourceId && resourceColumns.value) {
       // already fetched
       return;
     }
     resourceColumnsId.value = resourceId;
+    resourceColumns.value = null;
     resourceColumnsError.value = '';
     const res = await callAdminForthApi({
-      path: '/get_resource',
+      path: '/get_resource_columns',
       method: 'POST',
       body: {
         resourceId,
       }
-    });
+    }
+    );
     if (res.error) {
       resourceColumnsError.value = res.error;
     } else {
-      resourceById.value[resourceId] = res.resource;
-      resource.value = res.resource;
-      resourceOptions.value = res.resource.options;
+      resourceColumns.value = res.resource.columns;
     }
   }
 
@@ -111,16 +91,21 @@ export const useCoreStore = defineStore('core', () => {
     config.value = {...config.value, ...res};
   }
 
- 
+  async function logout() {
+    await callAdminForthApi({
+      path: '/logout',
+      method: 'POST',
+    });
+  }
 
   const username = computed(() => {
     const usernameField = config.value.usernameField;
-    return adminUser.value && adminUser.value[usernameField];
+    return user.value && user.value[usernameField];
   });
 
   const userFullname = computed(() => {
     const userFullnameField = config.value.userFullnameField;
-    return adminUser.value && adminUser.value[userFullnameField];
+    return user.value && user.value[userFullnameField];
   })
 
 
@@ -134,11 +119,9 @@ export const useCoreStore = defineStore('core', () => {
     fetchMenuAndResource, 
     fetchRecord, 
     record, 
-    fetchResourceFull, 
+    resourceColumns, 
+    fetchColumns, 
     resourceColumnsError,
-    resourceOptions,
-    resource,
-    adminUser,
-    resourceColumnsWithFilters
+    logout
   }
 })