adminforth 1.1.79 → 1.1.81

package/dist/index.js

@@ -612,7 +612,7 @@ class AdminForth {
                             username
                         };
                         const beforeLoginConfirmation = this.config.auth.beforeLoginConfirmation;
-                        if (beforeLoginConfirmation.length) {
+                        if (beforeLoginConfirmation === null || beforeLoginConfirmation === void 0 ? void 0 : beforeLoginConfirmation.length) {
                             for (const hook of beforeLoginConfirmation) {
                                 const resp = yield hook({ userRecord: adminUser });
                                 if ((_d = resp === null || resp === void 0 ? void 0 : resp.body) === null || _d === void 0 ? void 0 : _d.setCookie) {

package/dist/modules/codeInjector.js

@@ -202,7 +202,9 @@ class CodeInjector {
                 });
                 // copy whole custom directory
                 if ((_b = this.adminforth.config.customization) === null || _b === void 0 ? void 0 : _b.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
                 const customFav = (_c = this.adminforth.config.customization) === null || _c === void 0 ? void 0 : _c.favicon;
@@ -402,30 +404,32 @@ class CodeInjector {
             const collectDirectories = (dir) => __awaiter(this, void 0, void 0, function* () {
                 const files = yield 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));
                         yield collectDirectories(path.join(dir, file.name));
                     }
                 }
             });
             yield 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);
             });
-            watcher.on('change', (file) => __awaiter(this, void 0, void 0, function* () {
-                console.log(`File ${file} changed, preparing sources...`);
+            watcher.on('change', (file, x) => __awaiter(this, void 0, void 0, function* () {
+                console.log(`File ${file} changed ${x}, preparing sources...`);
                 yield this.prepareSources({ filesUpdated: [file.replace(spaPath + '/', '')] });
             }));
             this.allWatchers.push(watcher);
         });
     }
     watchCustomComponentsForCopy(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ verbose }) {
-            const customComponentsDir = this.adminforth.config.customization.customComponentsDir;
+        return __awaiter(this, arguments, void 0, function* ({ verbose, customComponentsDir, destination }) {
             if (!customComponentsDir) {
                 return;
             }
@@ -441,32 +445,48 @@ class CodeInjector {
             }
             // get all subdirs
             const directories = [];
+            const files = [];
             const collectDirectories = (dir) => __awaiter(this, void 0, void 0, function* () {
                 directories.push(dir);
-                const files = yield fs.promises.readdir(dir, { withFileTypes: true });
-                for (const file of files) {
-                    if (file.isDirectory()) {
+                const filesAndDirs = yield fs.promises.readdir(dir, { withFileTypes: true });
+                yield Promise.all(filesAndDirs.map((file) => __awaiter(this, void 0, void 0, function* () {
+                    const isDir = fs.lstatSync(path.join(dir, file.name)).isDirectory();
+                    if (isDir) {
                         yield collectDirectories(path.join(dir, file.name));
                     }
-                }
+                    else {
+                        files.push(path.join(dir, file.name));
+                    }
+                })));
             });
             yield 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', (file) => __awaiter(this, void 0, void 0, function* () {
+            watcher.on('change', (fileOrDir) => __awaiter(this, void 0, void 0, function* () {
                 // 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}`);
+                    yield fsExtra.copy(fileOrDir, destPath);
+                    return;
+                }
+                else {
+                    // for now do nothing
                 }
-                yield fsExtra.copy(this.adminforth.config.customization.customComponentsDir, path.join(CodeInjector.SPA_TMP_PATH, 'src', 'custom'), {
-                    recursive: true,
-                });
             }));
             this.allWatchers.push(watcher);
         });
@@ -476,8 +496,16 @@ class CodeInjector {
             this.adminforth.runningHotReload = hotReload;
             yield this.prepareSources({ verbose });
             if (hotReload) {
-                yield this.watchForReprepare({ verbose });
-                yield this.watchCustomComponentsForCopy({ verbose });
+                yield Promise.all([
+                    this.watchForReprepare({ verbose }),
+                    ...Object.entries(this.srcFoldersToSync).map((_b) => __awaiter(this, [_b], void 0, function* ([src, dest]) {
+                        yield this.watchCustomComponentsForCopy({
+                            verbose,
+                            customComponentsDir: src,
+                            destination: dest,
+                        });
+                    })),
+                ]);
             }
             console.log('AdminForth bundling');
             const cwd = CodeInjector.SPA_TMP_PATH;

package/dist/plugins/AuditLog/index.js

@@ -0,0 +1,13 @@
+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;

package/dist/plugins/AuditLog/types.js

@@ -0,0 +1 @@
+export {};

package/dist/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/dist/spa/index.html

@@ -17,7 +17,7 @@
 
   </head>
   <body class=" ">
-    <div id="app" class="min-h-screen bg-lightHtml dark:bg-darkHtml"></div>
+    <div id="app" class="min-h-screen bg-html-bg dark:bg-gray-800"></div>
     <script type="module" src="/src/main.ts"></script>
   </body>
 </html>

package/dist/spa/package-lock.json

@@ -19,7 +19,6 @@
         "unhead": "^1.9.12",
         "uuid": "^10.0.0",
         "vue": "^3.4.21",
-        "vue-diff": "^1.2.4",
         "vue-router": "^4.3.0",
         "vue-slider-component": "^4.1.0-beta.7"
       },
@@ -1903,11 +1902,6 @@
       "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==",
       "dev": true
     },
-    "node_modules/diff-match-patch": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/diff-match-patch/-/diff-match-patch-1.0.5.tgz",
-      "integrity": "sha512-IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw=="
-    },
     "node_modules/dir-glob": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
@@ -2532,14 +2526,6 @@
         "he": "bin/he"
       }
     },
-    "node_modules/highlight.js": {
-      "version": "11.9.0",
-      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.9.0.tgz",
-      "integrity": "sha512-fJ7cW7fQGCYAkgv4CPfwFHrfd/cLS4Hau96JuJ+ZTOWhjnhoeN1ub1tFmALm/+lW5z4WCAuAV9bm05AP0mS6Gw==",
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
     "node_modules/hookable": {
       "version": "5.5.3",
       "resolved": "https://registry.npmjs.org/hookable/-/hookable-5.5.3.tgz",
@@ -4134,103 +4120,6 @@
         }
       }
     },
-    "node_modules/vue-diff": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/vue-diff/-/vue-diff-1.2.4.tgz",
-      "integrity": "sha512-9z+0uPHigi/DdE3Zhdg1zR3VkiBaDN4czjWa/Zznvizn4znckVqz20p1KytaWq5NJtJ7UnkqRbuWsaCuC1ZHaA==",
-      "dependencies": {
-        "@vueuse/core": "^8.3.1",
-        "diff-match-patch": "^1.0.5",
-        "highlight.js": "^11.5.1"
-      }
-    },
-    "node_modules/vue-diff/node_modules/@types/web-bluetooth": {
-      "version": "0.0.14",
-      "resolved": "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.14.tgz",
-      "integrity": "sha512-5d2RhCard1nQUC3aHcq/gHzWYO6K0WJmAbjO7mQJgCQKtZpgXxv1rOM6O/dBDhDYYVutk1sciOgNSe+5YyfM8A=="
-    },
-    "node_modules/vue-diff/node_modules/@vueuse/core": {
-      "version": "8.9.4",
-      "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-8.9.4.tgz",
-      "integrity": "sha512-B/Mdj9TK1peFyWaPof+Zf/mP9XuGAngaJZBwPaXBvU3aCTZlx3ltlrFFFyMV4iGBwsjSCeUCgZrtkEj9dS2Y3Q==",
-      "dependencies": {
-        "@types/web-bluetooth": "^0.0.14",
-        "@vueuse/metadata": "8.9.4",
-        "@vueuse/shared": "8.9.4",
-        "vue-demi": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/antfu"
-      },
-      "peerDependencies": {
-        "@vue/composition-api": "^1.1.0",
-        "vue": "^2.6.0 || ^3.2.0"
-      },
-      "peerDependenciesMeta": {
-        "@vue/composition-api": {
-          "optional": true
-        },
-        "vue": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/vue-diff/node_modules/@vueuse/metadata": {
-      "version": "8.9.4",
-      "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-8.9.4.tgz",
-      "integrity": "sha512-IwSfzH80bnJMzqhaapqJl9JRIiyQU0zsRGEgnxN6jhq7992cPUJIRfV+JHRIZXjYqbwt07E1gTEp0R0zPJ1aqw==",
-      "funding": {
-        "url": "https://github.com/sponsors/antfu"
-      }
-    },
-    "node_modules/vue-diff/node_modules/@vueuse/shared": {
-      "version": "8.9.4",
-      "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-8.9.4.tgz",
-      "integrity": "sha512-wt+T30c4K6dGRMVqPddexEVLa28YwxW5OFIPmzUHICjphfAuBFTTdDoyqREZNDOFJZ44ARH1WWQNCUK8koJ+Ag==",
-      "dependencies": {
-        "vue-demi": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/antfu"
-      },
-      "peerDependencies": {
-        "@vue/composition-api": "^1.1.0",
-        "vue": "^2.6.0 || ^3.2.0"
-      },
-      "peerDependenciesMeta": {
-        "@vue/composition-api": {
-          "optional": true
-        },
-        "vue": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/vue-diff/node_modules/vue-demi": {
-      "version": "0.14.8",
-      "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.8.tgz",
-      "integrity": "sha512-Uuqnk9YE9SsWeReYqK2alDI5YzciATE0r2SkA6iMAtuXvNTMNACJLJEXNXaEy94ECuBe4Sk6RzRU80kjdbIo1Q==",
-      "hasInstallScript": true,
-      "bin": {
-        "vue-demi-fix": "bin/vue-demi-fix.js",
-        "vue-demi-switch": "bin/vue-demi-switch.js"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/antfu"
-      },
-      "peerDependencies": {
-        "@vue/composition-api": "^1.0.0-rc.1",
-        "vue": "^3.0.0-0 || ^2.6.0"
-      },
-      "peerDependenciesMeta": {
-        "@vue/composition-api": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/vue-eslint-parser": {
       "version": "9.4.2",
       "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.4.2.tgz",

package/dist/spa/package.json

@@ -23,7 +23,6 @@
     "unhead": "^1.9.12",
     "uuid": "^10.0.0",
     "vue": "^3.4.21",
-    "vue-diff": "^1.2.4",
     "vue-router": "^4.3.0",
     "vue-slider-component": "^4.1.0-beta.7"
   },

package/dist/spa/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/dist/spa/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)
       }"