@izara_frontend/shared-complex-filter 1.0.3 → 1.0.4

package/src/complexFilterMain/modalComplexFilterComponent.jsx

@@ -13,37 +13,24 @@ import {
 } from "@izaraFrontends/styles";
 import { useImmer } from "use-immer";
 
-// import {
-//   getObjectSchema,
-//   reformatObjectSchema,
-// } from "@izara_project/izara-shared-service-schemas";
-
-// import { get_objectLinksSchema } from "../../../../izara-frontend-lib-core-page-output-config_rut/configPageOutputSection/getSchemaNewLibrary/getObjectSchemaQuery";
-// import {
-//   collectObjectLinksWithRequestProperties,
-//   collectObjectSchemaWithHierarchy,
-// } from "@izara_frontend/service-schemas";
-
 import { useDispatch, useSelector } from "react-redux";
 import { nanoid } from "nanoid";
 import { ModalLinkStepsComponent } from "../linkSteps/modalLinkStepsComponent.jsx";
 import { UserTagsSelectAndCreateComponent } from "../valueUserTags/valueUserTagsComponent.jsx";
 import { successTraversalConfig } from "../function/createActionLibCreateLinkStepAndComplexFilter";
 
-// import { ModalRequiredData } from "./modalRequiredData";
-// import _, { flatMap, last } from "lodash";
 var hash = require("object-hash");
 
 function createObjTypeConcat(objType) {
-  console.log("objType:sdsadwsd ", 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) {
@@ -58,8 +45,8 @@ function objTypeFromObjTypeConcat(objTypeConcat) {
 
 export function findLogicalRoot(activeId, logicalElementObj) {
   const prevId = logicalElementObj[activeId]?.previousLogicalElementId;
-  console.log("prevId:sdasdaszc ", prevId);
-  console.log("activeId:sdasdaszc ", activeId);
+  
+  
 
   if (prevId) {
     if (
@@ -191,41 +178,15 @@ export const ModalComplexFilterComponent = ({
   collectObjectLinksWithRequestProperties,
   collectObjectSchemaWithHierarchy,
   objConfigUseCase,
-  // successTraversal,
 }) => {
-  // console.log("keyUseCase:dfecvxvd ", keyUseCase);
   if (!objTypeMain) {
     objTypeMain = objConfigUseCase.objType;
   }
 
-  console.log("valueUserTags:dfcxvcxvxc ", valueUserTags);
-  console.log("successFunction: sdxcxcaAD", successFunction);
-  // console.log("objConfigUseCase:adxzvcxbxb ", objConfigUseCase, valueUserTag);
-
-  // if (!valueUserTag) {
-  //   if (objConfigUseCase?.valueUserTags) {
-  //     valueUserTag = objConfigUseCase.valueUserTags;
-  //   } else {
-  //     valueUserTag = {};
-  //   }
-  // }
-
-  // const valueUserTags = Object.fromEntries(
-  //   Object.entries(objConfigUseCase?.valueUserTags).filter(
-  //     ([_, val]) =>
-  //       "defaultValue" in val || "perParentIdentifierFieldname" in val,
-  //   ),
-  // );
-
-  // console.log("valueUserTag:sxzcvxcb ", valueUserTags);
-
   const dispatch = useDispatch();
   const [modalTraversal, setModalTraversal] = useState(false);
 
-  //----------------------------logical-----------------------------------------
   const [fieldValueUserTag, setFieldValueUserTag] = useImmer({
-    // fieldName: "",
-    // valueUserTag: "",
   });
 
   function selectValueUserTagForPartitionKey(e, key) {
@@ -240,8 +201,8 @@ export const ModalComplexFilterComponent = ({
 
   function handleSelectFieldNameAndValueUserTag(e, type) {
     let value = e.target.value;
-    console.log("type:sdadfdsfd ", type);
-    console.log("value:sdadfdsfd ", value);
+    
+    
 
     setFieldValueUserTag((fieldValueUserTag) => {
       fieldValueUserTag[type] = value;
@@ -290,21 +251,15 @@ export const ModalComplexFilterComponent = ({
     setFieldValueUserTag({});
   }
 
-  //----------------------------logical-----------------------------------------
-
   const [allObjTypesLinkConfigs, collectRequireLinksFn, collectLinksOpt] =
     collectObjectLinksWithRequestProperties(); // allObjTypesLinkConfigs
 
   const [resultFieldName, getObjSchemaHieFn, collectLinksOpt2] =
     collectObjectSchemaWithHierarchy();
 
-  console.log("objConfigUseCase:dsfevcxvzxc ", objConfigUseCase);
+  
 
-  console.log(
-    "dataRelationship:wsxzx data ",
-    allObjTypesLinkConfigs,
-    resultFieldName,
-  );
+  
   const [initialLogicalElementId, setInitialLogicalElementId] = useState(
     objConfigUseCase ? objConfigUseCase.initialLogicalElementId : "",
   );
@@ -322,19 +277,14 @@ export const ModalComplexFilterComponent = ({
   const [newUserTagsRequestProperties, setNewUserTagsRequestProperties] =
     useImmer({});
 
-  console.log(
-    "logicalElementOutput: awscxzzvbm",
-    initialLogicalElementId,
-    logicalElementOutput,
-    logicalElementObj,
-  );
+  
 
   useEffect(() => {
     collectRequireLinksFn(objTypeMain);
     getObjSchemaHieFn(objTypeMain);
   }, []);
 
-  console.log("objTypeMain:sdwdxzxzxcc ", objTypeMain);
+  
   function createArrObjTypeLogical(activeId, logicalElementObj) {
     const result = {
       arrOutput: [],
@@ -342,22 +292,17 @@ export const ModalComplexFilterComponent = ({
     };
 
     function loopLogical(id) {
-      console.log("logicalElementObj:xsadfdfds ", logicalElementObj, id);
+      
       const currentLogical = logicalElementObj[id];
-      console.log("currentLogical:createArrObjTypeLogical ", currentLogical);
+      
 
       if (!currentLogical) return;
       if (currentLogical.previousLogicalElementId !== null) {
-        console.log("IF:createArrObjTypeLogical");
+        
 
         loopLogical(currentLogical.previousLogicalElementId);
       }
-      console.log(
-        "createArrObjTypeLogical",
-        id,
-        logicalElementObj[currentLogical.previousLogicalElementId]
-          ?.childLogicalElementId,
-      );
+      
       if (
         id ===
         logicalElementObj[currentLogical.previousLogicalElementId]
@@ -372,7 +317,7 @@ export const ModalComplexFilterComponent = ({
               .pathLinkType.objType,
           );
         }
-        console.log("objTypeOutput:createArrObjTypeLogical", objTypeOutput);
+        
 
         result.lastObjtype = objTypeOutput;
         result.arrOutput.push({ [objTypeOutput]: id });
@@ -381,7 +326,7 @@ export const ModalComplexFilterComponent = ({
 
     loopLogical(activeId);
 
-    console.log("result:createArrObjTypeLogical ", result);
+    
     return result;
   }
 
@@ -389,22 +334,21 @@ export const ModalComplexFilterComponent = ({
     let result = null;
 
     function loop(id) {
-      console.log("id:wdsfdfdf ", id);
+      
       const current = logicalElementObj[id];
-      console.log("current:sadfdf ", current);
+      
       if (!current) return;
 
       if (
         current.logicalElementType === "childComplexFilter" ||
         current.logicalElementType === "logical"
-        // !current.previousLogicalElementId
       ) {
         result = current.objType || null;
         return;
       }
 
       const prevId = current.previousLogicalElementId;
-      console.log("prevId:findObjTypeStep ", prevId);
+      
 
       if (!prevId) {
         if (current.objType) {
@@ -416,7 +360,6 @@ export const ModalComplexFilterComponent = ({
       const prev = logicalElementObj[prevId];
       if (!prev) return;
 
-      // ถ้า previous มี childLogicalElementId === currentId แสดงว่า current เป็น child ของ prev  หยุด (ไม่ข้ามขึ้น)
       if (prev.childLogicalElementId === id) {
         // แต่ถ้ามี objType ของตัวเอง ใช้ตัวเอง
         if (current.objType) {
@@ -444,28 +387,8 @@ export const ModalComplexFilterComponent = ({
     let result = null;
 
     function loop(id) {
-      console.log("id:wdsfdfdf ", id);
       const current = logicalElementObj[id];
-      // console.log("current:sadfdf ", current);
-      // if (!current) {
-      //   result = null;
-      //   return;
-      // } else {
-      //   result = current.objType;
-      //   return;
-      // }
-
-      // if (
-      //   current.logicalElementType === "childComplexFilter" ||
-      //   current.logicalElementType === "logical"
-      //   // !current.previousLogicalElementId
-      // ) {
-      //   result = current.objType || null;
-      //   return;
-      // }
-
       const prevId = current.previousLogicalElementId;
-      console.log("prevId:findObjTypeStep ", prevId);
 
       if (!prevId) {
         if (current.objType) {
@@ -477,7 +400,6 @@ export const ModalComplexFilterComponent = ({
       const prev = logicalElementObj[prevId];
       if (!prev) return;
 
-      // ถ้า previous มี childLogicalElementId === currentId แสดงว่า current เป็น child ของ prev  หยุด (ไม่ข้ามขึ้น)
       if (prev.childLogicalElementId === id) {
         // แต่ถ้ามี objType ของตัวเอง ใช้ตัวเอง
         if (current.objType) {
@@ -509,7 +431,7 @@ export const ModalComplexFilterComponent = ({
       logicalElementObj[logicalElementOutput.active].nextLogicalElementId,
     );
     let logicalObj = {};
-    console.log("dfofjdf", logicalElementObj[logicalElementOutput.active]);
+    
 
     setLogicalElementOutput((logicalElementOutput) => {
       logicalElementOutput.status = false;
@@ -554,28 +476,12 @@ export const ModalComplexFilterComponent = ({
     }
 
     if (logicalElementType === "logical") {
-      console.log(
-        "typeLogicalInFunction:ttyyxfchs",
-        createObjTypeConcat(
-          findObjTypeStep(logicalElementOutput.active, logicalElementObj),
-        ),
-        resultFieldName[
-          logicalElementObj[logicalElementOutput.active]
-            .previousLogicalElementId === null
-            ? createObjTypeConcat(objTypeMain)
-            : createObjTypeConcat(
-                findObjTypeStep(logicalElementOutput.active, logicalElementObj),
-              )
-        ],
-      );
+      
 
       logicalObj = {
         ...mainLoigcalObj,
         objType: objType,
         partitionKeyValueUserTags: {},
-        // fieldName: "",
-        // comparison: "",
-        // valueUserTag: "",
       };
     }
 
@@ -596,20 +502,6 @@ export const ModalComplexFilterComponent = ({
     });
   }
 
-  // console.log(
-  //   "typeLogicalOutFunction:ttyyxfchs",
-  //   createObjTypeConcat(
-  //     findObjTypeStep(logicalElementOutput.active, logicalElementObj),
-  //   ),
-  //   resultFieldName[
-  //     logicalElementObj[logicalElementOutput.active]
-  //       ?.previousLogicalElementId === null
-  //       ? createObjTypeConcat(objTypeMain)
-  //       : createObjTypeConcat(
-  //           findObjTypeStep(logicalElementOutput.active, logicalElementObj),
-  //         )
-  //   ],
-  // );
   function handleOperationChange(e) {
     let operation = e.target.value;
 
@@ -678,7 +570,7 @@ export const ModalComplexFilterComponent = ({
   function handleAddLogicalElement(action) {
     const uuid = nanoid(10);
 
-    console.log("action:asfdsgsdg ", action);
+    
     if (action === "addChild") {
       collectRequireLinksFn(
         logicalElementObj[logicalElementOutput.active].pathLinkType.objType,
@@ -750,16 +642,13 @@ export const ModalComplexFilterComponent = ({
   }
 
   function hadelActiveTopParent(objType) {
-    console.log("objType:sdsacascz ", objType);
+    
     setLogicalElementOutput((logicalElementOutput) => {
       logicalElementOutput.active = Object.values(objType)[0];
     });
   }
 
-  console.log(
-    "afsofiud",
-    createArrObjTypeLogical(logicalElementOutput.active, logicalElementObj),
-  );
+  
 
   function handleSelectFieldName(e, type) {
     let value = e.target.value;
@@ -798,7 +687,7 @@ export const ModalComplexFilterComponent = ({
   }
 
   function handleUpdateNewValue(e, type) {
-    console.log("type: safddfdgcxg", type, newUserTags);
+    
 
     setNewUserTags((newUserTags) => {
       newUserTags.obj[type] = e.target.value;
@@ -817,7 +706,7 @@ export const ModalComplexFilterComponent = ({
 
   function handleSelectCreateNewValue(e) {
     let type = e.target.value;
-    console.log("type:fgrgdfgfdh ", type);
+    
 
     setNewUserTags((newUserTags) => {
       if (type === "valueUserTag") {
@@ -839,14 +728,9 @@ export const ModalComplexFilterComponent = ({
         }
       }
     });
-    // setNewUserTags({});
   }
 
-  console.log(
-    "newUserTags:sadsxczvbbvb ",
-    newUserTagsRequestProperties,
-    valueDataUserTags,
-  );
+  
 
   function handleCreateNewValue(e) {
     setLogicalElementObj((logicalElementObj) => {
@@ -889,7 +773,7 @@ export const ModalComplexFilterComponent = ({
     });
   }
 
-  console.log("newUserTags: ", newUserTags);
+  
   const logicalElementType = [
     "openBracket",
     "closeBracket",
@@ -913,7 +797,7 @@ export const ModalComplexFilterComponent = ({
   ];
 
   function handelCreateFilterElement() {
-    console.log("createFilterElement:dcvnnnbjxdx ", createFilterElement);
+    
     if (createFilterElement) {
       createFilterElement(
         createObjTypeConcat(objTypeMain),
@@ -926,7 +810,6 @@ export const ModalComplexFilterComponent = ({
       dispatch(
         successFunction({
           parentOutputId: parentOutputId,
-          // keyElement,
           initialLogicalElementId: initialLogicalElementId,
           logicalElements: logicalElementObj,
           valueDataUserTags: valueDataUserTags,
@@ -964,17 +847,14 @@ export const ModalComplexFilterComponent = ({
     parentOutputId,
     arrTraversalSteps,
   ) {
-    console.log("arrTraversalSteps:dsfcxvxbx ", arrTraversalSteps);
+    
 
     let linkStepsArr = [];
     let linkStepObj = {};
     for (const index in arrTraversalSteps) {
       const linkStep = arrTraversalSteps[index];
-      console.log("linkStep:fdvdcxfedfxcv ", linkStep);
-      console.log(
-        "linkStep?.pathLinkType?.relType:fdvdcxfedfxcv ",
-        linkStep?.pathLinkType?.relType,
-      );
+      
+      
       if (linkStep?.pathLinkType?.relType) {
         if (Object.keys(linkStep?.pathLinkType?.relType).length === 0) {
           alert("relType in traversal step is empty, please select relType");
@@ -1004,7 +884,6 @@ export const ModalComplexFilterComponent = ({
       successTraversalConfig({
         parentOutputId: parentOutputId,
         traversalLinkStepsObj: linkStepObj,
-        // keyElement,
       }),
     );
   }
@@ -1016,10 +895,10 @@ export const ModalComplexFilterComponent = ({
     });
   }
 
-  console.log("createFilterElement:fsdfbcsdfe", createFilterElement);
-  console.log("valueDataUserTags: ", valueDataUserTags);
+  
+  
 
-  console.log("logicalElementObj:dfcxvxzzcs ", logicalElementObj);
+  
 
   return (
     <div>
@@ -1151,22 +1030,7 @@ export const ModalComplexFilterComponent = ({
                                   {key}
                                 </option>
                               ))}
-                              {/* {console.log(
-                                resultFieldName[
-                                  logicalElementObj[logicalElementOutput.active]
-                                    .previousLogicalElementId === null
-                                    ? createObjTypeConcat(objTypeMain)
-                                    : createArrObjTypeLogical(
-                                        logicalElementOutput.active,
-                                        logicalElementObj,
-                                      ).lastObjtype
-                                ]?.identifiers,
-                                createArrObjTypeLogical(
-                                  logicalElementOutput.active,
-                                  logicalElementObj,
-                                ).lastObjtype,
-                                "ssdawdafafff",
-                              )} */}
+                              {/* {} */}
                               {/* {createArrObjTypeLogical(
                                 logicalElementOutput.active,
                                 logicalElementObj,
@@ -1212,10 +1076,7 @@ export const ModalComplexFilterComponent = ({
                                 "div",
                               )}
                             >
-                              {console.log(
-                                allObjTypesLinkConfigs,
-                                "foopesofods",
-                              )}
+                              {}
 
                               {!allObjTypesLinkConfigs[
                                 logicalElementObj[logicalElementOutput.active]
@@ -1961,11 +1822,7 @@ export const ModalComplexFilterComponent = ({
                                                           ].fieldNames,
                                                         ).map((key) => (
                                                           <>
-                                                            {console.log(
-                                                              "ewyyydsydfd",
-                                                              identifier.fieldName,
-                                                              key,
-                                                            )}
+                                                            {}
                                                             {identifier.fieldName !==
                                                               key && (
                                                               <option
@@ -2257,7 +2114,6 @@ export const ModalComplexFilterComponent = ({
                                   objConfigUseCase={objConfigUseCase}
                                   nameReducer={nameReducer}
                                   parentOutputId={parentOutputId}
-                                  // successFunc={successRequiredDataConfig}
                                   collectObjectLinksWithRequestProperties={
                                     collectObjectLinksWithRequestProperties
                                   }
@@ -2265,12 +2121,6 @@ export const ModalComplexFilterComponent = ({
                                     collectObjectSchemaWithHierarchy
                                   }
                                   valueUserTags={valueUserTags}
-                                  // nameObjectLinkStepEdit={
-                                  //   stausModalSortFiled === true
-                                  //     ? ""
-                                  //     : stausModalSortFiled
-                                  // }
-                                  //----------------------------------
                                   ComponentUseCase={TraversalComponent}
                                   LastStepsComponentUseCase={
                                     FieldValueUserTagsComponent
@@ -2278,7 +2128,6 @@ export const ModalComplexFilterComponent = ({
                                   successFuncUseCase={
                                     sussessComplexFilterTypeTraversal
                                   }
-                                  // nameUserTag={undefined}
                                 />
                               )}
                               <fieldset></fieldset>
@@ -2439,19 +2288,14 @@ export const FieldValueUserTagsComponent = ({
   valueUserTags,
   parentOutputId,
 }) => {
-  console.log(
-    linkSteps[linkStepsOutput.active],
-    "last step:FieldValueUserTagsComponent",
-  );
+  
   const [fieldValueUserTag, setFieldValueUserTag] = useImmer({
-    // fieldName: "",
-    // valueUserTag: "",
   });
 
   function handleSelectFieldNameAndValueUserTag(e, type) {
     let value = e.target.value;
-    console.log("type:sdadfdsfd ", type);
-    console.log("value:sdadfdsfd ", value);
+    
+    
 
     setFieldValueUserTag((fieldValueUserTag) => {
       fieldValueUserTag[type] = value;
@@ -2479,8 +2323,8 @@ export const FieldValueUserTagsComponent = ({
     });
     setFieldValueUserTag({});
   }
-  console.log("fieldValueUserTag:efdgcvgfdrg ", fieldValueUserTag);
-  console.log("valueUserTags:FieldValueUserTagsComponent ", valueUserTags);
+  
+  
   return (
     <>
       {/* {(linkStepsOutput.status === "lastStep" ||
@@ -2505,17 +2349,14 @@ export const FieldValueUserTagsComponent = ({
             <IzaraDivStyle
               styletags={createStyleDefualtTags("background", "scroll", "div")}
             >
-              {console.log(
-                linkSteps[linkStepsOutput.active]?.fieldValueUserTags,
-                "dfjiusf0sdjfgop",
-              )}
+              {}
               {linkSteps[linkStepsOutput.active]?.fieldValueUserTags !==
                 undefined && (
                 <>
                   {linkSteps[linkStepsOutput.active]?.fieldValueUserTags?.map(
                     (fieldValueUserTag, index) => (
                       <div key={index}>
-                        {console.log(fieldValueUserTag, "sdafdfsdfewrse")}
+                        {}
                         <p>{JSON.stringify(fieldValueUserTag)}</p>
                       </div>
                     ),