adminforth 1.3.54-next.9 → 1.3.55-next.2

package/spa/src/stores/filters.ts

@@ -1,27 +0,0 @@
-import { ref, type Ref } from 'vue';
-import { defineStore } from 'pinia';
-
-export const useFiltersStore = defineStore('filters', () => {
-    const filters: Ref<any[]> = ref([]);
-    const sort: Ref<any> = ref({});
-
-    const setSort = (s: any) => {
-        sort.value = s;
-    }
-    const getSort = () => {
-        return sort.value;
-    }
-    const setFilter = (filter: any) => {
-        filters.value.push(filter);
-    }
-    const setFilters = (f: any) => {
-        filters.value = f;
-    }
-    const getFilters = () => {
-        return filters.value;
-    }
-    const clearFilters = () => {
-        filters.value = [];
-    }
-    return {setFilter, getFilters, clearFilters, filters, setFilters, setSort, getSort}
-})

package/spa/src/stores/modal.ts

@@ -1,48 +0,0 @@
-import { ref } from 'vue'
-import { defineStore } from 'pinia'
-
- type ModalContentType = {
-  title?: string;
-  content?: string;
-  acceptText?: string;
-  cancelText?: string;
- }
-
-
-export const useModalStore = defineStore('modal', () => {
-  const modalContent = ref({
-    title: 'title',
-    content: 'content',
-    acceptText: 'acceptText',
-    cancelText: 'cancelText',
-  });  
-  const isOpened = ref(false);
-  const onAcceptFunction: any = ref(()=>{});
-  const onCancelFunction: any = ref(()=>{});
-  function togleModal() {
-    isOpened.value = !isOpened.value;
-  }
-  function setOnAcceptFunction(func: Function) {
-    onAcceptFunction.value = func;
-  }
-  function setOnCancelFunction(func: Function) {
-    onCancelFunction.value = func;
-  }
-  function setModalContent(content: ModalContentType) {
-    modalContent.value = content;
-  }
-  function resetmodalState() {
-    isOpened.value = false;
-    modalContent.value = {
-      title: 'title',
-      content: 'content',
-      acceptText: 'acceptText',
-      cancelText: 'cancelText',
-    };
-    setOnAcceptFunction(()=>{});
-
-  }
-    
-  return {isOpened, setModalContent,onCancelFunction, togleModal,modalContent, setOnAcceptFunction, onAcceptFunction,resetmodalState,setOnCancelFunction} 
-   
-})

package/spa/src/stores/toast.ts

@@ -1,31 +0,0 @@
-import { ref, watch, type Ref } from 'vue'
-import { defineStore } from 'pinia'
-import { v1 as uuid } from 'uuid';
-import { useRoute } from 'vue-router';
-
-
-
-export const useToastStore = defineStore('toast', () => {
-    const toasts: Ref<any[]> = ref([]);
-    const route = useRoute();
-
-    watch(route, () => {
-        console.log('route changed 121');
-        // on route change clear all toasts older then 5 seconds
-        const now = +new Date();
-        toasts.value = toasts.value.filter((t) => now - t.createdAt < 5000);
-    });
-
-    const addToast = (toast: { message: string; variant: string }) => {
-        const toastId = uuid();
-        toasts.value.push({
-            ...toast,
-            id: toastId,
-            createdAt: +new Date(),
-        });
-    };
-    const removeToast = (toast: { id: string }) => {
-        toasts.value = toasts.value.filter((t) => t.id !== toast.id);
-    };
-    return { toasts, addToast, removeToast };
-});

package/spa/src/stores/user.ts

@@ -1,72 +0,0 @@
-import { ref } from 'vue';
-import { defineStore } from 'pinia';
-import { callAdminForthApi } from '@/utils';
-import { initFlowbite } from 'flowbite'
-import { useRouter } from 'vue-router';
-import { useCoreStore } from './core';
-import router from '@/router';
-
-
-
-export const useUserStore = defineStore('user', () => {
-    const isAuthorized = ref(false);
-
-    function authorize() {
-        isAuthorized.value = true;
-        localStorage.setItem('isAuthorized', 'true');
-    }
-
-    function unauthorize() {
-        isAuthorized.value = false;
-        localStorage.setItem('isAuthorized', 'false');
-    }
-
-    async function finishLogin() {
-        const coreStore = useCoreStore();
-        authorize(); // TODO not sure we need this approach with localStorage
-        await router.push('/');
-        await router.isReady();
-        await coreStore.fetchMenuAndResource();
-        setTimeout(() => {
-            initFlowbite();
-        }); 
-    }
-
-    async function logout() {
-        await callAdminForthApi({
-          path: '/logout',
-          method: 'POST',
-        });
-        unauthorize();
-      }
-
-    // async function checkAuth( skipApiCall = false){
-    //      console.log('checkAuth', isAuthorized.value, skipApiCall)
-    //     if(isAuthorized.value) {
-    //         return true}
-    //     else {
-    //         if(skipApiCall) return false;
-    //         const resp = await callAdminForthApi({
-    //             path: '/check_auth',
-    //             method: 'POST',
-    //         });
-    //         if (resp.status !== 401) {
-    //             authorize();
-    //             return true;
-    //         }
-    //         else {
-    //             unauthorize();
-    //             return false;}
-    //     }
-        
-    // }
-
-    return {
-        isAuthorized,
-        authorize,
-        unauthorize,
-        logout,
-        finishLogin
-    }
-
-});        

package/spa/src/utils.ts

@@ -1,160 +0,0 @@
-import { onMounted, ref, resolveComponent } from 'vue';
-import type { CoreConfig } from './spa_types/core';
-import type { ValidationObject } from './types/AdminForthConfig';
-
-
-import router from "./router";
-import { useCoreStore } from './stores/core';
-import { useUserStore } from './stores/user';
-import { Dropdown } from 'flowbite';
-
-
-export async function callApi({path, method, body=undefined}: {
-  path: string, method: 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH' 
-  body?: any
-}): Promise<any> {
-  const options = {
-    method,
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    body: JSON.stringify(body),
-  };
-  const fullPath = `${import.meta.env.VITE_ADMINFORTH_PUBLIC_PATH || ''}${path}`;
-  const r = await fetch(fullPath, options);
-  if (r.status == 401 ) {
-    useUserStore().unauthorize();
-    router.push({ name: 'login' });
-    return null;
-  } 
-  return await r.json();
-}
-
-export async function callAdminForthApi({ path, method, body=undefined }: {
-  path: string,
-  method: 'GET' | 'POST' | 'PUT' | 'DELETE',
-  body?: any
-}) {
-  try {
-    return callApi({path: `/adminapi/v1${path}`, method, body} );
-  } catch (e) {
-    console.error('error', e);
-    return { error: `Unexpected error: ${e}` };
-  }
-}
-
-export function getCustomComponent({ file, meta }: { file: string, meta: any }) {
-  const name = file.replace(/@/g, '').replace(/\./g, '').replace(/\//g, '');
-  return resolveComponent(name);
-}
-
-export function getIcon(icon: string) {
-  // icon format is "feather:icon-name". We need to get IconName in pascal case
-  if (!icon.includes(':')) {
-    throw new Error('Icon name should be in format "icon-set:icon-name"');
-  }
-  const [iconSet, iconName] = icon.split(':');
-  const compName = 'Icon' + iconName.split('-').map((word) => word.charAt(0).toUpperCase() + word.slice(1)).join('');
-  return resolveComponent(compName);
-}
-
-export const loadFile = (file: string) => {
-  if (file.startsWith('http')) {
-    return file;
-  }
-  let path;
-  let baseUrl = '';
-  if (file.startsWith('@/')) {
-    path = file.replace('@/', '');
-    baseUrl = new URL(`./${path}`, import.meta.url).href;
-  } else if (file.startsWith('@@/')) {
-    path = file.replace('@@/', '');
-    baseUrl = new URL(`./custom/${path}`, import.meta.url).href;
-  } else {
-    baseUrl = new URL(`./${file}`, import.meta.url).href;
-  }
-  return baseUrl;
-}
-
-export function checkEmptyValues(value: any, viewType: 'show' | 'list' ) {
-  const config: CoreConfig | {} = useCoreStore().config;
-  let emptyFieldPlaceholder = '';
-  if (config.emptyFieldPlaceholder) {
-    if(typeof config.emptyFieldPlaceholder === 'string') {
-      emptyFieldPlaceholder = config.emptyFieldPlaceholder;
-    } else {
-       emptyFieldPlaceholder = config.emptyFieldPlaceholder?.[viewType] || '';
-    }
-    if (value === null || value === undefined || value === '') {
-      return emptyFieldPlaceholder;
-    }
-  }
-  return value;
-}
-
-export function checkAcessByAllowedActions(allowedActions:any, action:any ) {
-  if (!allowedActions) {
-    console.warn('allowedActions not set');
-    return;
-  }
-  if(allowedActions[action] === false) {
-    console.warn(`Action ${action} is not allowed`);
-    router.back();
-  }
-}
-
-export function initThreeDotsDropdown() {
-  const threeDotsDropdown: HTMLElement | null = document.querySelector('#listThreeDotsDropdown');
-  if (threeDotsDropdown) {
-    // this resource has three dots dropdown
-    const dd = new Dropdown(
-      threeDotsDropdown, 
-      document.querySelector('[data-dropdown-toggle="listThreeDotsDropdown"]') as HTMLElement, 
-    );
-    window.adminforth.list.closeThreeDotsDropdown = () => {
-      dd.hide();
-    }
-  }
-}
-
-export function applyRegexValidation(value: any, validation: ValidationObject[] | undefined) {
-
-  if ( validation?.length ) {
-    const validationArray = validation;
-    for (let i = 0; i < validationArray.length; i++) {
-      if (validationArray[i].regExp) {
-        let flags = '';
-        if (validationArray[i].caseSensitive) {
-          flags += 'i';
-        }
-        if (validationArray[i].multiline) {
-          flags += 'm';
-        }
-        if (validationArray[i].global) {
-          flags += 'g';
-        }
-
-        const regExp = new RegExp(validationArray[i].regExp, flags);
-        if (value === undefined || value === null) {
-          value = '';
-        }
-        let valueS = `${value}`;
-
-        if (!regExp.test(valueS)) {
-          return validationArray[i].message;
-        }
-      }
-    }
-  }
-}
-
-export function currentQuery() {
-  return router.currentRoute.value.query;
-}
-
-export function setQuery(query: any) {
-  const currentQuery = { ...router.currentRoute.value.query, ...query };
-  router.replace({
-    query: currentQuery,
-  });
-}

package/spa/src/views/CreateView.vue

@@ -1,167 +0,0 @@
-<template>
-  <div class="relative">
-
-    <component 
-      v-for="c in coreStore?.resourceOptions?.pageInjections?.create?.beforeBreadcrumbs || []"
-      :is="getCustomComponent(c)"
-      :meta="c.meta"
-      :record="coreStore.record"
-      :resource="coreStore.resource"
-      :adminUser="coreStore.adminUser"
-    />
-
-    <BreadcrumbsWithButtons>
-      <!-- save and cancle -->
-      <button @click="$router.back()"
-        class="flex items-center py-1 px-3 me-2 text-sm font-medium rounded-default text-gray-900 focus:outline-none bg-white rounded border border-gray-300 hover:bg-gray-100 hover:text-lightPrimary 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"
-      >
-        Cancel
-      </button>
-
-      <button  
-        @click="saveRecord"
-        class="flex items-center py-1 px-3 text-sm font-medium rounded-default text-red-600 focus:outline-none bg-white rounded border border-gray-300 hover:bg-gray-100 hover:text-red-700 focus:z-10 focus:ring-4 focus:ring-gray-100 dark:focus:ring-gray-700 dark:bg-gray-800 dark:text-red-500 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700 disabled:opacity-50"
-        :disabled="saving || (validating && !isValid)"
-      > 
-        <svg v-if="saving" x
-         aria-hidden="true" class="w-4 h-4 mr-1 text-gray-200 animate-spin dark:text-gray-600 fill-red-600" viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z" fill="currentColor"/><path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z" fill="currentFill"/></svg>
-        
-        <IconFloppyDiskSolid v-else class="w-4 h-4 mr-1" />
-        Save
-      </button>
-
-      <ThreeDotsMenu 
-        :threeDotsDropdownItems="coreStore.resourceOptions?.pageInjections?.create?.threeDotsDropdownItems"
-      ></ThreeDotsMenu>
-
-    </BreadcrumbsWithButtons>
-
-    <component 
-      v-for="c in coreStore?.resourceOptions?.pageInjections?.create?.afterBreadcrumbs || []"
-      :is="getCustomComponent(c)"
-      :meta="c.meta"
-      :record="coreStore.record"
-      :resource="coreStore.resource"
-      :adminUser="coreStore.adminUser"
-    />
-
-    <SingleSkeletLoader v-if="loading"></SingleSkeletLoader>
-
-    
-    <ResourceForm 
-      v-else
-      :record="record"
-      :resource="coreStore.resource"
-      @update:record="onUpdateRecord"
-      @update:isValid="isValid = $event"
-      :validating="validating"
-      :source="'create'"
-    >
-    </ResourceForm>
-
-    <component 
-      v-for="c in coreStore?.resourceOptions?.pageInjections?.create?.bottom || []"
-      :is="getCustomComponent(c)"
-      :meta="c.meta"
-      :record="coreStore.record"
-      :resource="coreStore.resource"
-      :adminUser="coreStore.adminUser"
-    />
-
-  </div>
-</template>
-
-
-<script setup>
-
-import BreadcrumbsWithButtons from '@/components/BreadcrumbsWithButtons.vue';
-import ResourceForm from '@/components/ResourceForm.vue';
-import SingleSkeletLoader from '@/components/SingleSkeletLoader.vue';
-import { useCoreStore } from '@/stores/core';
-import { callAdminForthApi, getCustomComponent,checkAcessByAllowedActions, initThreeDotsDropdown } from '@/utils';
-import { IconFloppyDiskSolid } from '@iconify-prerendered/vue-flowbite';
-import { onMounted, ref, watch } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
-import { computed } from 'vue';
-import { showErrorTost } from '@/composables/useFrontendApi';
-import ThreeDotsMenu from '@/components/ThreeDotsMenu.vue';
-
-
-const isValid = ref(false);
-const validating = ref(false);
-
-const loading = ref(false);
-const saving = ref(false);
-
-const route = useRoute();
-const router = useRouter();
-
-const record = ref({});
-
-const coreStore = useCoreStore();
-
-const initalValues = computed(() => {
-  if (!route.query.values) {
-    return {};
-  }
-  return JSON.parse(decodeURIComponent(route.query.values));
-});
-
-
-
-async function onUpdateRecord(newRecord) {
-  console.log('newRecord', newRecord);
-  record.value = newRecord;
-}
-
-onMounted(async () => {
-  loading.value = true;
-  record.value = initalValues.value;
-  await coreStore.fetchResourceFull({
-    resourceId: route.params.resourceId
-  });
-  loading.value = false;
-  checkAcessByAllowedActions(coreStore.resourceOptions.allowedActions,'create');
-  initThreeDotsDropdown();
-});
-
-async function saveRecord() {
-  console.log('saveRecord isValid', isValid.value);
-  if (!isValid.value) {
-    validating.value = true;
-    return;
-  } else {
-    validating.value = false;
-  }
-  saving.value = true;
-  const response = await callAdminForthApi({
-    method: 'POST',
-    path: `/create_record`,
-    body: {
-      resourceId: route.params.resourceId,
-      record: record.value,
-    },
-  });
-  if (response.error) {
-    showErrorTost(response.error);
-  }
-  saving.value = false;
-  if (route.query.returnTo) {
-    router.push(route.query.returnTo);
-  } else {
-    router.push({ 
-      name: 'resource-show', 
-      params: { 
-        resourceId: route.params.resourceId, 
-        primaryKey: response.newRecordId
-      } 
-    });
-    window.adminforth.alert({
-      message: 'Record created successfully',
-      variant: 'success'
-    });
-  }
-}
-
-
-</script>

package/spa/src/views/EditView.vue

@@ -1,170 +0,0 @@
-<template>
-  <div class="relative">
-    <component 
-      v-for="c in coreStore?.resourceOptions?.pageInjections?.edit?.beforeBreadcrumbs || []"
-      :is="getCustomComponent(c)"
-      :meta="c.meta"
-      :record="editableRecord"
-      :resource="coreStore.resource"
-      :adminUser="coreStore.adminUser"
-    />
-
-    <BreadcrumbsWithButtons>
-      <!-- save and cancle -->
-      <button @click="$router.back()"
-        class="flex items-center py-1 px-3 me-2 text-sm font-medium text-gray-900  rounded-default focus:outline-none bg-white rounded border border-gray-300 hover:bg-gray-100 hover:text-lightPrimary 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"
-      >
-        Cancel
-      </button>
-
-      <button
-        @click="saveRecord"
-        class="flex items-center py-1 px-3 text-sm font-medium  rounded-default text-red-600 focus:outline-none bg-white rounded border border-gray-300 hover:bg-gray-100 hover:text-red-700 focus:z-10 focus:ring-4 focus:ring-gray-100 dark:focus:ring-gray-700 dark:bg-gray-800 dark:text-red-500 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700 disabled:opacity-50"
-        :disabled="saving || (validating && !isValid)"
-      >
-        <IconFloppyDiskSolid class="w-4 h-4" />
-        Save
-      </button>
-
-      <ThreeDotsMenu 
-        :threeDotsDropdownItems="coreStore.resourceOptions?.pageInjections?.edit?.threeDotsDropdownItems"
-      ></ThreeDotsMenu>
-
-    </BreadcrumbsWithButtons>
-
-    <component 
-      v-for="c in coreStore?.resourceOptions?.pageInjections?.edit?.afterBreadcrumbs || []"
-      :is="getCustomComponent(c)"
-      :meta="c.meta"
-      :record="coreStore.record"
-      :resource="coreStore.resource"
-      :adminUser="coreStore.adminUser"
-    />
-
-    <SingleSkeletLoader v-if="loading"></SingleSkeletLoader>
-
-    <ResourceForm 
-      v-else
-      :record="editableRecord"
-      :resource="coreStore.resource"
-      :adminUser="coreStore.adminUser"
-      @update:record="onUpdateRecord"
-      @update:isValid="isValid = $event"
-      :validating="validating"
-      :source="'edit'"
-    >
-    </ResourceForm>
-
-    <component 
-      v-for="c in coreStore?.resourceOptions?.pageInjections?.edit?.bottom || []"
-      :is="getCustomComponent(c)"
-      :meta="c.meta"
-      :record="coreStore.record"
-      :resource="coreStore.resource"
-      :adminUser="coreStore.adminUser"
-    />
-
-  </div>
-</template>
-
-
-<script setup>
-
-import BreadcrumbsWithButtons from '@/components/BreadcrumbsWithButtons.vue';
-import ResourceForm from '@/components/ResourceForm.vue';
-import SingleSkeletLoader from '@/components/SingleSkeletLoader.vue';
-import { useCoreStore } from '@/stores/core';
-import { callAdminForthApi, getCustomComponent,checkAcessByAllowedActions, initThreeDotsDropdown } from '@/utils';
-import { IconFloppyDiskSolid } from '@iconify-prerendered/vue-flowbite';
-import { computed, onMounted, ref } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
-import { showErrorTost } from '@/composables/useFrontendApi';
-import ThreeDotsMenu from '@/components/ThreeDotsMenu.vue';
-
-
-const coreStore = useCoreStore();
-
-const isValid = ref(false);
-const validating = ref(false);
-
-const route = useRoute();
-const router = useRouter();
-
-const loading = ref(false);
-
-const saving = ref(false);
-
-const record = ref({});
-
-async function onUpdateRecord(newRecord) {
-  record.value = newRecord;
-}
-
-const editableRecord = computed(() => {
-  const newRecord = { ...coreStore.record };
-  if (!coreStore.resource) {
-    return {};
-  }
-  coreStore.resource.columns.forEach(column => {
-    if (column.foreignResource) {
-      newRecord[column.name] = newRecord[column.name]?.pk
-    }
-  });
-  return newRecord;
-})
-
-onMounted(async () => {
-  loading.value = true;
-
-  await coreStore.fetchResourceFull({
-    resourceId: route.params.resourceId
-  });
-  initThreeDotsDropdown();
-
-  await coreStore.fetchRecord({
-    resourceId: route.params.resourceId, 
-    primaryKey: route.params.primaryKey,
-  });
-  checkAcessByAllowedActions(coreStore.resourceOptions.allowedActions,'edit');
-  loading.value = false;
-});
-
-async function saveRecord() {
-  if (!isValid.value) {
-    validating.value = true;
-    return;
-  } else {
-    validating.value = false;
-  }
-
-  saving.value = true;
-  const updates = {};
-  for (const key in record.value) {
-    if (record.value[key] !== coreStore.record[key]) {
-      updates[key] = record.value[key];
-    }
-  }
-
-  const resp = await callAdminForthApi({
-    method: 'POST',
-    path: `/update_record`,
-    body: {
-      resourceId: route.params.resourceId,
-      recordId: route.params.primaryKey,
-      record: updates,
-    },
-  });
-  if (resp.error) {
-    showErrorTost(resp.error);
-  } else {
-    window.adminforth.alert({
-      message: 'Record updated successfully',
-      variant: 'success',
-      timeout: 400000
-    });
-  }
-  saving.value = false;
-  router.push({ name: 'resource-show', params: { resourceId: route.params.resourceId, primaryKey: coreStore.record[coreStore.primaryKey] } });
-}
-
-</script>