@izara_frontend/shared-complex-filter 1.0.2 → 1.0.4

package/src/linkSteps/modalLinkStepsComponent.jsx

@@ -1,4 +1,4 @@
-import { useState, useEffect, useMemo } from "react";
+import React, { useState, useEffect, useMemo } from "react";
 import { useImmer } from "use-immer";
 import {
   IzaraDivStyle,
@@ -8,21 +8,14 @@ import {
 } from "@izaraFrontends/styles";
 
 import { useDispatch } from "react-redux";
-//test---------------------------------
-// import { successTraversalConfig } from "./function/createActionLibCreateLinkStepAndComplexFilter";
-// import { ConditionsAndMultipleIdentifersComponent } from "./conditionsAndMultipleIdentifersComponent";
 
 function createObjTypeConcat(objType) {
-  console.log("objType:dfcvcbcxb ", objType);
-
   return `${objType.serviceTag}_${objType.objectType}`;
 }
 function createRelTypeConcat(relType) {
-  console.log("objType:sdsadwsd ", relType);
   return `${relType?.serviceTag}_${relType?.relationshipTag}`;
 }
 function objTypeFromObjTypeConcat(objTypeConcat) {
-  console.log("objTypeConcat:aeaeaeww ", objTypeConcat);
   let result = objTypeConcat.split("_");
 
   if (result.length !== 2) {
@@ -36,31 +29,24 @@ function objTypeFromObjTypeConcat(objTypeConcat) {
 }
 
 export const ModalLinkStepsComponent = ({
-  titleModal, //string
-  statusModalFunc, //func
-  objConfigUseCase, //store
+  titleModal,
+  statusModalFunc,
+  objConfigUseCase,
   objTypeMain,
   nameReducer,
   parentOutputId,
-  successFunc, //func
+  successFunc,
   collectObjectLinksWithRequestProperties,
   collectObjectSchemaWithHierarchy,
 
-  //useCase props
   nameObjectLinkStepEdit,
   userTag,
-  keyElement, //**** */
+  keyElement,
   ComponentUseCase,
   LastStepsComponentUseCase,
   valueUserTags,
   successFuncUseCase,
 }) => {
-  // InitialSchemaLib.initSchemaFn(
-  //   getObjSchemaS3WithHierarchyShared,
-  //   getObjectLinksShared
-  // );
-
-  console.log("valueUserTags:ModalLinkStepsComponent ", valueUserTags);
   let arrObjRequiredData = [{}];
 
   arrObjRequiredData = [];
@@ -82,37 +68,28 @@ export const ModalLinkStepsComponent = ({
     }
   }
 
-  console.log("arrObjRequiredData: xxxxaaawwweee", arrObjRequiredData);
   if (!objTypeMain) {
     objTypeMain = objConfigUseCase.objType;
   }
 
   console.time("renderTimeInModalRequiredData");
 
-  //--------------------------------------------------------------
-
   const [allObjTypesLinkConfigs, collectRequireLinksFn, collectLinksOpt] =
-    collectObjectLinksWithRequestProperties(); // allObjTypesLinkConfigs
+    collectObjectLinksWithRequestProperties();
 
   const [resultFieldName, getObjSchemaHieFn, collectLinksOpt2] =
     collectObjectSchemaWithHierarchy();
 
-  //--------------------------------------------------------------
-
   const [linkSteps, setLinkSteps] = useImmer(arrObjRequiredData);
 
   const [nameLinkSteps, setNameLinkSteps] = useState(nameObjectLinkStepEdit);
   const [linkStepsOutput, setLinkStepsOutput] = useImmer({
-    status: null, //link or lastStep
+    status: null,
     active: 0,
   });
 
   const dispatch = useDispatch();
 
-  console.log("linkSteps:linkStepsLog ", linkSteps);
-  console.log("collectLinks: ", allObjTypesLinkConfigs, collectLinksOpt);
-  console.log("allObjTypesLinkConfigs: ", allObjTypesLinkConfigs);
-
   useEffect(() => {
     collectRequireLinksFn(objTypeMain, {
       returnLinkTypeId: false,
@@ -133,12 +110,6 @@ export const ModalLinkStepsComponent = ({
             returnPathLinkTypeId: true,
           });
           getObjSchemaHieFn(linkStep.pathLinkType.objType);
-
-          // if (keyLinkStep === arrObjRequiredData.length - 1) {
-          //   setLinkStepsOutput((linkStepsOutput) => {
-          //     linkStepsOutput.status = true;
-          //   });
-          // }
         } else {
           getObjSchemaHieFn(
             keyLinkStep === 0
@@ -146,14 +117,12 @@ export const ModalLinkStepsComponent = ({
               : arrObjRequiredData[keyLinkStep - 1].pathLinkType.objType,
           );
         }
-        console.log("linkStep: sddfdfdfgcvb", linkStep);
       }
     }
   }, []);
-  //-----------------------Shared function-----------------------------------
 
   function checkObjTypeLinkStep(activeIndex) {
-    let objTypeConcat; // objTypeConcat
+    let objTypeConcat;
     objTypeConcat = createObjTypeConcat(objTypeMain);
     if (activeIndex !== 0) {
       objTypeConcat = createObjTypeConcat(
@@ -163,8 +132,6 @@ export const ModalLinkStepsComponent = ({
     return objTypeConcat;
   }
 
-  //-----------------------End Shared function-----------------------------------
-
   function hadelSelectType(e) {
     let type = e.target.value;
 
@@ -201,7 +168,6 @@ export const ModalLinkStepsComponent = ({
     let relType = e.target.value;
     let index = e.target.selectedIndex - 1;
 
-    console.log("index:handelSelectRelTypeAndDirection ", index, typeof index);
     let objTypeConcat = checkObjTypeLinkStep(linkStepsOutput.active);
 
     collectRequireLinksFn(
@@ -220,10 +186,6 @@ export const ModalLinkStepsComponent = ({
         direction: allObjTypesLinkConfigs[objTypeConcat][index].base.direction,
       };
 
-      // linkSteps[
-      //   linkStepsOutput.active
-      // ].allObjTypesLinkConfigIndex = index;
-
       if (allObjTypesLinkConfigs[objTypeConcat][index]?.requestProperties) {
         let requestProperties = {};
         for (const key in allObjTypesLinkConfigs[objTypeConcat][index]
@@ -257,21 +219,17 @@ export const ModalLinkStepsComponent = ({
   }
 
   function handleNextStep() {
-    // funcUseCase.testA();
     let validateResult = true;
-    // validateAggregateCompare() &&
-    // validateComparison() &&
-    // validateRequestProperties();
 
     if (validateResult) {
       setLinkStepsOutput((linkStepsOutput) => {
         linkStepsOutput.active++;
-      }); //
+      });
 
       if (linkSteps.length === linkStepsOutput.active + 1) {
         setLinkSteps((linkSteps) => {
           linkSteps[linkStepsOutput.active + 1] = {};
-        }); //
+        });
       }
     }
   }
@@ -287,12 +245,8 @@ export const ModalLinkStepsComponent = ({
   }
 
   function submitLinkSteps() {
-    console.log("nameObjectLinkStepEdit:xczxczxsd ", nameObjectLinkStepEdit);
-    console.log("nameLinkSteps:xczxczxsd ", nameLinkSteps);
-
     if (nameObjectLinkStepEdit !== undefined) {
       if (nameLinkSteps) {
-        console.log("xczxczxsd");
         if (successFunc) {
           dispatch(
             successFunc({
@@ -304,7 +258,6 @@ export const ModalLinkStepsComponent = ({
             }),
           );
         } else {
-          //sortFields in requiredData
           successFuncUseCase(
             parentOutputId,
             linkSteps,
@@ -319,25 +272,13 @@ export const ModalLinkStepsComponent = ({
       }
     } else {
       if (successFuncUseCase) {
-        console.log("dofigusoigdjigfdg");
         const resultStaus = successFuncUseCase(parentOutputId, linkSteps);
 
         statusModalFunc(resultStaus);
       }
-
-      // dispatch(
-      //   successTraversalConfig({
-      //     parentOutputId: parentOutputId,
-      //     traversalLinkStepsObj: linkSteps,
-      //   }),
-      // );
-      // statusModalFunc(false);
     }
-
-    // }
   }
 
-  console.log("nameObjectLinkStepEdit: ", nameObjectLinkStepEdit);
   console.timeEnd("renderTimeInModalRequiredData");
   return (
     <IzaraDivStyle
@@ -349,7 +290,6 @@ export const ModalLinkStepsComponent = ({
         <IzaraDivStyle
           styletags={createStyleDefualtTags("modal", "", "gridTemplate")}
         >
-          {/* --------------------------header-------------------- */}
           <IzaraDivStyle
             styletags={createStyleDefualtTags("modal", "", "headerTemplate")}
           >
@@ -370,7 +310,6 @@ export const ModalLinkStepsComponent = ({
             <button onClick={(e) => submitLinkSteps()}>save</button>
             <button onClick={(e) => statusModalFunc(false)}>cancel</button>
           </IzaraDivStyle>
-          {/* --------------------------data-------------------- */}
           <div>
             <IzaraDivStyle
               styletags={createStyleDefualtTags("pagination", "", "template")}
@@ -415,9 +354,7 @@ export const ModalLinkStepsComponent = ({
                 )}
               </>
             </IzaraDivStyle>
-            <IzaraDivStyle
-            // styletags={createStyleDefualtTags("background", "scroll", "div")}
-            >
+            <IzaraDivStyle>
               <p>type:</p>
 
               <select
@@ -428,26 +365,11 @@ export const ModalLinkStepsComponent = ({
                       ? "link"
                       : "lastStep"
                 }
-                value={
-                  linkSteps.length === 0
-                    ? ""
-                    : linkSteps[linkStepsOutput.active].pathLinkType?.objType
-                }
                 onChange={(e) => {
                   hadelSelectType(e);
                 }}
               >
-                <option
-                // value=""
-                // selected={
-                //   Object.keys(linkSteps[linkStepsOutput.active]).length === 0
-                // }
-                // disabled={
-                //   Object.keys(linkSteps[linkStepsOutput.active]).length !== 0
-                // }
-                >
-                  -- choose type --
-                </option>
+                <option>-- choose type --</option>
                 <option value="link">link</option>
                 <option value="lastStep">lastStep</option>
               </select>
@@ -463,9 +385,9 @@ export const ModalLinkStepsComponent = ({
                         linkStepsOutput.active === 0
                           ? createObjTypeConcat(objTypeMain)
                           : createObjTypeConcat(
-                              linkSteps[linkStepsOutput.active - 1].pathLinkType
-                                .objType,
-                            )
+                            linkSteps[linkStepsOutput.active - 1].pathLinkType
+                              .objType,
+                          )
                       ] ? (
                         <IzaraDivStyle
                           styletags={createStyleDefualtTags(
@@ -476,13 +398,7 @@ export const ModalLinkStepsComponent = ({
                         ></IzaraDivStyle>
                       ) : (
                         <>
-                          <IzaraDivStyle
-                          // styletags={createStyleDefualtTags(
-                          //   "background",
-                          //   "scroll ",
-                          //   "div"
-                          // )}
-                          >
+                          <IzaraDivStyle>
                             <p> relationship type:</p>
                             <select
                               value={JSON.stringify(
@@ -506,9 +422,9 @@ export const ModalLinkStepsComponent = ({
                                 linkStepsOutput.active === 0
                                   ? createObjTypeConcat(objTypeMain)
                                   : createObjTypeConcat(
-                                      linkSteps[linkStepsOutput.active - 1]
-                                        .pathLinkType.objType,
-                                    )
+                                    linkSteps[linkStepsOutput.active - 1]
+                                      .pathLinkType.objType,
+                                  )
                               ].map((dataLink, index) => (
                                 <option
                                   key={index}
@@ -523,50 +439,49 @@ export const ModalLinkStepsComponent = ({
                               linkSteps[linkStepsOutput.active]?.pathLinkType
                                 ?.relType,
                             ).length !== 0 && (
-                              <>
-                                <p> object type:</p>
-                                <span>
-                                  {createObjTypeConcat(
-                                    linkSteps[linkStepsOutput.active]
-                                      ?.pathLinkType.objType,
-                                  )}
-                                </span>
-                                <p>direction</p>
-                                <span>
-                                  {
-                                    linkSteps[linkStepsOutput.active]
-                                      ?.pathLinkType.direction
-                                  }
-                                </span>
-                                <br></br>
-                                <hr></hr>
-                                {ComponentUseCase && (
-                                  <ComponentUseCase
-                                    allObjTypesLinkConfigs={
-                                      allObjTypesLinkConfigs
-                                    }
-                                    resultFieldName={resultFieldName}
-                                    linkSteps={linkSteps}
-                                    setLinkSteps={setLinkSteps}
-                                    linkStepsOutput={linkStepsOutput}
-                                    objTypeMain={objTypeMain}
-                                    valueUserTags={valueUserTags}
-                                    objConfigUseCase={objConfigUseCase}
-                                    parentOutputId={parentOutputId}
-                                    collectObjectLinksWithRequestProperties={
-                                      collectObjectLinksWithRequestProperties
+                                <>
+                                  <p> object type:</p>
+                                  <span>
+                                    {createObjTypeConcat(
+                                      linkSteps[linkStepsOutput.active]
+                                        ?.pathLinkType.objType,
+                                    )}
+                                  </span>
+                                  <p>direction</p>
+                                  <span>
+                                    {
+                                      linkSteps[linkStepsOutput.active]
+                                        ?.pathLinkType.direction
                                     }
-                                    collectObjectSchemaWithHierarchy={
-                                      collectObjectSchemaWithHierarchy
-                                    }
-                                    LastStepsComponentUseCase={
-                                      LastStepsComponentUseCase
-                                    }
-                                    // funcUseCase={funcUseCase}
-                                  />
-                                )}
-                              </>
-                            )}
+                                  </span>
+                                  <br></br>
+                                  <hr></hr>
+                                  {ComponentUseCase && (
+                                    <ComponentUseCase
+                                      allObjTypesLinkConfigs={
+                                        allObjTypesLinkConfigs
+                                      }
+                                      resultFieldName={resultFieldName}
+                                      linkSteps={linkSteps}
+                                      setLinkSteps={setLinkSteps}
+                                      linkStepsOutput={linkStepsOutput}
+                                      objTypeMain={objTypeMain}
+                                      valueUserTags={valueUserTags}
+                                      objConfigUseCase={objConfigUseCase}
+                                      parentOutputId={parentOutputId}
+                                      collectObjectLinksWithRequestProperties={
+                                        collectObjectLinksWithRequestProperties
+                                      }
+                                      collectObjectSchemaWithHierarchy={
+                                        collectObjectSchemaWithHierarchy
+                                      }
+                                      LastStepsComponentUseCase={
+                                        LastStepsComponentUseCase
+                                      }
+                                    />
+                                  )}
+                                </>
+                              )}
                           </IzaraDivStyle>
                         </>
                       )}
@@ -598,7 +513,6 @@ export const ModalLinkStepsComponent = ({
             )}
           </div>
 
-          {/* --------------------------footer-------------------- */}
           <IzaraDivStyle
             styletags={createStyleDefualtTags("gridColumn", "", "11")}
           >
@@ -612,7 +526,7 @@ export const ModalLinkStepsComponent = ({
               onClick={handleNextStep}
               disabled={
                 linkSteps[linkStepsOutput.active]?.pathLinkType?.direction ===
-                  "" ||
+                "" ||
                 !linkSteps[linkStepsOutput.active]?.pathLinkType?.objType
               }
             >
@@ -624,5 +538,3 @@ export const ModalLinkStepsComponent = ({
     </IzaraDivStyle>
   );
 };
-
-//----------------------------- use Lib -----------------------------------------------

package/src/valueUserTags/fieldNameComponent.jsx

@@ -10,16 +10,12 @@ import {
 var hash = require("object-hash");
 
 function createObjTypeConcat(objType) {
-  console.log("objType:dfcvcbcxb ", objType);
-
   return `${objType.serviceTag}_${objType.objectType}`;
 }
 function createRelTypeConcat(relType) {
-  console.log("objType:sdsadwsd ", relType);
   return `${relType?.serviceTag}_${relType?.relationshipTag}`;
 }
 function objTypeFromObjTypeConcat(objTypeConcat) {
-  console.log("objTypeConcat:aeaeaeww ", objTypeConcat);
   let result = objTypeConcat.split("_");
 
   if (result.length !== 2) {
@@ -109,5 +105,3 @@ export const FieldNameComponent = ({
     </>
   );
 };
-
-//----------------------------- use Lib -----------------------------------------------

package/src/valueUserTags/valueUserTagsComponent.jsx

@@ -1,14 +1,7 @@
-// import React, { memo, Fragment, useContext, useEffect, useState } from "react";
-// import { createAction } from "@reduxjs/toolkit";
-// import {
-//   IzaraDivStyle,
-//   createStyleDefualtTags,
-//   IzaraButtonStyle,
-// } from "@izaraFrontends/styles";
+import React from "react";
 import { useImmer } from "use-immer";
 import { useDispatch, useSelector } from "react-redux";
 
-//----------------------------Lib-Test------------------------------
 import { valueUserTagCreateConfig } from "../function/createActionLibCreateLinkStepAndComplexFilter";
 
 export const UserTagsSelectAndCreateComponent = ({

package/webpack.config.js

@@ -5,12 +5,23 @@ const webpack = require("webpack");
 // export default {
 module.exports = {
   mode: "development",
+  devtool: "source-map",
+  experiments: {
+    outputModule: true,
+  },
   entry: "./src/index.js",
 
   output: {
     path: resolve("dist"),
     filename: "complexFilter.js",
-    libraryTarget: "commonjs2",
+    library: {
+      type: "module",
+    },
+    module: true,
+    environment: {
+      module: true,
+      dynamicImport: true,
+    },
   },
 
   plugins: [
@@ -58,96 +69,28 @@ module.exports = {
     ],
   },
   resolve: {
-    // fallback: {
-    //   buffer: require.resolve("buffer/"),
-    //   process: require.resolve("process/browser"),
-    // },
-    // fallback: {
-    //   process: false,
-    //   buffer: false,
-    //   crypto: false,
-    //   stream: false,
-    // },
+    fallback: {
+      crypto: false,
+    },
 
     alias: {
       react: resolve("./node_modules/react"),
       "react-dom": resolve("./node_modules/react-dom"),
     },
     extensions: [".js", ".jsx"],
-
-    // fallback: {
-    //   fs: false,
-    // },
-    // importsFields: ['@izaraFrontends/styles', '@izaraFrontends/authentication$'],
-    // descriptionFiles: []
   },
 
   externals: {
-    react: {
-      commonjs: "react",
-      commonjs2: "react",
-      amd: "React",
-      root: "React",
-    },
-    "react-dom": {
-      commonjs: "react-dom",
-      commonjs2: "react-dom",
-      amd: "ReactDOM",
-      root: "ReactDOM",
-    },
-    "react-redux": {
-      commonjs: "react-redux",
-      commonjs2: "react-redux",
-      amd: "react-redux",
-      root: "react-redux",
-    },
-    "@reduxjs/toolkit": {
-      commonjs: "@reduxjs/toolkit",
-      commonjs2: "@reduxjs/toolkit",
-      amd: "@reduxjs/toolkit",
-      root: "@reduxjs/toolkit",
-    },
-    "use-immer": {
-      commonjs: "use-immer",
-      commonjs2: "use-immer",
-      amd: "use-immer",
-      root: "use-immer",
-    },
-    nanoid: {
-      commonjs: "nanoid",
-      commonjs2: "nanoid",
-      amd: "nanoid",
-      root: "nanoid",
-    },
-    "object-hash": {
-      commonjs: "object-hash",
-      commonjs2: "object-hash",
-      amd: "object-hash",
-      root: "object-hash",
-    },
-    "@izaraFrontends/styles": {
-      commonjs: "@izaraFrontends/styles",
-      commonjs2: "@izaraFrontends/styles",
-      amd: "@izaraFrontends/styles",
-      root: "@izaraFrontends/styles",
-    },
-    "@izaraFrontends/store": {
-      commonjs: "@izaraFrontends/store",
-      commonjs2: "@izaraFrontends/store",
-      amd: "@izaraFrontends/store",
-      root: "@izaraFrontends/store",
-    },
-    "@izara_project/izara-shared-search-and-sort": {
-      commonjs: "@izara_project/izara-shared-search-and-sort",
-      commonjs2: "@izara_project/izara-shared-search-and-sort",
-      amd: "@izara_project/izara-shared-search-and-sort",
-      root: "@izara_project/izara-shared-search-and-sort",
-    },
-    "@izara_project/izara-shared-service-schemas": {
-      commonjs: "@izara_project/izara-shared-service-schemas",
-      commonjs2: "@izara_project/izara-shared-service-schemas",
-      amd: "@izara_project/izara-shared-service-schemas",
-      root: "@izara_project/izara-shared-service-schemas",
-    },
+    react: "react",
+    "react-dom": "react-dom",
+    "react-redux": "react-redux",
+    "@reduxjs/toolkit": "@reduxjs/toolkit",
+    "use-immer": "use-immer",
+    nanoid: "nanoid",
+    "object-hash": "object-hash",
+    "@izaraFrontends/styles": "@izaraFrontends/styles",
+    "@izaraFrontends/store": "@izaraFrontends/store",
+    "@izara_project/izara-shared-search-and-sort": "@izara_project/izara-shared-search-and-sort",
+    "@izara_project/izara-shared-service-schemas": "@izara_project/izara-shared-service-schemas",
   },
 };