Merge branch 'next' of github.com:devforth/adminforth into next

Author: ivictbor

Taskfile.yml

@@ -0,0 +1,27 @@
+version: '3'
+
+tasks:
+  update-adminforth-version:
+    desc: "Update adminforth peer/dev dependency version in all plugins and adapters"
+    vars:
+      VERSION: '{{.VERSION | default ""}}'
+    preconditions:
+      - sh: '[ -n "{{.VERSION}}" ]'
+        msg: "VERSION is required. Run: task update-adminforth-version VERSION=1.2.3"
+    cmds:
+      - |
+        for dir in plugins/*/  adapters/*/; do
+          pkg="$dir/package.json"
+          [ -f "$pkg" ] || continue
+          node -e "
+            const fs = require('fs');
+            const p = JSON.parse(fs.readFileSync('$pkg'));
+            let changed = false;
+            if (p.peerDependencies?.adminforth) { p.peerDependencies.adminforth = '^{{.VERSION}}'; changed = true; }
+            if (p.devDependencies?.adminforth)  { p.devDependencies.adminforth  = '^{{.VERSION}}'; changed = true; }
+            if (changed) {
+              fs.writeFileSync('$pkg', JSON.stringify(p, null, 2) + '\n');
+              console.log('updated: $pkg');
+            }
+          "
+        done

adminforth/spa/src/components/MenuLink.vue

@@ -1,9 +1,12 @@
 <template>
-  <RouterLink 
-      :to="item.url || { name: item.resourceId ? 'resource-list' : item.path, params: item.resourceId ? { resourceId: item.resourceId }: {}}" 
+  <component
+      :is="isExternalUrl(item.url) ? 'a' : RouterLink"
+      v-bind="isExternalUrl(item.url)
+        ? { href: item.url }
+        : { to: item.url || { name: item.resourceId ? 'resource-list' : item.path, params: item.resourceId ? { resourceId: item.resourceId }: {} } }"
       :target="item.isOpenInNewTab ? '_blank' : '_self'"
-      class="af-menu-link flex group relative items-center w-full py-2 text-lightSidebarText dark:text-darkSidebarText rounded-default transition-all duration-200 ease-in-out" 
-      :class="{ 
+      class="af-menu-link flex group relative items-center w-full py-2 text-lightSidebarText dark:text-darkSidebarText rounded-default transition-all duration-200 ease-in-out"
+      :class="{
         'hover:bg-lightSidebarItemHover hover:text-lightSidebarTextHover dark:hover:bg-darkSidebarItemHover dark:hover:text-darkSidebarTextHover active:bg-lightSidebarActive dark:active:bg-darkSidebarHover': !['divider', 'gap', 'heading'].includes(item.type),
         'pl-6 pr-3.5': (isChild && !isSidebarIconOnly && !isSidebarHovering) || (isChild && isSidebarIconOnly && isSidebarHovering),
         'px-3.5 ': !isChild || (isSidebarIconOnly && !isSidebarHovering),
@@ -51,7 +54,7 @@
     <div v-if="(item.badge || item.badge === 0) && isSidebarIconOnly && !isSidebarHovering"  class="af-badge absolute right-0.5 bottom-1 -translate-y-1/2 inline-flex items-center justify-center h-2 w-2 text-sm font-medium rounded-full bg-lightAnnouncementBG dark:bg-darkAnnouncementBG 
       fill-lightAnnouncementText dark:fill-darkAccent text-lightAnnouncementText dark:text-darkAccent">
     </div>
-  </RouterLink>
+  </component>
 </template>
 
 <script setup lang="ts">  
@@ -60,13 +63,15 @@ import { Tooltip } from '@/afcl';
 import { ref, watch, computed } from 'vue';
 import { useCoreStore } from '@/stores/core';
 import { IconFileImageOutline } from '@iconify-prerendered/vue-flowbite';
-import { useRoute } from 'vue-router';
+import { useRoute, RouterLink } from 'vue-router';
+
+const isExternalUrl = (url: string ) => /^https?:\/\//.test(url || '');
 
 const route = useRoute();
 
 const isItemActive = (item: any) => {
   if (item.url) {
-    return route.fullPath === item.url;
+    return !isExternalUrl(item.url) && route.fullPath === item.url;
   }
 
   if (item.resourceId) {

adminforth/types/Common.ts

@@ -1177,6 +1177,23 @@ export interface AdminForthConfigMenuItem {
    * Item id will be automatically generated from hashed resourceId+Path+label
    */
   itemId?: string,  // todo move to runtime type
+
+
+  /**
+   * If set, menu item will be rendered as external link with this URL. Supported for AdminForthMenuTypes.PAGE and AdminForthMenuTypes.RESOURCE only!
+   * If URL starts with `http://` or `https://`, it will be treated as absolute URL. Otherwise, it will be treated as relative to admin panel base URL.
+   * Example of absolute URL:
+   * 
+   * ```ts
+   * url: 'https://google.com',
+   * ```
+   * 
+   * Example of relative URL:
+   * 
+   * ```ts
+   * url: '/custom-page',
+   * ```
+   */
 
   url?: string
 

dev-demo/migrations/prisma/sqlite/migrations/20260401085719_add_listed_to_translations/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "translations" ADD COLUMN "listed" BOOLEAN;

dev-demo/migrations/prisma/sqlite/migrations/20260415080036_add_cars/migration.sql

@@ -0,0 +1,33 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `listed` on the `translations` table. All the data in the column will be lost.
+
+*/
+-- AlterTable
+ALTER TABLE "adminuser" ADD COLUMN "cars" TEXT;
+
+-- RedefineTables
+PRAGMA defer_foreign_keys=ON;
+PRAGMA foreign_keys=OFF;
+CREATE TABLE "new_translations" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "en_string" TEXT NOT NULL,
+    "created_at" DATETIME NOT NULL,
+    "uk_string" TEXT,
+    "ja_string" TEXT,
+    "fr_string" TEXT,
+    "es_string" TEXT,
+    "ptBR_string" TEXT,
+    "category" TEXT NOT NULL,
+    "source" TEXT,
+    "completedLangs" TEXT
+);
+INSERT INTO "new_translations" ("category", "completedLangs", "created_at", "en_string", "es_string", "fr_string", "id", "ja_string", "ptBR_string", "source", "uk_string") SELECT "category", "completedLangs", "created_at", "en_string", "es_string", "fr_string", "id", "ja_string", "ptBR_string", "source", "uk_string" FROM "translations";
+DROP TABLE "translations";
+ALTER TABLE "new_translations" RENAME TO "translations";
+CREATE INDEX "translations_en_string_category_idx" ON "translations"("en_string", "category");
+CREATE INDEX "translations_category_idx" ON "translations"("category");
+CREATE INDEX "translations_completedLangs_idx" ON "translations"("completedLangs");
+PRAGMA foreign_keys=ON;
+PRAGMA defer_foreign_keys=OFF;

dev-demo/resources/adminuser.ts

@@ -10,7 +10,6 @@ import AdminForthAdapterGoogleOauth2 from '../../adapters/adminforth-oauth-adapt
 import OpenSignupPlugin from '../../plugins/adminforth-open-signup/index.js';
 import OAuthPlugin from '../../plugins/adminforth-oauth/index.js';
 import KeyValueAdapterRam from '../../adapters/adminforth-key-value-adapter-ram/index.js';
-import AdminForthAgent from '../../plugins/adminforth-agent/index.js';
 import CompletionAdapterOpenAIChatGPT from '../../adapters/adminforth-completion-adapter-open-ai-chat-gpt/index.js';
 
 async function allowedForSuperAdmin({ adminUser }: { adminUser: AdminUser }): Promise<boolean> {