adminforth 1.0.39 → 1.0.41

package/dataConnectors/mongo.ts

@@ -126,12 +126,23 @@ class MongoConnector {
         
         for (const filter of filters) {
             if (!this.OperatorsMap[filter.operator]) {
-            throw new Error(`Operator ${filter.operator} is not allowed`);
+                throw new Error(`Operator ${filter.operator} is not allowed`);
             }
 
-            if (!resource.dataSourceColumns.some((col) => col.name == filter.field)) {
+            if (!resource.dataSourceColumns.some((col) => col.name === filter.field)) {
                 throw new Error(`Field ${filter.field} is not in resource ${resource.resourceId}. Available fields: ${resource.dataSourceColumns.map((col) => col.name).join(', ')}`);
             }
+
+            if (filter.operator === AdminForthFilterOperators.IN || filter.operator === AdminForthFilterOperators.NIN) {
+                if (!Array.isArray(filter.value)) {
+                    throw new Error(`Value for operator ${filter.operator} should be an array`);
+                }
+            }
+
+            if (filter.operator === AdminForthFilterOperators.IN && filter.value.length === 0) {
+                // nonsense
+                return { data: [], total: 0 };
+            }
         }
 
         const collection = this.db.db().collection(tableName);

package/dist/dataConnectors/mongo.js

@@ -134,9 +134,18 @@ class MongoConnector {
                 if (!this.OperatorsMap[filter.operator]) {
                     throw new Error(`Operator ${filter.operator} is not allowed`);
                 }
-                if (!resource.dataSourceColumns.some((col) => col.name == filter.field)) {
+                if (!resource.dataSourceColumns.some((col) => col.name === filter.field)) {
                     throw new Error(`Field ${filter.field} is not in resource ${resource.resourceId}. Available fields: ${resource.dataSourceColumns.map((col) => col.name).join(', ')}`);
                 }
+                if (filter.operator === AdminForthFilterOperators.IN || filter.operator === AdminForthFilterOperators.NIN) {
+                    if (!Array.isArray(filter.value)) {
+                        throw new Error(`Value for operator ${filter.operator} should be an array`);
+                    }
+                }
+                if (filter.operator === AdminForthFilterOperators.IN && filter.value.length === 0) {
+                    // nonsense
+                    return { data: [], total: 0 };
+                }
             }
             const collection = this.db.db().collection(tableName);
             const query = {};

package/dist/index.js

@@ -221,6 +221,20 @@ class AdminForth {
         if (errors.length > 0) {
             throw new Error(`Invalid AdminForth config: ${errors.join(', ')}`);
         }
+        // check is all custom components files exists
+        for (const resource of this.config.resources) {
+            for (const column of resource.columns) {
+                if (column.component) {
+                    for (const [key, value] of Object.entries(column.component)) {
+                        // console.log(`${key}: ${value}`);
+                        const path = value.replace('@@', this.config.customization.customComponentsDir);
+                        if (!fs.existsSync(path)) {
+                            throw new Error(`Component file ${path} does not exist`);
+                        }
+                    }
+                }
+            }
+        }
     }
     postProcessAfterDiscover(resource) {
         resource.columns.forEach((column) => {
@@ -675,7 +689,6 @@ class AdminForth {
             path: '/update_record',
             handler: (_7) => __awaiter(this, [_7], void 0, function* ({ body, adminUser }) {
                 var _8, _9, _10, _11, _12, _13, _14, _15;
-                console.log('update_record', body);
                 const resource = this.config.resources.find((res) => res.resourceId == body['resourceId']);
                 if (!resource) {
                     return { error: `Resource '${body['resourceId']}' not found` };

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

@@ -97,6 +97,10 @@ onMounted(() => {
     updateFromProps();
   });
 
+  watch(() => props.options, () => {
+    updateFromProps();
+  });
+
   addClickListener();
 
 });

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

@@ -44,6 +44,7 @@
                     </div>
                     </td>
                     <td class="px-6 py-4 whitespace-nowrap whitespace-pre-wrap relative">
+
                     <Dropdown
                         single
                         v-if="column.foreignResource"

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

@@ -23,7 +23,7 @@
 
     <ResourceForm 
       v-else
-      :record="coreStore.record"
+      :record="editableRecord"
       :resourceColumns="coreStore.resourceColumns"
       @update:record="onUpdateRecord"
       @update:isValid="isValid = $event"
@@ -43,7 +43,7 @@ import SingleSkeletLoader from '@/components/SingleSkeletLoader.vue';
 import { useCoreStore } from '@/stores/core';
 import { callAdminForthApi } from '@/utils';
 import { IconFloppyDiskSolid } from '@iconify-prerendered/vue-flowbite';
-import { defineAsyncComponent, onMounted, ref } from 'vue';
+import { defineAsyncComponent, onMounted, ref, computed } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 
 const coreStore = useCoreStore();
@@ -65,6 +65,18 @@ async function onUpdateRecord(newRecord) {
   record.value = newRecord;
 }
 
+const editableRecord = computed(() => {
+  const newRecord = { ...coreStore.record };
+  if (!coreStore.resourceColumns) {
+    return {};
+  }
+  coreStore.resourceColumns.forEach(column => {
+    if (column.foreignResource) {
+      newRecord[column.name] = newRecord[column.name]?.pk
+    }
+  });
+  return newRecord;
+})
 
 onMounted(async () => {
   loading.value = true;

package/index.ts

@@ -267,6 +267,21 @@ class AdminForth {
     if (errors.length > 0) {
       throw new Error(`Invalid AdminForth config: ${errors.join(', ')}`);
     }
+
+    // check is all custom components files exists
+    for (const resource of this.config.resources) {
+      for (const column of resource.columns) {
+          if (column.component) {
+            for (const [key, value] of Object.entries(column.component)) {
+                // console.log(`${key}: ${value}`);
+                const path = value.replace('@@', this.config.customization.customComponentsDir);
+                if (!fs.existsSync(path)) {
+                    throw new Error(`Component file ${path} does not exist`);
+                }
+            }
+        }
+      }
+    }
   }
 
   postProcessAfterDiscover(resource) {
@@ -754,7 +769,6 @@ class AdminForth {
         method: 'POST',
         path: '/update_record',
         handler: async ({ body, adminUser }) => {
-            console.log('update_record', body);
             const resource = this.config.resources.find((res) => res.resourceId == body['resourceId']);
             if (!resource) {
                 return { error: `Resource '${body['resourceId']}' not found` };

package/package.json

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

package/spa/src/components/Dropdown.vue

@@ -97,6 +97,10 @@ onMounted(() => {
     updateFromProps();
   });
 
+  watch(() => props.options, () => {
+    updateFromProps();
+  });
+
   addClickListener();
 
 });

package/spa/src/components/ResourceForm.vue

@@ -44,6 +44,7 @@
                     </div>
                     </td>
                     <td class="px-6 py-4 whitespace-nowrap whitespace-pre-wrap relative">
+
                     <Dropdown
                         single
                         v-if="column.foreignResource"

package/spa/src/views/EditView.vue

@@ -23,7 +23,7 @@
 
     <ResourceForm 
       v-else
-      :record="coreStore.record"
+      :record="editableRecord"
       :resourceColumns="coreStore.resourceColumns"
       @update:record="onUpdateRecord"
       @update:isValid="isValid = $event"
@@ -43,7 +43,7 @@ import SingleSkeletLoader from '@/components/SingleSkeletLoader.vue';
 import { useCoreStore } from '@/stores/core';
 import { callAdminForthApi } from '@/utils';
 import { IconFloppyDiskSolid } from '@iconify-prerendered/vue-flowbite';
-import { defineAsyncComponent, onMounted, ref } from 'vue';
+import { defineAsyncComponent, onMounted, ref, computed } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 
 const coreStore = useCoreStore();
@@ -65,6 +65,18 @@ async function onUpdateRecord(newRecord) {
   record.value = newRecord;
 }
 
+const editableRecord = computed(() => {
+  const newRecord = { ...coreStore.record };
+  if (!coreStore.resourceColumns) {
+    return {};
+  }
+  coreStore.resourceColumns.forEach(column => {
+    if (column.foreignResource) {
+      newRecord[column.name] = newRecord[column.name]?.pk
+    }
+  });
+  return newRecord;
+})
 
 onMounted(async () => {
   loading.value = true;