adminforth 1.0.31 → 1.0.32

package/dataConnectors/postgres.ts

@@ -147,7 +147,7 @@ class PostgresConnector {
 
     async getRecordByPrimaryKey(resource, key) {
         const tableName = resource.table;
-        const columns = resource.dataSourceColumns.map((col) => col.name).join(', ');
+        const columns = resource.dataSourceColumns.map((col) => `"${col.name}"`).join(', ');
         const stmt = await this.db.query(`SELECT ${columns} FROM ${tableName} WHERE ${this.getPrimaryKey(resource)} = $1`, [key]);
         const row = stmt.rows[0];
         if (!row) {
@@ -177,7 +177,7 @@ class PostgresConnector {
       }
     
     async getData({ resource, limit, offset, sort, filters }) {
-      const columns = resource.dataSourceColumns.filter(c=> !c.virtual).map((col) => col.name).join(', ');
+      const columns = resource.dataSourceColumns.filter(c=> !c.virtual).map((col) => `"${col.name}"`).join(', ');
       const tableName = resource.table;
       
       for (const filter of filters) {
@@ -199,7 +199,7 @@ class PostgresConnector {
         } else {
             totalCounter += 1;
         }
-        return `${field} ${operator} ${placeholder}`
+        return `"${field}" ${operator} ${placeholder}`
       }).join(' AND ')}` : '';
 
       const filterValues = [];
@@ -267,17 +267,20 @@ class PostgresConnector {
                 return record[colName];
             }
         });
+        for (let i = 0; i < columns.length; i++) {
+            columns[i] = `"${columns[i]}"`;
+        }
         await this.db.query(`INSERT INTO ${tableName} (${columns.join(', ')}) VALUES (${placeholders})`, values);
     }
 
     async updateRecord({ resource, recordId, record, newValues }) {
         const values = [...Object.values(newValues), recordId];
-        const columnsWithPlaceholders = Object.keys(newValues).map((col, i) => `${col} = $${i + 1}`).join(', ');
-        await this.db.query(`UPDATE ${resource.table} SET ${columnsWithPlaceholders} WHERE ${this.getPrimaryKey(resource)} = $${values.length}`, values);
+        const columnsWithPlaceholders = Object.keys(newValues).map((col, i) => `"${col}" = $${i + 1}`).join(', ');
+        await this.db.query(`UPDATE ${resource.table} SET ${columnsWithPlaceholders} WHERE "${this.getPrimaryKey(resource)}" = $${values.length}`, values);
     }
 
     async deleteRecord({ resource, recordId }) {
-        await this.db.query(`DELETE FROM ${resource.table} WHERE ${this.getPrimaryKey(resource)} = $1`, [recordId]);
+        await this.db.query(`DELETE FROM ${resource.table} WHERE "${this.getPrimaryKey(resource)}" = $1`, [recordId]);
     }
 
     async close() {

package/dist/dataConnectors/postgres.js

@@ -148,7 +148,7 @@ class PostgresConnector {
     getRecordByPrimaryKey(resource, key) {
         return __awaiter(this, void 0, void 0, function* () {
             const tableName = resource.table;
-            const columns = resource.dataSourceColumns.map((col) => col.name).join(', ');
+            const columns = resource.dataSourceColumns.map((col) => `"${col.name}"`).join(', ');
             const stmt = yield this.db.query(`SELECT ${columns} FROM ${tableName} WHERE ${this.getPrimaryKey(resource)} = $1`, [key]);
             const row = stmt.rows[0];
             if (!row) {
@@ -180,7 +180,7 @@ class PostgresConnector {
     }
     getData(_a) {
         return __awaiter(this, arguments, void 0, function* ({ resource, limit, offset, sort, filters }) {
-            const columns = resource.dataSourceColumns.filter(c => !c.virtual).map((col) => col.name).join(', ');
+            const columns = resource.dataSourceColumns.filter(c => !c.virtual).map((col) => `"${col.name}"`).join(', ');
             const tableName = resource.table;
             for (const filter of filters) {
                 if (!this.OperatorsMap[filter.operator]) {
@@ -202,7 +202,7 @@ class PostgresConnector {
                 else {
                     totalCounter += 1;
                 }
-                return `${field} ${operator} ${placeholder}`;
+                return `"${field}" ${operator} ${placeholder}`;
             }).join(' AND ')}` : '';
             const filterValues = [];
             filters.length ? filters.forEach((f) => {
@@ -272,19 +272,22 @@ class PostgresConnector {
                     return record[colName];
                 }
             });
+            for (let i = 0; i < columns.length; i++) {
+                columns[i] = `"${columns[i]}"`;
+            }
             yield this.db.query(`INSERT INTO ${tableName} (${columns.join(', ')}) VALUES (${placeholders})`, values);
         });
     }
     updateRecord(_a) {
         return __awaiter(this, arguments, void 0, function* ({ resource, recordId, record, newValues }) {
             const values = [...Object.values(newValues), recordId];
-            const columnsWithPlaceholders = Object.keys(newValues).map((col, i) => `${col} = $${i + 1}`).join(', ');
-            yield this.db.query(`UPDATE ${resource.table} SET ${columnsWithPlaceholders} WHERE ${this.getPrimaryKey(resource)} = $${values.length}`, values);
+            const columnsWithPlaceholders = Object.keys(newValues).map((col, i) => `"${col}" = $${i + 1}`).join(', ');
+            yield this.db.query(`UPDATE ${resource.table} SET ${columnsWithPlaceholders} WHERE "${this.getPrimaryKey(resource)}" = $${values.length}`, values);
         });
     }
     deleteRecord(_a) {
         return __awaiter(this, arguments, void 0, function* ({ resource, recordId }) {
-            yield this.db.query(`DELETE FROM ${resource.table} WHERE ${this.getPrimaryKey(resource)} = $1`, [recordId]);
+            yield this.db.query(`DELETE FROM ${resource.table} WHERE "${this.getPrimaryKey(resource)}" = $1`, [recordId]);
         });
     }
     close() {

package/dist/index.js

@@ -22,6 +22,14 @@ import { guessLabelFromName } from './modules/utils.js';
 import ExpressServer from './servers/express.js';
 import { v1 as uuid } from 'uuid';
 import fs from 'fs';
+let package_json;
+if (fs.existsSync('../package.json')) {
+    // in prod we are in dist folder
+    package_json = JSON.parse(fs.readFileSync('../package.json', 'utf8'));
+}
+else {
+    package_json = JSON.parse(fs.readFileSync('./package.json', 'utf8'));
+}
 import { AdminForthFilterOperators, AdminForthTypes } from './types.js';
 const AVAILABLE_SHOW_IN = ['list', 'edit', 'create', 'filter', 'show'];
 const DEFAULT_ALLOWED_ACTIONS = { create: true, edit: true, show: true, delete: true };
@@ -409,6 +417,7 @@ class AdminForth {
                         usernameField: this.config.auth.usernameField,
                     },
                     adminUser,
+                    version: package_json.version,
                 };
             }),
         });

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

@@ -141,10 +141,6 @@ const routerIsReady = ref(false);
 
 const loggedIn = computed(() => route.name !== 'login' && routerIsReady.value);
 
-watch(loggedIn, (value) => {
-  console.log('🔻🔻🔻 loggedIn', value);
-});
-
 const theme = ref('light');
 
 function toggleTheme() {

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

@@ -76,7 +76,6 @@ const showDropdown = ref(false);
 const selectedItems = ref([]);
 
 function updateFromProps() {
-  console.log('⚡ updateFromProps', props.modelValue)
   if (props.modelValue !== undefined) {
     if (props.single) {
       selectedItems.value = [props.options.find(item => item.value === props.modelValue)];

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

@@ -357,10 +357,6 @@ const totalRows = ref(0);
 const allCheckedActions = ref([]);
 const allowedActions = ref({});
 
-onMounted(() => {
-  console.log('LISTVIEW mounted⌛⌛⌛⌛⌛⌛🔻🔻🔻');
-});
-
 const DEFAULT_PAGE_SIZE = 10;
 
 const columnsListed = computed(() => coreStore.resourceColumns?.filter(c => c.showIn.includes('list')));

package/index.ts

@@ -9,6 +9,13 @@ import ExpressServer from './servers/express.js';
 import {v1 as uuid} from 'uuid';
 import fs from 'fs';
 
+let package_json;
+if (fs.existsSync('../package.json')) {
+  // in prod we are in dist folder
+  package_json = JSON.parse(fs.readFileSync('../package.json', 'utf8'));
+} else {
+  package_json = JSON.parse(fs.readFileSync('./package.json', 'utf8'));
+}
 
 import { AdminForthFilterOperators, AdminForthTypes, AdminForthTypesValues } from './types.js';
 
@@ -568,6 +575,7 @@ class AdminForth {
             usernameField: this.config.auth.usernameField,
           },
           adminUser,
+          version: package_json.version,
         };
       },
     });

package/package.json

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

package/spa/src/App.vue

@@ -141,10 +141,6 @@ const routerIsReady = ref(false);
 
 const loggedIn = computed(() => route.name !== 'login' && routerIsReady.value);
 
-watch(loggedIn, (value) => {
-  console.log('🔻🔻🔻 loggedIn', value);
-});
-
 const theme = ref('light');
 
 function toggleTheme() {

package/spa/src/components/Dropdown.vue

@@ -76,7 +76,6 @@ const showDropdown = ref(false);
 const selectedItems = ref([]);
 
 function updateFromProps() {
-  console.log('⚡ updateFromProps', props.modelValue)
   if (props.modelValue !== undefined) {
     if (props.single) {
       selectedItems.value = [props.options.find(item => item.value === props.modelValue)];

package/spa/src/views/ListView.vue

@@ -357,10 +357,6 @@ const totalRows = ref(0);
 const allCheckedActions = ref([]);
 const allowedActions = ref({});
 
-onMounted(() => {
-  console.log('LISTVIEW mounted⌛⌛⌛⌛⌛⌛🔻🔻🔻');
-});
-
 const DEFAULT_PAGE_SIZE = 10;
 
 const columnsListed = computed(() => coreStore.resourceColumns?.filter(c => c.showIn.includes('list')));