ui-soxo-bootstrap-core 2.6.30 → 2.6.31

package/core/lib/models/forms/components/form-creator/form-creator.js

@@ -203,6 +203,53 @@ function FormCreator({
         }
     }
 
+    const submitFormValues = async (values) => {
+        setLoading(true);
+
+        const nextValues = { ...values };
+
+        // Keep the same value preparation path for normal submit and search reset.
+        fields.forEach((field) => {
+
+            if (field.field && field.field.includes('date')) {
+
+                nextValues[field.field] = moment(nextValues[field.field]).valueOf();
+
+            }
+
+            if (field.type === ('time')) {
+
+                nextValues[field.field] = moment(nextValues[field.field]).format('HH:mm A');
+
+            }
+        })
+
+        try {
+            if (onSubmit) {
+                await onSubmit(nextValues);
+            }
+        } finally {
+            setLoading(false);
+        }
+    }
+
+    const handleSearchReset = async (fieldName) => {
+        if (!fieldName) return;
+
+        const values = {
+            ...form.getFieldsValue(true),
+            [fieldName]: [],
+        };
+
+        form.setFieldsValue({ [fieldName]: [] });
+
+        if (onFormValuesChange) {
+            onFormValuesChange(values);
+        }
+
+        await submitFormValues(values);
+    }
+
     return (
         <section className="form-creator">
       
@@ -223,41 +270,7 @@ function FormCreator({
                     {...layoutValue}
                     className="new-record"
                     name="new-record"
-                    onFinish={(values) => {
-
-                        setLoading(true);
-
-                        // Do a screening to check if date fields are 
-                        fields.forEach((field) => {
-
-                            if (field.field && field.field.includes('date')) {
-
-                                // values[field.field] = new Timestamp(new Date());
-
-                                values[field.field] = moment(values[field.field]).valueOf();
-
-                            } else {
-
-                            }
-
-                            if (field.type === ('time')) {
-
-                                // values[field.field] = new Timestamp(new Date());
-
-                                values[field.field] = moment(values[field.field]).format('HH:mm A');
-
-                            } else {
-
-                            }
-                        })
-
-                        onSubmit(values).then(() => {
-
-                            setLoading(false);
-
-                        });
-
-                    }}
+                    onFinish={submitFormValues}
                     // layout="inline"
 
                     onFieldsChange={onFieldsChange}
@@ -276,6 +289,7 @@ function FormCreator({
                         fields={fields}
                         reportId={reportId}
                         onChange={onChange}
+                        onSearchReset={handleSearchReset}
                         selectedInformation={selectedInformation}
                         onUpload={onUpload}
                         onFieldUpdate={onFieldUpdate}
@@ -311,6 +325,7 @@ function FieldMapper({
     fields = [],
     reportId,
     onChange,
+    onSearchReset,
     selectedInformation,
     onUpload,
     onFieldUpdate,
@@ -350,6 +365,7 @@ function FieldMapper({
                                             fields={tab.fields}
                                             reportId={reportId}
                                             onChange={onChange}
+                                            onSearchReset={onSearchReset}
                                             onUpload={onUpload}
                                             onFieldUpdate={onFieldUpdate}
                                             onFieldRemove={onFieldRemove}
@@ -370,6 +386,7 @@ function FieldMapper({
                             ?
                             <UserInput
                                 onChange={onChange}
+                                onSearchReset={onSearchReset}
                                 reportId={reportId}
                                 index={index}
                                 key={index}
@@ -384,6 +401,7 @@ function FieldMapper({
                     } else {
                         return <UserInput
                             onChange={onChange}
+                            onSearchReset={onSearchReset}
                             reportId={reportId}
                             key={index}
                             selectedInformation={selectedInformation}
@@ -411,7 +429,7 @@ function FieldMapper({
  * 
  * @param {*} param0 
  */
-function UserInput({ field, onUpload, selectedInformation, onChange, onFieldUpdate, onFieldRemove, index, reportId }) {
+function UserInput({ field, onUpload, selectedInformation, onChange, onSearchReset, onFieldUpdate, onFieldRemove, index, reportId }) {
 
     let props = {};
 
@@ -438,7 +456,7 @@ function UserInput({ field, onUpload, selectedInformation, onChange, onFieldUpda
         switch (field.type) {
 
             case 'search':
-                return <AdvancedSearchSelect {...field} reportId={reportId} style={{ width: '100%' }} />
+                return <AdvancedSearchSelect {...field} reportId={reportId} style={{ width: '100%' }} onReset={onSearchReset} />
 
             case 'number':
                 return <InputNumber  required={field.required} />

package/core/modules/reporting/components/reporting-dashboard/adavance-search/advance-search.js

@@ -140,10 +140,24 @@ export default function AdvancedSearchSelect({ reportId, onReset, field, value,
     onChange(newValues);
   };
 
+  const notifyReset = () => {
+    if (finalOnReset) {
+      finalOnReset(fieldName);
+    }
+  };
+
   const handleReset = () => {
     onChange([]);
-    if (finalOnReset) {
-      finalOnReset();   // 🔥 trigger dashboard refresh
+    notifyReset();
+  };
+
+  const handleSelectChange = (nextValue) => {
+    const nextValues = Array.isArray(nextValue) ? nextValue : [];
+
+    onChange(nextValues);
+
+    if (safeValue.length > 0 && nextValues.length === 0) {
+      notifyReset();
     }
   };
 
@@ -177,7 +191,7 @@ export default function AdvancedSearchSelect({ reportId, onReset, field, value,
           // Always pass an array back to the parent to be consistent with the Select mode.
           onChange(text ? [text] : []);
           if (!text && finalOnReset) {
-            finalOnReset();
+            finalOnReset(fieldName);
           }
         }}
       />
@@ -205,7 +219,7 @@ export default function AdvancedSearchSelect({ reportId, onReset, field, value,
       }}
       allowClear
       maxTagCount={1}
-      onChange={onChange}
+      onChange={handleSelectChange}
       maxTagPlaceholder={(omittedValues) => (
         <span className="tag-placeholder-count">
           +{omittedValues.length}

package/core/modules/reporting/components/reporting-dashboard/reporting-dashboard.js

@@ -435,7 +435,12 @@ export default function ReportingDashboard({
 
     if (!hasSearchValues) {
       const currentUrlParams = Location.search();
-      const { script_id, selected_card, ...cleanParams } = currentUrlParams;
+      const searchKeys = new Set(searchParameters.map((parameter) => parameter.field));
+      const cleanParams = Object.fromEntries(
+        Object.entries(currentUrlParams).filter(
+          ([key]) => key !== 'script_id' && key !== 'selected_card' && !searchKeys.has(key)
+        )
+      );
 
       const newParams = new URLSearchParams({
         ...cleanParams,
@@ -520,14 +525,22 @@ export default function ReportingDashboard({
         return parameter;
       });
 
-      //  Remove keys with undefined, null, or empty string values
+      const currentParams = Location.search();
+      // Mark existing empty values as null so Location.search removes stale query params.
       const filteredParams = Object.fromEntries(
-        Object.entries(urlsToUpdate).filter(([_, value]) => value !== undefined && value !== null && value !== '')
+        Object.entries(urlsToUpdate).flatMap(([key, value]) => {
+          const shouldRemove = value === undefined || value === null || value === '' || (Array.isArray(value) && value.length === 0);
+          if (shouldRemove && !Object.prototype.hasOwnProperty.call(currentParams, key)) {
+            return [];
+          }
+
+          return [[key, shouldRemove ? null : value]];
+        })
       );
 
       setformContents(formContent);
       setLiveFormContents(formContent);
-      Location.search({ ...Location.search(), ...filteredParams });
+      Location.search({ ...currentParams, ...filteredParams });
     }
 
     // Reset Pagination Data
@@ -568,6 +581,7 @@ export default function ReportingDashboard({
         <MenuDashBoardComponent
           dashBoardIds={dashBoardIds} //Pass the available dashboard IDs to the componen
           activeId={Number(urlParams?.selected_card || 0)}
+          dbPtr={dbPtr}
           callback={(record) => {
             const selectedCard = record?.id;
             if (record.other_details) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ui-soxo-bootstrap-core",
-  "version": "2.6.30",
+  "version": "2.6.31",
   "description": "All the Core Components for you to start",
   "keywords": [
     "all in one"