adminforth 1.0.71 → 1.0.73

package/dataConnectors/postgres.ts

@@ -227,7 +227,11 @@ class PostgresConnector {
       const limitOffset = `LIMIT $${totalCounter} OFFSET $${totalCounter + 1}`; 
       const d = [...filterValues, limit, offset];
       const orderBy = sort.length ? `ORDER BY ${sort.map((s) => `${s.field} ${this.SortDirectionsMap[s.direction]}`).join(', ')}` : '';
-      const stmt = await this.db.query(`SELECT ${columns} FROM ${tableName} ${where} ${orderBy} ${limitOffset}`, d);
+      const selectQuery = `SELECT ${columns} FROM ${tableName} ${where} ${orderBy} ${limitOffset}`;
+      if (process.env.HEAVY_DEBUG) {
+        console.log('🗨️ PG selectQuery:', selectQuery, 'params:', d);
+      }
+      const stmt = await this.db.query(selectQuery, d);
       const rows = stmt.rows;
       
       const total = (await this.db.query(`SELECT COUNT(*) FROM ${tableName} ${where}`, filterValues)).rows[0].count;

package/dist/dataConnectors/postgres.js

@@ -230,7 +230,11 @@ class PostgresConnector {
             const limitOffset = `LIMIT $${totalCounter} OFFSET $${totalCounter + 1}`;
             const d = [...filterValues, limit, offset];
             const orderBy = sort.length ? `ORDER BY ${sort.map((s) => `${s.field} ${this.SortDirectionsMap[s.direction]}`).join(', ')}` : '';
-            const stmt = yield this.db.query(`SELECT ${columns} FROM ${tableName} ${where} ${orderBy} ${limitOffset}`, d);
+            const selectQuery = `SELECT ${columns} FROM ${tableName} ${where} ${orderBy} ${limitOffset}`;
+            if (process.env.HEAVY_DEBUG) {
+                console.log('🗨️ PG selectQuery:', selectQuery, 'params:', d);
+            }
+            const stmt = yield this.db.query(selectQuery, d);
             const rows = stmt.rows;
             const total = (yield this.db.query(`SELECT COUNT(*) FROM ${tableName} ${where}`, filterValues)).rows[0].count;
             // run all fields via getFieldValue

package/dist/index.js

@@ -98,7 +98,7 @@ class AdminForth {
         }
         if (this.config.resources) {
             this.config.resources.forEach((res) => {
-                var _b, _c;
+                var _b, _c, _d;
                 if (!res.table) {
                     errors.push(`Resource "${res.dataSource}" is missing table`);
                 }
@@ -167,12 +167,12 @@ class AdminForth {
                         errors.push(`Resource "${res.resourceId}" bulkActions must be an array`);
                         bulkActions = [];
                     }
-                    if (((_c = res.options) === null || _c === void 0 ? void 0 : _c.allowDelete) && !bulkActions.find((action) => action.label === 'Delete checked')) {
+                    if (((_d = (_c = res.options) === null || _c === void 0 ? void 0 : _c.allowedActions) === null || _d === void 0 ? void 0 : _d.delete) && !bulkActions.find((action) => action.label === 'Delete checked')) {
                         bulkActions.push({
                             label: `Delete checked`,
                             state: 'danger',
                             icon: 'flowbite:trash-bin-outline',
-                            action: (_d) => __awaiter(this, [_d], void 0, function* ({ selectedIds }) {
+                            action: (_e) => __awaiter(this, [_e], void 0, function* ({ selectedIds }) {
                                 const connector = this.connectors[res.dataSource];
                                 yield Promise.all(selectedIds.map((recordId) => __awaiter(this, void 0, void 0, function* () {
                                     yield connector.deleteRecord({ resource: res, recordId });
@@ -343,6 +343,7 @@ class AdminForth {
             method: 'POST',
             path: '/login',
             handler: (_b) => __awaiter(this, [_b], void 0, function* ({ body, response }) {
+                var _c;
                 const INVALID_MESSAGE = 'Invalid username or password';
                 const { username, password } = body;
                 let token;
@@ -355,7 +356,7 @@ class AdminForth {
                         throw new Error('No config.auth defined');
                     }
                     const userResource = this.config.resources.find((res) => res.resourceId === this.config.auth.resourceId);
-                    const userRecord = yield this.connectors[userResource.dataSource].getData({
+                    const userRecord = (_c = (yield this.connectors[userResource.dataSource].getData({
                         resource: userResource,
                         filters: [
                             { field: this.config.auth.usernameField, operator: AdminForthFilterOperators.EQ, value: username },
@@ -363,7 +364,7 @@ class AdminForth {
                         limit: 1,
                         offset: 0,
                         sort: [],
-                    }).data[0];
+                    })).data) === null || _c === void 0 ? void 0 : _c[0];
                     if (!userRecord) {
                         return { error: 'User not found' };
                     }
@@ -387,7 +388,7 @@ class AdminForth {
             noAuth: true,
             method: 'POST',
             path: '/logout',
-            handler: (_c) => __awaiter(this, [_c], void 0, function* ({ response }) {
+            handler: (_d) => __awaiter(this, [_d], void 0, function* ({ response }) {
                 response.setHeader('Set-Cookie', `adminforth_jwt=; Path=${this.config.baseUrl || '/'}; HttpOnly; SameSite=Strict; Expires=Thu, 01 Jan 1970 00:00:00 GMT`);
                 return { ok: true };
             }),
@@ -396,8 +397,8 @@ class AdminForth {
             noAuth: true,
             method: 'GET',
             path: '/get_public_config',
-            handler: (_d) => __awaiter(this, [_d], void 0, function* ({ body }) {
-                var _e;
+            handler: (_e) => __awaiter(this, [_e], void 0, function* ({ body }) {
+                var _f;
                 // find resource
                 if (!this.config.auth) {
                     throw new Error('No config.auth defined');
@@ -409,15 +410,15 @@ class AdminForth {
                     brandName: this.config.customization.brandName,
                     usernameFieldName: usernameColumn.label,
                     loginBackgroundImage: this.config.auth.loginBackgroundImage,
-                    title: (_e = this.config.customization) === null || _e === void 0 ? void 0 : _e.title,
+                    title: (_f = this.config.customization) === null || _f === void 0 ? void 0 : _f.title,
                 };
             }),
         });
         server.endpoint({
             method: 'GET',
             path: '/get_base_config',
-            handler: (_f) => __awaiter(this, [_f], void 0, function* ({ input, adminUser, cookies }) {
-                var _g;
+            handler: (_g) => __awaiter(this, [_g], void 0, function* ({ input, adminUser, cookies }) {
+                var _h, _j;
                 const cookieParsed = this.auth.verify(cookies['adminforth_jwt']);
                 let username = '';
                 let userFullName = '';
@@ -459,7 +460,8 @@ class AdminForth {
                         deleteConfirmation: this.config.deleteConfirmation,
                         auth: this.config.auth,
                         usernameField: this.config.auth.usernameField,
-                        title: (_g = this.config.customization) === null || _g === void 0 ? void 0 : _g.title,
+                        title: (_h = this.config.customization) === null || _h === void 0 ? void 0 : _h.title,
+                        emtyFieldPlaceholder: (_j = this.config.customization) === null || _j === void 0 ? void 0 : _j.emtyFieldPlaceholder,
                     },
                     adminUser,
                     version: ADMINFORTH_VERSION,
@@ -469,7 +471,7 @@ class AdminForth {
         server.endpoint({
             method: 'POST',
             path: '/get_resource_columns',
-            handler: (_h) => __awaiter(this, [_h], void 0, function* ({ body }) {
+            handler: (_k) => __awaiter(this, [_k], void 0, function* ({ body }) {
                 const { resourceId } = body;
                 if (!this.statuses.dbDiscover) {
                     return { error: 'Database discovery not started' };
@@ -488,8 +490,8 @@ class AdminForth {
         server.endpoint({
             method: 'POST',
             path: '/get_resource_data',
-            handler: (_j) => __awaiter(this, [_j], void 0, function* ({ body, adminUser }) {
-                var _k, _l, _m, _o;
+            handler: (_l) => __awaiter(this, [_l], void 0, function* ({ body, adminUser }) {
+                var _m, _o, _p, _q;
                 const { resourceId, source } = body;
                 if (['show', 'list'].includes(source) === false) {
                     return { error: 'Invalid source, should be list or show' };
@@ -504,7 +506,7 @@ class AdminForth {
                 if (!resource) {
                     return { error: `Resource ${resourceId} not found` };
                 }
-                for (const hook of getFunctionList((_l = (_k = resource.hooks) === null || _k === void 0 ? void 0 : _k[source]) === null || _l === void 0 ? void 0 : _l.beforeDatasourceRequest)) {
+                for (const hook of getFunctionList((_o = (_m = resource.hooks) === null || _m === void 0 ? void 0 : _m[source]) === null || _o === void 0 ? void 0 : _o.beforeDatasourceRequest)) {
                     const resp = yield hook({ resource, query: body, adminUser });
                     if (!resp || (!resp.ok && !resp.error)) {
                         throw new Error(`Hook must return object with {ok: true} or { error: 'Error' } `);
@@ -571,7 +573,7 @@ class AdminForth {
                         item[col.name] = targetDataMap[item[col.name]];
                     });
                 })));
-                for (const hook of getFunctionList((_o = (_m = resource.hooks) === null || _m === void 0 ? void 0 : _m[source]) === null || _o === void 0 ? void 0 : _o.afterDatasourceResponse)) {
+                for (const hook of getFunctionList((_q = (_p = resource.hooks) === null || _p === void 0 ? void 0 : _p[source]) === null || _q === void 0 ? void 0 : _q.afterDatasourceResponse)) {
                     const resp = yield hook({ resource, response: data.data, adminUser });
                     if (!resp || (!resp.ok && !resp.error)) {
                         throw new Error(`Hook must return object with {ok: true} or { error: 'Error' } `);
@@ -597,8 +599,8 @@ class AdminForth {
         server.endpoint({
             method: 'POST',
             path: '/get_resource_foreign_data',
-            handler: (_p) => __awaiter(this, [_p], void 0, function* ({ body, adminUser }) {
-                var _q, _r, _s, _t;
+            handler: (_r) => __awaiter(this, [_r], void 0, function* ({ body, adminUser }) {
+                var _s, _t, _u, _v;
                 const { resourceId, column } = body;
                 if (!this.statuses.dbDiscover) {
                     return { error: 'Database discovery not started' };
@@ -619,7 +621,7 @@ class AdminForth {
                 }
                 const targetResourceId = columnConfig.foreignResource.resourceId;
                 const targetResource = this.config.resources.find((res) => res.resourceId == targetResourceId);
-                for (const hook of getFunctionList((_r = (_q = columnConfig.foreignResource.hooks) === null || _q === void 0 ? void 0 : _q.dropdownList) === null || _r === void 0 ? void 0 : _r.beforeDatasourceRequest)) {
+                for (const hook of getFunctionList((_t = (_s = columnConfig.foreignResource.hooks) === null || _s === void 0 ? void 0 : _s.dropdownList) === null || _t === void 0 ? void 0 : _t.beforeDatasourceRequest)) {
                     const resp = yield hook({ query: body, adminUser });
                     if (!resp || (!resp.ok && !resp.error)) {
                         throw new Error(`Hook must return object with {ok: true} or { error: 'Error' } `);
@@ -648,7 +650,7 @@ class AdminForth {
                 const response = {
                     items
                 };
-                for (const hook of getFunctionList((_t = (_s = columnConfig.foreignResource.hooks) === null || _s === void 0 ? void 0 : _s.dropdownList) === null || _t === void 0 ? void 0 : _t.afterDatasourceResponse)) {
+                for (const hook of getFunctionList((_v = (_u = columnConfig.foreignResource.hooks) === null || _u === void 0 ? void 0 : _u.dropdownList) === null || _v === void 0 ? void 0 : _v.afterDatasourceResponse)) {
                     const resp = yield hook({ response, adminUser });
                     if (!resp || (!resp.ok && !resp.error)) {
                         throw new Error(`Hook must return object with {ok: true} or { error: 'Error' } `);
@@ -663,7 +665,7 @@ class AdminForth {
         server.endpoint({
             method: 'POST',
             path: '/get_min_max_for_columns',
-            handler: (_u) => __awaiter(this, [_u], void 0, function* ({ body }) {
+            handler: (_w) => __awaiter(this, [_w], void 0, function* ({ body }) {
                 const { resourceId } = body;
                 if (!this.statuses.dbDiscover) {
                     return { error: 'Database discovery not started' };
@@ -692,8 +694,8 @@ class AdminForth {
         server.endpoint({
             method: 'POST',
             path: '/create_record',
-            handler: (_v) => __awaiter(this, [_v], void 0, function* ({ body, adminUser }) {
-                var _w, _x, _y, _z, _0;
+            handler: (_x) => __awaiter(this, [_x], void 0, function* ({ body, adminUser }) {
+                var _y, _z, _0, _1, _2;
                 console.log('create_record', body, this.config.resources);
                 const resource = this.config.resources.find((res) => res.resourceId == body['resourceId']);
                 if (!resource) {
@@ -701,7 +703,7 @@ class AdminForth {
                 }
                 const record = body['record'];
                 // execute hook if needed
-                for (const hook of getFunctionList((_x = (_w = resource.hooks) === null || _w === void 0 ? void 0 : _w.create) === null || _x === void 0 ? void 0 : _x.beforeSave)) {
+                for (const hook of getFunctionList((_z = (_y = resource.hooks) === null || _y === void 0 ? void 0 : _y.create) === null || _z === void 0 ? void 0 : _z.beforeSave)) {
                     const resp = yield hook({ resource, record, adminUser });
                     if (!resp || (!resp.ok && !resp.error)) {
                         throw new Error(`Hook beforeSave must return object with {ok: true} or { error: 'Error' } `);
@@ -718,7 +720,7 @@ class AdminForth {
                             });
                         }
                     }
-                    if (((_y = column.required) === null || _y === void 0 ? void 0 : _y.create) && body['record'][column.name] === undefined) {
+                    if (((_0 = column.required) === null || _0 === void 0 ? void 0 : _0.create) && body['record'][column.name] === undefined) {
                         return { error: `Column '${column.name}' is required` };
                     }
                     if (column.isUnique) {
@@ -743,7 +745,7 @@ class AdminForth {
                 const connector = this.connectors[resource.dataSource];
                 yield connector.createRecord({ resource, record });
                 // execute hook if needed
-                for (const hook of getFunctionList((_0 = (_z = resource.hooks) === null || _z === void 0 ? void 0 : _z.create) === null || _0 === void 0 ? void 0 : _0.afterSave)) {
+                for (const hook of getFunctionList((_2 = (_1 = resource.hooks) === null || _1 === void 0 ? void 0 : _1.create) === null || _2 === void 0 ? void 0 : _2.afterSave)) {
                     const resp = yield hook({ resource, record, adminUser });
                     if (!resp || (!resp.ok && !resp.error)) {
                         throw new Error(`Hook afterSave must return object with {ok: true} or { error: 'Error' } `);
@@ -760,8 +762,8 @@ class AdminForth {
         server.endpoint({
             method: 'POST',
             path: '/update_record',
-            handler: (_1) => __awaiter(this, [_1], void 0, function* ({ body, adminUser }) {
-                var _2, _3, _4, _5;
+            handler: (_3) => __awaiter(this, [_3], void 0, function* ({ body, adminUser }) {
+                var _4, _5, _6, _7;
                 const resource = this.config.resources.find((res) => res.resourceId == body['resourceId']);
                 if (!resource) {
                     return { error: `Resource '${body['resourceId']}' not found` };
@@ -775,7 +777,7 @@ class AdminForth {
                 }
                 const record = body['record'];
                 // execute hook if needed
-                for (const hook of getFunctionList((_3 = (_2 = resource.hooks) === null || _2 === void 0 ? void 0 : _2.edit) === null || _3 === void 0 ? void 0 : _3.beforeSave)) {
+                for (const hook of getFunctionList((_5 = (_4 = resource.hooks) === null || _4 === void 0 ? void 0 : _4.edit) === null || _5 === void 0 ? void 0 : _5.beforeSave)) {
                     const resp = yield hook({ resource, record, adminUser });
                     if (!resp || (!resp.ok && !resp.error)) {
                         throw new Error(`Hook beforeSave must return object with {ok: true} or { error: 'Error' } `);
@@ -803,7 +805,7 @@ class AdminForth {
                     yield connector.updateRecord({ resource, recordId, record, newValues });
                 }
                 // execute hook if needed
-                for (const hook of getFunctionList((_5 = (_4 = resource.hooks) === null || _4 === void 0 ? void 0 : _4.edit) === null || _5 === void 0 ? void 0 : _5.afterSave)) {
+                for (const hook of getFunctionList((_7 = (_6 = resource.hooks) === null || _6 === void 0 ? void 0 : _6.edit) === null || _7 === void 0 ? void 0 : _7.afterSave)) {
                     const resp = yield hook({ resource, record, adminUser });
                     if (!resp || (!resp.ok && !resp.error)) {
                         throw new Error(`Hook afterSave must return object with {ok: true} or { error: 'Error' } `);
@@ -820,15 +822,15 @@ class AdminForth {
         server.endpoint({
             method: 'POST',
             path: '/delete_record',
-            handler: (_6) => __awaiter(this, [_6], void 0, function* ({ body, adminUser }) {
-                var _7, _8, _9, _10;
+            handler: (_8) => __awaiter(this, [_8], void 0, function* ({ body, adminUser }) {
+                var _9, _10, _11, _12;
                 const resource = this.config.resources.find((res) => res.resourceId == body['resourceId']);
                 const record = yield this.connectors[resource.dataSource].getRecordByPrimaryKey(resource, body['primaryKey']);
                 if (!resource) {
                     return { error: `Resource '${body['resourceId']}' not found` };
                 }
                 // execute hook if needed
-                for (const hook of getFunctionList((_8 = (_7 = resource.hooks) === null || _7 === void 0 ? void 0 : _7.delete) === null || _8 === void 0 ? void 0 : _8.beforeSave)) {
+                for (const hook of getFunctionList((_10 = (_9 = resource.hooks) === null || _9 === void 0 ? void 0 : _9.delete) === null || _10 === void 0 ? void 0 : _10.beforeSave)) {
                     const resp = yield hook({ resource, record, adminUser });
                     if (!resp || (!resp.ok && !resp.error)) {
                         throw new Error(`Hook beforeSave must return object with {ok: true} or { error: 'Error' } `);
@@ -840,7 +842,7 @@ class AdminForth {
                 const connector = this.connectors[resource.dataSource];
                 yield connector.deleteRecord({ resource, recordId: body['primaryKey'] });
                 // execute hook if needed
-                for (const hook of getFunctionList((_10 = (_9 = resource.hooks) === null || _9 === void 0 ? void 0 : _9.delete) === null || _10 === void 0 ? void 0 : _10.afterSave)) {
+                for (const hook of getFunctionList((_12 = (_11 = resource.hooks) === null || _11 === void 0 ? void 0 : _11.delete) === null || _12 === void 0 ? void 0 : _12.afterSave)) {
                     const resp = yield hook({ resource, record, adminUser });
                     if (!resp || (!resp.ok && !resp.error)) {
                         throw new Error(`Hook afterSave must return object with {ok: true} or { error: 'Error' } `);
@@ -857,7 +859,7 @@ class AdminForth {
         server.endpoint({
             method: 'POST',
             path: '/start_bulk_action',
-            handler: (_11) => __awaiter(this, [_11], void 0, function* ({ body }) {
+            handler: (_13) => __awaiter(this, [_13], void 0, function* ({ body }) {
                 const { resourceId, actionId, recordIds } = body;
                 const resource = this.config.resources.find((res) => res.resourceId == resourceId);
                 if (!resource) {

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

@@ -205,8 +205,8 @@
               :row="row"
             />
           </td>
-          <td class="flex items-center px-6 py-4">
-
+          <td class=" items-center px-6 py-4">
+            <div class="flex">
             <RouterLink
               :to="{ name: 'resource-show', params: { resourceId: $route.params.resourceId, primaryKey: row._primaryKeyValue } }"
               class="font-medium text-blue-600 dark:text-blue-500 hover:underline"
@@ -251,6 +251,7 @@
               Delete
               <div class="tooltip-arrow" data-popper-arrow></div>
             </div>
+          </div>
           </td>
         </tr>
         </tbody>

package/index.ts

@@ -206,7 +206,7 @@ class AdminForth {
             errors.push(`Resource "${res.resourceId}" bulkActions must be an array`);
             bulkActions = [];
           }
-          if(res.options?.allowDelete && !bulkActions.find((action) => action.label === 'Delete checked')){
+          if(res.options?.allowedActions?.delete && !bulkActions.find((action) => action.label === 'Delete checked')){
             bulkActions.push({
               label: `Delete checked`,
               state: 'danger',
@@ -422,15 +422,17 @@ class AdminForth {
             throw new Error('No config.auth defined');
           }
           const userResource = this.config.resources.find((res) => res.resourceId === this.config.auth.resourceId);
-          const userRecord = await this.connectors[userResource.dataSource].getData({
-            resource: userResource,
-            filters: [
-              { field: this.config.auth.usernameField, operator: AdminForthFilterOperators.EQ, value: username },
-            ],
-            limit: 1,
-            offset: 0,
-            sort: [],
-          }).data[0];
+          const userRecord = (
+            await this.connectors[userResource.dataSource].getData({
+              resource: userResource,
+              filters: [
+                { field: this.config.auth.usernameField, operator: AdminForthFilterOperators.EQ, value: username },
+              ],
+              limit: 1,
+              offset: 0,
+              sort: [],
+            })
+          ).data?.[0];
 
           if (!userRecord) {
             return { error: 'User not found' };
@@ -532,6 +534,7 @@ class AdminForth {
             auth: this.config.auth,
             usernameField: this.config.auth.usernameField,
             title: this.config.customization?.title,
+            emtyFieldPlaceholder: this.config.customization?.emtyFieldPlaceholder,
           },
           adminUser,
           version: ADMINFORTH_VERSION,

package/package.json

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

package/spa/src/views/ListView.vue

@@ -205,8 +205,8 @@
               :row="row"
             />
           </td>
-          <td class="flex items-center px-6 py-4">
-
+          <td class=" items-center px-6 py-4">
+            <div class="flex">
             <RouterLink
               :to="{ name: 'resource-show', params: { resourceId: $route.params.resourceId, primaryKey: row._primaryKeyValue } }"
               class="font-medium text-blue-600 dark:text-blue-500 hover:underline"
@@ -251,6 +251,7 @@
               Delete
               <div class="tooltip-arrow" data-popper-arrow></div>
             </div>
+          </div>
           </td>
         </tr>
         </tbody>

package/types/AdminForthConfig.ts

@@ -81,7 +81,6 @@ export type AdminForthResource = {
         id?: string,
       }>,
       allowedActions?: AllowedActions,
-      allowDelete?: boolean,
       listPageSize?: number,
     },
   }
@@ -115,6 +114,12 @@ export  type AdminForthConfig = {
       datesFormat?: string,
       title?: string,
       brandLogo?: string,
+      emtyFieldPlaceholder?: {
+        show?: string,
+        list?: string,
+        create?: string,
+        edit?: string,
+      },
     },
     baseUrl?: string,