awing-library 2.1.2-dev.520 → 2.1.2-dev.521

package/dist/AWING/DataForm/container.test.js

@@ -9,7 +9,7 @@ var __webpack_modules__ = {
     "AWING/DataInput": function(module) {
         module.exports = __WEBPACK_EXTERNAL_MODULE__DataInput_index_js_c7933a4f__;
     },
-    "../helper": function(module) {
+    "AWING/helper": function(module) {
         module.exports = __WEBPACK_EXTERNAL_MODULE__helper_js_663c9e82__;
     }
 };
@@ -92,9 +92,9 @@ jest.mock('@mui/material', ()=>({
             })
     }));
 const mockInputFactory = __webpack_require__("AWING/DataInput")["default"];
-const mockCalculateValue = __webpack_require__("../helper").calculateValue;
-const mockConvertFormulaToBinaryTree = __webpack_require__("../helper").convertFormulaToBinaryTree;
-const mockReplaceFieldsValue = __webpack_require__("../helper").replaceFieldsValue;
+const mockCalculateValue = __webpack_require__("AWING/helper").calculateValue;
+const mockConvertFormulaToBinaryTree = __webpack_require__("AWING/helper").convertFormulaToBinaryTree;
+const mockReplaceFieldsValue = __webpack_require__("AWING/helper").replaceFieldsValue;
 describe('DataForm Component', ()=>{
     const mockFields = [
         {

package/dist/Features/SYSTEM/Sharing/AddOrEdit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AddOrEdit.d.ts","sourceRoot":"","sources":["../../../../src/Features/SYSTEM/Sharing/AddOrEdit.tsx"],"names":[],"mappings":"AAyBA,MAAM,CAAC,OAAO,UAAU,MAAM,4CA2P7B"}
+{"version":3,"file":"AddOrEdit.d.ts","sourceRoot":"","sources":["../../../../src/Features/SYSTEM/Sharing/AddOrEdit.tsx"],"names":[],"mappings":"AAyBA,MAAM,CAAC,OAAO,UAAU,MAAM,4CA0P7B"}

package/dist/Features/SYSTEM/Sharing/AddOrEdit.js

@@ -9,7 +9,7 @@ import ClassicDrawer from "../../../Commons/Components/ClassicDrawer.js";
 import { useParams } from "react-router";
 import { useAtom } from "jotai";
 import { getDifferent } from "../../../Utils/getDifferent.js";
-import { WorkspaceOptionsState, WorkspacesState, confirmExitState } from "./Atoms.js";
+import { WorkspacesState, confirmExitState } from "./Atoms.js";
 import TargetWorkspace from "./component/TargetWorkspace.js";
 import WorkspaceSharingInformation from "./component/WorkspaceSharingInformation.js";
 import Context from "./Context.js";
@@ -22,7 +22,6 @@ function Create() {
     const isCreate = isUndefined(id);
     const workspaceSharingId = isCreate ? -1 : toNumber(id);
     const [workspaces, setWorkspaces] = useAtom(WorkspacesState);
-    const [workspaceOptions] = useAtom(WorkspaceOptionsState);
     const [confirmExit, setConfirmExit] = useAtom(confirmExitState);
     const [tabValue, setTabValue] = useState('1');
     const [filterParams, setFilterParams] = useState([]);
@@ -145,10 +144,11 @@ function Create() {
         workspaces
     ]);
     useEffect(()=>{
-        const currentWorkspaces = getWorkspacesConfigByFilter(workspaces, workspaceOptions, filterParams);
+        const currentWorkspaces = getWorkspacesConfigByFilter(workspaces, filterParams, schemaParams);
         setWorkspaces(currentWorkspaces);
     }, [
-        filterParams
+        filterParams,
+        schemaParams
     ]);
     const handleCloseDrawer = ()=>{
         setWorkspaces([]);

package/dist/Features/SYSTEM/Sharing/Utils.d.ts

@@ -30,7 +30,7 @@ export declare const getDefaultValues: (key: string, obj?: WorkspaceOption & {
         id: number;
     }[];
 }) => string | undefined;
-export declare const getWorkspacesConfigByFilter: (workspaces: SharingWorkspace[], workspaceOptions: WorkspaceOption[], filterParams: string[]) => {
+export declare const getWorkspacesConfigByFilter: (workspaces: SharingWorkspace[], filterParams: string[], schemaParams: string[]) => {
     sharingWorkspaceConfigs: Configuration[];
     __typename?: "SharingWorkspace";
     id?: number;

package/dist/Features/SYSTEM/Sharing/Utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Utils.d.ts","sourceRoot":"","sources":["../../../../src/Features/SYSTEM/Sharing/Utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,SAAS,CAAC;AAC/C,OAAO,EACH,eAAe,EACf,YAAY,EACZ,4CAA4C,EAC5C,sCAAsC,EACtC,kBAAkB,EAClB,OAAO,EAEP,KAAK,aAAa,EAClB,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EACxB,MAAM,SAAS,CAAC;AAIjB,eAAO,MAAM,gBAAgB,QAAO,MAGnC,CAAC;AAEF,eAAO,MAAM,UAAU,SAAU,gBAAgB,KAAG,OAQnD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,0BAA0B,UAAW,MAAM,KAAG,MAAM,EAUhE,CAAC;AAEF,eAAO,MAAM,uBAAuB,eAAgB,YAAY,EAAE,yBAYjE,CAAC;AAEF,eAAO,MAAM,aAAa,YAAa,gBAAgB,CAAC,yBAAyB,CAAC,mDAajF,CAAC;AAEF,eAAO,MAAM,yBAAyB,uBACd,gBAAgB,CAAC,yBAAyB,CAAC,sBAC3C,gBAAgB,CAAC,yBAAyB,CAAC,iBAsClE,CAAC;AAEF,eAAO,MAAM,iBAAiB,qBAAsB,gBAAgB,EAAE,6CAarE,CAAC;AAEF,eAAO,MAAM,qBAAqB,iBAChB,gBAAgB,EAAE,gBAClB,gBAAgB,EAAE,KACjC,sCAAsC,EAmDxC,CAAC;AAEF,eAAO,MAAM,kBAAkB,oBAAqB,eAAe,uBAAuB,kBAAkB,EAAE,UAyC7G,CAAC;AAEF,eAAO,MAAM,cAAc,SAAU,MAAM,GAAG,IAAI,KAAG,OAuBpD,CAAC;AAEF,eAAO,MAAM,iBAAiB,WAClB,GAAG,EAAE,YACH,GAAG,EAAE,KAChB;IACC,MAAM,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IAC5B,UAAU,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;CAYnC,CAAC;AAEF,eAAO,MAAM,kBAAkB,WAAY,GAAG,EAAE,YAAY,GAAG,EAAE,KAAG,CAAC,MAAM,GAAG,MAAM,CAAC,EAQpF,CAAC;AAEF,eAAO,MAAM,oBAAoB,WAAY,GAAG,EAAE,YAAY,GAAG,EAAE,KAAG,CAAC,MAAM,GAAG,MAAM,CAAC,EAQtF,CAAC;AAEF,eAAO,MAAM,mBAAmB,aAAc,OAAO,CAAC,OAAO,CAAC,KAAG,OAEhE,CAAC;AAEF,eAAO,MAAM,YAAY,QAAS,MAAM,GAAG,MAAM,EAAE,KAAG,MAAM,GAAG,MAAM,EAGpE,CAAC;AAEF,eAAO,MAAM,gCAAgC,eAAgB,gBAAgB,EAAE;;;CAiB9E,CAAC;AAEF,eAAO,MAAM,gBAAgB,QAAS,MAAM,QAAQ,eAAe,GAAG;IAAE,SAAS,CAAC,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;CAAE,uBAcrG,CAAC;AAEF,eAAO,MAAM,2BAA2B,eACxB,gBAAgB,EAAE,oBACZ,eAAe,EAAE,gBACrB,MAAM,EAAE;;;;;;;GAiDzB,CAAC;AAEF,eAAO,MAAM,aAAa,WAAY,IAAI,GAAG,MAAM,GAAG,SAAS,GAAG,MAAM,yCACK,CAAC"}
+{"version":3,"file":"Utils.d.ts","sourceRoot":"","sources":["../../../../src/Features/SYSTEM/Sharing/Utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,SAAS,CAAC;AAC/C,OAAO,EACH,eAAe,EACf,YAAY,EACZ,4CAA4C,EAC5C,sCAAsC,EACtC,kBAAkB,EAClB,OAAO,EAEP,KAAK,aAAa,EAClB,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EACxB,MAAM,SAAS,CAAC;AAIjB,eAAO,MAAM,gBAAgB,QAAO,MAGnC,CAAC;AAEF,eAAO,MAAM,UAAU,SAAU,gBAAgB,KAAG,OAQnD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,0BAA0B,UAAW,MAAM,KAAG,MAAM,EAUhE,CAAC;AAEF,eAAO,MAAM,uBAAuB,eAAgB,YAAY,EAAE,yBAYjE,CAAC;AAEF,eAAO,MAAM,aAAa,YAAa,gBAAgB,CAAC,yBAAyB,CAAC,mDAajF,CAAC;AAEF,eAAO,MAAM,yBAAyB,uBACd,gBAAgB,CAAC,yBAAyB,CAAC,sBAC3C,gBAAgB,CAAC,yBAAyB,CAAC,iBAsClE,CAAC;AAEF,eAAO,MAAM,iBAAiB,qBAAsB,gBAAgB,EAAE,6CAarE,CAAC;AAEF,eAAO,MAAM,qBAAqB,iBAChB,gBAAgB,EAAE,gBAClB,gBAAgB,EAAE,KACjC,sCAAsC,EAmDxC,CAAC;AAEF,eAAO,MAAM,kBAAkB,oBAAqB,eAAe,uBAAuB,kBAAkB,EAAE,UAyC7G,CAAC;AAEF,eAAO,MAAM,cAAc,SAAU,MAAM,GAAG,IAAI,KAAG,OAuBpD,CAAC;AAEF,eAAO,MAAM,iBAAiB,WAClB,GAAG,EAAE,YACH,GAAG,EAAE,KAChB;IACC,MAAM,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IAC5B,UAAU,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;CAYnC,CAAC;AAEF,eAAO,MAAM,kBAAkB,WAAY,GAAG,EAAE,YAAY,GAAG,EAAE,KAAG,CAAC,MAAM,GAAG,MAAM,CAAC,EAQpF,CAAC;AAEF,eAAO,MAAM,oBAAoB,WAAY,GAAG,EAAE,YAAY,GAAG,EAAE,KAAG,CAAC,MAAM,GAAG,MAAM,CAAC,EAQtF,CAAC;AAEF,eAAO,MAAM,mBAAmB,aAAc,OAAO,CAAC,OAAO,CAAC,KAAG,OAEhE,CAAC;AAEF,eAAO,MAAM,YAAY,QAAS,MAAM,GAAG,MAAM,EAAE,KAAG,MAAM,GAAG,MAAM,EAGpE,CAAC;AAEF,eAAO,MAAM,gCAAgC,eAAgB,gBAAgB,EAAE;;;CAiB9E,CAAC;AAEF,eAAO,MAAM,gBAAgB,QAAS,MAAM,QAAQ,eAAe,GAAG;IAAE,SAAS,CAAC,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;CAAE,uBAcrG,CAAC;AAEF,eAAO,MAAM,2BAA2B,eACxB,gBAAgB,EAAE,gBAChB,MAAM,EAAE,gBACR,MAAM,EAAE;;;;;;;GA0DzB,CAAC;AAEF,eAAO,MAAM,aAAa,WAAY,IAAI,GAAG,MAAM,GAAG,SAAS,GAAG,MAAM,yCACK,CAAC"}

package/dist/Features/SYSTEM/Sharing/Utils.js

@@ -211,10 +211,10 @@ const getDefaultValues = (key, obj)=>{
             return;
     }
 };
-const getWorkspacesConfigByFilter = (workspaces, workspaceOptions, filterParams)=>lodash.map(lodash.cloneDeep(workspaces), (w)=>{
+const getWorkspacesConfigByFilter = (workspaces, filterParams, schemaParams)=>lodash.map(lodash.cloneDeep(workspaces), (w)=>{
         const nConfigs = [];
         const restFilter = [];
-        const currentWorkspace = lodash.find(workspaceOptions, (o)=>`${o.id}` === `${w.targetWorkspaceId}`);
+        const restSchema = [];
         lodash.each(w.sharingWorkspaceConfigs, (c)=>{
             if (c?.paramType === SharingConfigParamType.Filter) {
                 if (lodash.includes(getLowerCase(filterParams), c?.paramName?.toLowerCase())) {
@@ -228,21 +228,34 @@ const getWorkspacesConfigByFilter = (workspaces, workspaceOptions, filterParams)
                         });
                     }
                 }
-            } else if (c) nConfigs.push({
-                id: c.id,
-                paramName: c?.paramName ?? '',
-                paramValue: c.paramValue,
-                paramType: c.paramType
-            });
+            } else if (lodash.includes(getLowerCase(schemaParams), c?.paramName?.toLowerCase())) {
+                if (c) {
+                    restSchema.push(c?.paramName ?? '');
+                    nConfigs.push({
+                        id: c.id,
+                        paramName: c?.paramName ?? '',
+                        paramValue: c.paramValue,
+                        paramType: c.paramType
+                    });
+                }
+            }
         });
         lodash.each(lodash.difference(getLowerCase(filterParams), getLowerCase(restFilter)), (r)=>{
             nConfigs.push({
                 id: generateUniqueId(),
                 paramName: filterParams[lodash.findIndex(getLowerCase(filterParams), (f)=>f === r)],
-                paramValue: getDefaultValues(r, currentWorkspace),
+                paramValue: getDefaultValues(r, w.targetWorkspace),
                 paramType: SharingConfigParamType.Filter
             });
         });
+        lodash.each(lodash.difference(getLowerCase(schemaParams), getLowerCase(restSchema)), (r)=>{
+            nConfigs.push({
+                id: generateUniqueId(),
+                paramName: schemaParams[lodash.findIndex(getLowerCase(schemaParams), (f)=>f === r)],
+                paramValue: getDefaultValues(r, w.targetWorkspace),
+                paramType: SharingConfigParamType.Schema
+            });
+        });
         return {
             ...w,
             sharingWorkspaceConfigs: nConfigs

package/dist/Features/SYSTEM/Sharing/component/WorkspaceSharingConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WorkspaceSharingConfig.d.ts","sourceRoot":"","sources":["../../../../../src/Features/SYSTEM/Sharing/component/WorkspaceSharingConfig.tsx"],"names":[],"mappings":"AAQA,OAAO,EAA0B,kBAAkB,EAAE,KAAK,aAAa,EAAE,KAAK,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAInH,MAAM,MAAM,2BAA2B,GAAG;IACtC,UAAU,CAAC,EAAE,kBAAkB,EAAE,CAAC;IAClC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,0BAA0B,CAAC,EAAE,kBAAkB,EAAE,CAAC;IAClD,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,sBAAsB,EAAE,CAAC,MAAM,EAAE;QAC7B,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;QACpB,WAAW,EAAE,MAAM,CAAC;QACpB,cAAc,EAAE,aAAa,EAAE,CAAC;KACnC,KAAK,IAAI,CAAC;CACd,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,sBAAsB,CAAC,KAAK,EAAE,2BAA2B,2CAyPhF"}
+{"version":3,"file":"WorkspaceSharingConfig.d.ts","sourceRoot":"","sources":["../../../../../src/Features/SYSTEM/Sharing/component/WorkspaceSharingConfig.tsx"],"names":[],"mappings":"AAQA,OAAO,EAA0B,kBAAkB,EAAE,KAAK,aAAa,EAAE,KAAK,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAInH,MAAM,MAAM,2BAA2B,GAAG;IACtC,UAAU,CAAC,EAAE,kBAAkB,EAAE,CAAC;IAClC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,0BAA0B,CAAC,EAAE,kBAAkB,EAAE,CAAC;IAClD,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,sBAAsB,EAAE,CAAC,MAAM,EAAE;QAC7B,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;QACpB,WAAW,EAAE,MAAM,CAAC;QACpB,cAAc,EAAE,aAAa,EAAE,CAAC;KACnC,KAAK,IAAI,CAAC;CACd,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,sBAAsB,CAAC,KAAK,EAAE,2BAA2B,2CA+OhF"}

package/dist/Features/SYSTEM/Sharing/component/WorkspaceSharingConfig.js

@@ -29,9 +29,6 @@ function WorkspaceSharingConfig(props) {
         if (configId) {
             const currentWorkspace = find(workspaces, (w)=>`${w.id}` === `${configId}`);
             if (!currentWorkspace) return;
-            const currentWorkspaceByOption = {
-                id: currentWorkspace.targetWorkspaceId
-            };
             const pushedFilter = [];
             const pushedSchema = [];
             const crFilter = currentWorkspace?.sharingWorkspaceConfigs?.filter((i)=>{
@@ -51,13 +48,13 @@ function WorkspaceSharingConfig(props) {
             const restFilter = map(difference(filter, pushedFilter), (i)=>({
                     id: generateUniqueId(),
                     paramName: i,
-                    paramValue: getDefaultValues(i, currentWorkspaceByOption),
+                    paramValue: getDefaultValues(i, currentWorkspace.targetWorkspace),
                     paramType: SharingConfigParamType.Filter
                 }));
             const restSchema = map(difference(schema, pushedSchema), (i)=>({
                     id: generateUniqueId(),
                     paramName: i,
-                    paramValue: getDefaultValues(i, currentWorkspaceByOption),
+                    paramValue: getDefaultValues(i, currentWorkspace.targetWorkspace),
                     paramType: SharingConfigParamType.Schema
                 }));
             setConfigurations({

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "awing-library",
-    "version": "2.1.2-dev.520",
+    "version": "2.1.2-dev.521",
     "license": "MIT",
     "exports": {
         ".": {