adminforth 1.17.0 → 1.19.0

package/commands/createApp/utils.js

@@ -96,7 +96,7 @@ function generateDbUrlForPrisma(connectionString) {
   return connectionString.toString();
 }
 
-function initialChecks() {
+function initialChecks(options) {
   return [
     {
       title: '👀 Checking Node.js version...',
@@ -104,21 +104,25 @@ function initialChecks() {
     },
     {
       title: '👀 Validating current working directory...',
-      task: () => checkForExistingPackageJson()
+      task: () => checkForExistingPackageJson(options)
     }
   ]
 }
 
-function checkForExistingPackageJson() {
-  if (fs.existsSync(path.join(process.cwd(), 'package.json'))) {
+function checkForExistingPackageJson(options) {
+  const projectDir = path.join(process.cwd(), options.appName);
+  if (fs.existsSync(projectDir)) {
     throw new Error(
-      `A package.json already exists in this directory.\n` +
-      `Please remove it or use an empty directory.`
+      `Directory "${options.appName}" already exists.\n` +
+      `Please remove it or use a different name.`
     );
   }
 }
 
 async function scaffoldProject(ctx, options, cwd) {
+  const projectDir = path.join(cwd, options.appName);
+  await fse.ensureDir(projectDir);
+
   const connectionString = parseConnectionString(options.db);
   const provider = detectDbProvider(connectionString.protocol);
   const prismaDbUrl = generateDbUrlForPrisma(connectionString);
@@ -130,9 +134,9 @@ async function scaffoldProject(ctx, options, cwd) {
   const dirname = path.dirname(filename);
 
   // Prepare directories
-  ctx.customDir = path.join(cwd, 'custom');
+  ctx.customDir = path.join(projectDir, 'custom');
   await fse.ensureDir(ctx.customDir);
-  await fse.ensureDir(path.join(cwd, 'resources'));
+  await fse.ensureDir(path.join(projectDir, 'resources'));
 
   // Copy static assets to `custom/assets`
   const sourceAssetsDir = path.join(dirname, 'assets');
@@ -141,13 +145,14 @@ async function scaffoldProject(ctx, options, cwd) {
   await fse.copy(sourceAssetsDir, targetAssetsDir);
 
   // Write templated files
-  writeTemplateFiles(dirname, cwd, {
+  writeTemplateFiles(dirname, projectDir, {
     dbUrl: connectionString.toString(),
     prismaDbUrl,
     appName,
     provider,
   });
 
+  return projectDir;  // Return the new directory path
 }
 
 async function writeTemplateFiles(dirname, cwd, options) {
@@ -236,14 +241,18 @@ async function installDependencies(ctx, cwd) {
   const customDir = ctx.customDir;
 
   await Promise.all([
-    await execa('npm', ['install', '--no-package-lock'], { cwd }),
+    await execa('npm', ['install'], { cwd }),
     await execa('npm', ['install'], { cwd: customDir }),
   ]);
 }
 
-function generateFinalInstructions(skipPrismaSetup) {
+function generateFinalInstructions(skipPrismaSetup, options) {
   let instruction = '⏭️  Run the following commands to get started:\n';
   if (!skipPrismaSetup)
+    instruction += `
+  ${chalk.dim('// Go to the project directory')}
+  ${chalk.cyan(`$ cd ${options.appName}`)}\n`;
+
     instruction += `
   ${chalk.dim('// Generate and apply initial migration')}
   ${chalk.cyan('$ npm run makemigration -- --name init')}\n`;
@@ -272,33 +281,35 @@ export function prepareWorkflow(options) {
       title: '🔍 Initial checks...',
       task: (_, task) =>
         task.newListr(
-          initialChecks(),
+          initialChecks(options),
           { concurrent: true },
         )
     },
     {
       title: '🚀 Scaffolding your project...',
-      task: async (ctx) => scaffoldProject(ctx, options, cwd)
+      task: async (ctx) => {
+        ctx.projectDir = await scaffoldProject(ctx, options, cwd);
+      }
     },
     {
       title: '📦 Installing dependencies...',
-      task: async (ctx) => installDependencies(ctx, cwd)
+      task: async (ctx) => installDependencies(ctx, ctx.projectDir)
     },
     {
       title: '📝 Preparing final instructions...',
       task: (ctx) => {
-        console.log(chalk.green(`✅ Successfully created your new Adminforth project!\n`));
-        console.log(generateFinalInstructions(ctx.skipPrismaSetup));
+        console.log(chalk.green(`✅ Successfully created your new Adminforth project in ${ctx.projectDir}!\n`));
+        console.log(generateFinalInstructions(ctx.skipPrismaSetup, options));
         console.log('\n\n');
+      }
     }
-  }],
+  ],
   {
     rendererOptions: {collapseSubtasks: false},
     concurrent: false,
     exitOnError: true,
     collectErrors: true,
-  }
-);
+  });
 
   return tasks;
 }

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

@@ -3,7 +3,7 @@ import type { IAdminForth, IHttpServer, AdminForthResourcePages, AdminForthResou
 import type { PluginOptions } from './types.js';
 
 
-export default class ChatGptPlugin extends AdminForthPlugin {
+export default class {{pluginName}} extends AdminForthPlugin {
   options: PluginOptions;
 
   constructor(options: PluginOptions) {

package/dist/spa/src/afcl/Dropzone.vue

@@ -1,5 +1,6 @@
 <template>
-  <div class="flex items-center justify-center w-full"
+    <!-- tag form used to reset the input (method .reset() in claer() function) -->
+  <form class="flex items-center justify-center w-full"
     @dragover.prevent="dragging = true"
     @dragleave.prevent="dragging = false"
     @drop.prevent="dragging = false; doEmit($event.dataTransfer.files)"
@@ -43,12 +44,12 @@
             :multiple="props.multiple || false"
           />
       </label>
-  </div> 
+    </form> 
 </template>
 
 <script setup lang="ts">
 import { humanifySize } from '@/utils';
-import { ref, type Ref } from 'vue';
+import { ref, defineExpose, type Ref } from 'vue';
 import { IconFileSolid } from '@iconify-prerendered/vue-flowbite';
 import { watch } from 'vue';
 import adminforth from '@/adminforth';
@@ -125,4 +126,14 @@ function doEmit(filesIn: FileList) {
 
 const dragging = ref(false);
 
+function clear() {
+  selectedFiles.value = [];
+  emit('update:modelValue', []);
+  const form = document.getElementById(id)?.closest('form');
+  form?.reset();
+}
+
+defineExpose({
+    clear,
+});
 </script>

package/dist/spa/src/renderers/CompactField.vue

@@ -16,7 +16,9 @@ import { computed, ref, onMounted, nextTick } from 'vue';
 import { IconFileCopyAltSolid } from '@iconify-prerendered/vue-flowbite';
 import Tooltip from '@/afcl/Tooltip.vue';
 import adminforth from '@/adminforth';
+import { useI18n } from 'vue-i18n';
 
+const { t } = useI18n();
 const visualValue = computed(() => {
   // if lenght is more then 8, show only first 4 and last 4 characters, ... in the middle
   const val = props.record[props.column.name];
@@ -33,7 +35,7 @@ const id = ref();
 function copyToCB() {
   navigator.clipboard.writeText(props.record[props.column.name]);
   adminforth.alert({
-    message: 'ID copied to clipboard',
+    message: t('ID copied to clipboard'),
     variant: 'success',
   })
 }

package/dist/spa/src/renderers/CompactUUID.vue

@@ -16,7 +16,9 @@ import { computed, ref, onMounted, nextTick } from 'vue';
 import { IconFileCopyAltSolid } from '@iconify-prerendered/vue-flowbite';
 import Tooltip from '@/afcl/Tooltip.vue';
 import adminforth from '@/adminforth';
+import { useI18n } from 'vue-i18n';
 
+const { t } = useI18n();
 const visualValue = computed(() => {
   // if lenght is more then 8, show only first 4 and last 4 characters, ... in the middle
   const val = props.record[props.column.name];
@@ -33,7 +35,7 @@ const id = ref();
 function copyToCB() {
   navigator.clipboard.writeText(props.record[props.column.name]);
   adminforth.alert({
-    message: 'ID copied to clipboard',
+    message: t('ID copied to clipboard'),
     variant: 'success',
   })
 }

package/dist/spa/src/types/Adapters.ts

@@ -28,6 +28,21 @@ export interface CompletionAdapter {
   }>;
 }
 
+export interface ImageGenerationAdapter {
+
+  validate(): void;
+
+  generate(
+    prompt: string,
+    inputFiles: string[],
+  ): Promise<{
+    imageURL?: string;
+    error?: string;
+  }>;
+}
+
+
+
 export interface OAuth2Adapter {
   getAuthUrl(): string;
   getTokenFromCode(code: string, redirect_uri: string): Promise<{ email: string }>;

package/dist/spa/src/types/Back.ts

@@ -386,7 +386,7 @@ export interface IAdminForth {
    * Example:
    * 
    * ```ts
-   * const i18nPlugin = adminforth.getPluginByClassName<I18nPlugin>('I18nPlugin');
+   * const i18nPlugin = adminforth.getPluginByClassName\<I18nPlugin\>('I18nPlugin');
    * ```
    * 
    */

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

@@ -81,7 +81,9 @@ import { useRoute, useRouter } from 'vue-router';
 import { showErrorTost } from '@/composables/useFrontendApi';
 import ThreeDotsMenu from '@/components/ThreeDotsMenu.vue';
 import adminforth from '@/adminforth';
+import { useI18n } from 'vue-i18n';
 
+const { t } = useI18n();
 const coreStore = useCoreStore();
 
 const isValid = ref(false);
@@ -170,7 +172,7 @@ async function saveRecord() {
     showErrorTost(resp.error);
   } else {
     adminforth.alert({
-      message: 'Record updated successfully',
+      message: t('Record updated successfully'),
       variant: 'success',
       timeout: 400000
     });

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

@@ -331,7 +331,7 @@ async function init() {
   await coreStore.fetchResourceFull({
     resourceId: route.params.resourceId
   });
-
+  isPageLoaded.value = true;
   // !!! clear filters should be in same tick with sort assignment so that watch can catch it as one change
 
   // try to init filters from query params
@@ -446,8 +446,4 @@ watch([sort], async () => {
   setQuery({ sort: SortQuerySerializer.serialize(sort.value) });
 });
 
-watch(() => coreStore.resource, () => {
-  isPageLoaded.value = true;
-});
-
 </script>

package/dist/types/Adapters.d.ts

@@ -13,6 +13,13 @@ export interface CompletionAdapter {
         error?: string;
     }>;
 }
+export interface ImageGenerationAdapter {
+    validate(): void;
+    generate(prompt: string, inputFiles: string[]): Promise<{
+        imageURL?: string;
+        error?: string;
+    }>;
+}
 export interface OAuth2Adapter {
     getAuthUrl(): string;
     getTokenFromCode(code: string, redirect_uri: string): Promise<{

package/dist/types/Adapters.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Adapters.d.ts","sourceRoot":"","sources":["../../types/Adapters.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,YAAY;IAC3B,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE1B,SAAS,CACP,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,MAAM,EACV,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,GACd,OAAO,CAAC;QACT,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,EAAE,CAAC,EAAE,OAAO,CAAC;KACd,CAAC,CAAC;CACJ;AAED,MAAM,WAAW,iBAAiB;IAEhC,QAAQ,IAAI,IAAI,CAAC;IAEjB,QAAQ,CACN,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EAAE,EACd,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC;QACT,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC,CAAC;CACJ;AAED,MAAM,WAAW,aAAa;IAC5B,UAAU,IAAI,MAAM,CAAC;IACrB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACjF,OAAO,IAAI,MAAM,CAAC;IAClB,aAAa,CAAC,IAAI,MAAM,CAAC;IACzB,OAAO,CAAC,IAAI,MAAM,CAAC;CACpB"}
+{"version":3,"file":"Adapters.d.ts","sourceRoot":"","sources":["../../types/Adapters.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,YAAY;IAC3B,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE1B,SAAS,CACP,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,MAAM,EACV,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,GACd,OAAO,CAAC;QACT,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,EAAE,CAAC,EAAE,OAAO,CAAC;KACd,CAAC,CAAC;CACJ;AAED,MAAM,WAAW,iBAAiB;IAEhC,QAAQ,IAAI,IAAI,CAAC;IAEjB,QAAQ,CACN,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EAAE,EACd,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC;QACT,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC,CAAC;CACJ;AAED,MAAM,WAAW,sBAAsB;IAErC,QAAQ,IAAI,IAAI,CAAC;IAEjB,QAAQ,CACN,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAAE,GACnB,OAAO,CAAC;QACT,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC,CAAC;CACJ;AAID,MAAM,WAAW,aAAa;IAC5B,UAAU,IAAI,MAAM,CAAC;IACrB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACjF,OAAO,IAAI,MAAM,CAAC;IAClB,aAAa,CAAC,IAAI,MAAM,CAAC;IACzB,OAAO,CAAC,IAAI,MAAM,CAAC;CACpB"}

package/dist/types/Back.d.ts

@@ -367,7 +367,7 @@ export interface IAdminForth {
      * Example:
      *
      * ```ts
-     * const i18nPlugin = adminforth.getPluginByClassName<I18nPlugin>('I18nPlugin');
+     * const i18nPlugin = adminforth.getPluginByClassName\<I18nPlugin\>('I18nPlugin');
      * ```
      *
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminforth",
-  "version": "1.17.0",
+  "version": "1.19.0",
   "description": "OpenSource Vue3 powered forth-generation admin panel",
   "main": "dist/index.js",
   "module": "dist/index.js",