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

Author: ivictbor

adapters/install-adapters.sh

@@ -17,7 +17,7 @@ install_adapter() {
       git pull
   else
       echo "Repository for $adapter does not exist. Cloning..."
-      git clone git@github.com:devforth/$adapter.git "$adapter"
+      git clone https://github.com/devforth/$adapter.git "$adapter"
       cd "$adapter"
   fi
 

adminforth/commands/createApp/templates/api.ts.hbs

@@ -1,10 +1,13 @@
-import { Express } from "express";
+import { Express, Request, Response } from "express";
 import { IAdminForth } from "adminforth";
-
 export function initApi(app: Express, admin: IAdminForth) {
   app.get(`${admin.config.baseUrl}/api/hello/`,
-    (req, res) => {
-      res.json({ message: "Hello from AdminForth API!" });
+    async (req: Request, res: Response) => {
+      const allUsers = await admin.resource("adminuser").list([]);
+      res.json({
+        message: "Hello from AdminForth API!",
+        users: allUsers,
+      });
     }
   );
 }

adminforth/dataConnectors/postgres.ts

@@ -385,7 +385,7 @@ class PostgresConnector extends AdminForthBaseConnector implements IAdminForthDa
         const tableName = resource.table;
         const result = {};
         await Promise.all(columns.map(async (col) => {
-            const q = `SELECT MIN(${col.name}) as min, MAX(${col.name}) as max FROM "${tableName}"`;
+            const q = `SELECT MIN("${col.name}") as min, MAX("${col.name}") as max FROM "${tableName}"`;
             dbLogger.trace(`🪲📜 PG Q: ${q}`);
             const stmt = await this.client.query(q);
             const { min, max } = stmt.rows[0];

adminforth/documentation/docs/tutorial/05-ListOfAdapters.md

@@ -255,7 +255,8 @@ Cones:
 npm i @adminforth/key-value-adapter-redis
 ```
 
-Redis adapter uses redis database.
+Redis adapter uses in-memory RAM-based Redis database with O(1) get complexity. It is great fit for most of lightweight tasks which fit in RAM. Also capable with multi-process or replica-based installations as centralized storage. Please note that Redis daemon might be not persisted to disk during restarts without additional settings, so if persistence is critical for your task - you might need to set up it separately (for many tasks like rate-limits ephemeral data are fine 
+
 
 ```ts
 import RedisKeyValueAdapter from '@adminforth/key-value-adapter-redis';
@@ -274,7 +275,9 @@ adapeter.set('test-key', 'test-value', 120); //expiry in 120 seconds
 npm i @adminforth/key-value-adapter-leveldb
 ```
 
-LebelDB uses local storage for storing keys.
+LebelDB uses disk storage with o(log(n)) get complexity. Good fit for large and/or persistent KV datasets which still require fast KV access but don't efficently fit into RAM. Please not that this is a single-process adapter only, so if you will run severall processes of admin - they will not be able to work with this adapter (>=2 processes which look at same level database might lead to unpredicted behaviour - exceptions or crashes). 
+
+You can use replicas with isolated disks, however in this case state will be also separated between replicas.
 
 ```ts
 import LevelDBKeyValueAdapter from '@adminforth/key-value-adapter-leveldb'

adminforth/documentation/docs/tutorial/08-Plugins/02-TwoFactorsAuth.md

@@ -280,10 +280,6 @@ options: {
           adminUser: adminUser,
         //diff-add
           userPk: adminUser.pk,
-        //diff-add
-          cookies: extra.cookies,
-        //diff-add
-          response: response,
         //diff-add
           extra: extra,
         //diff-add
@@ -393,8 +389,6 @@ hooks: {
       const verifyRes = await t2fa.verify(confirmationResult, {
         adminUser,
         userPk: adminUser.pk,
-        cookies: extra?.cookies,
-        response,
         extra
       });
       if (!verifyRes || 'error' in verifyRes) {
@@ -404,7 +398,7 @@ hooks: {
     },
   },
   create: {
-    beforeSave: async ({ adminUser, adminforth, extra }) => {
+    beforeSave: async ({ adminUser, adminforth, response, extra }) => {
       const t2fa = adminforth.getPluginByClassName('TwoFactorsAuthPlugin');
       if (!t2fa) {
         return { ok: false, error: 'TwoFactorsAuthPlugin is not configured' };
@@ -418,7 +412,7 @@ hooks: {
       const verifyRes = await t2fa.verify(confirmationResult, {
         adminUser,
         userPk: adminUser.pk,
-        cookies: extra?.cookies,
+        extra
       });
       if (!verifyRes || 'error' in verifyRes) {
         return { ok: false, error: verifyRes?.error || 'Two-factor verification failed' };
@@ -534,12 +528,8 @@ app.post(`${ADMIN_BASE_URL}/myCriticalAction`,
         adminUser: adminUser,
       // diff-add
         userPk: adminUser.pk,
-      // diff-add
-        cookies: cookies,
-      //diff-add
-        response: res, 
       //diff-add
-        extra: {...req.headers},
+        extra: {...req.headers, ...req.cookies, response: res},
       //diff-add
       });
       // diff-add

adminforth/index.ts

@@ -116,6 +116,7 @@ class AdminForth implements IAdminForth {
   connectorClasses: any;
   runningHotReload: boolean;
   activatedPlugins: Array<AdminForthPlugin>;
+  pluginsById: Record<string, AdminForthPlugin> = {};
   configValidator: IConfigValidator;
   restApi: AdminForthRestAPI;
 
@@ -256,6 +257,13 @@ class AdminForth implements IAdminForth {
             throw new Error(`Attempt to activate Plugin ${pluginInstance.constructor.name} second time for same resource, but plugin does not support it. 
               To support multiple plugin instance pre one resource, plugin should return unique string values for each installation from instanceUniqueRepresentation`);
           }
+          const pluginId = pluginInstance.pluginOptions?.id;
+          if (pluginId) {
+            if (this.pluginsById[pluginId]) {
+              throw new Error(`Plugin with id "${pluginId}" already exists!`);
+            }
+            this.pluginsById[pluginId] = pluginInstance;
+          }
           this.activatedPlugins.push(pluginInstance);
           afLogger.trace(`🔌 Plugin ${pluginInstance.constructor.name} activated successfully`);
         }
@@ -282,6 +290,15 @@ class AdminForth implements IAdminForth {
     return plugins[0] as T;
   }
 
+  getPluginById<T = any>(id: string): T {
+    const plugin = this.pluginsById[id];
+    if (!plugin) {
+      const similar = suggestIfTypo(Object.keys(this.pluginsById), id);
+      throw new Error(`Plugin with id "${id}" not found.${similar ? ` Did you mean "${similar}"?` : ''}`);
+      }
+      return plugin as T;
+    }
+
   validateFieldGroups(fieldGroups: {
     groupName: string;
     columns: string[];
@@ -422,15 +439,15 @@ class AdminForth implements IAdminForth {
       res.columns.forEach((col, i) => {
         if (!fieldTypes[col.name] && !col.virtual) {
           const similar = suggestIfTypo(Object.keys(fieldTypes), col.name);
-          throw new Error(`Resource '${res.table}' has no column '${col.name}'. ${similar ? `Did you mean '${similar}'?` : ''}`);
+          throw new Error(`Table '${res.table}' has no column '${col.name}'. ${similar ? `Did you mean '${similar}'?` : ''}`);
         }
         // first find discovered values, but allow override
         res.columns[i] = { ...fieldTypes[col.name], ...col };
       });
 
       // check if primaryKey column is present
       if (!res.columns.some((col) => col.primaryKey)) {
-        throw new Error(`Resource '${res.table}' has no column defined or auto-discovered. Please set 'primaryKey: true' in a columns which has unique value for each record and index`);
+        throw new Error(`Table '${res.table}' has no column defined or auto-discovered. Please set 'primaryKey: true' in a columns which has unique value for each record and index`);
       }
 
     }));

adminforth/spa/src/afcl/Input.vue

@@ -12,7 +12,9 @@
       ref="input"
       v-bind="$attrs"
       :type="type"
-      @input="$emit('update:modelValue', type === 'number' ? Number(($event.target as HTMLInputElement)?.value) : ($event.target as HTMLInputElement)?.value)"
+      :min="min"
+      :max="max"
+      @input="onInput"
       :value="modelValue"
       aria-describedby="helper-text-explanation"
       class="afcl-input  inline-flex bg-lightInputBackground text-lightInputText dark:text-darkInputText border border-lightInputBorder rounded-0 focus:ring-lightPrimary focus:border-lightPrimary dark:focus:ring-darkPrimary dark:focus:border-darkPrimary 
@@ -48,8 +50,31 @@ const props = defineProps<{
   suffix?: string,
   prefix?: string,
   readonly?: boolean,
+  min?: number | null,
+  max?: number | null,
 }>()
 
+const emit = defineEmits<{
+  (e: 'update:modelValue', value: number | null): void
+}>();
+
+const onInput = (e: Event) => {
+  const el = e.target as HTMLInputElement;
+
+  if (props.type === 'number') {
+    let val = Number(el.value);
+
+    if (props.min != null && val < props.min) val = props.min;
+    if (props.max != null && val > props.max) val = props.max;
+
+    el.value = String(val);
+    emit('update:modelValue', val);
+  } else {
+    emit('update:modelValue', el.value);
+  }
+};
+
+
 const input = ref<HTMLInputElement | null>(null)
 
 defineExpose({

adminforth/spa/src/components/ColumnValueInput.vue

@@ -69,8 +69,8 @@
       class="w-40"
       placeholder="0"
       :fullWidth="true"
-      :min="![undefined, null].includes(column.minValue) ? column.minValue : ''"
-      :max="![undefined, null].includes(column.maxValue) ? column.maxValue : ''"
+      :min="![undefined, null].includes(column.minValue) ? column.minValue : null"
+      :max="![undefined, null].includes(column.maxValue) ? column.maxValue : null"
       :prefix="column.inputPrefix"
       :suffix="column.inputSuffix"
       :readonly="(column.editReadonly && source === 'edit') || readonly"
@@ -107,8 +107,8 @@
       class="w-40"
       placeholder="0.0"
       :fullWidth="true"
-      :min="![undefined, null].includes(column.minValue) ? column.minValue : ''"
-      :max="![undefined, null].includes(column.maxValue) ? column.maxValue : ''"
+      :min="![undefined, null].includes(column.minValue) ? column.minValue : null"
+      :max="![undefined, null].includes(column.maxValue) ? column.maxValue : null"
       :prefix="column.inputPrefix"
       :suffix="column.inputSuffix"
       :modelValue="value"

adminforth/spa/src/components/Toast.vue

@@ -18,14 +18,14 @@
     <div v-else class="af-toast-icon inline-flex items-center justify-center flex-shrink-0 w-8 h-8 text-green-500 bg-green-100 rounded-lg dark:bg-green-800 dark:text-green-200">
         <IconCheckCircleSolid class="w-5 h-5" aria-hidden="true" />
     </div>
-    <div class="flex flex-col items-center justify-center break-all">
+    <div class="flex flex-col items-center justify-center break-all overflow-hidden [display:-webkit-box] [-webkit-box-orient:vertical] [-webkit-line-clamp:70]">
         <div class="ms-3 text-sm font-normal max-w-xs pr-2" v-if="toast.messageHtml" v-html="toast.messageHtml"></div>
         <div class="ms-3 text-sm font-normal max-w-xs pr-2" v-else>
             {{toast.message}}
         </div>
-        <div v-if="toast.buttons" class="flex mt-2 gap-2 w-full ml-6">
+        <div v-if="toast.buttons" class="flex mt-2 gap-2 w-full ml-3">
             <div v-for="button in toast.buttons" class="af-toast-button rounded-md bg-lightButtonsBackground hover:bg-lightButtonsHover text-lightButtonsText dark:bg-darkPrimary dark:hover:bg-darkButtonsBackground  dark:text-darkButtonsText">
-                <button @click="onButtonClick(button.value)" class="px-2 py-1 rounded hover:bg-black/5 dark:hover:bg-white/10">
+                <button @click="onButtonClick(button.value)" class="px-2 py-1 rounded hover:bg-black/5 dark:hover:bg-white/10 text-sm">
                     {{ button.label }}
                 </button>
             </div>

adminforth/spa/src/utils.ts

@@ -0,0 +1,2 @@
+export * from './utils/utils';
+export * from './utils/listUtils';