adminforth 1.0.66 → 1.0.68

package/spa/src/stores/core.ts

@@ -66,7 +66,7 @@ export const useCoreStore = defineStore('core', () => {
     resourceOptions.value = respData.options;
   }
 
-  async function fetchColumns({ resourceId }) {
+  async function fetchResourceFull({ resourceId }) {
     if (resourceColumnsId.value === resourceId && resourceColumns.value) {
       // already fetched
       return;
@@ -86,6 +86,7 @@ export const useCoreStore = defineStore('core', () => {
       resourceColumnsError.value = res.error;
     } else {
       resourceColumns.value = res.resource.columns;
+      resourceById.value[resourceId] = res.resource;
     }
   }
 
@@ -126,7 +127,7 @@ export const useCoreStore = defineStore('core', () => {
     fetchRecord, 
     record, 
     resourceColumns, 
-    fetchColumns, 
+    fetchResourceFull, 
     resourceColumnsError,
     flowBitIsInitialised,
     resourceOptions,

package/spa/src/views/CreateView.vue

@@ -71,7 +71,7 @@ async function onUpdateRecord(newRecord) {
 
 onMounted(async () => {
   loading.value = true;
-  await coreStore.fetchColumns({
+  await coreStore.fetchResourceFull({
     resourceId: route.params.resourceId
   });
   createComponentsPerColumn = coreStore.resourceColumns.reduce((acc, column) => {

package/spa/src/views/EditView.vue

@@ -81,7 +81,7 @@ const editableRecord = computed(() => {
 onMounted(async () => {
   loading.value = true;
 
-  await coreStore.fetchColumns({
+  await coreStore.fetchResourceFull({
     resourceId: route.params.resourceId
   });
   await coreStore.fetchRecord({

package/spa/src/views/ListView.vue

@@ -377,7 +377,7 @@ async function selectAll(value) {
   // checkboxes.value = rows.value.map((v) => v.id);
 }
 
-const pageSize = computed(() => coreStore.resourceById[route.params.resourceId]?.pageSize || DEFAULT_PAGE_SIZE);
+const pageSize = computed(() => coreStore.resourceById[route.params.resourceId]?.options?.listPageSize || DEFAULT_PAGE_SIZE);
 const totalPages = computed(() => Math.ceil(totalRows.value / pageSize.value));
 let listComponentsPerColumn = {};
 const allFromThisPageChecked = computed(() => {
@@ -510,7 +510,7 @@ function addToCheckedValues(id) {
 
 async function init() {
   
-  await coreStore.fetchColumns({
+  await coreStore.fetchResourceFull({
     resourceId: route.params.resourceId
   });
 

package/spa/src/views/ShowView.vue

@@ -100,7 +100,7 @@ const coreStore = useCoreStore();
 
 onMounted(async () => {
   loading.value = true;
-  await coreStore.fetchColumns({
+  await coreStore.fetchResourceFull({
     resourceId: route.params.resourceId
   });
   await coreStore.fetchRecord({

package/spa/vite.config.ts

@@ -11,6 +11,12 @@ const customLogger = {
       console.log(msg);
     }
   },
+  warnOnce(msg: string) {
+    console.warn('warn once', msg);
+    if (!this.hasWarned) {
+      this.hasWarned = true;
+    }
+  },
   warn(msg: string) {
     console.warn(msg);
   },

package/types/AdminForthConfig.ts

@@ -11,6 +11,9 @@ export type AdminForthConfigMenuItem = {
     open?: boolean,
     children?: Array<AdminForthConfigMenuItem>,
     isStaticRoute?: boolean,
+    meta?: {
+      title?: string,
+    },
   }
   
   
@@ -79,6 +82,7 @@ export type AdminForthResource = {
       }>,
       allowedActions?: AllowedActions,
       allowDelete?: boolean,
+      listPageSize?: number,
     },
   }
   
@@ -107,12 +111,15 @@ export  type AdminForthConfig = {
       customComponentsDir?: string,
       vueUsesFile?: string,
       customPublicDir?: string,
+      brandName?: string,
+      datesFormat?: string,
+      title?: string,
+      brandLogo?: string,
     },
     baseUrl?: string,
-    brandName?: string,
-    datesFormat?: string,
+   
     deleteConfirmation?: boolean,
-    title?: string,
+   
     styles?: Object,
   }
   

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

@@ -1,148 +0,0 @@
-<template>
-  <div class="flex flex-wrap 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"
-      v-model="start"
-    >
-
-    <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"
-      v-model="end"
-    >
-
-    <button
-      v-if="isChanged"
-      type="button"
-      class="flex items-center p-0.5 ml-auto 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"
-      @click="clear">Clear
-    </button>
-
-    <div class="w-full">
-      <vue-slider
-        class="custom-slider"
-        :dot-size="20"
-        height="7.99px"
-        :min="minFormatted"
-        :max="maxFormatted"
-        v-model="sliderValue"
-        @update:model-value="updateFromSlider($event)"
-      />
-    </div>
-  </div>
-</template>
-<script setup lang="ts">
-import VueSlider from 'vue-slider-component';
-import 'vue-slider-component/theme/antd.css'
-import {computed, onMounted, ref, watch} from "vue";
-import debounce from 'debounce'
-
-const props = defineProps({
-  valueStart: {
-    default: '',
-  },
-  valueEnd: {
-    default: '',
-  },
-  min: {
-    default: 0,
-  },
-  max: {
-    default: 10,
-  },
-});
-
-const emit = defineEmits(['update:valueStart', 'update:valueEnd']);
-
-const minFormatted = computed(() => Math.floor(props.min));
-const maxFormatted = computed(() => Math.ceil(props.max));
-
-const isChanged = computed(() => {
-  return start.value && start.value !== minFormatted.value || end.value && end.value !== maxFormatted.value;
-});
-
-const start = ref(props.valueStart);
-const end = ref(props.valueEnd);
-
-const sliderValue = ref([minFormatted.value, maxFormatted.value]);
-
-const updateFromSlider =
-    debounce((value: [number, number]) => {
-      start.value = value[0] === minFormatted.value ? '': value[0];
-      end.value = value[1] === maxFormatted.value ? '': value[1];
-    }, 500);
-
-onMounted(() => {
-  updateStartFromProps();
-  updateEndFromProps();
-
-  watch(() => props.valueStart, (value) => {
-    updateStartFromProps();
-  });
-
-  watch(() => props.valueEnd, (value) => {
-    updateEndFromProps();
-  });
-})
-
-function updateStartFromProps() {
-  start.value = props.valueStart;
-  setSliderValues(start.value, end.value)
-}
-
-function updateEndFromProps() {
-  end.value = props.valueEnd;
-  setSliderValues(start.value, end.value)
-}
-
-watch(start, () => {
-  console.log('⚡ emit', start.value)
-  emit('update:valueStart', start.value)
-})
-
-watch(end, () => {
-  console.log('⚡ emit', end.value)
-  emit('update:valueEnd', end.value);
-})
-
-const clear = () => {
-  start.value = ''
-  end.value = ''
-  setSliderValues('', '')
-}
-
-function setSliderValues(start, end) {
-  sliderValue.value = [start || minFormatted.value, end || maxFormatted.value];
-}
-</script>
-
-<style lang="scss" scoped>
-.custom-slider {
-    &:deep(.vue-slider-rail) {
-        background-color: rgb(229 231 235);
-    }
-
-    &:deep(.vue-slider-dot-handle) {
-        background-color: #1c64f2;
-        border: none;
-        box-shadow: none;
-    }
-
-    &:deep(.vue-slider-dot-handle:hover) {
-        background-color: #1c64f2;
-        border: none;
-        box-shadow: none;
-    }
-
-    &:deep(.vue-slider-process) {
-        background-color: rgb(225 239 254);
-    }
-
-    &:deep(.vue-slider-process:hover) {
-        background-color: rgb(225 239 254);
-    }
-}
-</style>