@solidxai/core-ui 0.1.9-beta.0 → 0.1.9-beta.10

package/dist/components/core/kanban/kanban-fields/SolidShortTextKanbanField.tsx

@@ -1,6 +1,7 @@
 
 import { useState } from 'react';
 import { SolidKanbanViewFieldsParams } from '../SolidKanbanViewFields';
+import { Dialog } from 'primereact/dialog';
 import { Document, Page } from "react-pdf";
 import { PDFSvg } from '../../../../components/Svg/PDFSvg';
 import MP3Image from '../../../../resources/images/fileTypes/Mp3.png'
@@ -8,18 +9,29 @@ import MP4Image from '../../../../resources/images/fileTypes/Mp4.png'
 import FileImage from '../../../../resources/images/fileTypes/File.png'
 import Image from "../../../common/Image";
 import { ExcelSvg } from '../../../../components/Svg/ExcelSvg';
-import {
-    SolidDialog,
-    SolidDialogBody,
-    SolidDialogClose,
-    SolidDialogHeader,
-    SolidDialogTitle,
-} from "../../../shad-cn-ui";
 const SolidShortTextKanbanField = ({ solidKanbanViewMetaData, fieldMetadata, fieldLayout, data, setLightboxUrls, setOpenLightbox, groupedView }: SolidKanbanViewFieldsParams) => {
     const [visible, setVisible] = useState(false);
     const widget = fieldLayout?.attrs?.widget ? fieldLayout?.attrs?.widget : "text";
     const mimeType = data && data?.mimeType
     const fileName = data?.originalFileName;
+    const PDFHeader = () => {
+        return (
+            <div className='flex justify-content-between align-items-center'>
+                <p className='m-0'>
+                    {fileName}
+                </p>
+                <a
+                    href={data[fieldMetadata.name]}
+                    download={fileName}
+                    target="_blank"
+                    rel="noopener noreferrer"
+                    className='mr-4'
+                >
+                    <i className='pi pi-download' />
+                </a>
+            </div>
+        )
+    }
     return (
         <div className={`${fieldLayout?.attrs?.className ? ` ${fieldLayout.attrs.className}` : ""}`}>
             {widget === "text" && groupedView &&
@@ -49,29 +61,11 @@ const SolidShortTextKanbanField = ({ solidKanbanViewMetaData, fieldMetadata, fie
                     <div className='kanban-media-view-card' onClick={() => setVisible(true)} style={{ cursor: 'pointer' }}>
                         <PDFSvg />
                     </div>
-                    <SolidDialog open={visible} onOpenChange={setVisible} className="solid-kanban-preview-dialog">
-                        <SolidDialogHeader className="solid-kanban-preview-dialog-header">
-                            <div className="solid-kanban-preview-dialog-title-row">
-                                <SolidDialogTitle>{fileName}</SolidDialogTitle>
-                                <a
-                                    href={data[fieldMetadata.name]}
-                                    download={fileName}
-                                    target="_blank"
-                                    rel="noopener noreferrer"
-                                    className="solid-kanban-preview-download"
-                                    onClick={(event) => event.stopPropagation()}
-                                >
-                                    <i className='pi pi-download' />
-                                </a>
-                                <SolidDialogClose />
-                            </div>
-                        </SolidDialogHeader>
-                        <SolidDialogBody className="solid-kanban-preview-dialog-body">
-                            <Document file={data[fieldMetadata.name]}>
-                                <Page pageNumber={1} />
-                            </Document>
-                        </SolidDialogBody>
-                    </SolidDialog>
+                    <Dialog header={<PDFHeader />} visible={visible} style={{ width: "" }} onHide={() => setVisible(false)} modal>
+                        <Document file={data[fieldMetadata.name]}>
+                            <Page pageNumber={1} />
+                        </Document>
+                    </Dialog>
                 </div>
             )}
 

package/dist/components/core/kanban/kanban-fields/relations/SolidRelationManyToOneKanbanField.js.map

@@ -1 +1 @@
-{"version":3,"file":"SolidRelationManyToOneKanbanField.js","sourceRoot":"","sources":["../../../../../../src/components/core/kanban/kanban-fields/relations/SolidRelationManyToOneKanbanField.tsx"],"names":[],"mappings":";AAOA,IAAM,iCAAiC,GAAG,UAAC,EAAyF;QAAvF,uBAAuB,6BAAA,EAAE,aAAa,mBAAA,EAAE,WAAW,iBAAA,EAAC,IAAI,UAAA;IAEjG,OAAO,CACJ,mBAAK,CACP,CAAC;AAEN,CAAC,CAAC;AAEF,eAAe,iCAAiC,CAAC","sourcesContent":["\nimport { FilterMatchMode } from 'primereact/api';\nimport { Column, ColumnFilterElementTemplateOptions } from \"primereact/column\";\nimport { FormEvent } from \"primereact/ts-helpers\";\nimport { InputTypes, SolidVarInputsFilterElement } from '../../../../../components/core/filter/SolidVarInputsFilterElement';\nimport { SolidKanbanViewFieldsParams } from '../../../../../components/core/kanban/SolidKanbanViewFields';\n\nconst SolidRelationManyToOneKanbanField = ({ solidKanbanViewMetaData, fieldMetadata, fieldLayout,data }: SolidKanbanViewFieldsParams) => {\n \n    return (\n       <></>\n    );\n\n};\n\nexport default SolidRelationManyToOneKanbanField;\n"]}
+{"version":3,"file":"SolidRelationManyToOneKanbanField.js","sourceRoot":"","sources":["../../../../../../src/components/core/kanban/kanban-fields/relations/SolidRelationManyToOneKanbanField.tsx"],"names":[],"mappings":";AAOA,IAAM,iCAAiC,GAAG,UAAC,EAAyF;QAAvF,uBAAuB,6BAAA,EAAE,aAAa,mBAAA,EAAE,WAAW,iBAAA,EAAC,IAAI,UAAA;IAEjG,OAAO,CACJ,mBAAK,CACP,CAAC;AAEN,CAAC,CAAC;AAEF,eAAe,iCAAiC,CAAC","sourcesContent":["\nimport { FilterMatchMode } from 'primereact/api';\nimport { Column, ColumnFilterElementTemplateOptions } from \"primereact/column\";\nimport { FormEvent } from \"primereact/ts-helpers\";\nimport { InputTypes, SolidVarInputsFilterElement } from '../../../../../components/core/kanban/SolidVarInputsFilterElement';\nimport { SolidKanbanViewFieldsParams } from '../../../../../components/core/kanban/SolidKanbanViewFields';\n\nconst SolidRelationManyToOneKanbanField = ({ solidKanbanViewMetaData, fieldMetadata, fieldLayout,data }: SolidKanbanViewFieldsParams) => {\n \n    return (\n       <></>\n    );\n\n};\n\nexport default SolidRelationManyToOneKanbanField;"]}

package/dist/components/core/kanban/kanban-fields/relations/SolidRelationManyToOneKanbanField.tsx

@@ -2,7 +2,7 @@
 import { FilterMatchMode } from 'primereact/api';
 import { Column, ColumnFilterElementTemplateOptions } from "primereact/column";
 import { FormEvent } from "primereact/ts-helpers";
-import { InputTypes, SolidVarInputsFilterElement } from '../../../../../components/core/filter/SolidVarInputsFilterElement';
+import { InputTypes, SolidVarInputsFilterElement } from '../../../../../components/core/kanban/SolidVarInputsFilterElement';
 import { SolidKanbanViewFieldsParams } from '../../../../../components/core/kanban/SolidKanbanViewFields';
 
 const SolidRelationManyToOneKanbanField = ({ solidKanbanViewMetaData, fieldMetadata, fieldLayout,data }: SolidKanbanViewFieldsParams) => {
@@ -13,4 +13,4 @@ const SolidRelationManyToOneKanbanField = ({ solidKanbanViewMetaData, fieldMetad
 
 };
 
-export default SolidRelationManyToOneKanbanField;
+export default SolidRelationManyToOneKanbanField;

package/dist/components/core/list/SolidListView.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SolidListView.d.ts","sourceRoot":"","sources":["../../../../src/components/core/list/SolidListView.tsx"],"names":[],"mappings":";AAwDA,eAAO,MAAM,+BAA+B,WAgB3C,CAAC;AAGF,eAAO,MAAM,oCAAoC,QAAS,MAAM,QAgB/D,CAAC;AAEF,eAAO,MAAM,6BAA6B,gBAAiB,GAAG,kBAU7D,CAAC;AAGF,eAAO,MAAM,kCAAkC,QAAS,MAAM,eAAe,GAAG,kBAU/E,CAAC;AAEF,KAAK,mBAAmB,GAAG;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,6BAA6B,CAAC,EAAE,GAAG,CAAC;IACpC,8BAA8B,CAAC,EAAE,GAAG,CAAC;IACrC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,iBAAiB,CAAC,EAAE,GAAG,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC;;;;;OAKG;IACH,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB;;;;OAIG;IACH,YAAY,EAAE,MAAM,IAAI,CAAC;IACzB;;;;;;OAMG;IACH,WAAW,EAAE,CAAC,MAAM,EAAE;QACpB,uBAAuB,CAAC,EAAE,GAAG,CAAC;QAC9B,gBAAgB,CAAC,EAAE,GAAG,CAAC;QACvB,sBAAsB,CAAC,EAAE,GAAG,CAAC;QAC7B,2BAA2B,CAAC,EAAE,GAAG,CAAC;KACnC,KAAK,IAAI,CAAC;IACX;;;;OAIG;IACH,aAAa,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7D;;;OAGG;IACH,OAAO,EAAE,CAAC,aAAa,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC;IACpE;;;OAGG;IACH,eAAe,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;IAC1C;;;OAGG;IACH,QAAQ,EAAE,MAAM;QACd,KAAK,EAAE,MAAM,CAAC;QACd,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,EAAE,MAAM,CAAC;QAClB,SAAS,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;QACtB,YAAY,EAAE,OAAO,CAAC;QACtB,OAAO,EAAE,GAAG,CAAC;QACb,gBAAgB,EAAE,GAAG,CAAC;QACtB,QAAQ,EAAE,GAAG,EAAE,CAAC;QAChB,YAAY,EAAE,MAAM,CAAC;QACrB,OAAO,EAAE,OAAO,CAAC;KAClB,CAAC;CACH,CAAC;AAEF,eAAO,MAAM,aAAa,qHAykDxB,CAAC"}
+{"version":3,"file":"SolidListView.d.ts","sourceRoot":"","sources":["../../../../src/components/core/list/SolidListView.tsx"],"names":[],"mappings":";AAwDA,eAAO,MAAM,+BAA+B,WAgB3C,CAAC;AAGF,eAAO,MAAM,oCAAoC,QAAS,MAAM,QAgB/D,CAAC;AAEF,eAAO,MAAM,6BAA6B,gBAAiB,GAAG,kBAU7D,CAAC;AAGF,eAAO,MAAM,kCAAkC,QAAS,MAAM,eAAe,GAAG,kBAU/E,CAAC;AAEF,KAAK,mBAAmB,GAAG;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,6BAA6B,CAAC,EAAE,GAAG,CAAC;IACpC,8BAA8B,CAAC,EAAE,GAAG,CAAC;IACrC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,iBAAiB,CAAC,EAAE,GAAG,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC;;;;;OAKG;IACH,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB;;;;OAIG;IACH,YAAY,EAAE,MAAM,IAAI,CAAC;IACzB;;;;;;OAMG;IACH,WAAW,EAAE,CAAC,MAAM,EAAE;QACpB,uBAAuB,CAAC,EAAE,GAAG,CAAC;QAC9B,gBAAgB,CAAC,EAAE,GAAG,CAAC;QACvB,sBAAsB,CAAC,EAAE,GAAG,CAAC;QAC7B,2BAA2B,CAAC,EAAE,GAAG,CAAC;KACnC,KAAK,IAAI,CAAC;IACX;;;;OAIG;IACH,aAAa,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7D;;;OAGG;IACH,OAAO,EAAE,CAAC,aAAa,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC;IACpE;;;OAGG;IACH,eAAe,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;IAC1C;;;OAGG;IACH,QAAQ,EAAE,MAAM;QACd,KAAK,EAAE,MAAM,CAAC;QACd,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,EAAE,MAAM,CAAC;QAClB,SAAS,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;QACtB,YAAY,EAAE,OAAO,CAAC;QACtB,OAAO,EAAE,GAAG,CAAC;QACb,gBAAgB,EAAE,GAAG,CAAC;QACtB,QAAQ,EAAE,GAAG,EAAE,CAAC;QAChB,YAAY,EAAE,MAAM,CAAC;QACrB,OAAO,EAAE,OAAO,CAAC;KAClB,CAAC;CACH,CAAC;AAEF,eAAO,MAAM,aAAa,qHA0oDxB,CAAC"}

package/dist/components/core/list/SolidListView.js

@@ -187,6 +187,7 @@ export var SolidListView = forwardRef(function (params, ref) {
     var _48 = useState(null), filterPredicates = _48[0], setFilterPredicates = _48[1];
     var _49 = useState(false), showSaveFilterPopup = _49[0], setShowSaveFilterPopup = _49[1];
     var _50 = useState(false), showGlobalSearchElement = _50[0], setShowGlobalSearchElement = _50[1];
+    var suppressNextFilterPaginationResetRef = useRef(false);
     var triggerCheckIfPermissionExists = useLazyCheckIfPermissionExistsQuery()[0];
     var handleCustomButtonClick = useHandleListCustomButtonClick();
     var editBaseUrl = useMemo(function () { return normalizeSolidListTreeKanbanActionPath(pathname, editButtonUrl || "form"); }, [editButtonUrl, pathname]);
@@ -424,6 +425,7 @@ export var SolidListView = forwardRef(function (params, ref) {
         if (solidListViewMetaData && solidListViewLayout) {
             var queryObject = getFilterObjectFromLocalStorage();
             if (queryObject) {
+                suppressNextFilterPaginationResetRef.current = true;
                 var queryData = {
                     offset: queryObject.offset || 0,
                     limit: queryObject.limit || 25,
@@ -668,8 +670,9 @@ export var SolidListView = forwardRef(function (params, ref) {
                     return [3 /*break*/, 4];
                 case 4:
                     queryString = qs.stringify(queryData, { encodeValuesOnly: true });
-                    if (latestFilterPredicatesRef.current && latestFilterPredicatesRef.current.persistFilter) {
+                    if (latestFilterPredicatesRef.current) {
                         fileterTobeStored = structuredClone(queryData);
+                        fileterTobeStored.finalFullFilter = fileterTobeStored.filters;
                         delete fileterTobeStored.filters;
                         fileterTobeStored.custom_filter_predicate = latestFilterPredicatesRef.current.custom_filter_predicate || null;
                         fileterTobeStored.search_predicate = latestFilterPredicatesRef.current.search_predicate || null;
@@ -700,6 +703,20 @@ export var SolidListView = forwardRef(function (params, ref) {
             queryfilter.$and.push(filterPredicates.predefined_search_predicate);
         }
         var updatedFilter = queryfilter;
+        var previousPredicates = latestFilterPredicatesRef.current;
+        var nextPredicatesComparable = {
+            custom_filter_predicate: (filterPredicates === null || filterPredicates === void 0 ? void 0 : filterPredicates.custom_filter_predicate) || null,
+            search_predicate: (filterPredicates === null || filterPredicates === void 0 ? void 0 : filterPredicates.search_predicate) || null,
+            saved_filter_predicate: (filterPredicates === null || filterPredicates === void 0 ? void 0 : filterPredicates.saved_filter_predicate) || null,
+            predefined_search_predicate: (filterPredicates === null || filterPredicates === void 0 ? void 0 : filterPredicates.predefined_search_predicate) || null,
+        };
+        var previousPredicatesComparable = {
+            custom_filter_predicate: (previousPredicates === null || previousPredicates === void 0 ? void 0 : previousPredicates.custom_filter_predicate) || null,
+            search_predicate: (previousPredicates === null || previousPredicates === void 0 ? void 0 : previousPredicates.search_predicate) || null,
+            saved_filter_predicate: (previousPredicates === null || previousPredicates === void 0 ? void 0 : previousPredicates.saved_filter_predicate) || null,
+            predefined_search_predicate: (previousPredicates === null || previousPredicates === void 0 ? void 0 : previousPredicates.predefined_search_predicate) || null,
+        };
+        var hasPredicateChanged = JSON.stringify(previousPredicatesComparable) !== JSON.stringify(nextPredicatesComparable);
         // Update refs IMMEDIATELY (synchronously)
         latestFiltersRef.current = updatedFilter;
         var updatedFilterPredicates = structuredClone(filterPredicates);
@@ -708,7 +725,54 @@ export var SolidListView = forwardRef(function (params, ref) {
         // Then update state
         setFilters(updatedFilter);
         setFilterPredicates(updatedFilterPredicates);
-        setFirst(0);
+        var hasMeaningfulFilterValueLocal = function (value) {
+            if (value === null || value === undefined)
+                return false;
+            if (typeof value === "string")
+                return value.trim().length > 0;
+            if (typeof value === "number" || typeof value === "boolean")
+                return true;
+            if (Array.isArray(value))
+                return value.some(function (item) { return hasMeaningfulFilterValueLocal(item); });
+            if (typeof value === "object")
+                return hasAppliedFiltersLocal(value);
+            return false;
+        };
+        var hasAppliedFiltersLocal = function (filterObject) {
+            if (!filterObject || typeof filterObject !== "object")
+                return false;
+            if (Array.isArray(filterObject)) {
+                return filterObject.some(function (item) { return hasAppliedFiltersLocal(item) || hasMeaningfulFilterValueLocal(item); });
+            }
+            return Object.entries(filterObject).some(function (_a) {
+                var key = _a[0], val = _a[1];
+                if (key === "matchMode" || key === "operator")
+                    return false;
+                if (key === "value")
+                    return hasMeaningfulFilterValueLocal(val);
+                if ((key === "$and" || key === "$or") && Array.isArray(val)) {
+                    return val.some(function (item) { return hasAppliedFiltersLocal(item) || hasMeaningfulFilterValueLocal(item); });
+                }
+                if (typeof val === "object")
+                    return hasAppliedFiltersLocal(val);
+                return hasMeaningfulFilterValueLocal(val);
+            });
+        };
+        var hasCurrentMeaningfulPredicates = hasAppliedFiltersLocal(updatedFilterPredicates === null || updatedFilterPredicates === void 0 ? void 0 : updatedFilterPredicates.custom_filter_predicate) ||
+            hasAppliedFiltersLocal(updatedFilterPredicates === null || updatedFilterPredicates === void 0 ? void 0 : updatedFilterPredicates.search_predicate) ||
+            hasAppliedFiltersLocal(updatedFilterPredicates === null || updatedFilterPredicates === void 0 ? void 0 : updatedFilterPredicates.saved_filter_predicate) ||
+            hasAppliedFiltersLocal(updatedFilterPredicates === null || updatedFilterPredicates === void 0 ? void 0 : updatedFilterPredicates.predefined_search_predicate);
+        var hasPreviousMeaningfulPredicates = hasAppliedFiltersLocal(previousPredicates === null || previousPredicates === void 0 ? void 0 : previousPredicates.custom_filter_predicate) ||
+            hasAppliedFiltersLocal(previousPredicates === null || previousPredicates === void 0 ? void 0 : previousPredicates.search_predicate) ||
+            hasAppliedFiltersLocal(previousPredicates === null || previousPredicates === void 0 ? void 0 : previousPredicates.saved_filter_predicate) ||
+            hasAppliedFiltersLocal(previousPredicates === null || previousPredicates === void 0 ? void 0 : previousPredicates.predefined_search_predicate);
+        var shouldResetPagination = hasPredicateChanged && (hasCurrentMeaningfulPredicates || hasPreviousMeaningfulPredicates);
+        if (suppressNextFilterPaginationResetRef.current) {
+            suppressNextFilterPaginationResetRef.current = false;
+        }
+        else if (shouldResetPagination) {
+            setFirst(0);
+        }
         // Force synchronous state updates
     };
     // clear Filter