adminforth 1.0.52 → 1.0.53

package/dataConnectors/postgres.ts

@@ -83,6 +83,10 @@ class PostgresConnector {
                 field.type = AdminForthTypes.BOOLEAN;
                 field._underlineType = 'bool';
 
+            } else if (baseType == 'uuid') {
+                field.type = AdminForthTypes.STRING;
+                field._underlineType = 'uuid';
+
             } else if (baseType.includes('character varying')) {
                 field.type = AdminForthTypes.STRING;
                 field._underlineType = 'varchar';
@@ -183,6 +187,7 @@ class PostgresConnector {
       let totalCounter = 1;
       const where = filters.length ? `WHERE ${filters.map((f, i) => {
         let placeholder = '$'+(totalCounter);
+        const fieldData = resource.dataSourceColumns.find((col) => col.name == f.field);
         let field = f.field;
         let operator = this.OperatorsMap[f.operator];
         if (f.operator == AdminForthFilterOperators.IN || f.operator == AdminForthFilterOperators.NIN) {
@@ -191,7 +196,13 @@ class PostgresConnector {
         } else {
             totalCounter += 1;
         }
-        return `"${field}" ${operator} ${placeholder}`
+
+        if (fieldData._underlineType == 'uuid') {
+            field = `cast("${field}" as text)`
+        } else { 
+            field = `"${field}"`
+        }
+        return `${field} ${operator} ${placeholder}`;
       }).join(' AND ')}` : '';
 
       const filterValues = [];

package/dist/dataConnectors/postgres.js

@@ -84,6 +84,10 @@ class PostgresConnector {
                     field.type = AdminForthTypes.BOOLEAN;
                     field._underlineType = 'bool';
                 }
+                else if (baseType == 'uuid') {
+                    field.type = AdminForthTypes.STRING;
+                    field._underlineType = 'uuid';
+                }
                 else if (baseType.includes('character varying')) {
                     field.type = AdminForthTypes.STRING;
                     field._underlineType = 'varchar';
@@ -185,6 +189,7 @@ class PostgresConnector {
             let totalCounter = 1;
             const where = filters.length ? `WHERE ${filters.map((f, i) => {
                 let placeholder = '$' + (totalCounter);
+                const fieldData = resource.dataSourceColumns.find((col) => col.name == f.field);
                 let field = f.field;
                 let operator = this.OperatorsMap[f.operator];
                 if (f.operator == AdminForthFilterOperators.IN || f.operator == AdminForthFilterOperators.NIN) {
@@ -194,7 +199,13 @@ class PostgresConnector {
                 else {
                     totalCounter += 1;
                 }
-                return `"${field}" ${operator} ${placeholder}`;
+                if (fieldData._underlineType == 'uuid') {
+                    field = `cast("${field}" as text)`;
+                }
+                else {
+                    field = `"${field}"`;
+                }
+                return `${field} ${operator} ${placeholder}`;
             }).join(' AND ')}` : '';
             const filterValues = [];
             filters.length ? filters.forEach((f) => {

package/dist/index.js

@@ -548,8 +548,8 @@ class AdminForth {
                 data.data.forEach((item) => {
                     item._label = resource.itemLabel(item);
                 });
-                if ((_p = (_o = resource.hooks) === null || _o === void 0 ? void 0 : _o[source]) === null || _p === void 0 ? void 0 : _p.afterDatasourceRequest) {
-                    const resp = yield ((_r = (_q = resource.hooks) === null || _q === void 0 ? void 0 : _q[source]) === null || _r === void 0 ? void 0 : _r.afterDatasourceRequest({ resource, response: data.data, adminUser }));
+                if ((_p = (_o = resource.hooks) === null || _o === void 0 ? void 0 : _o[source]) === null || _p === void 0 ? void 0 : _p.afterDatasourceResponse) {
+                    const resp = yield ((_r = (_q = resource.hooks) === null || _q === void 0 ? void 0 : _q[source]) === null || _r === void 0 ? void 0 : _r.afterDatasourceResponse({ resource, response: data.data, adminUser }));
                     if (!resp || (!resp.ok && !resp.error)) {
                         throw new Error(`Hook must return object with {ok: true} or { error: 'Error' } `);
                     }
@@ -565,7 +565,6 @@ class AdminForth {
                         }
                     });
                 });
-                console.log('data', data);
                 return Object.assign(Object.assign({}, data), { options: resource === null || resource === void 0 ? void 0 : resource.options });
             }),
         });

package/dist/modules/codeInjector.js

@@ -162,6 +162,9 @@ class CodeInjector {
                 // if file - return, if dir - go recursively
                 const customComponents = yield fs.promises.readdir(customComponentsDir);
                 for (const filePath of customComponents) {
+                    if (!filePath.endsWith('.vue')) {
+                        continue;
+                    }
                     fs.stat(`${customComponentsDir}/${filePath}`, (err, data) => {
                         if (err) {
                             console.log(err);
@@ -187,6 +190,9 @@ class CodeInjector {
             if (customComponentsDir) {
                 const customComponents = yield fs.promises.readdir(customComponentsDir);
                 for (const filePath of customComponents) {
+                    if (!filePath.endsWith('.vue')) {
+                        continue;
+                    }
                     fs.stat(`${customComponentsDir}/${filePath}`, (err, data) => {
                         if (err) {
                             console.log('Custom components importing error: ', err);

package/dist/spa/spa/src/App.vue

@@ -61,7 +61,7 @@
     <div class="h-full px-3 pb-4 overflow-y-auto bg-nav-menu-bg dark:bg-gray-800">
       <div class="flex ms-2 md:me-24  m-4  ">
             <img src="https://flowbite.com/docs/images/logo.svg" class="h-8 me-3" alt="FlowBite Logo" />
-            <span class="self-center text-xl font-semibold sm:text-2xl whitespace-nowrap dark:text-header-text text-header-logo-color">
+            <span class="self-center text-header-text-size font-semibold sm:text-header-text-size whitespace-nowrap dark:text-header-text text-header-logo-color">
               {{ coreStore.config?.brandName }}
             </span>
           </div>

package/dist/spa/spa/src/components/Filters.vue

@@ -92,7 +92,7 @@
    </div>
   </div>
 
-  <div v-if="show" drawer-backdrop="" class="bg-gray-900/50 dark:bg-gray-900/80 fixed inset-0 z-30"
+  <div v-if="show" drawer-backdrop="" class="bg-gray-900/50 dark:bg-gray-900/80 fixed inset-0 z-50"
     @click="$emit('hide')">
   </div>
 </template>

package/index.ts

@@ -629,9 +629,8 @@ class AdminForth {
           item._label = resource.itemLabel(item);
         })
 
-      
-        if (resource.hooks?.[source]?.afterDatasourceRequest) {
-          const resp = await resource.hooks?.[source]?.afterDatasourceRequest({ resource, response: data.data, adminUser });
+        if (resource.hooks?.[source]?.afterDatasourceResponse) {
+          const resp = await resource.hooks?.[source]?.afterDatasourceResponse({ resource, response: data.data, adminUser });
           if (!resp || (!resp.ok && !resp.error)) {
             throw new Error(`Hook must return object with {ok: true} or { error: 'Error' } `);
           }
@@ -649,9 +648,11 @@ class AdminForth {
             }
           })
         });
-        console.log('data', data);
 
-        return {...data, options: resource?.options };
+        return {
+          ...data, 
+          options: resource?.options,
+        };
       },
     });
     server.endpoint({

package/modules/codeInjector.ts

@@ -180,6 +180,9 @@ class CodeInjector {
         // if file - return, if dir - go recursively
         const customComponents = await fs.promises.readdir(customComponentsDir);
         for (const filePath of customComponents) {
+            if (!filePath.endsWith('.vue')) {
+              continue;
+            }
             fs.stat(`${customComponentsDir}/${filePath}`, (err, data) => {
                 if (err) {
                     console.log(err);
@@ -207,16 +210,19 @@ class CodeInjector {
     if (customComponentsDir) {
         const customComponents = await fs.promises.readdir(customComponentsDir);
         for (const filePath of customComponents) {
-            fs.stat(`${customComponentsDir}/${filePath}`, (err, data) => {
-                if (err) {
-                    console.log('Custom components importing error: ', err);
-                    return;
-                }
-                if (data.isFile()) {
-                    const componentName = getComponentNameFromPath(filePath);
-                    customComponentsComponents += `app.component('${componentName}', ${componentName});\n`;
-                }
-            })
+          if (!filePath.endsWith('.vue')) {
+            continue;
+          }
+          fs.stat(`${customComponentsDir}/${filePath}`, (err, data) => {
+            if (err) {
+              console.log('Custom components importing error: ', err);
+              return;
+            }
+            if (data.isFile()) {
+              const componentName = getComponentNameFromPath(filePath);
+              customComponentsComponents += `app.component('${componentName}', ${componentName});\n`;
+            }
+          })
         }
     }
     

package/package.json

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

package/spa/src/App.vue

@@ -61,7 +61,7 @@
     <div class="h-full px-3 pb-4 overflow-y-auto bg-nav-menu-bg dark:bg-gray-800">
       <div class="flex ms-2 md:me-24  m-4  ">
             <img src="https://flowbite.com/docs/images/logo.svg" class="h-8 me-3" alt="FlowBite Logo" />
-            <span class="self-center text-xl font-semibold sm:text-2xl whitespace-nowrap dark:text-header-text text-header-logo-color">
+            <span class="self-center text-header-text-size font-semibold sm:text-header-text-size whitespace-nowrap dark:text-header-text text-header-logo-color">
               {{ coreStore.config?.brandName }}
             </span>
           </div>

package/spa/src/components/Filters.vue

@@ -92,7 +92,7 @@
    </div>
   </div>
 
-  <div v-if="show" drawer-backdrop="" class="bg-gray-900/50 dark:bg-gray-900/80 fixed inset-0 z-30"
+  <div v-if="show" drawer-backdrop="" class="bg-gray-900/50 dark:bg-gray-900/80 fixed inset-0 z-50"
     @click="$emit('hide')">
   </div>
 </template>