@solidxai/core-ui 0.1.3 → 0.1.4-beta.0

package/dist/components/core/common/SolidGlobalSearchElement.tsx

@@ -6,7 +6,7 @@ import { Divider } from "primereact/divider";
 import { usePathname } from "../../../hooks/usePathname";
 import { useRouter } from "../../../hooks/useRouter";
 import { useSearchParams } from "../../../hooks/useSearchParams";
-import { queryStringToQueryObject } from "../list/SolidListView";
+import { getFilterObjectFromLocalStorage } from "../list/SolidListView";
 import { InputText } from "primereact/inputtext";
 import { createSolidEntityApi } from "../../../redux/api/solidEntityApi";
 import qs from "qs";
@@ -14,6 +14,8 @@ import { SolidSaveCustomFilterForm } from "./SolidSaveCustomFilterForm";
 import { ERROR_MESSAGES } from "../../../constants/error-messages";
 import { hydrateRelationRules } from "../../../helpers/hydrateRelationRules";
 import { useSession } from '../../../hooks/useSession'
+import GroupingComponent, { AggregationRule, GroupingRule, DateGroupingFormat } from "./GroupingComponent";
+
 
 const getRandomInt = (min: number, max: number) => {
     return Math.floor(Math.random() * (max - min + 1)) + min;
@@ -25,6 +27,24 @@ interface PredefinedSearch {
     filters: Record<string, any>;
 }
 
+export type SearchableField = {
+    fieldName: string;
+    displayName: string;
+    searchField: string;
+    matchMode: string;
+}
+
+export type GroupableField = {
+    fieldName: string;
+    displayName: string;
+    searchField: string;
+    matchMode: string;
+    type: string;
+    ormType: string;
+    relationType: string;
+    computedFieldValueType: string;
+}
+
 const extractFields = (nodes: any[] = []): any[] => {
     const result: any[] = [];
 
@@ -354,7 +374,7 @@ export const mergeSearchAndCustomFilters = (transformedFilter: any, newFilter: a
 }
 
 
-export const mergeAllDiffFilters = (customFilter: any, searchFilter: any, savedFilter: any, preDefinedFilter?: any) => {
+export const mergeAllDiffFilters = (customFilter: any, searchFilter: any, savedFilter: any, preDefinedFilter?: any, groupingRules?: GroupingRule[], aggregationRules?: AggregationRule[]) => {
     const filters: any = {};
 
     // Add only non-null filters
@@ -370,6 +390,12 @@ export const mergeAllDiffFilters = (customFilter: any, searchFilter: any, savedF
     if (preDefinedFilter && Object.keys(preDefinedFilter).length > 0) {
         filters["predefined_search_predicate"] = preDefinedFilter;
     }
+    if (groupingRules && Object.keys(groupingRules).length > 0) {
+        filters["grouping_rules"] = groupingRules;
+    }
+    if (aggregationRules && Object.keys(aggregationRules).length > 0) {
+        filters["aggregation_rules"] = aggregationRules;
+    }
     // Return the combined filters object
     return filters;
 }
@@ -479,11 +505,13 @@ const extractChips = (node: any): any[] => {
     return [];
 };
 
+
+
 type RelationCache = Map<string, { label: string; value: number }>;
 
 
 
-export const SolidGlobalSearchElement = forwardRef(({ viewData, handleApplyCustomFilter, showSaveFilterPopup, setShowSaveFilterPopup, filterPredicates }: any, ref) => {
+export const SolidGlobalSearchElement = forwardRef(({ viewData, viewType, handleApplyCustomFilter, showSaveFilterPopup, setShowSaveFilterPopup, filterPredicates }: any, ref) => {
     const defaultState: FilterRule[] = [
         {
             id: 1,
@@ -512,6 +540,20 @@ export const SolidGlobalSearchElement = forwardRef(({ viewData, handleApplyCusto
             ]
         }
     ];
+
+    const defaultAggregationRules: AggregationRule[] = [
+        {
+            id: 1,
+            operator: "count",
+            fieldName: "id",
+            locked: true
+        }
+    ];
+
+    const defaultGroupingRules: GroupingRule[] = [
+        { id: 1, fieldName: null, dateGrouping: null }
+    ];
+
     const [initialState, setInitialState] = useState(defaultState);
     const pathname = usePathname();
 
@@ -530,6 +572,10 @@ export const SolidGlobalSearchElement = forwardRef(({ viewData, handleApplyCusto
 
     const [fields, setFields] = useState<any[]>([]);
     const [searchableFields, setSearchableFields] = useState<any[]>([]);
+    const [groupableFields, setGroupableFields] = useState<GroupableField[]>([]);
+
+    const [groupingRules, setGroupingRules] = useState<GroupingRule[]>(defaultGroupingRules);
+    const [aggregationRules, setAggregationRules] = useState<AggregationRule[]>(defaultAggregationRules);
 
     // used to show the list of predefined searches 
     const [predefinedSearches, setPredefinedSearches] = useState<PredefinedSearch[]>([]);
@@ -537,6 +583,10 @@ export const SolidGlobalSearchElement = forwardRef(({ viewData, handleApplyCusto
     // used to open / close the custom fitler popup 
     const [showGlobalSearchElement, setShowGlobalSearchElement] = useState<boolean>(false);
 
+    // used to open / close the group fitler popup 
+    const [showGroupFilterElement, setShowGroupFilterElement] = useState<boolean>(false);
+
+
     // searchChips maintain the ui to display searched query 
     // searchFilter maintain the transformed filter of the  searched query 
     const [searchChips, setSearchChips] = useState<{ columnName?: string; value: string }[]>([]);
@@ -670,7 +720,7 @@ export const SolidGlobalSearchElement = forwardRef(({ viewData, handleApplyCusto
 
                 if (activeSavedFilter && savedFilters.length === 0) return;
 
-                const queryObject = queryStringToQueryObject();
+                const queryObject = getFilterObjectFromLocalStorage();
                 // const savedQuery = parsedSearchParams?.get("savedQuery");
                 if (activeSavedFilter) {
                     const currentSavedFilterId = Number(activeSavedFilter);
@@ -717,6 +767,31 @@ export const SolidGlobalSearchElement = forwardRef(({ viewData, handleApplyCusto
                     const hydratedRules = await hydrateRelationRules([rules], viewData);
                     setFilterRules(hydratedRules);
                 }
+                const hasGroupingRules = (queryObject?.grouping_rules?.some((rule: any) => rule.fieldName !== null));
+
+                if (hasGroupingRules) {
+                    setGroupingRules(queryObject?.grouping_rules);
+                } else {
+                    // If no grouping rules in localStorage check layout
+                    const layoutGroupBy = viewData?.data?.solidView?.layout?.attrs?.groupBy;
+
+                    if (Array.isArray(layoutGroupBy) && layoutGroupBy.length > 0) {
+                        const initialGroupingRules: GroupingRule[] = layoutGroupBy.map((groupStr: string, index: number) => {
+                            const [fieldName, dateGrouping] = groupStr.split(":");
+                            return {
+                                id: Date.now() + index,
+                                fieldName: fieldName || null,
+                                dateGrouping: (dateGrouping as DateGroupingFormat) || null
+                            };
+                        });
+                        setGroupingRules(initialGroupingRules);
+                    }
+                }
+
+                if (queryObject?.aggregation_rules && queryObject?.aggregation_rules !== aggregationRules) {
+                    setAggregationRules(queryObject?.aggregation_rules);
+                }
+
 
                 setRefreshKey((prev) => prev + 1)
                 setHasSearched(true);
@@ -791,6 +866,7 @@ export const SolidGlobalSearchElement = forwardRef(({ viewData, handleApplyCusto
                     matchMode: viewFieldElement?.attrs?.searchMatchMode,
                     searchField: viewFieldElement?.attrs?.searchField ?? null,
                     isSearchable: viewFieldElement?.attrs?.isSearchable ?? false,
+                    relationType: value?.relationType ?? null,
                 };
             });
 
@@ -816,8 +892,30 @@ export const SolidGlobalSearchElement = forwardRef(({ viewData, handleApplyCusto
                 }
             });
 
-            // console.log("searchableFieldsList", searchableFieldsList);
-
+            const groupableFieldsList = fieldsList.filter((field: any) => {
+                switch (field.type) {
+                    case "relation":
+                        // Only include relation if searchField is present
+                        if (field.relationType === "many-to-one")
+                            return true;
+                        return false;
+                    case "longText":
+                    case "shortText":
+                    case "selectionStatic":
+                    case "selectionDynamic":
+                    case "int":
+                    case "float":
+                    case "boolean":
+                    case "date":
+                    case "datetime":
+                        return true;
+                    // case "selectionStatic":
+                    case "computed":
+                        return field.ormType === "varchar";
+                    default:
+                        return false;
+                }
+            });
 
             // Optionally map to a minimal structure if needed for UI
             let finalSearchableFieldsList: any = searchableFieldsList.map((field: any) => ({
@@ -827,10 +925,21 @@ export const SolidGlobalSearchElement = forwardRef(({ viewData, handleApplyCusto
                 matchMode: field.matchMode
             }));
 
-            // console.log("finalSearchableFieldsList", finalSearchableFieldsList);
-
             setSearchableFields(finalSearchableFieldsList);
 
+            let finalGroupableFieldsList: any = groupableFieldsList.map((field: any) => ({
+                fieldName: field.value,
+                displayName: field.name,
+                searchField: field.searchField ?? "",
+                matchMode: field.matchMode,
+                type: field.type,
+                ormType: field.ormType,
+                relationType: field.relationType,
+                computedFieldValueType: field.computedFieldValueType
+            }));
+
+            setGroupableFields(finalGroupableFieldsList)
+
             const predefinedSearchesList = viewData?.data?.solidView?.layout?.attrs?.predefinedSearches || [];
             setPredefinedSearches(predefinedSearchesList);
         }
@@ -922,10 +1031,16 @@ export const SolidGlobalSearchElement = forwardRef(({ viewData, handleApplyCusto
 
     }
 
+    const applyGrouping = (groupingRules: GroupingRule[], aggregationRules: AggregationRule[]) => {
+        setHasSearched(true)
+        setShowGroupFilterElement(false);
+        setGroupingRules(groupingRules);
+        setAggregationRules(aggregationRules);
+        setRefreshKey((prev) => prev + 1)
+    }
+
     useEffect(() => {
         if (refreshKey > 0 && hasSearched) {
-            console.log("refres", refreshKey);
-            console.log("hasSearched", hasSearched);
 
             const formattedChips = {
                 $and: searchChips.map((chip: any) => ({
@@ -944,7 +1059,7 @@ export const SolidGlobalSearchElement = forwardRef(({ viewData, handleApplyCusto
             const finalPredefinedFilter = predefinedSearchBaseFilter
 
             const finalCustomFilter = customFilter
-            const finalFilter = mergeAllDiffFilters(finalCustomFilter, finalSearchFilter, finalSavedFilter, finalPredefinedFilter)
+            const finalFilter = mergeAllDiffFilters(finalCustomFilter, finalSearchFilter, finalSavedFilter, finalPredefinedFilter, groupingRules, aggregationRules)
             handleApplyCustomFilter(finalFilter, true);
             setHasSearched(false)
             // }
@@ -1006,8 +1121,8 @@ export const SolidGlobalSearchElement = forwardRef(({ viewData, handleApplyCusto
         } else {
             console.error(ERROR_MESSAGES.SAVE_FILTER_UNDEFINED_NULL);
         }
-
     }
+
     const deleteSavedFilter = async () => {
         // delte the saved filter with id 
         await deleteEntity(savedFilterTobeDeleted);
@@ -1170,7 +1285,6 @@ export const SolidGlobalSearchElement = forwardRef(({ viewData, handleApplyCusto
         }
     }
 
-
     const SavedFiltersChip = () => {
 
         return (
@@ -1212,6 +1326,40 @@ export const SolidGlobalSearchElement = forwardRef(({ viewData, handleApplyCusto
         )
     };
 
+    const removeGrouping = () => {
+        setGroupingRules(defaultGroupingRules);
+        setAggregationRules(defaultAggregationRules);
+        setHasSearched(true);
+        setRefreshKey((prev) => prev + 1)
+    }
+
+    const GroupingChip = () => {
+        return (
+            <li className="solid-global-search-chip">
+                <div className="flex align-items-center gap-2">
+                    <div className="flex align-items-center gap-2">
+                        <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg"
+
+                            onClick={() => setShowGroupFilterElement(true)}
+                        >
+                            <rect width="20" height="20" rx="4" fill="#722ED1" />
+                            <path d="M8.66667 15V13.3333H11.3333V15H8.66667ZM6 10.8333V9.16667H14V10.8333H6ZM4 6.66667V5H16V6.66667H4Z"
+                                fill="white" />
+                        </svg>
+                        <span><strong>{groupingRules.length}</strong> Grouping rules applied</span>
+                    </div>
+
+                    {/* button to clear filter */}
+                    <a onClick={removeGrouping}
+                        style={{ cursor: "pointer" }}
+                    >
+                        <i className="pi pi-times ml-1">
+                        </i></a>
+                </div>
+            </li>
+        )
+    };
+
 
 
 
@@ -1312,7 +1460,7 @@ export const SolidGlobalSearchElement = forwardRef(({ viewData, handleApplyCusto
         }
 
         try {
-            // Replace {{search}} placeholders with actual search value
+            // Replace {{ search }} placeholders with actual search value
             const processedFilter = replacePlaceholders(predefinedSearch.filters, inputValue.trim());
 
             // Clear all existing filters and searches
@@ -1383,6 +1531,7 @@ export const SolidGlobalSearchElement = forwardRef(({ viewData, handleApplyCusto
                         {currentSavedFilterData && <SavedFiltersChip />}
                         {predefinedSearchChip && <PredefinedSearchChip />}
                         {customFilter && <CustomChip />}
+                        {groupingRules.length > 0 && groupingRules.some(r => r.fieldName !== null) && <GroupingChip />}
                         <SearchChip />
                         <li ref={chipsRef}>
                             <div className="relative solid-global-search-element-wrapper">
@@ -1509,8 +1658,11 @@ export const SolidGlobalSearchElement = forwardRef(({ viewData, handleApplyCusto
                                 <Divider className="m-0" />
                             </>
                         }
-                        <div className="px-2 py-1">
+                        <div className="px-2 py-1 flex justify-content-between">
                             <Button text size="small" label="Custom Filter" iconPos="left" icon='pi pi-plus' onClick={() => setShowGlobalSearchElement(true)} className="font-bold" />
+                            {viewType === "tree" &&
+                                <Button text size="small" label="Grouping" iconPos="left" icon='pi pi-plus' onClick={() => setShowGroupFilterElement(true)} className="font-bold" />
+                            }
                         </div>
                     </div>
                 )
@@ -1521,19 +1673,40 @@ export const SolidGlobalSearchElement = forwardRef(({ viewData, handleApplyCusto
                         <Button icon="pi pi-times" rounded text aria-label="Cancel" type="reset" size="small" onClick={() => setShowGlobalSearchElement(false)} />
                     </div>
                     <Divider className="m-0" />
-                    <div className="p-3 lg:p-4">
+                    <div className="p-2 lg:p-2">
                         {fields.length > 0 &&
                             <FilterComponent viewData={viewData} fields={fields} filterRules={filterRules} setFilterRules={setFilterRules} transformFilterRules={transformCustomFilterRules} closeDialog={() => setShowGlobalSearchElement(false)}></FilterComponent>
                         }
                     </div>
                 </Dialog>
+                <Dialog header={false} className="solid-global-search-filter" showHeader={false} visible={showGroupFilterElement} style={{ width: '20vw' }} breakpoints={{ '1024px': '75vw', '991px': '90vw', '767px': '94w', '250px': '96vw' }} onHide={() => { if (!showGroupFilterElement) return; setShowGroupFilterElement(false); }}>
+                    <div className="flex align-items-center justify-content-between px-3">
+                        <h5 className="solid-custom-title m-0"></h5>
+                        <Button icon="pi pi-times" rounded text aria-label="Cancel" type="reset" size="small" onClick={() => setShowGroupFilterElement(false)} />
+                    </div>
+                    <Divider className="m-0" />
+                    <div className="p-2 lg:p-2">
+                        {groupableFields.length > 0 &&
+                            <GroupingComponent
+                                viewData={viewData}
+                                fields={groupableFields}
+                                groupingRules={groupingRules}
+                                setGroupingRules={setGroupingRules}
+                                aggregationRules={aggregationRules}
+                                setAggregationRules={setAggregationRules}
+                                applyGrouping={applyGrouping}
+                                closeDialog={() => setShowGroupFilterElement(false)}
+                            ></GroupingComponent>
+                        }
+                    </div>
+                </Dialog >
                 <Dialog header={false} className="solid-global-search-filter" showHeader={false} visible={showSavedFilterComponent} style={{ width: '65vw' }} breakpoints={{ '1024px': '75vw', '991px': '90vw', '767px': '94w', '250px': '96vw' }} onHide={() => { if (!showSavedFilterComponent) return; setShowSavedFilterComponent(false); }}>
                     <div className="flex align-items-center justify-content-between px-3">
                         <h5 className="solid-custom-title m-0">Saved Filter</h5>
                         <Button icon="pi pi-times" rounded text aria-label="Cancel" type="reset" size="small" onClick={() => setShowSavedFilterComponent(false)} />
                     </div>
                     <Divider className="m-0" />
-                    <div className="p-3 lg:p-4">
+                    <div className="p-2 lg:p-2">
                         {fields.length > 0 &&
                             <FilterComponent viewData={viewData} fields={fields} filterRules={currentSavedFilterRules} setFilterRules={setCurrentSavedFilterRules} transformFilterRules={transformSavedFilterRules} closeDialog={() => setShowSavedFilterComponent(false)}></FilterComponent>
                         }
@@ -1558,7 +1731,7 @@ export const SolidGlobalSearchElement = forwardRef(({ viewData, handleApplyCusto
                 >
                     <p>Are you sure you want to delete the {currentSavedFilterData?.name} saved query?</p>
                 </Dialog>
-            </div>
+            </div >
             {/* <div>
                 <Button
                     icon="pi pi-save"

package/dist/components/core/extension/solid-core/modelSequence/modelSequenceFormViewChangeHandler.d.ts

@@ -0,0 +1,19 @@
+declare const hanldeModelSequenceFormViewChange: (event: any) => Promise<{
+    layoutChanged: boolean;
+    dataChanged: boolean;
+    newFormData: {
+        model: null;
+        field: null;
+    };
+    newLayout: import("../../../../..").LayoutNode;
+} | {
+    layoutChanged: boolean;
+    dataChanged: boolean;
+    newFormData: {
+        field: null;
+        model?: undefined;
+    };
+    newLayout: import("../../../../..").LayoutNode;
+} | undefined>;
+export default hanldeModelSequenceFormViewChange;
+//# sourceMappingURL=modelSequenceFormViewChangeHandler.d.ts.map

package/dist/components/core/extension/solid-core/modelSequence/modelSequenceFormViewChangeHandler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"modelSequenceFormViewChangeHandler.d.ts","sourceRoot":"","sources":["../../../../../../src/components/core/extension/solid-core/modelSequence/modelSequenceFormViewChangeHandler.tsx"],"names":[],"mappings":"AAEA,QAAA,MAAM,iCAAiC,UAAiB,GAAG;;;;;;;;;;;;;;;;cAuD1D,CAAA;AACD,eAAe,iCAAiC,CAAC"}

package/dist/components/core/extension/solid-core/modelSequence/modelSequenceFormViewChangeHandler.js

@@ -0,0 +1,90 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+import { SolidViewLayoutManager } from "../../../../../components/core/common/SolidViewLayoutManager";
+var hanldeModelSequenceFormViewChange = function (event) { return __awaiter(void 0, void 0, void 0, function () {
+    var modifiedField, modifiedFieldValue, formViewLayout, layout, layoutManager, modelWhereClause, fieldWhereClauseOnModule, fieldWhereClauseOnModel;
+    return __generator(this, function (_a) {
+        console.log("event", event);
+        modifiedField = event.modifiedField, modifiedFieldValue = event.modifiedFieldValue, formViewLayout = event.formViewLayout;
+        layout = formViewLayout;
+        layoutManager = new SolidViewLayoutManager(layout);
+        if (modifiedField === 'module') {
+            modelWhereClause = {
+                module: {
+                    id: { $eq: modifiedFieldValue.id }
+                }
+            };
+            fieldWhereClauseOnModule = {
+                model: {
+                    module: {
+                        id: { $eq: modifiedFieldValue.id }
+                    }
+                }
+            };
+            layoutManager.updateNodeAttributes('model', { "whereClause": JSON.stringify(modelWhereClause) });
+            layoutManager.updateNodeAttributes('field', { "whereClause": JSON.stringify(fieldWhereClauseOnModule) });
+            return [2 /*return*/, {
+                    layoutChanged: true,
+                    dataChanged: true,
+                    newFormData: {
+                        model: null,
+                        field: null
+                    },
+                    newLayout: layoutManager.getLayout(),
+                }];
+        }
+        if (modifiedField === 'model') {
+            fieldWhereClauseOnModel = {
+                model: {
+                    id: { $eq: modifiedFieldValue.id }
+                }
+            };
+            layoutManager.updateNodeAttributes('field', { "whereClause": JSON.stringify(fieldWhereClauseOnModel) });
+            return [2 /*return*/, {
+                    layoutChanged: true,
+                    dataChanged: true,
+                    newFormData: {
+                        field: null
+                    },
+                    newLayout: layoutManager.getLayout(),
+                }];
+        }
+        return [2 /*return*/];
+    });
+}); };
+export default hanldeModelSequenceFormViewChange;
+//# sourceMappingURL=modelSequenceFormViewChangeHandler.js.map

package/dist/components/core/extension/solid-core/modelSequence/modelSequenceFormViewChangeHandler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"modelSequenceFormViewChangeHandler.js","sourceRoot":"","sources":["../../../../../../src/components/core/extension/solid-core/modelSequence/modelSequenceFormViewChangeHandler.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,8DAA8D,CAAC;AAEtG,IAAM,iCAAiC,GAAG,UAAO,KAAU;;;QAEvD,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;QAEnB,aAAa,GAAyC,KAAK,cAA9C,EAAE,kBAAkB,GAAqB,KAAK,mBAA1B,EAAE,cAAc,GAAK,KAAK,eAAV,CAAW;QAE9D,MAAM,GAAG,cAAc,CAAC;QACxB,aAAa,GAAG,IAAI,sBAAsB,CAAC,MAAM,CAAC,CAAC;QACzD,IAAI,aAAa,KAAK,QAAQ,EAAE;YAEtB,gBAAgB,GAAG;gBACrB,MAAM,EAAE;oBACJ,EAAE,EAAE,EAAE,GAAG,EAAE,kBAAkB,CAAC,EAAE,EAAE;iBACrC;aACJ,CAAC;YACI,wBAAwB,GAAG;gBAC7B,KAAK,EAAE;oBACH,MAAM,EAAE;wBACJ,EAAE,EAAE,EAAE,GAAG,EAAE,kBAAkB,CAAC,EAAE,EAAE;qBACrC;iBACJ;aACJ,CAAC;YAEF,aAAa,CAAC,oBAAoB,CAAC,OAAO,EAAE,EAAE,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC;YACjG,aAAa,CAAC,oBAAoB,CAAC,OAAO,EAAE,EAAE,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,wBAAwB,CAAC,EAAE,CAAC,CAAC;YAEzG,sBAAO;oBACH,aAAa,EAAE,IAAI;oBACnB,WAAW,EAAE,IAAI;oBACjB,WAAW,EAAE;wBACT,KAAK,EAAE,IAAI;wBACX,KAAK,EAAE,IAAI;qBACd;oBACD,SAAS,EAAE,aAAa,CAAC,SAAS,EAAE;iBACvC,EAAA;SACJ;QACD,IAAI,aAAa,KAAK,OAAO,EAAE;YAErB,uBAAuB,GAAG;gBAC5B,KAAK,EAAE;oBACH,EAAE,EAAE,EAAE,GAAG,EAAE,kBAAkB,CAAC,EAAE,EAAE;iBACrC;aACJ,CAAC;YAEF,aAAa,CAAC,oBAAoB,CAAC,OAAO,EAAE,EAAE,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,uBAAuB,CAAC,EAAE,CAAC,CAAC;YAExG,sBAAO;oBACH,aAAa,EAAE,IAAI;oBACnB,WAAW,EAAE,IAAI;oBACjB,WAAW,EAAE;wBACT,KAAK,EAAE,IAAI;qBACd;oBACD,SAAS,EAAE,aAAa,CAAC,SAAS,EAAE;iBACvC,EAAA;SACJ;;;KACJ,CAAA;AACD,eAAe,iCAAiC,CAAC","sourcesContent":["import { SolidViewLayoutManager } from \"../../../../../components/core/common/SolidViewLayoutManager\";\n\nconst hanldeModelSequenceFormViewChange = async (event: any) => {\n\n    console.log(\"event\", event)\n\n    const { modifiedField, modifiedFieldValue, formViewLayout } = event;\n\n    const layout = formViewLayout;\n    const layoutManager = new SolidViewLayoutManager(layout);\n    if (modifiedField === 'module') {\n        // module change\n        const modelWhereClause = {\n            module: {\n                id: { $eq: modifiedFieldValue.id }\n            }\n        };\n        const fieldWhereClauseOnModule = {\n            model: {\n                module: {\n                    id: { $eq: modifiedFieldValue.id }\n                }\n            }\n        };\n\n        layoutManager.updateNodeAttributes('model', { \"whereClause\": JSON.stringify(modelWhereClause) });\n        layoutManager.updateNodeAttributes('field', { \"whereClause\": JSON.stringify(fieldWhereClauseOnModule) });\n\n        return {\n            layoutChanged: true,\n            dataChanged: true,\n            newFormData: {\n                model: null,\n                field: null\n            },\n            newLayout: layoutManager.getLayout(),\n        }\n    }\n    if (modifiedField === 'model') {\n        // model change\n        const fieldWhereClauseOnModel = {\n            model: {\n                id: { $eq: modifiedFieldValue.id }\n            }\n        };\n\n        layoutManager.updateNodeAttributes('field', { \"whereClause\": JSON.stringify(fieldWhereClauseOnModel) });\n\n        return {\n            layoutChanged: true,\n            dataChanged: true,\n            newFormData: {\n                field: null\n            },\n            newLayout: layoutManager.getLayout(),\n        }\n    }\n}\nexport default hanldeModelSequenceFormViewChange;"]}

package/dist/components/core/extension/solid-core/modelSequence/modelSequenceFormViewChangeHandler.tsx

@@ -0,0 +1,59 @@
+import { SolidViewLayoutManager } from "../../../../../components/core/common/SolidViewLayoutManager";
+
+const hanldeModelSequenceFormViewChange = async (event: any) => {
+
+    console.log("event", event)
+
+    const { modifiedField, modifiedFieldValue, formViewLayout } = event;
+
+    const layout = formViewLayout;
+    const layoutManager = new SolidViewLayoutManager(layout);
+    if (modifiedField === 'module') {
+        // module change
+        const modelWhereClause = {
+            module: {
+                id: { $eq: modifiedFieldValue.id }
+            }
+        };
+        const fieldWhereClauseOnModule = {
+            model: {
+                module: {
+                    id: { $eq: modifiedFieldValue.id }
+                }
+            }
+        };
+
+        layoutManager.updateNodeAttributes('model', { "whereClause": JSON.stringify(modelWhereClause) });
+        layoutManager.updateNodeAttributes('field', { "whereClause": JSON.stringify(fieldWhereClauseOnModule) });
+
+        return {
+            layoutChanged: true,
+            dataChanged: true,
+            newFormData: {
+                model: null,
+                field: null
+            },
+            newLayout: layoutManager.getLayout(),
+        }
+    }
+    if (modifiedField === 'model') {
+        // model change
+        const fieldWhereClauseOnModel = {
+            model: {
+                id: { $eq: modifiedFieldValue.id }
+            }
+        };
+
+        layoutManager.updateNodeAttributes('field', { "whereClause": JSON.stringify(fieldWhereClauseOnModel) });
+
+        return {
+            layoutChanged: true,
+            dataChanged: true,
+            newFormData: {
+                field: null
+            },
+            newLayout: layoutManager.getLayout(),
+        }
+    }
+}
+export default hanldeModelSequenceFormViewChange;

package/dist/components/core/extension/solid-core/roleMetadata/RolePermissionsManyToManyFieldWidget.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RolePermissionsManyToManyFieldWidget.d.ts","sourceRoot":"","sources":["../../../../../../src/components/core/extension/solid-core/roleMetadata/RolePermissionsManyToManyFieldWidget.tsx"],"names":[],"mappings":"AASA,OAAO,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AAe5E,eAAO,MAAM,oCAAoC,6BAA8B,yBAAyB,4CA0GvG,CAAC"}
+{"version":3,"file":"RolePermissionsManyToManyFieldWidget.d.ts","sourceRoot":"","sources":["../../../../../../src/components/core/extension/solid-core/roleMetadata/RolePermissionsManyToManyFieldWidget.tsx"],"names":[],"mappings":"AASA,OAAO,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AAe5E,eAAO,MAAM,oCAAoC,6BAA8B,yBAAyB,4CA+GvG,CAAC"}

package/dist/components/core/extension/solid-core/roleMetadata/RolePermissionsManyToManyFieldWidget.js

@@ -38,12 +38,16 @@ var groupByController = function (items) {
     return grouped;
 };
 export var RolePermissionsManyToManyFieldWidget = function (_a) {
+    var _b;
     var formik = _a.formik, fieldContext = _a.fieldContext;
     var fieldLayoutInfo = fieldContext.field;
     var readOnlyPermission = fieldContext.readOnly;
-    var _b = useState(false), visibleCreateDialog = _b[0], setVisibleCreateDialog = _b[1];
-    var _c = useRelationEntityHandler({ fieldContext: fieldContext, formik: formik }), autoCompleteItems = _c.autoCompleteItems, fetchRelationEntities = _c.fetchRelationEntities, addNewRelation = _c.addNewRelation;
-    var _d = useState({}), visibleDialogs = _d[0], setVisibleDialogs = _d[1];
+    var _c = useState(false), visibleCreateDialog = _c[0], setVisibleCreateDialog = _c[1];
+    var _d = useRelationEntityHandler({ fieldContext: fieldContext, formik: formik }), autoCompleteItems = _d.autoCompleteItems, fetchRelationEntities = _d.fetchRelationEntities, populateFormikWithRelatedEntities = _d.populateFormikWithRelatedEntities, addNewRelation = _d.addNewRelation;
+    var _e = useState({}), visibleDialogs = _e[0], setVisibleDialogs = _e[1];
+    useEffect(function () {
+        populateFormikWithRelatedEntities();
+    }, [(_b = formik.values) === null || _b === void 0 ? void 0 : _b.id]);
     useEffect(function () {
         var queryData = {
             offset: 0,