adminforth 1.1.79 → 1.1.80

package/dist/spa/src/views/EditView.vue

@@ -46,7 +46,7 @@
       @update:record="onUpdateRecord"
       @update:isValid="isValid = $event"
       :validating="validating"
-      :source="'edit'"
+      :customComponentsPerColumn="editComponentsPerColumn"
     >
     </ResourceForm>
 
@@ -88,6 +88,7 @@ const loading = ref(false);
 const saving = ref(false);
 
 const record = ref({});
+let editComponentsPerColumn = {};
 
 async function onUpdateRecord(newRecord) {
   record.value = newRecord;
@@ -118,6 +119,13 @@ onMounted(async () => {
     primaryKey: route.params.primaryKey,
   });
   checkAcessByAllowedActions(coreStore.resourceOptions.allowedActions,'edit');
+
+  editComponentsPerColumn = coreStore.resource.columns.reduce((acc, column) => {
+      if (column.components?.edit) {
+          acc[column.name] = getCustomComponent(column.components.edit);
+      }
+      return acc;
+    }, {});
   loading.value = false;
 });
 

package/dist/spa/src/views/ListView.vue

@@ -22,7 +22,7 @@
         v-if="checkboxes.length"
         data-tooltip-target="tooltip-remove-all"
         data-tooltip-placement="bottom"
-        class="flex gap-1  items-center py-1 px-3 me-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-darkListTable dark:text-gray-400 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700 rounded-default"
+        class="flex gap-1  items-center py-1 px-3 me-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 rounded-default"
       >
         <IconBanOutline class="w-5 h-5 "/>
 
@@ -70,7 +70,7 @@
           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"
           v-if="filtersStore.filters.length">
             {{ filtersStore.filters.length }}
-        </span>
+          </span>
       </button>
     </BreadcrumbsWithButtons>
 
@@ -89,7 +89,6 @@
       @update:sort="sort = $event"
       @update:checkboxes="checkboxes = $event"
       @update:records="getList"
-      :sort="sort"
       :pageSize="pageSize"
       :totalRows="totalRows"
       :checkboxes="checkboxes"
@@ -230,15 +229,6 @@ async function init() {
     resourceId: route.params.resourceId
   });
 
-  if (coreStore.resource.options?.defaultSort) {
-    sort.value = [{
-        field: coreStore.resource.options.defaultSort.columnName,
-        direction: coreStore.resource.options.defaultSort.direction
-    }];
-  } else {
-    sort.value = [];
-  }
-
   await getList();
   columnsMinMax.value = await callAdminForthApi({
     path: '/get_min_max_for_columns',
@@ -260,6 +250,7 @@ onMounted(async () => {
 watch(() => route.params.resourceId, async () => {
   filtersStore.setFilters([]);
   checkboxes.value = [];
+  sort.value = [];
   await init();
 });
 

package/dist/spa/src/views/LoginView.vue

@@ -103,8 +103,6 @@ onMounted(() => {
     coreStore.getPublicConfig()
 });
 
-
-
 async function login() {
     inProgress.value = true;
     const resp = await callAdminForthApi({
@@ -118,10 +116,7 @@ async function login() {
     inProgress.value = false;
     if (resp.error) {
       error.value = resp.error;
-    } else if (resp.redirectTo) {
-      router.push(resp.redirectTo);
-    }
-     else {
+    } else {
       error.value = null;
       user.authorize()
       router.push('/');

package/dist/spa/src/views/ResourceParent.vue

@@ -1,5 +1,5 @@
 <template>
-  <div :key="`${$route?.params.resourceId}---${$route?.params.primaryKey}`" class="p-4">
+  <div :key="`${$route?.params.resourceId}---${$route?.params.primaryKey}`">
     <RouterView/>
   </div>
 </template>
@@ -11,6 +11,7 @@
 
 
 import { useCoreStore } from '@/stores/core';
+import { onMounted } from 'vue';
 
 const coreStore = useCoreStore()
 

package/dist/spa/src/views/ShowView.vue

@@ -44,10 +44,10 @@
     </div>
     <div 
       v-else
-      class="relative overflow-x-auto shadow-resourseFormShadow "
+      class="relative overflow-x-auto shadow-resourse-form-shadow "
     >
      <table class="w-full text-sm text-left rtl:text-right text-gray-500 dark:text-gray-400 rounded-default">
-        <thead class="text-xs text-gray-700 uppercase bg-lightormHeading dark:bg-gray-700 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">
                     Field
@@ -59,7 +59,7 @@
         </thead>
         <tbody>
             <tr v-for="column in coreStore.resource?.columns.filter(c => c.showIn.includes('show'))" :key="column.name"
-                class="bg-lightForm bg-darkForm odd:dark:bg-gray-900  even:dark:bg-gray-800 border-b  dark:border-gray-700"
+                class="bg-form-view-bg odd:dark:bg-gray-900  even:dark:bg-gray-800 border-b  dark:border-gray-700"
             >
               <component
                 v-if="column.components?.showRow"
@@ -75,8 +75,8 @@
                 </td>
                 <td class="px-6 py-4 whitespace-nowrap whitespace-pre-wrap">
                   <component
-                    v-if="column?.components?.show"
-                    :is="getCustomComponent(column?.components?.show)"
+                    v-if="showComponentsPerColumn[column.name]"
+                    :is="showComponentsPerColumn[column.name]"
                     :resource="coreStore.resource"
                     :meta="column.components.show.meta"
                     :column="column"
@@ -126,7 +126,8 @@ import {showSuccesTost} from '@/composables/useFrontendApi';
 const item = ref(null);
 const route = useRoute();
 const router = useRouter();
-const loading = ref(true);
+const loading = ref(false);
+let showComponentsPerColumn = {};
 
 console.log(route.params,'showWiev');
 
@@ -144,6 +145,13 @@ onMounted(async () => {
     primaryKey: route.params.primaryKey,
   });
   checkAcessByAllowedActions(coreStore.resourceOptions.allowedActions,'show');
+
+  showComponentsPerColumn = coreStore.resource.columns.reduce((acc, column) => {
+      if (column.components?.show) {
+          acc[column.name] = getCustomComponent(column.components.show);
+      }
+      return acc;
+  }, {});
   loading.value = false;
 });
 

package/dist/spa/tailwind.config.js

@@ -9,9 +9,7 @@ export default {
 
   darkMode: 'class',
   plugins: [
-    require('flowbite/plugin')({
-      charts: true,
-    }),
+    require('flowbite/plugin'),
   ],
 }
 

package/modules/codeInjector.ts

@@ -217,7 +217,9 @@ class CodeInjector implements CodeInjectorType {
 
       // copy whole custom directory
       if (this.adminforth.config.customization?.customComponentsDir) {
-        this.srcFoldersToSync[this.adminforth.config.customization.customComponentsDir] = './'
+        // resolve customComponentsDir to absolute path, so ./aa will be resolved to /path/to/current/dir/aa
+        const customCompAbsPath = path.resolve(this.adminforth.config.customization.customComponentsDir);
+        this.srcFoldersToSync[customCompAbsPath] = './'
       }
 
       // if this.adminforth.config.customization.favicon is set, copy it to assets
@@ -461,7 +463,10 @@ async watchForReprepare({ verbose }) {
     const collectDirectories = async (dir) => {
       const files = await fs.promises.readdir(dir, { withFileTypes: true });
       for (const file of files) {
-        if (file.isDirectory() && ['node_modules', 'dist'].indexOf(file.name) === -1) {
+        if (['node_modules', 'dist'].includes(file.name)) {
+          continue;
+        }
+        if (file.isDirectory()) {
           directories.push(path.join(dir, file.name));
           await collectDirectories(path.join(dir, file.name));
         }
@@ -469,11 +474,10 @@ async watchForReprepare({ verbose }) {
     };
     await collectDirectories(spaPath);
 
-    if (verbose) {
+    if (process.env.HEAVY_DEBUG) {
       console.log('🔎 Watching for changes in:', directories.join(','));
     }
 
-
     const watcher = filewatcher();
     directories.forEach((dir) => {
       watcher.add(dir);
@@ -481,16 +485,15 @@ async watchForReprepare({ verbose }) {
 
     watcher.on(
       'change',
-      async (file) => {
-        console.log(`File ${file} changed, preparing sources...`);
+      async (file, x) => {
+        console.log(`File ${file} changed ${x}, preparing sources...`);
         await this.prepareSources({ filesUpdated: [file.replace(spaPath + '/', '')] });
       }
     )
     this.allWatchers.push(watcher);
   }
 
-  async watchCustomComponentsForCopy({ verbose }) {
-    const customComponentsDir = this.adminforth.config.customization.customComponentsDir;
+  async watchCustomComponentsForCopy({ verbose, customComponentsDir, destination }) {
     if (!customComponentsDir) {
       return;
     }
@@ -506,39 +509,57 @@ async watchForReprepare({ verbose }) {
 
     // get all subdirs
     const directories = [];
+    const files = []
     const collectDirectories = async (dir) => {
       directories.push(dir);
 
-      const files = await fs.promises.readdir(dir, { withFileTypes: true });
-      for (const file of files) {
-        if (file.isDirectory()) {
-          await collectDirectories(path.join(dir, file.name));
-        }
-      }
+      const filesAndDirs = await fs.promises.readdir(dir, { withFileTypes: true });
+      await Promise.all(
+        filesAndDirs.map(
+          async (file) => {
+            const isDir = fs.lstatSync(path.join(dir, file.name)).isDirectory();
+            if (isDir) {
+              await collectDirectories(path.join(dir, file.name));
+            } else {
+              files.push(path.join(dir, file.name));
+            }
+          }
+        )
+      )
     };
 
     await collectDirectories(customComponentsDir);
 
     const watcher = filewatcher();
-    directories.forEach((dir) => {
-      watcher.add(dir);
+    files.forEach((file) => {
+      process.env.HEAVY_DEBUG && console.log(`🔎 Watching for changes in file ${file}`);
+      watcher.add(file);
     });
 
-    if (verbose) {
+    if (process.env.HEAVY_DEBUG) {
       console.log('🔎 Watching for changes in:', directories.join(','));
     }
     
     watcher.on(
       'change',
-      async (file) => {
+      async (fileOrDir) => {
         // copy one file
-        // TODO: non optimal, copy only changed file, test on both nested and parent dir
-        if (verbose) {
-          console.log(`🔎 File ${file} changed, copying to spa_tmp...`);
+        const relativeFilename = fileOrDir.replace(customComponentsDir + '/', '');
+        if (process.env.HEAVY_DEBUG) {
+          console.log(`🔎 fileOrDir ${fileOrDir} changed`);
+          console.log(`🔎 relativeFilename ${relativeFilename}`);
+          console.log(`🔎 customComponentsDir ${customComponentsDir}`);
+          console.log(`🔎 destination ${destination}`);
+        }
+        const isFile = fs.lstatSync(fileOrDir).isFile();
+        if (isFile) {
+          const destPath = path.join(CodeInjector.SPA_TMP_PATH, 'src', 'custom', destination, relativeFilename);
+          process.env.HEAVY_DEBUG && console.log(`🔎 Copying file ${fileOrDir} to ${destPath}`);
+          await fsExtra.copy(fileOrDir, destPath);
+          return;
+        } else {
+          // for now do nothing
         }
-        await fsExtra.copy(this.adminforth.config.customization.customComponentsDir, path.join(CodeInjector.SPA_TMP_PATH, 'src', 'custom'), {
-          recursive: true,
-        });
       }
     )
     this.allWatchers.push(watcher);
@@ -550,8 +571,17 @@ async watchForReprepare({ verbose }) {
     await this.prepareSources({ verbose });
 
     if (hotReload) {
-      await this.watchForReprepare({ verbose });
-      await this.watchCustomComponentsForCopy({ verbose });
+      await Promise.all([
+        this.watchForReprepare({ verbose }),
+        ...Object.entries(this.srcFoldersToSync).map(async ([src, dest]) => {
+
+          await this.watchCustomComponentsForCopy({ 
+            verbose, 
+            customComponentsDir: src,
+            destination: dest,
+          });
+        }),
+      ]);
     }
 
     console.log('AdminForth bundling');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminforth",
-  "version": "1.1.79",
+  "version": "1.1.80",
   "description": "OpenSource Vue3 powered forth-generation admin panel",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/plugins/S3UploadPlugin/custom/s3uploader.vue

@@ -26,6 +26,7 @@
 
 <script setup>
 import { computed, ref } from 'vue'
+import { callAdminForthApi } from '@/utils' 
 
 const props = defineProps({
   meta: String
@@ -111,7 +112,9 @@ const onFileChange = async (e) => {
       method: 'POST',
       body: {
         originalFilename: name,
-        contentType, size, originalExtension 
+        contentType: type,
+        size,
+        originalExtension: extension,
       },
   });
 }

package/spa/src/App.vue

@@ -84,7 +84,7 @@
                     :aria-controls="`dropdown-example${i}`"
                     :data-collapse-toggle="`dropdown-example${i}`"
                 >
-                  <component v-if="item.icon" :is="getIcon(item.icon)" class="w-5 h-5 text-lightSidebarIcons group-hover:text-lightSidebarIconsHover transition duration-75 active:   dark:group-hover:text-darkSidebarIconsHover dark:text-darkSidebarIcons" ></component>
+                  <component v-if="item.icon" :is="getIcon(item.icon)" class="w-5 h-5 text-lightSidebarIcons group-hover:text-lightSidebarIconsHover transition duration-75   dark:group-hover:text-darkSidebarIconsHover dark:text-darkSidebarIcons" ></component>
 
                   <span class="flex-1 ms-3 text-left rtl:text-right whitespace-nowrap">{{ item.label }}</span>
                   <svg :class="{'rotate-180':  opened.includes(i) }" class="w-3 h-3" aria-hidden="true" xmlns="http://www.w3.org/2000/svg"  fill="none" viewBox="0 0 10 6">

package/spa/src/components/MenuLink.vue

@@ -5,7 +5,7 @@
       :class="{ 
         'px-4': isChild,
         'px-2': !isChild,
-        'bg-lightSidebarItemActive dark:bg-darkSidebarItemActive': item.resourceId ?
+        'bg-sidebarActive dark:bg-gray-700': item.resourceId ?
         ($route.params.resourceId === item.resourceId && $route.name === 'resource-list') :
         ($route.name === item.path)
       }"

package/dist/plugins/TwoFactorsAuthPlugin/node_modules/.package-lock.json

@@ -1,61 +0,0 @@
-{
-  "name": "twofactorsauthplugin",
-  "version": "1.0.0",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "node_modules/@types/node": {
-      "version": "20.14.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.9.tgz",
-      "integrity": "sha512-06OCtnTXtWOZBJlRApleWndH4JsRVs1pDCc8dLSQp+7PpUpX3ePdHyeNSFTeSe7FtKyQkrlPvHwJOW3SLd8Oyg==",
-      "dependencies": {
-        "undici-types": "~5.26.4"
-      }
-    },
-    "node_modules/@types/notp": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@types/notp/-/notp-2.0.5.tgz",
-      "integrity": "sha512-ZsZS0PYUa6ZE4K3yOGerBvaxCp4ePf6ZmkFbPeilcqz2Ui/lmXox7KlRt7XZkXzqUgXhFLkc09ixyVmFLCU3gQ==",
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/node-2fa": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/node-2fa/-/node-2fa-2.0.3.tgz",
-      "integrity": "sha512-PQldrOhjuoZyoydMvMSctllPN1ZPZ1/NwkEcgYwY9faVqE/OymxR+3awPpbWZxm6acLKqvmNqQmdqTsqYyflFw==",
-      "dependencies": {
-        "@types/notp": "^2.0.0",
-        "notp": "^2.0.3",
-        "thirty-two": "1.0.2",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/notp": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/notp/-/notp-2.0.3.tgz",
-      "integrity": "sha512-oBig/2uqkjQ5AkBuw4QJYwkEWa/q+zHxI5/I5z6IeP2NT0alpJFsP/trrfCC+9xOAgQSZXssNi962kp5KBmypQ==",
-      "engines": {
-        "node": "> v0.6.0"
-      }
-    },
-    "node_modules/thirty-two": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/thirty-two/-/thirty-two-1.0.2.tgz",
-      "integrity": "sha512-OEI0IWCe+Dw46019YLl6V10Us5bi574EvlJEOcAkB29IzQ/mYD1A6RyNHLjZPiHCmuodxvgF6U+vZO1L15lxVA==",
-      "engines": {
-        "node": ">=0.2.6"
-      }
-    },
-    "node_modules/tslib": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz",
-      "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ=="
-    },
-    "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="
-    }
-  }
-}

package/dist/plugins/TwoFactorsAuthPlugin/node_modules/@types/node/LICENSE

@@ -1,21 +0,0 @@
-    MIT License
-
-    Copyright (c) Microsoft Corporation.
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in all
-    copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-    SOFTWARE

package/dist/plugins/TwoFactorsAuthPlugin/node_modules/@types/node/README.md

@@ -1,15 +0,0 @@
-# Installation
-> `npm install --save @types/node`
-
-# Summary
-This package contains type definitions for node (https://nodejs.org/).
-
-# Details
-Files were exported from https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/node.
-
-### Additional Details
- * Last updated: Tue, 25 Jun 2024 22:07:01 GMT
- * Dependencies: [undici-types](https://npmjs.com/package/undici-types)
-
-# Credits
-These definitions were written by [Microsoft TypeScript](https://github.com/Microsoft), [Alberto Schiabel](https://github.com/jkomyno), [Alvis HT Tang](https://github.com/alvis), [Andrew Makarov](https://github.com/r3nya), [Benjamin Toueg](https://github.com/btoueg), [Chigozirim C.](https://github.com/smac89), [David Junger](https://github.com/touffy), [Deividas Bakanas](https://github.com/DeividasBakanas), [Eugene Y. Q. Shen](https://github.com/eyqs), [Hannes Magnusson](https://github.com/Hannes-Magnusson-CK), [Huw](https://github.com/hoo29), [Kelvin Jin](https://github.com/kjin), [Klaus Meinhardt](https://github.com/ajafff), [Lishude](https://github.com/islishude), [Mariusz Wiktorczyk](https://github.com/mwiktorczyk), [Mohsen Azimi](https://github.com/mohsen1), [Nikita Galkin](https://github.com/galkin), [Parambir Singh](https://github.com/parambirs), [Sebastian Silbermann](https://github.com/eps1lon), [Thomas den Hollander](https://github.com/ThomasdenH), [Wilco Bakker](https://github.com/WilcoBakker), [wwwy3y3](https://github.com/wwwy3y3), [Samuel Ainsworth](https://github.com/samuela), [Kyle Uehlein](https://github.com/kuehlein), [Thanik Bhongbhibhat](https://github.com/bhongy), [Marcin Kopacz](https://github.com/chyzwar), [Trivikram Kamat](https://github.com/trivikr), [Junxiao Shi](https://github.com/yoursunny), [Ilia Baryshnikov](https://github.com/qwelias), [ExE Boss](https://github.com/ExE-Boss), [Piotr Błażejewicz](https://github.com/peterblazejewicz), [Anna Henningsen](https://github.com/addaleax), [Victor Perin](https://github.com/victorperin), [Yongsheng Zhang](https://github.com/ZYSzys), [NodeJS Contributors](https://github.com/NodeJS), [Linus Unnebäck](https://github.com/LinusU), [wafuwafu13](https://github.com/wafuwafu13), [Matteo Collina](https://github.com/mcollina), and [Dmitry Semigradsky](https://github.com/Semigradsky).