adminforth 1.1.74 → 1.1.76

package/spa/src/components/ResourceForm.vue

@@ -20,17 +20,6 @@
               <tr v-for="column, i in editableColumns" :key="column.name"
                   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="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>
                     <td class="px-6 py-4 whitespace-nowrap "> <!--align-top-->
                       {{ column.label }}
                       <span :data-tooltip-target="`tooltip-show-${i}`" class="relative inline-block">
@@ -45,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 ?'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');"
-                    >
 
-                    <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>

package/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 {

package/spa/src/utils.ts

@@ -16,7 +16,7 @@ export async function callApi({path, method, body=undefined} ) {
   };
   const fullPath = `${import.meta.env.VITE_ADMINFORTH_PUBLIC_PATH || ''}${path}`;
   const r = await fetch(fullPath, options);
-  if (r.status == 401) {
+  if (r.status == 401 ) {
     useUserStore().unauthorize();
     router.push({ name: 'login' });
     return null;

package/spa/src/views/CreateView.vue

@@ -136,7 +136,6 @@ async function saveRecord() {
   });
   if (response.error) {
     showErrorTost(response.error);
-    
   }
   saving.value = false;
   if (route.query.returnTo) {

package/spa/src/views/LoginView.vue

@@ -118,7 +118,10 @@ async function login() {
     inProgress.value = false;
     if (resp.error) {
       error.value = resp.error;
-    } else {
+    } else if (resp.redirectTo) {
+      router.push(resp.redirectTo);
+    }
+     else {
       error.value = null;
       user.authorize()
       router.push('/');

package/types/AdminForthConfig.ts

@@ -206,7 +206,6 @@ export interface AdminForthClass {
 
   auth: {
     verify(jwt : string, mustHaveType: string): Promise<any>;
-
     issueJWT(payload: Object, type: string): string;
   }
 
@@ -607,11 +606,17 @@ export type BeforeSaveFunction = (params:{resource: AdminForthResource, adminUse
  */
 export type AfterSaveFunction = (params: {resource: AdminForthResource, adminUser: AdminUser, record: any}) => Promise<{ok: boolean, error?: string}>;
 
+/**
+ * Allow to get user data before login confirmation, will triger when user try to login.
+ */
+export type BeforeLoginConfirmationFunction = (params?: { userRecord: AdminUser }) => Promise<{ok:boolean, error?:string, body:{setCookie?:[], redirectTo?: 'string', allowedLogin?: boolean   }}>;
 
 /**
  * Resource describes one table or collection in database.
  * AdminForth generates set of pages for 'list', 'show', 'edit', 'create', 'filter' operations for each resource.
  */
+
+
 export type AdminForthResource = {
     /**
      * Unique identifier of resource. By default it equals to table name in database. 
@@ -846,6 +851,13 @@ export type AdminForthConfig = {
        */
       loginBackgroundImage?: string,
 
+      /**
+       * Function or functions  which will be called before user try to login.
+       * Each function will resive User object as an argument
+       */
+
+      beforeLoginConfirmation?: BeforeLoginConfirmationFunction | Array<BeforeLoginConfirmationFunction>,
+
       /**
        * Optionally if your users table has a field(column) with full name, you can set it here.
        * This field will be used to display user name in the top right corner of the admin panel.
@@ -985,7 +997,15 @@ export type AdminForthConfig = {
        * Object to redefine default styles for AdminForth components.  Use this file as reference for all possible adjustments https://github.com/devforth/adminforth/blob/main/adminforth/modules/styles.ts
        */
       styles?: Object,
-    },
+      /**
+       * Description of custom pages which will let register custom pages for custom routes in AdminForth.
+       */
+
+      customPages?: Array<{
+        path: string,
+        component: AdminForthComponentDeclaration,
+      }>,
+    }
 
     /**
      * If you want to Serve AdminForth from a subdirectory, e.g. on example.com/backoffice, you can specify it like:
@@ -1235,4 +1255,5 @@ export type AdminForthForeignResource = {
         afterDatasourceResponse?: AfterDataSourceResponseFunction | Array<AfterDataSourceResponseFunction>,
       },
     },
-  }
+  }
+

package/dist/plugins/AuditLog/index.js

@@ -1,13 +0,0 @@
-import AdminForthPlugin from "../base.js";
-class AuditLogPlugin extends AdminForthPlugin {
-    constructor(options) {
-        super(options, import.meta.url);
-        this.options = options;
-    }
-    modifyResourceConfig(adminforth, resourceConfig) {
-        super.modifyResourceConfig(adminforth, resourceConfig);
-        this.adminforth = adminforth;
-    }
-}
-AuditLogPlugin.defaultError = 'Sorry, you do not have access to this resource.';
-export default AuditLogPlugin;