adminforth 1.0.41 → 1.0.43

package/dataConnectors/mongo.ts

@@ -123,27 +123,6 @@ class MongoConnector {
     async getData({ resource, limit, offset, sort, filters }) {
         // 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]) {
-                throw new Error(`Operator ${filter.operator} is not allowed`);
-            }
-
-            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/dataConnectors/postgres.ts

@@ -180,14 +180,6 @@ class PostgresConnector {
       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]) {
-          throw new Error(`Operator ${filter.operator} is not allowed`);
-        }
-        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(', ')}`);
-        }
-      }
       let totalCounter = 1;
       const where = filters.length ? `WHERE ${filters.map((f, i) => {
         let placeholder = '$'+(totalCounter);

package/dataConnectors/sqlite.ts

@@ -138,18 +138,9 @@ class SQLiteConnector {
     
 
     getData({ resource, limit, offset, sort, filters }) {
+      console.log('SQLITE getData', { resource, limit, offset, sort, filters });
       const columns = resource.dataSourceColumns.map((col) => col.name).join(', ');
       const tableName = resource.table;
-      
-      for (const filter of filters) {
-        if (!this.OperatorsMap[filter.operator]) {
-          throw new Error(`Operator ${filter.operator} is not allowed`);
-        }
-
-        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(', ')}`);
-        }
-      }
 
       const where = filters.length ? `WHERE ${filters.map((f, i) => {
         let placeholder = '?';

package/dist/dataConnectors/mongo.js

@@ -130,23 +130,6 @@ class MongoConnector {
         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 tableName = resource.table;
-            for (const filter of filters) {
-                if (!this.OperatorsMap[filter.operator]) {
-                    throw new Error(`Operator ${filter.operator} is not allowed`);
-                }
-                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 = {};
             for (const filter of filters) {

package/dist/dataConnectors/postgres.js

@@ -182,14 +182,6 @@ class PostgresConnector {
         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 tableName = resource.table;
-            for (const filter of filters) {
-                if (!this.OperatorsMap[filter.operator]) {
-                    throw new Error(`Operator ${filter.operator} is not allowed`);
-                }
-                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(', ')}`);
-                }
-            }
             let totalCounter = 1;
             const where = filters.length ? `WHERE ${filters.map((f, i) => {
                 let placeholder = '$' + (totalCounter);

package/dist/dataConnectors/sqlite.js

@@ -148,16 +148,9 @@ class SQLiteConnector {
         return value;
     }
     getData({ resource, limit, offset, sort, filters }) {
+        console.log('SQLITE getData', { resource, limit, offset, sort, filters });
         const columns = resource.dataSourceColumns.map((col) => col.name).join(', ');
         const tableName = resource.table;
-        for (const filter of filters) {
-            if (!this.OperatorsMap[filter.operator]) {
-                throw new Error(`Operator ${filter.operator} is not allowed`);
-            }
-            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(', ')}`);
-            }
-        }
         const where = filters.length ? `WHERE ${filters.map((f, i) => {
             let placeholder = '?';
             let field = f.field;

package/dist/index.js

@@ -471,6 +471,23 @@ class AdminForth {
                     }
                 }
                 const { limit, offset, filters, sort } = body;
+                for (const filter of (filters || [])) {
+                    if (AdminForthFilterOperators[filter.operator] === undefined) {
+                        throw new Error(`Operator '${filter.operator}' is not allowed`);
+                    }
+                    if (!resource.columns.some((col) => col.name === filter.field)) {
+                        throw new Error(`Field '${filter.field}' is not in resource '${resource.resourceId}'. Available fields: ${resource.columns.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 data = yield this.connectors[resource.dataSource].getData({
                     resource,
                     limit,
@@ -483,6 +500,10 @@ class AdminForth {
                     const targetResource = this.config.resources.find((res) => res.resourceId == col.foreignResource.resourceId);
                     const targetConnector = this.connectors[targetResource.dataSource];
                     const targetResourcePkField = targetResource.columns.find((col) => col.primaryKey).name;
+                    const pksUnique = [...new Set(data.data.map((item) => item[col.name]))];
+                    if (pksUnique.length === 0) {
+                        return;
+                    }
                     const targetData = yield targetConnector.getData({
                         resource: targetResource,
                         limit: limit,
@@ -491,7 +512,7 @@ class AdminForth {
                             {
                                 field: targetResourcePkField,
                                 operator: AdminForthFilterOperators.IN,
-                                value: data.data.map((item) => item[col.name]),
+                                value: pksUnique,
                             }
                         ],
                         sort: [],

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

@@ -42,10 +42,10 @@ import debounce from 'debounce'
 
 const props = defineProps({
   valueStart: {
-    default: 0,
+    default: '',
   },
   valueEnd: {
-    default: 10,
+    default: '',
   },
   min: {
     default: 0,
@@ -61,19 +61,18 @@ const minFormatted = computed(() => Math.floor(props.min));
 const maxFormatted = computed(() => Math.ceil(props.max));
 
 const isChanged = computed(() => {
-  return start.value !== minFormatted.value || end.value !== maxFormatted.value;
+  return start.value && start.value !== minFormatted.value || end.value && end.value !== maxFormatted.value;
 });
 
-const start = ref(minFormatted.value);
-const end = ref(maxFormatted.value);
+const start = ref(props.valueStart);
+const end = ref(props.valueEnd);
 
-const sliderValue = ref([start.value, end.value]);
+const sliderValue = ref([minFormatted.value, maxFormatted.value]);
 
 const updateFromSlider =
     debounce((value: [number, number]) => {
-      console.log('start end', value)
-      start.value = value[0];
-      end.value = value[1];
+      start.value = value[0] === minFormatted.value ? '': value[0];
+      end.value = value[1] === maxFormatted.value ? '': value[1];
     }, 500);
 
 onMounted(() => {
@@ -90,24 +89,13 @@ onMounted(() => {
 })
 
 function updateStartFromProps() {
-  if (props.valueStart || props.valueStart === 0) {
-    start.value = props.valueStart ? props.valueStart : minFormatted.value;
-    sliderValue.value = [start.value, end.value]
-  } else {
-    console.log(props.valueStart)
-    start.value = minFormatted.value;
-    sliderValue.value = [minFormatted.value, end.value];
-  }
+  start.value = props.valueStart;
+  setSliderValues(start.value, end.value)
 }
 
 function updateEndFromProps() {
-  if (props.valueEnd || props.valueStart === 0) {
-    end.value = props.valueEnd ? props.valueEnd : minFormatted.value;
-    sliderValue.value = [start.value, end.value]
-  } else {
-    end.value = maxFormatted.value;
-    sliderValue.value = [start.value, maxFormatted.value];
-  }
+  end.value = props.valueEnd;
+  setSliderValues(start.value, end.value)
 }
 
 watch(start, () => {
@@ -121,9 +109,13 @@ watch(end, () => {
 })
 
 const clear = () => {
-  start.value = minFormatted.value;
-  end.value = maxFormatted.value;
-  sliderValue.value = [start.value, end.value]
+  start.value = ''
+  end.value = ''
+  setSliderValues('', '')
+}
+
+function setSliderValues(start, end) {
+  sliderValue.value = [start || minFormatted.value, end || maxFormatted.value];
 }
 </script>
 

package/index.ts

@@ -523,6 +523,7 @@ class AdminForth {
         if (!resource) {
           return { error: `Resource ${resourceId} not found` };
         }
+
         if (resource.hooks?.[source]?.beforeDatasourceRequest) {
           const resp = await resource.hooks?.[source]?.beforeDatasourceRequest({ resource, query: body, adminUser });
           if (!resp || (!resp.ok && !resp.error)) {
@@ -535,6 +536,26 @@ class AdminForth {
         }
         const { limit, offset, filters, sort } = body;
 
+        for (const filter of (filters || [])) {
+          if (AdminForthFilterOperators[filter.operator] === undefined) {
+              throw new Error(`Operator '${filter.operator}' is not allowed`);
+          }
+
+          if (!resource.columns.some((col) => col.name === filter.field)) {
+              throw new Error(`Field '${filter.field}' is not in resource '${resource.resourceId}'. Available fields: ${resource.columns.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 data = await this.connectors[resource.dataSource].getData({
           resource,
@@ -549,6 +570,10 @@ class AdminForth {
             const targetResource = this.config.resources.find((res) => res.resourceId == col.foreignResource.resourceId);
             const targetConnector = this.connectors[targetResource.dataSource];
             const targetResourcePkField = targetResource.columns.find((col) => col.primaryKey).name;
+            const pksUnique = [...new Set(data.data.map((item) => item[col.name]))];
+            if (pksUnique.length === 0) {
+              return;
+            }
             const targetData = await targetConnector.getData({
               resource: targetResource,
               limit: limit,
@@ -557,7 +582,7 @@ class AdminForth {
                 {
                   field: targetResourcePkField,
                   operator: AdminForthFilterOperators.IN,
-                  value: data.data.map((item) => item[col.name]),
+                  value: pksUnique,
                 }
               ],
               sort: [],

package/package.json

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

package/spa/src/components/CustomRangePicker.vue

@@ -42,10 +42,10 @@ import debounce from 'debounce'
 
 const props = defineProps({
   valueStart: {
-    default: 0,
+    default: '',
   },
   valueEnd: {
-    default: 10,
+    default: '',
   },
   min: {
     default: 0,
@@ -61,19 +61,18 @@ const minFormatted = computed(() => Math.floor(props.min));
 const maxFormatted = computed(() => Math.ceil(props.max));
 
 const isChanged = computed(() => {
-  return start.value !== minFormatted.value || end.value !== maxFormatted.value;
+  return start.value && start.value !== minFormatted.value || end.value && end.value !== maxFormatted.value;
 });
 
-const start = ref(minFormatted.value);
-const end = ref(maxFormatted.value);
+const start = ref(props.valueStart);
+const end = ref(props.valueEnd);
 
-const sliderValue = ref([start.value, end.value]);
+const sliderValue = ref([minFormatted.value, maxFormatted.value]);
 
 const updateFromSlider =
     debounce((value: [number, number]) => {
-      console.log('start end', value)
-      start.value = value[0];
-      end.value = value[1];
+      start.value = value[0] === minFormatted.value ? '': value[0];
+      end.value = value[1] === maxFormatted.value ? '': value[1];
     }, 500);
 
 onMounted(() => {
@@ -90,24 +89,13 @@ onMounted(() => {
 })
 
 function updateStartFromProps() {
-  if (props.valueStart || props.valueStart === 0) {
-    start.value = props.valueStart ? props.valueStart : minFormatted.value;
-    sliderValue.value = [start.value, end.value]
-  } else {
-    console.log(props.valueStart)
-    start.value = minFormatted.value;
-    sliderValue.value = [minFormatted.value, end.value];
-  }
+  start.value = props.valueStart;
+  setSliderValues(start.value, end.value)
 }
 
 function updateEndFromProps() {
-  if (props.valueEnd || props.valueStart === 0) {
-    end.value = props.valueEnd ? props.valueEnd : minFormatted.value;
-    sliderValue.value = [start.value, end.value]
-  } else {
-    end.value = maxFormatted.value;
-    sliderValue.value = [start.value, maxFormatted.value];
-  }
+  end.value = props.valueEnd;
+  setSliderValues(start.value, end.value)
 }
 
 watch(start, () => {
@@ -121,9 +109,13 @@ watch(end, () => {
 })
 
 const clear = () => {
-  start.value = minFormatted.value;
-  end.value = maxFormatted.value;
-  sliderValue.value = [start.value, end.value]
+  start.value = ''
+  end.value = ''
+  setSliderValues('', '')
+}
+
+function setSliderValues(start, end) {
+  sliderValue.value = [start || minFormatted.value, end || maxFormatted.value];
 }
 </script>