Merge pull request #485 from devforth/next

Next

Author: yaroslav8765

adminforth/auth.ts

@@ -106,9 +106,9 @@ getClientIp(headers: object) {
   }
 
   setCustomCookie({ response, payload }: {
-    response: any, payload: { name: string, value: string, expiry?: number | undefined, expirySeconds: number | undefined, httpOnly: boolean }
+    response: any, payload: { name: string, value: string, expiry?: number | undefined, expirySeconds: number | undefined, httpOnly: boolean, sessionBased?: boolean | undefined }
   }) {
-    const {name, value, expiry, httpOnly, expirySeconds } = payload;
+    const {name, value, expiry, httpOnly, expirySeconds, sessionBased } = payload;
 
     let expiryMs = 24 * 60 * 60 * 1000; // default 1 day
     if (expirySeconds !== undefined) {
@@ -117,11 +117,14 @@ getClientIp(headers: object) {
       afLogger.warn(`setCustomCookie: expiry(in ms) is deprecated, use expirySeconds instead (seconds), traceback: ${new Error().stack}`);
       expiryMs = expiry;
     }
-
     const brandSlug = this.adminforth.config.customization.brandNameSlug;
-    response.setHeader('Set-Cookie', `adminforth_${brandSlug}_${name}=${value}; Path=${this.adminforth.config.baseUrl || '/'};${
-      httpOnly ? ' HttpOnly;' : ''
-    } SameSite=Strict; Expires=${new Date(Date.now() + expiryMs).toUTCString() } `);
+    response.setHeader('Set-Cookie', 
+      `adminforth_${brandSlug}_${name}=${value}; Path=${this.adminforth.config.baseUrl || '/'};${
+        httpOnly ? ' HttpOnly;' : '' 
+      }SameSite=Strict;${
+        sessionBased ? '' : `Expires=${new Date(Date.now() + expiryMs).toUTCString() }`
+      }`
+    );
   }
 
   getCustomCookie({ cookies, name }: {

adminforth/commands/createPlugin/templates/index.ts.hbs

@@ -9,6 +9,7 @@ export default class {{pluginName}} extends AdminForthPlugin {
   constructor(options: PluginOptions) {
     super(options, import.meta.url);
     this.options = options;
+    this.shouldHaveSingleInstancePerWholeApp = () => false;
   }
 
   async modifyResourceConfig(adminforth: IAdminForth, resourceConfig: AdminForthResource) {
@@ -27,10 +28,6 @@ export default class {{pluginName}} extends AdminForthPlugin {
     return `single`;
   }
 
-  shouldHaveSingleInstancePerWholeApp(): boolean {
-    return false;
-  }
-
   setupEndpoints(server: IHttpServer) {
     server.endpoint({
       method: 'POST',

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

@@ -211,6 +211,45 @@ new CompletionAdapterGoogleGemini({
 }),
 ```
 
+### Using json_schema with adapter
+
+If you want use custom json schema for completion response - you can use outputSchema param for completion:
+
+
+```ts
+const openAi = new CompletionAdapterOpenAIChatGPT({
+  openAiApiKey: process.env.OPENAI_API_KEY as string,
+  model: 'gpt-5-mini',
+});
+
+const prompt = 'What is the capital of France? return json';
+
+openAi.complete(
+    prompt, 
+    [], 
+    200, 
+    { 
+      json_schema: {
+        name: "capital_response",
+        schema: {
+          type: "object",
+          properties: {
+            capital: { type: "string" },
+          },
+          required: ["capital"],
+        },
+      },
+    },
+  ).then((resp) => {
+    console.log(resp);
+});
+
+```
+
+Then output will be like: 
+```
+{ content: '{"capital":"Paris"}', finishReason: 'stop' }
+```
 
 ## 🔎 Image Analysis
 

adminforth/documentation/docs/tutorial/08-Plugins/10-i18n.md

@@ -717,24 +717,28 @@ Response will look like this:
 
 ```
   "languages": [
-        {
-            "code": "en",
-            "nameOnNative": "English",
-            "nameEnglish": "English",
-            "emojiFlag": "🇺🇸"
-        },
-        {
-            "code": "uk",
-            "nameOnNative": "Українська",
-            "nameEnglish": "Ukrainian",
-            "emojiFlag": "🇺🇦"
-        },
-        {
-            "code": "ar",
-            "nameOnNative": "العربية",
-            "nameEnglish": "Arabic",
-            "emojiFlag": "🇦🇷"
-        },
+    {
+        "code": "en",
+        "nameOnNative": "English",
+        "nameEnglish": "English",
+        "emojiFlag": "🇺🇸",
+        "svgFlagB64": "data:image/svg+xml;base64,..."
+    },
+    {
+        "code": "uk",
+        "nameOnNative": "Українська",
+        "nameEnglish": "Ukrainian",
+        "emojiFlag": "🇺🇦",
+        "svgFlagB64": "data:image/svg+xml;base64...
+    },
+    {
+        "code": "ja",
+        "nameOnNative": "日本語",
+        "nameEnglish": "Japanese",
+        "emojiFlag": "🇯🇵",
+        "svgFlagB64": "data:image/svg+xml;base64..."
+    },
+  ]
 ```
 
 ### Disable translation for admin (external app only)

adminforth/index.ts

@@ -6,7 +6,7 @@ import SQLiteConnector from './dataConnectors/sqlite.js';
 import CodeInjector from './modules/codeInjector.js';
 import ExpressServer from './servers/express.js';
 // import FastifyServer from './servers/fastify.js';
-import { ADMINFORTH_VERSION, listify, suggestIfTypo, RateLimiter, RAMLock, getClientIp, isProbablyUUIDColumn } from './modules/utils.js';
+import { ADMINFORTH_VERSION, listify, suggestIfTypo, RateLimiter, RAMLock, getClientIp, isProbablyUUIDColumn, convertPeriodToSeconds } from './modules/utils.js';
 import { 
   type AdminForthConfig, 
   type IAdminForth, 
@@ -46,10 +46,9 @@ export * from './types/Back.js';
 export * from './types/Common.js';
 export * from './types/adapters/index.js';
 export * from './modules/filtersTools.js';
-
 export { interpretResource };
 export { AdminForthPlugin };
-export { suggestIfTypo, RateLimiter, RAMLock, getClientIp };
+export { suggestIfTypo, RateLimiter, RAMLock, getClientIp, convertPeriodToSeconds };
 
 
 class AdminForth implements IAdminForth {

adminforth/modules/codeInjector.ts

@@ -64,6 +64,10 @@ function hashify(obj) {
   return md5hash(JSON.stringify(obj));
 }
 
+function isFulfilled<T>(result: PromiseSettledResult<T>): result is PromiseFulfilledResult<T> {
+  return result.status === 'fulfilled';
+}
+
 function notifyWatcherIssue(limit) {
   afLogger.info('Ran out of file handles after watching %s files.', limit);
   afLogger.info('Falling back to polling which uses more CPU.');
@@ -86,6 +90,36 @@ class CodeInjector implements ICodeInjector {
     return path.join(TMP_DIR, 'adminforth', brandSlug, 'spa_tmp');
   }
 
+  async checkIconNames(icons: string[]) {
+    const uniqueIcons = Array.from(new Set(icons));
+    const collections = new Set(icons.map((icon) => icon.split(':')[0]));
+    const iconPackageNames = Array.from(collections).map((collection) => `@iconify-prerendered/vue-${collection}`);
+
+    const iconPackages = (
+      await Promise.allSettled(iconPackageNames.map(async (pkg) => ({ pkg: await import(this.spaTmpPath() +'/node_modules/' + pkg), name: pkg})))
+    );
+
+    const loadedIconPackages = iconPackages.filter(isFulfilled).map((res) => res.value).reduce((acc, { pkg, name }) => {
+      acc[name.slice(`@iconify-prerendered/vue-`.length)] = pkg;
+      return acc;
+    }, {});
+
+    uniqueIcons.forEach((icon) => {
+      const [ collection, iconName ] = icon.split(':');
+      const PascalIconName = 'Icon' + iconName.split('-').map((part, index) => {
+        return part[0].toUpperCase() + part.slice(1);
+      }).join('');
+
+      if (!loadedIconPackages[collection]) {
+        throw new Error(`Collection ${collection} not found`);
+      }
+      if (!loadedIconPackages[collection][PascalIconName]) {
+        throw new Error(`Icon ${iconName} not found in collection ${collection}`);
+      }
+    });
+  }
+
+
   registerCustomComponent(filePath: string): void {
     const componentName = getComponentNameFromPath(filePath);
     this.allComponentNames[filePath] = componentName;
@@ -497,7 +531,6 @@ class CodeInjector implements ICodeInjector {
       }
     }
 
-
     customResourceComponents.forEach((filePath) => {
       const componentName = getComponentNameFromPath(filePath);
       this.allComponentNames[filePath] = componentName;
@@ -528,7 +561,6 @@ class CodeInjector implements ICodeInjector {
     let imports = iconImports + '\n';
     imports += customComponentsImports + '\n';
 
-
     if (this.adminforth.config.customization?.vueUsesFile) {
       imports += `import addCustomUses from '${this.adminforth.config.customization.vueUsesFile}';\n`;
     }
@@ -654,6 +686,7 @@ class CodeInjector implements ICodeInjector {
 
     try {
       const existingHash = await fs.promises.readFile(hashPath, 'utf-8');
+      await this.checkIconNames(icons);
       if (existingHash === fullHash) {
         afLogger.trace(`🪲Hashes match, skipping npm ci/install, from file: ${existingHash}, actual: ${fullHash}`);
         return;
@@ -693,7 +726,7 @@ class CodeInjector implements ICodeInjector {
         }
       });
     }
-
+    await this.checkIconNames(icons);
     await fs.promises.writeFile(hashPath, fullHash);
   }
 

adminforth/modules/restApi.ts

@@ -733,10 +733,10 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI {
           'edit': 'show',
         }[source];
 
-        for (const hook of listify(resource.hooks?.[hookSource]?.beforeDatasourceRequest)) {
+        for (const hook of listify(resource.hooks?.[hookSource]?.beforeDatasourceRequest as BeforeDataSourceRequestFunction[])) {
           const filterTools = filtersTools.get(body);
           body.filtersTools = filterTools;
-          const resp = await hook({
+          const resp = await (hook as BeforeDataSourceRequestFunction)({
             resource,
             query: body,
             adminUser,
@@ -1302,12 +1302,14 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI {
                 error: createRecordResponse.error, 
                 ok: false, 
                 newRecordId: createRecordResponse.redirectToRecordId ? createRecordResponse.redirectToRecordId :createRecordResponse.newRecordId, 
-                redirectToRecordId: createRecordResponse.redirectToRecordId };
+                redirectToRecordId: createRecordResponse.redirectToRecordId 
+              };
             }
             const connector = this.adminforth.connectors[resource.dataSource];
 
             return {
               newRecordId: createRecordResponse.createdRecord[connector.getPrimaryKey(resource)],
+              redirectToRecordId: createRecordResponse.createdRecord[connector.getPrimaryKey(resource)],
               ok: true
             }
         }

adminforth/modules/utils.ts

@@ -381,6 +381,20 @@ export function md5hash(str:string) {
   return crypto.createHash('md5').update(str).digest('hex');
 }
 
+export function convertPeriodToSeconds(period: string): number {
+    const periodChar = period.slice(-1);
+    const duration = parseInt(period.slice(0, -1));
+    if (periodChar === 's') {
+      return duration;
+    } else if (periodChar === 'm') {
+      return duration * 60;
+    } else if (periodChar === 'h') {
+      return duration * 60 * 60;
+    } else if (periodChar === 'd') {
+      return duration * 60 * 60 * 24;
+    }
+    throw new Error(`Invalid period: ${period}`);
+}
 export class RateLimiter {
   // constructor, accepts string like 10/10m, or 20/10s, or 30/1d
 
@@ -394,18 +408,7 @@ export class RateLimiter {
     }
 
 
-    const period = rate.slice(-1);
-    const duration = parseInt(rate.slice(0, -1));
-    if (period === 's') {
-      return duration;
-    } else if (period === 'm') {
-      return duration * 60;
-    } else if (period === 'h') {
-      return duration * 60 * 60;
-    } else if (period === 'd') {
-      return duration * 60 * 60 * 24;
-    }
-    throw new Error(`Invalid rate duration period: ${period}`);
+    return convertPeriodToSeconds(rate);
   }
 
 

adminforth/spa/src/afcl/Table.vue

@@ -78,7 +78,7 @@
             </tr>
           </tbody>
       </table>
-    <nav class="afcl-table-pagination-container bg-lightTableBackground dark:bg-darkTableBackground mt-2 flex flex-col gap-2 items-center sm:flex-row justify-center sm:justify-between px-4 pb-4" 
+    <nav class="afcl-table-pagination-container bg-lightTableBackground dark:bg-darkTableBackground pt-2 flex flex-col gap-2 items-center sm:flex-row justify-center sm:justify-between px-4 pb-4" 
       v-if="totalPages > 1"
       :aria-label="$t('Table navigation')"
       :class="makePaginationSticky ? 'sticky bottom-0 pt-4' : ''"

adminforth/spa/src/components/GroupsTable.vue

@@ -22,21 +22,23 @@
           class="bg-lightForm dark:bg-darkForm dark:border-darkFormBorder block md:table-row"
           :class="{ 'border-b': i !== group.columns.length - 1}"
         >
-          <td class="px-6 py-4 flex items-center block md:table-cell pb-0 md:pb-4" 
+          <td class="px-6 py-4 flex items-center block pb-0 md:pb-4 relative md:table-cell" 
               :class="{'rounded-bl-lg border-b-none': i === group.columns.length - 1}"> <!--align-top-->
-            <span class="flex items-center gap-1">                     
-              {{ column.label }}
-              <Tooltip v-if="column.required[mode]">
+            <div class="absolute inset-0 flex items-center overflow-hidden px-6 py-4 max-h-32">
+              <span class="flex items-center gap-1">                     
+                {{ column.label }}
+                <Tooltip v-if="column.required[mode]">
 
-                <IconExclamationCircleSolid v-if="column.required[mode]" class="w-4 h-4" 
-                  :class="(columnError(column) && validating) ? 'text-lightInputErrorColor dark:text-darkInputErrorColor' : 'text-lightRequiredIconColor dark:text-darkRequiredIconColor'"
-                />
+                  <IconExclamationCircleSolid v-if="column.required[mode]" class="w-4 h-4" 
+                    :class="(columnError(column) && validating) ? 'text-lightInputErrorColor dark:text-darkInputErrorColor' : 'text-lightRequiredIconColor dark:text-darkRequiredIconColor'"
+                  />
 
-                <template #tooltip>
-                  {{ $t('Required field') }}
-                </template>
-              </Tooltip>
-            </span>
+                  <template #tooltip>
+                    {{ $t('Required field') }}
+                  </template>
+                </Tooltip>
+              </span>
+            </div>
           </td>
           <td
             class="px-6 py-4  whitespace-pre-wrap relative block md:table-cell"