adminforth 1.2.33 → 1.2.35

package/dataConnectors/clickhouse.ts

@@ -190,7 +190,9 @@ class ClickhouseConnector extends AdminForthBaseConnector implements IAdminForth
         let field = f.field;
         let operator = this.OperatorsMap[f.operator];
         if (f.operator == AdminForthFilterOperators.IN || f.operator == AdminForthFilterOperators.NIN) {
-          placeholder = `(${f.value.map((_, j) => `p${i}_${j}`).join(', ')})`;
+          placeholder = `(${f.value.map((_, j) => `{p${i}_${j}:${
+            column._underlineType
+          }}`).join(', ')})`;
         }
 
         return `${field} ${operator} ${placeholder}`

package/dist/dataConnectors/clickhouse.js

@@ -194,7 +194,7 @@ class ClickhouseConnector extends AdminForthBaseConnector {
                 let field = f.field;
                 let operator = this.OperatorsMap[f.operator];
                 if (f.operator == AdminForthFilterOperators.IN || f.operator == AdminForthFilterOperators.NIN) {
-                    placeholder = `(${f.value.map((_, j) => `p${i}_${j}`).join(', ')})`;
+                    placeholder = `(${f.value.map((_, j) => `{p${i}_${j}:${column._underlineType}}`).join(', ')})`;
                 }
                 return `${field} ${operator} ${placeholder}`;
             }).join(' AND ')}` : '';

package/dist/modules/configValidator.js

@@ -248,14 +248,25 @@ export default class ConfigValidator {
                         allowed: (_b) => __awaiter(this, [_b], void 0, function* ({ resource, adminUser, allowedActions }) { return allowedActions.delete; }),
                         action: (_c) => __awaiter(this, [_c], void 0, function* ({ selectedIds, adminUser }) {
                             const connector = this.adminforth.connectors[res.dataSource];
+                            let error = null;
                             yield Promise.all(selectedIds.map((recordId) => __awaiter(this, void 0, void 0, function* () {
                                 const record = yield connector.getRecordByPrimaryKey(res, recordId);
+                                yield Promise.all(res.hooks.delete.beforeSave.map((hook) => __awaiter(this, void 0, void 0, function* () {
+                                    const resp = yield hook({ resource: res, record, adminUser });
+                                    if (!error && resp.error) {
+                                        error = resp.error;
+                                    }
+                                })));
                                 yield connector.deleteRecord({ resource: res, recordId });
                                 // call afterDelete hook
                                 yield Promise.all(res.hooks.delete.afterSave.map((hook) => __awaiter(this, void 0, void 0, function* () {
                                     yield hook({ resource: res, record, adminUser });
                                 })));
                             })));
+                            if (error) {
+                                return { error, ok: false };
+                            }
+                            return { ok: true };
                         })
                     });
                 }

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

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="mx-auto grid grid-cols-2 gap-4 mb-2">
+    <div class="grid w-40 gap-4 mb-2">
       <div>
         <label for="start-time" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">{{ label }}</label>
 
@@ -11,13 +11,13 @@
 
           <input ref="datepickerStartEl" type="text"
                  class="bg-gray-50 border leading-none border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
-                 placeholder="Start date">
+                 placeholder="Select date">
         </div>
       </div>
     </div>
 
     <div>
-      <div class="mx-auto grid grid-cols-2 gap-4 mb-2" :class="{hidden: !showTimeInputs}">
+      <div class="grid w-40 gap-4 mb-2" :class="{hidden: !showTimeInputs}">
         <div>
           <div class="relative">
             <div class="absolute inset-y-0 end-0 top-0 flex items-center pe-3.5 pointer-events-none">

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

@@ -21,7 +21,7 @@
       @click="clear">Clear
     </button>
 
-    <div class="w-full">
+    <div class="w-full px-2.5">
       <vue-slider
         class="custom-slider"
         :dot-size="20"

package/modules/configValidator.ts

@@ -269,20 +269,40 @@ export default class ConfigValidator implements IConfigValidator {
             allowed: async ({ resource, adminUser, allowedActions }) => { return allowedActions.delete },
             action: async ({ selectedIds, adminUser }) => {
               const connector = this.adminforth.connectors[res.dataSource];
-              await Promise.all(selectedIds.map(async (recordId) => {
-                const record = await connector.getRecordByPrimaryKey(res, recordId);
-
-                await connector.deleteRecord({ resource: res, recordId });
-                // call afterDelete hook
-                await Promise.all(
-                  (res.hooks.delete.afterSave as AfterSaveFunction[]).map(
-                    async (hook) => {
-                      await hook({ resource: res, record, adminUser }); 
-                    }
+              let error = null;
+
+              await Promise.all(
+                selectedIds.map(async (recordId) => {
+                  const record = await connector.getRecordByPrimaryKey(res, recordId);
+
+                  await Promise.all(
+                    (res.hooks.delete.beforeSave as AfterSaveFunction[]).map(
+                      async (hook) => {
+                        const resp = await hook({ resource: res, record, adminUser }); 
+                        if (!error && resp.error) {
+                          error = resp.error;
+                        }
+                      }
+                    )
                   )
-                )
-                
-              }));
+                  
+                  await connector.deleteRecord({ resource: res, recordId });
+                  // call afterDelete hook
+                  await Promise.all(
+                    (res.hooks.delete.afterSave as AfterSaveFunction[]).map(
+                      async (hook) => {
+                        await hook({ resource: res, record, adminUser }); 
+                      }
+                    )
+                  )
+                  
+                })
+              );
+
+              if (error) {
+                return { error, ok: false };
+              }
+              return { ok: true };
             }
           });
         }

package/package.json

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

package/spa/src/components/CustomDatePicker.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="mx-auto grid grid-cols-2 gap-4 mb-2">
+    <div class="grid w-40 gap-4 mb-2">
       <div>
         <label for="start-time" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">{{ label }}</label>
 
@@ -11,13 +11,13 @@
 
           <input ref="datepickerStartEl" type="text"
                  class="bg-gray-50 border leading-none border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
-                 placeholder="Start date">
+                 placeholder="Select date">
         </div>
       </div>
     </div>
 
     <div>
-      <div class="mx-auto grid grid-cols-2 gap-4 mb-2" :class="{hidden: !showTimeInputs}">
+      <div class="grid w-40 gap-4 mb-2" :class="{hidden: !showTimeInputs}">
         <div>
           <div class="relative">
             <div class="absolute inset-y-0 end-0 top-0 flex items-center pe-3.5 pointer-events-none">

package/spa/src/components/CustomRangePicker.vue

@@ -21,7 +21,7 @@
       @click="clear">Clear
     </button>
 
-    <div class="w-full">
+    <div class="w-full px-2.5">
       <vue-slider
         class="custom-slider"
         :dot-size="20"

package/types/AdminForthConfig.ts

@@ -680,7 +680,7 @@ export type AdminForthBulkAction = {
    * Callback which will be called on backend when user clicks on action button.
    * It should return Promise which will be resolved when action is done.
    */
-  action: ({ resource, selectedIds, adminUser }: { resource: AdminForthResource, selectedIds: Array<any>, adminUser: AdminUser }) => Promise<void>,
+  action: ({ resource, selectedIds, adminUser }: { resource: AdminForthResource, selectedIds: Array<any>, adminUser: AdminUser }) => Promise<{ ok: boolean, error?: string }>,
 
   /**
    * Confirmation message which will be displayed to user before action is executed.