adminforth 1.5.4-next.13 → 1.5.4-next.15

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

@@ -18,13 +18,13 @@
       {{ checkEmptyValues(column.enum.find(e => e.value === record[column.name])?.label || record[column.name], route.meta.type) }}
     </span>
     <span v-else-if="column.type === 'datetime'" class="whitespace-nowrap">
-      {{ checkEmptyValues(formatDateTime(record[column.name]),route.meta.type) }}
+      {{ checkEmptyValues(formatDateTime(record[column.name]), route.meta.type) }}
     </span>
     <span v-else-if="column.type === 'date'" class="whitespace-nowrap">
-      {{ checkEmptyValues(formatDate(record[column.name]),route.meta.type) }}
+      {{ checkEmptyValues(formatDate(record[column.name]), route.meta.type) }}
     </span>
     <span v-else-if="column.type === 'time'" class="whitespace-nowrap">
-      {{ checkEmptyValues(formatTime(record[column.name]),route.meta.type) }}
+      {{ checkEmptyValues(formatTime(record[column.name]), route.meta.type) }}
     </span>
     <span v-else-if="column.type === 'richtext'">
       <div v-html="protectAgainstXSS(record[column.name])" class="allow-lists"></div>
@@ -42,7 +42,7 @@
 </template>
 
 
-<script setup>
+<script setup lang="ts">
 
 import dayjs from 'dayjs';
 import utc from 'dayjs/plugin/utc';
@@ -52,10 +52,9 @@ import { useRoute, useRouter } from 'vue-router';
 import sanitizeHtml from 'sanitize-html';
 import { JsonViewer } from "vue3-json-viewer";
 import "vue3-json-viewer/dist/index.css";
-
+import type { AdminForthResourceColumnCommon } from '@/types/Common';
 
 import { useCoreStore } from '@/stores/core';
-import { computed } from 'vue';
 
 const coreStore = useCoreStore();
 const route = useRoute();
@@ -64,13 +63,13 @@ const route = useRoute();
 dayjs.extend(utc);
 dayjs.extend(timezone);
 
-const props = defineProps({
-  column: Object,
-  record: Object
-});
+const props = defineProps<{
+  column: AdminForthResourceColumnCommon,
+  record: any
+}>();
 
 
-function protectAgainstXSS(value) {
+function protectAgainstXSS(value: string) {
   return sanitizeHtml(value, {
     allowedTags: [
       "address", "article", "aside", "footer", "header", "h1", "h2", "h3", "h4",
@@ -89,17 +88,17 @@ function protectAgainstXSS(value) {
 }
 
 
-function formatDateTime(date) {
+function formatDateTime(date: string) {
   if (!date) return '';
   return dayjs.utc(date).local().format(`${coreStore.config?.datesFormat} ${coreStore.config?.timeFormat}` || 'YYYY-MM-DD HH:mm:ss');
 }
 
-function formatDate(date) {
+function formatDate(date: string) {
   if (!date) return '';
   return dayjs.utc(date).local().format(coreStore.config?.datesFormat || 'YYYY-MM-DD');
 }
 
-function formatTime(time) {
+function formatTime(time: string) {
   if (!time) return '';
   return dayjs(`0000-00-00 ${time}`).format(coreStore.config?.timeFormat || 'HH:mm:ss');
 }

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

@@ -27,7 +27,6 @@ export type CoreConfig = {
     timeFormat: string,
     usernameField: string,
     usernameFieldName?: string,
-    deleteConfirmation?: boolean,
     auth?: {
         resourceId: string,
         usernameField: string,
@@ -37,9 +36,8 @@ export type CoreConfig = {
         userFullnameField: string,
     },
     emptyFieldPlaceholder?: {
-        show: string,
-        list: string,
-       
+        show?: string,
+        list?: string,
     } | string,
 }
 

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

@@ -1,19 +1,18 @@
 import { ref, computed } from 'vue'
 import { defineStore } from 'pinia'
 import { callAdminForthApi } from '@/utils';
-import type { AdminForthResourceCommon, AdminForthResourceColumnCommon } from '@/types/Common';
+import type { AdminForthResourceCommon, AdminForthResourceColumnCommon, GetBaseConfigResponse, ResourceVeryShort, AdminUser, UserData, AdminForthConfigMenuItem, AdminForthConfigForFrontend } from '@/types/Common';
 import type { Ref } from 'vue'
-import type { AdminForthConfigMenuItem } from '@/types/Back';
 
 export const useCoreStore = defineStore('core', () => {
-  const resourceById: Ref<Object> = ref({});
+  const resourceById: Ref<Record<string, ResourceVeryShort>> = ref({});
   const theme: Ref<'light'| 'dark'> = ref(window.localStorage.getItem('af__theme') as ('light'|'dark') || 'light');
 
-  const menu = ref([]);
-  const config = ref({});
+  const menu: Ref<AdminForthConfigMenuItem[]> = ref([]);
+  const config: Ref<AdminForthConfigForFrontend | null> = ref(null);
   const record: Ref<any | null> = ref({});
   const resource: Ref<AdminForthResourceCommon | null> = ref(null);
-  const userData = ref(null);
+  const userData: Ref<UserData | null> = ref(null);
 
   const resourceColumnsWithFilters = computed(() => {
     if (!resource.value) {
@@ -23,9 +22,9 @@ export const useCoreStore = defineStore('core', () => {
   })
 
   const resourceOptions: Ref<AdminForthResourceCommon['options'] | null> = ref(null);
-  const resourceColumnsError = ref('');
-  const resourceColumnsId = ref(null);
-  const adminUser = ref(null);
+  const resourceColumnsError: Ref<string> = ref('');
+  const resourceColumnsId: Ref<string | null> = ref(null);
+  const adminUser: Ref<null | AdminUser> = ref(null);
 
   
   async function resetAdminUser() {
@@ -46,7 +45,7 @@ export const useCoreStore = defineStore('core', () => {
   }
 
   async function fetchMenuAndResource() {
-    const resp = await callAdminForthApi({
+    const resp: GetBaseConfigResponse = await callAdminForthApi({
       path: '/get_base_config',
       method: 'GET',
     });
@@ -54,7 +53,7 @@ export const useCoreStore = defineStore('core', () => {
       return
     }
     menu.value = resp.menu;
-    resourceById.value = resp.resources.reduce((acc: Object, resource: AdminForthResource) => {
+    resourceById.value = resp.resources.reduce((acc: Record<string, ResourceVeryShort>, resource: ResourceVeryShort) => {
       acc[resource.resourceId] = resource;
       return acc;
     }, {});
@@ -100,7 +99,7 @@ export const useCoreStore = defineStore('core', () => {
     if (!resource.value) {
       throw new Error('Columns not fetched yet');
     }
-    const col = resource.value.columns.find((col: AdminForthResourceColumn) => col.primaryKey);
+    const col = resource.value.columns.find((col: AdminForthResourceColumnCommon) => col.primaryKey);
     if (!col) {
       throw new Error(`Primary key not found in resource ${resourceId}`);
     }
@@ -170,13 +169,13 @@ export const useCoreStore = defineStore('core', () => {
 
 
   const username = computed(() => {
-    const usernameField = config.value.usernameField;
-    return userData.value && userData.value[usernameField];
+    const usernameField = config.value?.usernameField;
+    return userData.value && usernameField && userData.value[usernameField];
   });
 
   const userFullname = computed(() => {
-    const userFullnameField = config.value.userFullnameField;
-    return userData.value && userData.value[userFullnameField];
+    const userFullnameField = config.value?.userFullnameField;
+    return userData.value && userFullnameField && userData.value[userFullnameField];
   })