@quillsql/react 2.12.2 → 2.12.4

package/dist/esm/components/QuillMultiSelectWithCombo.d.ts

@@ -0,0 +1,11 @@
+import { MultiSelectComponentProps } from './UiComponents';
+/**
+ * A robust select component that implements the new minimal Select interface.
+ */
+export declare function QuillMultiSelectComponentWithCombo({ options, width, onChange, label, value, }: MultiSelectComponentProps): import("react/jsx-runtime").JSX.Element;
+export declare const ListboxTextInput: ({ value, onChange, placeholder, }: {
+    value: string;
+    onChange: (e: string) => void;
+    placeholder: string;
+}) => import("react/jsx-runtime").JSX.Element;
+//# sourceMappingURL=QuillMultiSelectWithCombo.d.ts.map

package/dist/esm/components/QuillMultiSelectWithCombo.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"QuillMultiSelectWithCombo.d.ts","sourceRoot":"","sources":["../../../src/components/QuillMultiSelectWithCombo.tsx"],"names":[],"mappings":"AACA,OAAO,EACL,yBAAyB,EAE1B,MAAM,gBAAgB,CAAC;AAYxB;;GAEG;AACH,wBAAgB,kCAAkC,CAAC,EACjD,OAAO,EACP,KAAK,EACL,QAAQ,EACR,KAAK,EACL,KAAK,GACN,EAAE,yBAAyB,2CAoS3B;AAED,eAAO,MAAM,gBAAgB;WAKpB,MAAM;kBACC,MAAM,KAAK,IAAI;iBAChB,MAAM;6CAyDpB,CAAC"}

package/dist/esm/components/QuillMultiSelectWithCombo.js

@@ -0,0 +1,200 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useOnClickOutside } from '../hooks';
+import React, { useContext, useEffect, useRef, useState, } from 'react';
+import { ThemeContext } from '../Context';
+/**
+ * A robust select component that implements the new minimal Select interface.
+ */
+export function QuillMultiSelectComponentWithCombo({ options, width, onChange, label, value, }) {
+    const [theme] = useContext(ThemeContext);
+    const [selectedOptions, setSelectedOptions] = useState([]);
+    const [showModal, setShowModal] = useState(false);
+    const modalRef = useRef(null);
+    const debounceTimeoutId = useRef(null);
+    const [searchQuery, setSearchQuery] = React.useState('');
+    const [filteredItems, setFilteredItems] = React.useState(options.slice(0, 20));
+    useEffect(() => {
+        setFilteredItems(options.slice(0, 20));
+    }, [options]);
+    const handleSearchChange = (value) => {
+        setSearchQuery(value);
+        const curFilteredItems = value === ''
+            ? options.slice(0, 20)
+            : options
+                .filter((option) => {
+                if (!option) {
+                    return false;
+                }
+                return option.value
+                    .toLowerCase()
+                    .replace(/\s+/g, '')
+                    .includes(value.toLowerCase().replace(/\s+/g, ''));
+            })
+                .slice(0, 20);
+        setFilteredItems(curFilteredItems);
+    };
+    useOnClickOutside(modalRef, (e) => setShowModal(false));
+    useEffect(() => {
+        if (!value) {
+            setSelectedOptions([]);
+        }
+        else {
+            setSelectedOptions(value);
+        }
+    }, [value]);
+    const debounce = (updatedChangeEvent) => {
+        if (debounceTimeoutId.current) {
+            clearTimeout(debounceTimeoutId.current);
+        }
+        debounceTimeoutId.current = setTimeout(() => {
+            onChange(updatedChangeEvent);
+        }, 500);
+    };
+    // const filterOptions = (query: string) => {
+    //   setSearchQuery(query);
+    //   setFilteredOptions(
+    //     options.filter((option) =>
+    //       option.label.toLowerCase().includes(query.toLowerCase()),
+    //     ),
+    //   );
+    // };
+    return (_jsxs("div", { style: {
+            position: 'relative',
+            borderRadius: '6px',
+            width: width,
+            minWidth: width,
+        }, children: [label && (_jsx("div", { style: {
+                    fontSize: 14,
+                    color: theme.secondaryTextColor,
+                    fontFamily: theme.fontFamily,
+                    paddingBottom: 5,
+                    fontWeight: 600,
+                }, children: label })), _jsxs("button", { style: {
+                    fontFamily: theme.fontFamily,
+                    color: theme.primaryTextColor,
+                    width: '100%',
+                    display: 'flex',
+                    alignItems: 'center',
+                    justifyContent: 'space-between',
+                    fontWeight: 'inherit',
+                    lineHeight: 'inherit',
+                    padding: '8px 12px',
+                    fontSize: 14,
+                    margin: 0,
+                    boxSizing: 'border-box',
+                    borderWidth: 1,
+                    borderStyle: 'solid',
+                    borderColor: theme.borderColor,
+                    borderRadius: 6,
+                    paddingTop: 9,
+                    paddingBottom: 9,
+                    height: 40,
+                    minHeight: 40,
+                    maxHeight: 40,
+                }, className: "quill-select-button", onClick: () => setShowModal((showModal) => !showModal), children: [_jsx("style", { children: ` .quill-select-button { background: ${theme.backgroundColor}; } 
+          .quill-select-button:hover { background: ${theme.hoverBackgroundColor}; }
+        ` }), _jsx("span", { style: {
+                            textOverflow: 'ellipsis',
+                            whiteSpace: 'nowrap',
+                            overflow: 'hidden',
+                            width: '100%',
+                            textAlign: 'left',
+                            zIndex: 1,
+                        }, children: value && value.length > 0 ? value.join(', ') : 'Select' }), _jsx("svg", { xmlns: "http://www.w3.org/2000/svg", viewBox: "0 0 20 20", fill: "currentColor", "aria-hidden": "true", "data-slot": "icon", height: 20, width: 20, style: { minHeight: 20, minWidth: 20 }, children: _jsx("path", { fillRule: "evenodd", d: "M5.22 8.22a.75.75 0 0 1 1.06 0L10 11.94l3.72-3.72a.75.75 0 1 1 1.06 1.06l-4.25 4.25a.75.75 0 0 1-1.06 0L5.22 9.28a.75.75 0 0 1 0-1.06Z", clipRule: "evenodd" }) })] }), showModal && (_jsxs("div", { ref: modalRef, style: {
+                    position: 'absolute',
+                    width: '100%',
+                    display: 'flex',
+                    flexDirection: 'column',
+                    boxSizing: 'border-box',
+                    borderWidth: 1,
+                    borderStyle: 'solid',
+                    borderColor: theme.borderColor,
+                    borderRadius: 6,
+                    background: 'white',
+                    marginTop: 12,
+                    zIndex: 100,
+                    padding: 6,
+                    fontFamily: theme.fontFamily,
+                    maxHeight: '50vh',
+                    overflow: 'scroll',
+                }, children: [options && options.length > 20 && (_jsx(ListboxTextInput, { value: searchQuery, placeholder: "Search", onChange: (value) => {
+                            handleSearchChange(value);
+                        } })), options && options.length > 20 && (_jsx("div", { style: { height: 9, width: 230, borderTop: '1px solid #e7e7e7' } })), filteredItems.map((option) => (_jsxs("button", { style: {
+                            display: 'flex',
+                            alignItems: 'center',
+                            padding: 8,
+                            margin: 0,
+                            boxSizing: 'border-box',
+                            borderWidth: 0,
+                            fontSize: 14,
+                            borderStyle: 'solid',
+                            borderColor: theme.borderColor,
+                            borderRadius: 4,
+                            fontFamily: theme.fontFamily,
+                            textOverflow: 'ellipsis',
+                            whiteSpace: 'nowrap',
+                            height: 34,
+                            minHeight: 34,
+                            gap: 6,
+                            overflow: 'hidden',
+                        }, className: "quill-option", onClick: () => {
+                            // Manually create a synthetic ChangeEvent and pass it to callback
+                            const changeEvent = { target: { value: option.value } };
+                            let updateSelctedOptions = [...selectedOptions];
+                            if (selectedOptions.includes(changeEvent.target.value)) {
+                                updateSelctedOptions = selectedOptions.filter((opt) => opt !== changeEvent.target.value);
+                                setSelectedOptions(updateSelctedOptions);
+                            }
+                            else {
+                                updateSelctedOptions = [
+                                    ...updateSelctedOptions,
+                                    changeEvent.target.value,
+                                ];
+                                setSelectedOptions(updateSelctedOptions);
+                            }
+                            const updatedChangeEvent = {
+                                target: { value: JSON.stringify(updateSelctedOptions) },
+                            };
+                            if (updateSelctedOptions.length === 0) {
+                                updatedChangeEvent.target.value = '';
+                            }
+                            debounce(updatedChangeEvent);
+                        }, children: [_jsx("style", { children: `
+                .quill-option {
+                  background: white;
+                }
+                  .quill-option:hover {
+                    background: #F4F4F5;
+                  }
+                ` }), _jsx("input", { type: "checkbox", checked: selectedOptions.includes(option.value), style: { width: '14px', height: '14px', margin: 'auto 0' }, readOnly: true }), _jsx("span", { style: {
+                                    textOverflow: 'ellipsis',
+                                    whiteSpace: 'nowrap',
+                                    overflow: 'hidden',
+                                }, children: option.label })] }, option.value)))] }))] }));
+}
+export const ListboxTextInput = ({ value, onChange, placeholder, }) => {
+    return (_jsxs("div", { style: {
+            position: 'relative',
+            display: 'flex',
+            flexDirection: 'row',
+            alignItems: 'center',
+            marginTop: 2,
+        }, children: [_jsx("style", { children: `
+      .quill-text-input {
+          background-color: white;
+          height: 40px;
+         width: 180px;
+         z-index: 2;
+         color: #384151;
+         border-radius: 4px;
+         text-align: left;
+         padding-right: 12px;
+         padding-top: 0px;
+         padding-bottom: 0px;
+         box-sizing: content-box;
+         margin-left: 6px;
+      }
+      .quill-text-input:focus {
+        outline: none;
+    }` }), _jsx("div", { style: { width: 6 } }), _jsx("svg", { xmlns: "http://www.w3.org/2000/svg", viewBox: "0 0 16 16", fill: "rgba(56, 65, 81, 0.7)", height: "16", width: "16", children: _jsx("path", { fillRule: "evenodd", d: "M9.965 11.026a5 5 0 1 1 1.06-1.06l2.755 2.754a.75.75 0 1 1-1.06 1.06l-2.755-2.754ZM10.5 7a3.5 3.5 0 1 1-7 0 3.5 3.5 0 0 1 7 0Z", clipRule: "evenodd" }) }), _jsx("input", { className: "quill-text-input", type: "text", value: value, onChange: (event) => onChange(event.target.value), placeholder: placeholder })] }));
+};

package/dist/esm/components/QuillSelectWithCombo.d.ts

@@ -0,0 +1,6 @@
+import { SelectComponentProps } from './UiComponents';
+/**
+ * A robust select component that implements the new minimal Select interface.
+ */
+export declare function QuillSelectComponentWithCombo({ options, value, width, onChange, label, }: SelectComponentProps): import("react/jsx-runtime").JSX.Element;
+//# sourceMappingURL=QuillSelectWithCombo.d.ts.map

package/dist/esm/components/QuillSelectWithCombo.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"QuillSelectWithCombo.d.ts","sourceRoot":"","sources":["../../../src/components/QuillSelectWithCombo.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAMtD;;GAEG;AACH,wBAAgB,6BAA6B,CAAC,EAC5C,OAAO,EACP,KAAK,EACL,KAAK,EACL,QAAQ,EACR,KAAK,GACN,EAAE,oBAAoB,2CA+OtB"}

package/dist/esm/components/QuillSelectWithCombo.js

@@ -0,0 +1,159 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useOnClickOutside } from '../hooks';
+import React, { useContext, useRef, useState } from 'react';
+import { ThemeContext } from '../Context';
+import { ListboxTextInput } from './QuillMultiSelectWithCombo';
+/**
+ * A robust select component that implements the new minimal Select interface.
+ */
+export function QuillSelectComponentWithCombo({ options, value, width, onChange, label, }) {
+    const [theme] = useContext(ThemeContext);
+    const [showModal, setShowModal] = useState(false);
+    const modalRef = useRef(null);
+    const [searchQuery, setSearchQuery] = React.useState('');
+    const [filteredItems, setFilteredItems] = React.useState(options.slice(0, 20));
+    useOnClickOutside(modalRef, (e) => setShowModal(false));
+    const handleSearchChange = (value) => {
+        setSearchQuery(value);
+        const curFilteredItems = value === ''
+            ? options.slice(0, 20)
+            : options
+                .filter((option) => {
+                if (!option) {
+                    return false;
+                }
+                return option.value
+                    .toLowerCase()
+                    .replace(/\s+/g, '')
+                    .includes(value.toLowerCase().replace(/\s+/g, ''));
+            })
+                .slice(0, 20);
+        setFilteredItems(curFilteredItems);
+    };
+    useOnClickOutside(modalRef, (e) => setShowModal(false));
+    return (_jsxs("div", { style: {
+            position: 'relative',
+            // width: 200,
+            // minWidth: 200,
+            borderRadius: '6px',
+            width: width,
+            minWidth: width,
+        }, children: [label && (_jsx("div", { style: {
+                    fontSize: 14,
+                    color: theme.secondaryTextColor,
+                    fontFamily: theme.fontFamily,
+                    paddingBottom: 5,
+                    fontWeight: 600,
+                }, children: label })), _jsxs("button", { style: {
+                    fontFamily: theme.fontFamily,
+                    color: theme.primaryTextColor,
+                    width: '100%',
+                    display: 'flex',
+                    alignItems: 'center',
+                    justifyContent: 'space-between',
+                    lineHeight: 'inherit',
+                    padding: '8px 12px',
+                    fontSize: 14,
+                    margin: 0,
+                    boxSizing: 'border-box',
+                    borderWidth: 1,
+                    borderStyle: 'solid',
+                    borderColor: theme.borderColor,
+                    borderRadius: 6,
+                    paddingTop: 9,
+                    paddingBottom: 9,
+                    height: 40,
+                    minHeight: 40,
+                    maxHeight: 40,
+                }, className: "quill-select-button", onClick: () => setShowModal((showModal) => !showModal), children: [_jsx("style", { children: ` .quill-select-button { background: ${theme.backgroundColor}; } .quill-select-button:hover { background: ${theme.hoverBackgroundColor}; }` }), _jsx("span", { style: {
+                            textOverflow: 'ellipsis',
+                            whiteSpace: 'nowrap',
+                            overflow: 'hidden',
+                        }, children: options.find((elem) => elem.value === value)?.label || 'Select' }), _jsx("svg", { xmlns: "http://www.w3.org/2000/svg", viewBox: "0 0 20 20", fill: "currentColor", "aria-hidden": "true", "data-slot": "icon", height: 20, width: 20, style: { minHeight: 20, minWidth: 20 }, children: _jsx("path", { fillRule: "evenodd", d: "M5.22 8.22a.75.75 0 0 1 1.06 0L10 11.94l3.72-3.72a.75.75 0 1 1 1.06 1.06l-4.25 4.25a.75.75 0 0 1-1.06 0L5.22 9.28a.75.75 0 0 1 0-1.06Z", clipRule: "evenodd" }) })] }), showModal && (_jsxs("div", { ref: modalRef, style: {
+                    position: 'absolute',
+                    width: '100%',
+                    display: 'flex',
+                    flexDirection: 'column',
+                    boxSizing: 'border-box',
+                    borderWidth: 1,
+                    borderStyle: 'solid',
+                    borderColor: theme.borderColor,
+                    borderRadius: 6,
+                    background: 'white',
+                    marginTop: 12,
+                    zIndex: 100,
+                    paddingTop: 6,
+                    paddingBottom: 6,
+                    paddingLeft: 6,
+                    paddingRight: 6,
+                    fontFamily: theme.fontFamily,
+                    maxHeight: '50vh',
+                    overflow: 'scroll',
+                }, children: [options && options.length > 20 && (_jsx(ListboxTextInput, { value: searchQuery, placeholder: "Search", onChange: (value) => {
+                            handleSearchChange(value);
+                        } })), searchQuery === '' && (_jsxs("button", { style: {
+                            display: 'flex',
+                            alignItems: 'center',
+                            justifyContent: 'space-between',
+                            padding: '8px 8px',
+                            margin: 0,
+                            boxSizing: 'border-box',
+                            borderWidth: 0,
+                            fontSize: 14,
+                            borderStyle: 'solid',
+                            borderColor: theme.borderColor,
+                            borderRadius: 4,
+                            fontFamily: theme.fontFamily,
+                            textOverflow: 'ellipsis',
+                            whiteSpace: 'nowrap',
+                            overflow: 'hidden',
+                            height: 34,
+                            minHeight: 34,
+                        }, className: "quill-option", onClick: () => {
+                            // Manually create a synthetic ChangeEvent and pass it to callback
+                            const changeEvent = { target: { value: '' } };
+                            onChange(changeEvent);
+                            setShowModal(false);
+                        }, children: [_jsx("style", { children: `
+                .quill-option {
+                  background: white;
+                }
+                  .quill-option:hover {
+                    background: #F4F4F5;
+                  }
+                ` }), 'Select'] })), filteredItems.map((option) => (_jsxs("button", { style: {
+                            display: 'flex',
+                            alignItems: 'center',
+                            justifyContent: 'space-between',
+                            padding: '8px 8px',
+                            margin: 0,
+                            boxSizing: 'border-box',
+                            borderWidth: 0,
+                            fontSize: 14,
+                            borderStyle: 'solid',
+                            borderColor: theme.borderColor,
+                            borderRadius: 4,
+                            fontFamily: theme.fontFamily,
+                            textOverflow: 'ellipsis',
+                            whiteSpace: 'nowrap',
+                            height: 34,
+                            minHeight: 34,
+                            overflow: 'hidden',
+                        }, className: "quill-option", onClick: () => {
+                            // Manually create a synthetic ChangeEvent and pass it to callback
+                            const changeEvent = { target: { value: option.value } };
+                            onChange(changeEvent);
+                            setShowModal(false);
+                        }, children: [_jsx("style", { children: `
+                .quill-option {
+                  background: white;
+                }
+                  .quill-option:hover {
+                    background: #F4F4F5;
+                  }
+                ` }), _jsx("span", { style: {
+                                    textOverflow: 'ellipsis',
+                                    whiteSpace: 'nowrap',
+                                    overflow: 'hidden',
+                                }, children: option.label })] }, option.value)))] }))] }));
+}

package/dist/esm/hooks/useQuill.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useQuill.d.ts","sourceRoot":"","sources":["../../../src/hooks/useQuill.ts"],"names":[],"mappings":"AAUA,UAAU,MAAM;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,KAAK;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,UAAU;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,WAAW;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B;AAED,eAAO,MAAM,QAAQ,aACT,MAAM;UAEV,WAAW,GAAG,IAAI;aACf,OAAO;WACT,MAAM,GAAG,IAAI;CAkFrB,CAAC"}
+{"version":3,"file":"useQuill.d.ts","sourceRoot":"","sources":["../../../src/hooks/useQuill.ts"],"names":[],"mappings":"AAWA,UAAU,MAAM;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,KAAK;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,UAAU;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,WAAW;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B;AAED,eAAO,MAAM,QAAQ,aACT,MAAM;UAEV,WAAW,GAAG,IAAI;aACf,OAAO;WACT,MAAM,GAAG,IAAI;CAoFrB,CAAC"}

package/dist/esm/hooks/useQuill.js

@@ -1,11 +1,12 @@
 import { useContext, useEffect, useState } from 'react';
-import { ClientContext, DashboardContext, DashboardFiltersContext, } from '../Context';
+import { ClientContext, CustomFieldContext, DashboardContext, DashboardFiltersContext, } from '../Context';
 import { getData } from '../utils/dataFetcher';
 import { mergeComparisonRange } from '../utils/merge';
 import { processFilterErrorList } from '../utils/errorProcessing';
 export const useQuill = (reportId) => {
     const { dashboard, dispatch } = useContext(DashboardContext);
     const { dashboardFilters } = useContext(DashboardFiltersContext);
+    const [customFields] = useContext(CustomFieldContext);
     const [client] = useContext(ClientContext);
     const [data, setData] = useState(null);
     const [loading, setLoading] = useState(true);
@@ -32,6 +33,7 @@ export const useQuill = (reportId) => {
                             task: 'item',
                             filters: [...Object.values(dashboardFilters)],
                             databaseType: client?.databaseType,
+                            customFields,
                         },
                     };
                     const cloudBody = {

package/dist/esm/internals/ReportBuilder/PivotModal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PivotModal.d.ts","sourceRoot":"","sources":["../../../../src/internals/ReportBuilder/PivotModal.tsx"],"names":[],"mappings":"AAAA,OAAc,EAOZ,SAAS,EACV,MAAM,OAAO,CAAC;AAoBf,OAAO,EACL,oBAAoB,EAKrB,MAAM,+BAA+B,CAAC;AAgBvC,OAAO,EAAE,MAAM,EAAkB,MAAM,sBAAsB,CAAC;AAE9D,MAAM,WAAW,KAAK;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAkBD,MAAM,WAAW,eAAe;IAC9B,aAAa,EAAE,GAAG,CAAC;IACnB,gBAAgB,EAAE,GAAG,CAAC;IACtB,gBAAgB,EAAE,GAAG,CAAC;IACtB,mBAAmB,EAAE,GAAG,CAAC;IACzB,eAAe,EAAE,GAAG,CAAC;IACrB,kBAAkB,EAAE,GAAG,CAAC;IACxB,gBAAgB,EAAE,GAAG,CAAC;IACtB,mBAAmB,EAAE,GAAG,CAAC;IACzB,UAAU,EAAE,GAAG,CAAC;IAChB,aAAa,EAAE,GAAG,CAAC;IACnB,aAAa,EAAE,GAAG,CAAC;IACnB,eAAe,EAAE,GAAG,CAAC;IACrB,eAAe,EAAE,GAAG,CAAC;IACrB,aAAa,EAAE,GAAG,CAAC;IACnB,wBAAwB,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;IACvE,gBAAgB,EAAE,CAAC,KAAK,EAAE;QACxB,MAAM,EAAE,OAAO,CAAC;QAChB,SAAS,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;QACrC,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QAClC,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QAClC,eAAe,EAAE,SAAS,CAAC;KAC5B,KAAK,GAAG,CAAC,OAAO,CAAC;IAClB,eAAe,EAAE,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,KAAK,GAAG,CAAC,OAAO,CAAC;IAC3D,cAAc,EAAE,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,KAAK,GAAG,CAAC,OAAO,CAAC;IAC1D,aAAa,EAAE,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,KAAK,GAAG,CAAC,OAAO,CAAC;IACzD,qBAAqB,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,YAAY,EAAE,MAAM,CAAA;KAAE,KAAK,GAAG,CAAC,OAAO,CAAC;IACzE,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,QAAQ,EAAE,SAAS,CAAA;KAAE,KAAK,GAAG,CAAC,OAAO,CAAC;IACpE,oBAAoB,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,QAAQ,EAAE,SAAS,CAAA;KAAE,KAAK,GAAG,CAAC,OAAO,CAAC;IACvE,gBAAgB,CAAC,EAAE,MAAM,GAAG,CAAC,OAAO,CAAC;IACrC,kBAAkB,EAAE,GAAG,CAAC;IACxB,qBAAqB,EAAE,GAAG,CAAC;IAC3B,WAAW,EAAE,GAAG,CAAC;IACjB,WAAW,EAAE,GAAG,CAAC;IACjB,eAAe,EAAE,GAAG,CAAC;IACrB,kBAAkB,EAAE,GAAG,CAAC;IACxB,IAAI,EAAE,GAAG,CAAC;IACV,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,KAAK,EAAE,GAAG,CAAC;IACX,MAAM,EAAE,GAAG,CAAC;IACZ,SAAS,EAAE,GAAG,CAAC;IACf,SAAS,EAAE,GAAG,CAAC;IACf,aAAa,EAAE,GAAG,CAAC;IACnB,gBAAgB,EAAE,GAAG,CAAC;IACtB,iBAAiB,EAAE,GAAG,CAAC;IACvB,oBAAoB,EAAE,GAAG,CAAC;IAC1B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,EAAE,GAAG,CAAC;IACf,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,mBAAmB,CAAC,EAAE,GAAG,CAAC;IAC1B,yBAAyB,CAAC,EAAE,GAAG,CAAC;IAChC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,2BAA2B,CAAC,EAAE,OAAO,CAAC;CACvC;AAED,eAAO,MAAM,UAAU,m3BAqDpB,eAAe,4CA2xBjB,CAAC;AAEF,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE;IACJ,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf,EAAE,EACH,MAAM,EAAE,MAAM;;;;IAsBf;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM,CAiBvD;AAuJD,wBAAgB,WAAW,CAAC,SAAS,EAAE,MAAM,WAY5C;AAgCD,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,GAAG,EACT,SAAS,EAAE;IAAE,KAAK,EAAE,IAAI,CAAC;IAAC,GAAG,EAAE,IAAI,CAAA;CAAE,GAAG,SAAS,EACjD,YAAY,EAAE,OAAO,EACrB,QAAQ,SAAK,EACb,SAAS,GAAE;IAAE,KAAK,EAAE,IAAI,CAAC;IAAC,GAAG,EAAE,IAAI,CAAA;CAAE,GAAG,SAAqB;;;;;;EA0c9D"}
+{"version":3,"file":"PivotModal.d.ts","sourceRoot":"","sources":["../../../../src/internals/ReportBuilder/PivotModal.tsx"],"names":[],"mappings":"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"}

package/dist/esm/internals/ReportBuilder/PivotModal.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useCallback, useContext, useMemo, useState, useEffect, useRef, } from 'react';
-import { ClientContext } from '../../Context';
+import { ClientContext, CustomFieldContext } from '../../Context';
 import { getDataFromCloud } from '../../utils/dataFetcher';
 import { PivotList, PivotCard } from './PivotList';
 import { differenceInDays, eachDayOfInterval, eachMonthOfInterval, eachWeekOfInterval, eachYearOfInterval, endOfDay, isWithinInterval, subMilliseconds, } from 'date-fns';
@@ -31,6 +31,7 @@ export const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField,
     const [selectedPivotType, setSelectedPivotType] = useState('recommended');
     const [errors, setErrors] = useState([]);
     const [client] = useContext(ClientContext);
+    const [customFields] = useContext(CustomFieldContext);
     const rowFieldRef = useRef(null);
     const colFieldRef = useRef(null);
     const [pivotCardWidth, setPivotCardWidth] = useState(420);
@@ -52,7 +53,7 @@ export const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField,
                 setAllowedValueFields(possibleColumns.valueFields);
                 return possibleColumns;
             }
-            const newUniqueValues = await getUniqueValuesByColumns(stringColumns, query || '', data.rows || [], client);
+            const newUniqueValues = await getUniqueValuesByColumns(stringColumns, query || '', data.rows || [], client, customFields);
             if (!uniqueValues ||
                 hashCode(uniqueValues) !== hashCode(newUniqueValues)) {
                 const possibleColumns = getPossiblePivotFieldOptions(columns, newUniqueValues || {});

package/dist/esm/utils/schema.d.ts

@@ -0,0 +1,6 @@
+export declare const getCustomFieldInfo: (client: any, caller?: string) => Promise<any[]>;
+export declare const getSchemaInfoWithCustomFields: (client: any, caller?: string) => Promise<{
+    schemaData: any;
+    customFieldsByTable: any[];
+}>;
+//# sourceMappingURL=schema.d.ts.map

package/dist/esm/utils/schema.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../src/utils/schema.ts"],"names":[],"mappings":"AAuBA,eAAO,MAAM,kBAAkB,WAAkB,GAAG,oCA6DnD,CAAC;AAEF,eAAO,MAAM,6BAA6B,WAChC,GAAG;;;EA2CZ,CAAC"}

package/dist/esm/utils/schema.js

@@ -0,0 +1,113 @@
+const parseResponse = (results) => {
+    if (results.data?.data) {
+        if (results.data.data.queries &&
+            results.data.data.queries.queryResults.length > 0) {
+            return results.data.data.queries.queryResults;
+        }
+        else {
+            return results.data.data.tables;
+        }
+    }
+    else {
+        if (results.queries &&
+            results.queries.queryResults &&
+            results.queries.queryResults.length > 0) {
+            return results.queries.queryResults;
+        }
+        else {
+            return results.data.tables;
+        }
+    }
+};
+export const getCustomFieldInfo = async (client, caller = 'se') => {
+    let customFieldsByTableUnique = [];
+    try {
+        const { queryEndpoint, queryHeaders, publicKey, databaseType, customerId } = client;
+        let response = await fetch(`${queryEndpoint}?cfr-${caller}`, {
+            method: 'POST',
+            headers: {
+                ...queryHeaders,
+                'Content-Type': 'application/json',
+            },
+            body: JSON.stringify({
+                metadata: {
+                    clientId: publicKey,
+                    publicKey,
+                    task: 'custom-field-records',
+                    databaseType: databaseType,
+                    orgId: customerId,
+                },
+            }),
+        });
+        let result = await response.json();
+        const extractedData = parseResponse(result);
+        const customFieldsByTable = [];
+        extractedData.forEach((table) => {
+            if (!table.rows) {
+                return;
+            }
+            table.rows.forEach((row) => {
+                customFieldsByTable.push({
+                    ref_table: row.ref_table,
+                    field: row.field,
+                    ref_column: row.ref_column,
+                    type: row.type,
+                });
+            });
+        });
+        // make sure the are no duplicate records in extractedData
+        const customFieldsByTableSet = new Set();
+        customFieldsByTableUnique = customFieldsByTable.filter((item) => {
+            if (customFieldsByTableSet.has(item.ref_table + item.field + item.ref_column + item.type)) {
+                return false;
+            }
+            customFieldsByTableSet.add(item.ref_table + item.field + item.ref_column + item.type);
+            return true;
+        });
+    }
+    catch (e) {
+        console.error('CUSTOM FIELDS DISABLED');
+    }
+    return customFieldsByTableUnique;
+};
+export const getSchemaInfoWithCustomFields = async (client, caller = 'se') => {
+    const { queryEndpoint, queryHeaders, publicKey, databaseType, customerId } = client;
+    let customFieldsByTableUnique = [];
+    let getCustomFields = true;
+    if (!customerId || customerId !== '*') {
+        try {
+            customFieldsByTableUnique = await getCustomFieldInfo(client, caller);
+        }
+        catch (e) {
+            getCustomFields = false;
+        }
+    }
+    const response = await fetch(`${queryEndpoint}?schema-${caller}`, {
+        method: 'POST',
+        headers: {
+            ...queryHeaders,
+            'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({
+            metadata: {
+                clientId: publicKey,
+                publicKey: publicKey,
+                task: 'schema',
+                removeCustomerField: true,
+                getCustomFields: !client.customerId ||
+                    client.customerId === '*' ||
+                    (customFieldsByTableUnique.length === 0 && !getCustomFields)
+                    ? false
+                    : true,
+                orgId: client.customerId || '*',
+                customFieldsByTable: customFieldsByTableUnique,
+                gatherSchemaData: true,
+            },
+        }),
+    });
+    const result = await response.json();
+    return {
+        schemaData: parseResponse(result),
+        customFieldsByTable: customFieldsByTableUnique,
+    };
+};

package/dist/esm/utils/tableProcessing.d.ts

@@ -1,6 +1,6 @@
 import { Column } from '../models/Columns';
 export declare const hasColumnAlias: (columns: Column[], referencedColumns: string[]) => boolean;
-export declare const getUniqueValuesByColumns: (columns: Column[], query: string, rows: any, client: any) => Promise<{
+export declare const getUniqueValuesByColumns: (columns: Column[], query: string, rows: any, client: any, customFields: any[]) => Promise<{
     [column: string]: {
         [value: string]: boolean;
     };

package/dist/esm/utils/tableProcessing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tableProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/tableProcessing.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAI3C,eAAO,MAAM,cAAc,YAChB,MAAM,EAAE,qBACE,MAAM,EAAE,KAC1B,OAUF,CAAC;AAEF,eAAO,MAAM,wBAAwB,YAC1B,MAAM,EAAE,SACV,MAAM,QACP,GAAG,UACD,GAAG;;;;SA2DZ,CAAC"}
+{"version":3,"file":"tableProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/tableProcessing.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAI3C,eAAO,MAAM,cAAc,YAChB,MAAM,EAAE,qBACE,MAAM,EAAE,KAC1B,OAUF,CAAC;AAEF,eAAO,MAAM,wBAAwB,YAC1B,MAAM,EAAE,SACV,MAAM,QACP,GAAG,UACD,GAAG,gBACG,GAAG,EAAE;;;;SA6DpB,CAAC"}

package/dist/esm/utils/tableProcessing.js

@@ -11,7 +11,7 @@ export const hasColumnAlias = (columns, referencedColumns) => {
     }
     return false;
 };
-export const getUniqueValuesByColumns = async (columns, query, rows, client) => {
+export const getUniqueValuesByColumns = async (columns, query, rows, client, customFields) => {
     const stringNames = columns.map((column) => column.field);
     const uniqueValues = {};
     if (!client.databaseType ||
@@ -24,6 +24,7 @@ export const getUniqueValuesByColumns = async (columns, query, rows, client) =>
                     orgId: client.customerId || '*',
                     clientId: client.publicKey,
                     databaseType: client?.databaseType,
+                    customFieldsByTable: customFields,
                 },
             };
             const cloudBody = { query };
@@ -46,7 +47,7 @@ export const getUniqueValuesByColumns = async (columns, query, rows, client) =>
     }
     else {
         const distinctValueQuery = generateDistinctQuery(stringNames, query);
-        const distinctStrings = await fetchDistinctStrings(distinctValueQuery, client);
+        const distinctStrings = await fetchDistinctStrings(distinctValueQuery, client, customFields);
         if (!distinctStrings) {
             return {};
         }
@@ -56,7 +57,7 @@ export const getUniqueValuesByColumns = async (columns, query, rows, client) =>
     }
     return uniqueValues;
 };
-const fetchDistinctStrings = async (query, client) => {
+const fetchDistinctStrings = async (query, client, customFields) => {
     try {
         const hostedBody = {
             metadata: {
@@ -65,6 +66,7 @@ const fetchDistinctStrings = async (query, client) => {
                 orgId: client.customerId || '*',
                 clientId: client.publicKey,
                 databaseType: client?.databaseType,
+                customFieldsByTable: customFields,
             },
         };
         const cloudBody = { query };

package/dist/esm/utils/valueFormatter.js

@@ -100,7 +100,7 @@ export const quillFormat = ({ value, format, }) => {
  */
 const formatString = (value) => {
     if (value === null || value === undefined) {
-        return 'null';
+        return '-';
     }
     if (typeof value === 'object') {
         return JSON.stringify(value);