adminforth 1.3.14 → 1.3.16

package/dataConnectors/baseConnector.ts

@@ -57,6 +57,21 @@ export default class AdminForthBaseConnector implements IAdminForthDataSourceCon
     throw new Error('Method not implemented.');
   }
 
+  async checkUnique(resource: AdminForthResource, column: AdminForthResourceColumn, value: any) {
+    process.env.HEAVY_DEBUG && console.log('☝️🪲🪲🪲🪲 checkUnique|||', column, value);
+    const existingRecord = await this.getData({
+      resource,
+      filters: [{ field: column.name, operator: AdminForthFilterOperators.EQ, value }],
+      limit: 1,
+      sort: [],
+      offset: 0,
+      getTotals: false
+    });
+    process.env.HEAVY_DEBUG && console.log('☝️🪲🪲🪲🪲 existingRecord|||', existingRecord);
+
+    return existingRecord.data.length > 0;
+  }
+
   async createRecord({ resource, record, adminUser }: { 
     resource: AdminForthResource; record: any; adminUser: any;
   }): Promise<{ error?: string; ok: boolean; createdRecord?: any; }> {
@@ -76,28 +91,21 @@ export default class AdminForthBaseConnector implements IAdminForthDataSourceCon
       recordWithOriginalValues[col.name] = this.setFieldValue(col, filledRecord[col.name]);
     }
 
-    async function checkUnique(column: AdminForthResourceColumn, value: any) {
-      const existingRecord = await this.getData({
-        resource,
-        filters: [{ field: column.name, operator: AdminForthFilterOperators.EQ, value }],
-        limit: 1,
-        sort: [],
-        offset: 0,
-        getTotals: false
-      });
-      return existingRecord.data.length > 0;
-    }
+    
     let error: string | null = null;
-    await Promise.race(
+    await Promise.all(
       resource.dataSourceColumns.map(async (col) => {
+
         if (col.isUnique && !col.virtual && !error) {
-          const exists = await checkUnique(col, recordWithOriginalValues[col.name]);
+
+          const exists = await this.checkUnique(resource, col, recordWithOriginalValues[col.name]);
           if (exists) {
             error = `Record with ${col.name} ${recordWithOriginalValues[col.name]} already exists`;
           }
         }
       })
     );
+    process.env.HEAVY_DEBUG && console.log('🪲🪲🪲🪲 error', error);
     if (error) {
       return { error, ok: false };
     }

package/dist/dataConnectors/baseConnector.js

@@ -50,6 +50,21 @@ export default class AdminForthBaseConnector {
     createRecordOriginalValues({ resource, record }) {
         throw new Error('Method not implemented.');
     }
+    checkUnique(resource, column, value) {
+        return __awaiter(this, void 0, void 0, function* () {
+            process.env.HEAVY_DEBUG && console.log('☝️🪲🪲🪲🪲 checkUnique|||', column, value);
+            const existingRecord = yield this.getData({
+                resource,
+                filters: [{ field: column.name, operator: AdminForthFilterOperators.EQ, value }],
+                limit: 1,
+                sort: [],
+                offset: 0,
+                getTotals: false
+            });
+            process.env.HEAVY_DEBUG && console.log('☝️🪲🪲🪲🪲 existingRecord|||', existingRecord);
+            return existingRecord.data.length > 0;
+        });
+    }
     createRecord(_a) {
         return __awaiter(this, arguments, void 0, function* ({ resource, record, adminUser }) {
             // transform value using setFieldValue and call createRecordOriginalValues
@@ -66,28 +81,16 @@ export default class AdminForthBaseConnector {
                 }
                 recordWithOriginalValues[col.name] = this.setFieldValue(col, filledRecord[col.name]);
             }
-            function checkUnique(column, value) {
-                return __awaiter(this, void 0, void 0, function* () {
-                    const existingRecord = yield this.getData({
-                        resource,
-                        filters: [{ field: column.name, operator: AdminForthFilterOperators.EQ, value }],
-                        limit: 1,
-                        sort: [],
-                        offset: 0,
-                        getTotals: false
-                    });
-                    return existingRecord.data.length > 0;
-                });
-            }
             let error = null;
-            yield Promise.race(resource.dataSourceColumns.map((col) => __awaiter(this, void 0, void 0, function* () {
+            yield Promise.all(resource.dataSourceColumns.map((col) => __awaiter(this, void 0, void 0, function* () {
                 if (col.isUnique && !col.virtual && !error) {
-                    const exists = yield checkUnique(col, recordWithOriginalValues[col.name]);
+                    const exists = yield this.checkUnique(resource, col, recordWithOriginalValues[col.name]);
                     if (exists) {
                         error = `Record with ${col.name} ${recordWithOriginalValues[col.name]} already exists`;
                     }
                 }
             })));
+            process.env.HEAVY_DEBUG && console.log('🪲🪲🪲🪲 error', error);
             if (error) {
                 return { error, ok: false };
             }

package/dist/index.js

@@ -185,6 +185,9 @@ class AdminForth {
             const connector = this.connectors[resource.dataSource];
             process.env.HEAVY_DEBUG && console.log('🪲🪲🪲🪲 creating record createResourceRecord', record);
             const { ok, error, createdRecord } = yield connector.createRecord({ resource, record, adminUser });
+            if (!ok) {
+                return { ok, error };
+            }
             const primaryKey = record[resource.columns.find((col) => col.primaryKey).name];
             // execute hook if needed
             for (const hook of listify((_g = (_f = resource.hooks) === null || _f === void 0 ? void 0 : _f.create) === null || _g === void 0 ? void 0 : _g.afterSave)) {

package/dist/modules/restApi.js

@@ -319,6 +319,7 @@ export default class AdminForthRestAPI {
                     offset,
                     filters,
                     sort,
+                    getTotals: true,
                 });
                 // for foreign keys, add references
                 yield Promise.all(resource.columns.filter((col) => col.foreignResource).map((col) => __awaiter(this, void 0, void 0, function* () {

package/index.ts

@@ -236,7 +236,10 @@ class AdminForth implements IAdminForth {
     const connector = this.connectors[resource.dataSource];
     process.env.HEAVY_DEBUG && console.log('🪲🪲🪲🪲 creating record createResourceRecord', record);
     const { ok, error, createdRecord } = await connector.createRecord({ resource, record, adminUser });
-
+    if (!ok) {
+      return { ok, error };
+    }
+    
     const primaryKey = record[resource.columns.find((col) => col.primaryKey).name];
 
     // execute hook if needed

package/modules/restApi.ts

@@ -261,8 +261,6 @@ export default class AdminForthRestAPI {
       },
     });
 
-    
-
     function checkAccess(action: AllowedActionsEnum, allowedActions: AllowedActions): { allowed: boolean, error?: string } {
       const allowed = (allowedActions[action] as boolean | string | undefined);
       if (allowed !== true) {
@@ -383,6 +381,7 @@ export default class AdminForthRestAPI {
           offset,
           filters,
           sort,
+          getTotals: true,
         });
         // for foreign keys, add references
         await Promise.all(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminforth",
-  "version": "1.3.14",
+  "version": "1.3.16",
   "description": "OpenSource Vue3 powered forth-generation admin panel",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -20,7 +20,7 @@
     "@clickhouse/client": "^1.4.0",
     "better-sqlite3": "^10.0.0",
     "dayjs": "^1.11.11",
-    "express": "^4.19.2",
+    "express": "^4.21.0",
     "filewatcher": "^3.0.1",
     "fs-extra": "^11.2.0",
     "fuse.js": "^7.0.0",

package/spa/src/components/Filters.vue

@@ -115,7 +115,7 @@
 </template>
 
 <script setup>
-import { watch, computed, ref, onMounted } from 'vue'
+import { watch, computed } from 'vue'
 import Dropdown from '@/components/Dropdown.vue';
 import CustomDateRangePicker from '@/components/CustomDateRangePicker.vue';
 import { callAdminForthApi } from '@/utils';

package/spa/src/components/ResourceForm.vue

@@ -130,7 +130,6 @@
                       </button>
                     </template>
                     <div v-if="columnError(column) && validating" class="mt-1 text-xs text-red-500 dark:text-red-400">{{ columnError(column) }}</div>
-
                     <div v-if="column.editingNote && column.editingNote[mode]" class="mt-1 text-xs text-gray-400 dark:text-gray-500">{{ column.editingNote[mode] }}</div>
 
                 </td>
@@ -154,10 +153,10 @@ import { IconExclamationCircleSolid, IconEyeSlashSolid, IconEyeSolid } from '@ic
 import { computedAsync } from '@vueuse/core';
 import { initFlowbite } from 'flowbite';
 import { computed, onMounted, ref, watch } from 'vue';
-import { useRouter } from 'vue-router';
+import { useRouter, useRoute } from 'vue-router';
 
 const router = useRouter();
-
+const route = useRoute();
 const props = defineProps({
   loading: Boolean,
   resource: Object,
@@ -168,7 +167,7 @@ const props = defineProps({
 
 const unmasked = ref({});
 
-const mode = computed(() => props.record  && Object.keys(props.record).length ? 'edit' : 'create');
+const mode = computed(() => route.name === 'resource-create' ? 'create' : 'edit');
 
 const emit = defineEmits(['update:record', 'update:isValid']);
 

package/spa/src/router/index.ts

@@ -56,12 +56,4 @@ const router = createRouter({
   ]
 })
 
-router.beforeEach((to, from, next) => {
-  const filterStore = useFiltersStore();
-  if (to.path.startsWith('/resource/')) {
-    filterStore.clearFilters();
-  }
-  next()
-})
-
 export default router

package/spa/src/stores/filters.ts

@@ -3,11 +3,12 @@ import { defineStore } from 'pinia';
 
 export const useFiltersStore = defineStore('filters', () => {
     const filters: Ref<any[]> = ref([]);
+    
     const setFilter = (filter: any) => {
-        filters.value = [...filters.value, filter];
+        filters.value.push(filter);
     }
     const setFilters = (f: any) => {
-        filters.value = [...f];
+        filters.value = f;
     }
     const getFilters = () => {
         return filters.value;

package/spa/src/views/ListView.vue

@@ -117,8 +117,6 @@ import { initFlowbite } from 'flowbite';
 import { computed, onMounted, ref, watch } from 'vue';
 import { useRoute } from 'vue-router';
 import { showErrorTost } from '@/composables/useFrontendApi'
-
-import ValueRenderer from '@/components/ValueRenderer.vue';
 import { getCustomComponent } from '@/utils';
 
 
@@ -151,20 +149,7 @@ const DEFAULT_PAGE_SIZE = 10;
 const pageSize = computed(() => coreStore.resource?.options?.listPageSize || DEFAULT_PAGE_SIZE);
 
 
-watch([page], async () => {
-  await getList();
-});
-
-watch(()=>filtersStore.filters, async () => {
-  page.value = 1;
-  checkboxes.value = [];
-
-  await getList();
-}, {deep: true});
 
-watch([sort], async () => {
-  await getList();
-}, {deep: true});
 
 
 async function getList() {
@@ -222,6 +207,8 @@ async function init() {
     resourceId: route.params.resourceId
   });
 
+  // !!! clear filters should be in same tick with sort assignment so that watch can catch it
+  filtersStore.clearFilters();
   if (coreStore.resource.options?.defaultSort) {
     sort.value = [{
         field: coreStore.resource.options.defaultSort.columnName,
@@ -230,8 +217,8 @@ async function init() {
   } else {
     sort.value = [];
   }
-
-  await getList();
+  console.log('↘️init fired');
+  // await getList();
   columnsMinMax.value = await callAdminForthApi({
     path: '/get_min_max_for_columns',
     method: 'POST',
@@ -241,18 +228,22 @@ async function init() {
   });
 }
 
+watch([page, sort, () => filtersStore.filters], async () => {
+  console.log('↘️watch fired getList');
+  await getList();
+}, { deep: true });
+
+watch(() => filtersStore.filters, async (to, from) => {
+  page.value = 1;
+  checkboxes.value = [];
+}, {deep: true});
+
 onMounted(async () => {
+  console.log('🧱onMounted fired');
   initFlowbite(); 
- 
   await init();
-
 });
 
-// on route param change 
-watch(() => route.params.resourceId, async () => {
-  filtersStore.setFilters([]);
-  checkboxes.value = [];
-  await init();
-});
+
 
 </script>