adminforth 1.3.51-next.3 → 1.3.52-next.0

package/dist/modules/codeInjector.js

@@ -474,7 +474,7 @@ class CodeInjector {
                 const npmInstallCommand = `install ${[
                     ...iconPackageNames,
                     ...usersPackages,
-                    ...pluginPackages.map(({ packages }) => packages)
+                    ...pluginPackages.map(({ packages }) => packages.join(' ')),
                 ].join(' ')}`;
                 yield this.runNpmShell({ command: npmInstallCommand, cwd: CodeInjector.SPA_TMP_PATH });
             }

package/dist/servers/express.js

@@ -196,6 +196,9 @@ class ExpressServer {
                 setStatus(code, message) {
                     this.status = code;
                     this.message = message;
+                },
+                blobStream() {
+                    return res;
                 }
             };
             const input = { body, query, headers, cookies, adminUser, response, _raw_express_req: req, _raw_express_res: res };
@@ -213,9 +216,13 @@ class ExpressServer {
             response.headers.forEach(([name, value]) => {
                 res.setHeader(name, value);
             });
-            const resp = res.status(response.status);
+            res.status(response.status);
             if (response.message) {
-                resp.send(response.message);
+                res.send(response.message);
+                return;
+            }
+            if (output === null) {
+                // nothing should be returned anymore
                 return;
             }
             res.json(output);

package/index.ts

@@ -12,7 +12,8 @@ import {
   type IConfigValidator,
   IOperationalResource,
   AdminForthFilterOperators,
-  AdminForthDataTypes, AdminForthResourcePages, IHttpServer, 
+  AdminForthDataTypes, 
+  IHttpServer, 
   BeforeSaveFunction,
   AfterSaveFunction,
   AdminUser,

package/modules/codeInjector.ts

@@ -538,13 +538,12 @@ class CodeInjector implements ICodeInjector {
     }
 
     await this.runNpmShell({command: 'ci', cwd: CodeInjector.SPA_TMP_PATH});
-
     
     if (iconPackageNames.length) {
       const npmInstallCommand = `install ${[
         ...iconPackageNames,
         ...usersPackages, 
-        ...pluginPackages.map(({ packages }) => packages)
+        ...pluginPackages.map(({ packages }) => packages.join(' ')),
       ].join(' ')}`;
       await this.runNpmShell({command: npmInstallCommand, cwd: CodeInjector.SPA_TMP_PATH});
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminforth",
-  "version": "1.3.51-next.3",
+  "version": "1.3.52-next.0",
   "description": "OpenSource Vue3 powered forth-generation admin panel",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/servers/express.ts

@@ -206,6 +206,7 @@ class ExpressServer implements IExpressHttpServer {
         headers: [],
         status: 200,
         message: undefined,
+
         setHeader(name, value) {
           process.env.HEAVY_DEBUG && console.log(' 🪲Setting header', name, value);
           this.headers.push([name, value]);
@@ -214,10 +215,15 @@ class ExpressServer implements IExpressHttpServer {
         setStatus(code, message) {
           this.status = code;
           this.message = message;
+        },
+
+        blobStream() {
+          return res;
         }
+        
       };
       const input = { body, query, headers, cookies, adminUser, response, _raw_express_req: req, _raw_express_res: res};
-
+      
       let output;
       try {
         output = await handler(input);
@@ -225,18 +231,21 @@ class ExpressServer implements IExpressHttpServer {
         console.error('Error in handler', e);
         // print full stack trace 
         console.error(e.stack);
-        
         res.status(500).send('Internal server error');
         return;
       }
       response.headers.forEach(([name, value]) => {
         res.setHeader(name, value);
       });
-      const resp = res.status(response.status);
+      res.status(response.status);
       if (response.message) {
-        resp.send(response.message);
+        res.send(response.message);
         return;
       }
+      if (output === null) {
+        // nothing should be returned anymore
+        return;
+      }      
       res.json(output);
     }
 

package/spa/src/components/ResourceForm.vue

@@ -218,7 +218,6 @@ const columnError = (column) => {
         return `This field must be less than ${column.maxValue}`;
       }
     }
-    console.log('column.validation: ', JSON.stringify(column), 'aa', JSON.stringify(currentValues.value[column.name]));
     if (currentValues.value[column.name] && column.validation) {
       const error = applyRegexValidation(currentValues.value[column.name], column.validation);
       if (error) {
@@ -244,13 +243,11 @@ const setCurrentValue = (key, value) => {
   }
 
   currentValues.value = { ...currentValues.value };
-  console.log('3️⃣ setCurrentValue', key, value);
   emit('update:record', currentValues.value);
 };
 
 onMounted(() => {
   currentValues.value = Object.assign({}, props.record);
-  console.log('2️⃣ currentValues', JSON.stringify(currentValues.value));
   initFlowbite();
   emit('update:isValid', isValid.value);
 });

package/spa/src/components/ResourceListTable.vue

@@ -23,7 +23,7 @@
           </div>
         </th>
 
-        <th v-for="c in columnsListed" scope="col" class="px-6 py-3">
+        <th v-for="c in columnsListed" scope="col" class="px-2 md:px-3 lg:px-6 py-3">
          
           <div @click="(evt) => c.sortable && onSortButtonClick(evt, c.name)" 
               class="flex items-center " :class="{'cursor-pointer':c.sortable}">
@@ -94,7 +94,7 @@
               <label for="checkbox-table-search-1" class="sr-only">checkbox</label>
             </div>
           </td>
-          <td v-for="c in columnsListed" class="px-6 py-4">
+          <td v-for="c in columnsListed" class="px-2 md:px-3 lg:px-6 py-4">
             <!-- if c.name in listComponentsPerColumn, render it. If not, render ValueRenderer -->
             <component
               :is="c?.components?.list ? getCustomComponent(c.components.list) : ValueRenderer"
@@ -105,7 +105,7 @@
               :resource="resource"
             />
           </td>
-          <td class=" items-center px-6 py-4 cursor-default" @click="(e)=>{e.stopPropagation()}">
+          <td class=" items-center px-2 md:px-3 lg:px-6 py-4 cursor-default" @click="(e)=>{e.stopPropagation()}">
             <div class="flex">
               <RouterLink
                 v-if="resource.options?.allowedActions.show"

package/types/AdminForthConfig.ts

@@ -1,4 +1,5 @@
 import type { Express } from 'express';
+import type { Writable } from 'stream';
 
 export interface ICodeInjector {
   srcFoldersToSync: Object;
@@ -13,6 +14,7 @@ export interface IConfigValidator {
 export interface IAdminForthHttpResponse {
     setHeader: (key: string, value: string) => void,
     setStatus: (code: number, message: string) => void,
+    blobStream: () => Writable,
 };
 
 /**