@izara_frontend/shared-complex-filter 1.0.3 → 1.0.4

package/src/complexFilterMain/modalLogicalElement.jsx

@@ -13,33 +13,20 @@ 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 { 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) {
@@ -54,8 +41,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 (
@@ -82,22 +69,6 @@ export const OutputListLogicalElement = ({
   handleAddLogicalElement,
   hadleActiveLogicalElement,
 }) => {
-  console.log("logicalElementId:dfdfsdgffdgfd ", logicalElementId);
-  // function loopFindLastLogicalElement(nextLogicalElementId) {
-  //   console.log(
-  //     "logicalElementObj[nextLogicalElementId]:asdsfcxvdsf ",
-  //     logicalElementObj[nextLogicalElementId]
-  //   );
-
-  //   if (logicalElementObj[nextLogicalElementId].nextLogicalElementId === null) {
-  //     console.log("nextLogicalElementId:xxczxvcxvcxb ", nextLogicalElementId);
-  //     return nextLogicalElementId;
-  //   } else {
-  //     return loopFindLastLogicalElement(
-  //       logicalElementObj[nextLogicalElementId].nextLogicalElementId
-  //     );
-  //   }
-  // }
   function handelRemoveLogical(startKey) {
     const toDelete = new Set();
 
@@ -124,7 +95,7 @@ export const OutputListLogicalElement = ({
     });
 
     setLogicalElementObj((logicalElementObj) => {
-      console.log("toDelete:awscxzzvbm ", toDelete);
+      
       for (const keyDelete of toDelete) {
         logicalElementObj[
           logicalElementObj[keyDelete].previousLogicalElementId
@@ -150,7 +121,6 @@ export const OutputListLogicalElement = ({
                 <>{logicalElementObj[logicalElementId].operation}</>
               ) : (
                 <>{logicalElementId}</>
-                // <>{logicalElementObj[logicalElementId].logicalElementType}</>
               )}
             </button>
 
@@ -199,13 +169,12 @@ export const ModalLogicalElement = ({
   collectObjectSchemaWithHierarchy,
   objConfigUseCase,
 }) => {
-  // console.log("keyUseCase:dfecvxvd ", keyUseCase);
   if (!objTypeMain) {
     objTypeMain = objConfigUseCase.objType;
   }
 
-  console.log("successFunction: sdxcxcaAD", successFunction);
-  console.log("objConfigUseCase:adxzvcxbxb ", objConfigUseCase, valueUserTag);
+  
+  
 
   if (!valueUserTag) {
     if (objConfigUseCase?.valueUserTags) {
@@ -222,7 +191,7 @@ export const ModalLogicalElement = ({
     ),
   );
 
-  console.log("valueUserTag:sxzcvxcb ", a);
+  
 
   const dispatch = useDispatch();
   const [modalSettingRequiredData, setModalSettingRequiredData] =
@@ -233,13 +202,9 @@ export const ModalLogicalElement = ({
   const [resultFieldName, getObjSchemaHieFn, collectLinksOpt2] =
     collectObjectSchemaWithHierarchy();
 
-  console.log("objConfigUseCase:dsfevcxvzxc ", objConfigUseCase);
+  
 
-  console.log(
-    "dataRelationship:wsxzx data ",
-    allObjTypesLinkConfigs,
-    resultFieldName,
-  );
+  
   const [initialLogicalElementId, setInitialLogicalElementId] = useState(
     objConfigUseCase ? objConfigUseCase.initialLogicalElementId : "",
   );
@@ -257,19 +222,14 @@ export const ModalLogicalElement = ({
   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: [],
@@ -277,22 +237,17 @@ export const ModalLogicalElement = ({
     };
 
     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]
@@ -307,7 +262,7 @@ export const ModalLogicalElement = ({
               .pathLinkType.objType,
           );
         }
-        console.log("objTypeOutput:createArrObjTypeLogical", objTypeOutput);
+        
 
         result.lastObjtype = objTypeOutput;
         result.arrOutput.push({ [objTypeOutput]: id });
@@ -316,7 +271,7 @@ export const ModalLogicalElement = ({
 
     loopLogical(activeId);
 
-    console.log("result:createArrObjTypeLogical ", result);
+    
     return result;
   }
 
@@ -324,22 +279,21 @@ export const ModalLogicalElement = ({
     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) {
@@ -351,7 +305,6 @@ export const ModalLogicalElement = ({
       const prev = logicalElementObj[prevId];
       if (!prev) return;
 
-      // ถ้า previous มี childLogicalElementId === currentId แสดงว่า current เป็น child ของ prev  หยุด (ไม่ข้ามขึ้น)
       if (prev.childLogicalElementId === id) {
         // แต่ถ้ามี objType ของตัวเอง ใช้ตัวเอง
         if (current.objType) {
@@ -379,28 +332,8 @@ export const ModalLogicalElement = ({
     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) {
@@ -412,7 +345,6 @@ export const ModalLogicalElement = ({
       const prev = logicalElementObj[prevId];
       if (!prev) return;
 
-      // ถ้า previous มี childLogicalElementId === currentId แสดงว่า current เป็น child ของ prev  หยุด (ไม่ข้ามขึ้น)
       if (prev.childLogicalElementId === id) {
         // แต่ถ้ามี objType ของตัวเอง ใช้ตัวเอง
         if (current.objType) {
@@ -444,7 +376,7 @@ export const ModalLogicalElement = ({
       logicalElementObj[logicalElementOutput.active].nextLogicalElementId,
     );
     let logicalObj = {};
-    console.log("dfofjdf", logicalElementObj[logicalElementOutput.active]);
+    
 
     setLogicalElementOutput((logicalElementOutput) => {
       logicalElementOutput.status = false;
@@ -492,9 +424,6 @@ export const ModalLogicalElement = ({
       logicalObj = {
         ...mainLoigcalObj,
         objType: objType,
-        // fieldName: "",
-        // comparison: "",
-        // valueUserTag: "",
       };
     }
 
@@ -575,7 +504,7 @@ export const ModalLogicalElement = ({
   function handleAddLogicalElement(action) {
     const uuid = nanoid(10);
 
-    console.log("action:asfdsgsdg ", action);
+    
     if (action === "addChild") {
       collectRequireLinksFn(
         logicalElementObj[logicalElementOutput.active].pathLinkType.objType,
@@ -647,16 +576,13 @@ export const ModalLogicalElement = ({
   }
 
   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;
@@ -695,7 +621,7 @@ export const ModalLogicalElement = ({
   }
 
   function handleUpdateNewValue(e, type) {
-    console.log("type: safddfdgcxg", type, newUserTags);
+    
 
     setNewUserTags((newUserTags) => {
       newUserTags.obj[type] = e.target.value;
@@ -714,7 +640,7 @@ export const ModalLogicalElement = ({
 
   function handleSelectCreateNewValue(e) {
     let type = e.target.value;
-    console.log("type:fgrgdfgfdh ", type);
+    
 
     setNewUserTags((newUserTags) => {
       if (type === "valueUserTag") {
@@ -737,14 +663,9 @@ export const ModalLogicalElement = ({
       }
     });
 
-    // setNewUserTags({});
   }
 
-  console.log(
-    "newUserTags:sadsxczvbbvb ",
-    newUserTagsRequestProperties,
-    valueDataUserTags,
-  );
+  
 
   function handleCreateNewValue(e) {
     setLogicalElementObj((logicalElementObj) => {
@@ -787,7 +708,7 @@ export const ModalLogicalElement = ({
     });
   }
 
-  console.log("newUserTags: ", newUserTags);
+  
   const logicalElementType = [
     "openBracket",
     "closeBracket",
@@ -823,7 +744,6 @@ export const ModalLogicalElement = ({
       dispatch(
         successFunction({
           parentOutputId: parentOutputId,
-          // keyElement,
           initialLogicalElementId: initialLogicalElementId,
           logicalElements: logicalElementObj,
           valueDataUserTags: valueDataUserTags,
@@ -866,10 +786,10 @@ export const ModalLogicalElement = ({
     dispatch();
   }
 
-  console.log("createFilterElement:fsdfbcsdfe", createFilterElement);
-  console.log("valueDataUserTags: ", valueDataUserTags);
+  
+  
 
-  console.log("logicalElementObj:dfcxvxzzcs ", logicalElementObj);
+  
 
   return (
     <div>
@@ -1001,22 +921,7 @@ export const ModalLogicalElement = ({
                                   {key}
                                 </option>
                               ))}
-                              {/* {console.log(
-                                resultFieldName[
-                                  logicalElementObj[logicalElementOutput.active]
-                                    .previousLogicalElementId === null
-                                    ? createObjTypeConcat(objTypeMain)
-                                    : createArrObjTypeLogical(
-                                        logicalElementOutput.active,
-                                        logicalElementObj,
-                                      ).lastObjtype
-                                ]?.identifiers,
-                                createArrObjTypeLogical(
-                                  logicalElementOutput.active,
-                                  logicalElementObj,
-                                ).lastObjtype,
-                                "ssdawdafafff",
-                              )} */}
+                              {/* {} */}
                               {resultFieldName && (
                                 <>
                                   {resultFieldName[
@@ -1053,10 +958,7 @@ export const ModalLogicalElement = ({
                                 "div",
                               )}
                             >
-                              {console.log(
-                                allObjTypesLinkConfigs,
-                                "foopesofods",
-                              )}
+                              {}
 
                               {!allObjTypesLinkConfigs[
                                 logicalElementObj[logicalElementOutput.active]
@@ -1904,25 +1806,14 @@ export const ModalLogicalElement = ({
                                     statusModalSettingRequiredData
                                   }
                                   objConfigUseCase={objConfigUseCase}
-                                  // objTypeMain={objConfig.pageOutputMainConfigUseCase.objType}
                                   nameReducer={nameReducer}
                                   parentOutputId={parentOutputId}
-                                  // userTags={objConfig.pageOutputMainConfigUseCase.values}
-                                  // sortFieldStatus={"fromSortField"}
-                                  // successRequiredDataConfig={
-                                  //   successRequiredDataConfig
-                                  // }
                                   collectObjectLinksWithRequestProperties={
                                     collectObjectLinksWithRequestProperties
                                   }
                                   collectObjectSchemaWithHierarchy={
                                     collectObjectSchemaWithHierarchy
                                   }
-                                  // keyRequiredData={
-                                  //   modalSettingRequiredData === true
-                                  //     ? ""
-                                  //     : modalSettingRequiredData
-                                  // }
                                 />
                               )}
                               <fieldset></fieldset>

package/src/function/createActionLibCreateLinkStepAndComplexFilter.js

@@ -1,6 +1,5 @@
 import { current, createEntityAdapter, createAction } from "@reduxjs/toolkit";
 
-//--------------------------valueUserTag----------------------------------------
 import {
   valueUserTagCreate,
   validateValueUserTagNotUsed,
@@ -14,34 +13,15 @@ export const validateValueUserTagNotUsedConfig = createAction(
   "validateValueUserTagNotUsedConfig",
 );
 
-//-------------------------------complexFilterFunction-----------------------------------
-
-import {
-  successTraversal,
-  // successFilterElement,
-} from "./complexFilterFunction";
+import { successTraversal } from "./complexFilterFunction";
 
 export const successTraversalConfig = createAction("successTraversalConfig");
-// export const successFilterElementConfig = createAction(
-//   "successFilterElementConfig",
-// );
-
-//--------------------------------linkStepFunctionAndUseCase-----------------------------------
-// import { successRequiredData } from "./linkStepFunction";
-
-// export const successRequiredDataConfig = createAction(
-//   "successRequiredDataConfig",
-// );
 
 export const sendExtraReducerLibCreateLinkStepAndComplexFilter = (builder) => {
-  //----------------------------valueUserTag---------------------------------------
   builder.addCase(valueUserTagCreateConfig, valueUserTagCreate);
   builder.addCase(
     validateValueUserTagNotUsedConfig,
     validateValueUserTagNotUsed,
   );
-  //----------------------------------complexFilterFunction----------------------------
   builder.addCase(successTraversalConfig, successTraversal);
-  // builder.addCase(successFilterElementConfig, successFilterElement);
-  // builder.addCase(successRequiredDataConfig, successRequiredData);
 };

package/src/function/valueUserTagFunction.js

@@ -3,78 +3,18 @@ import { current, createEntityAdapter, createAction } from "@reduxjs/toolkit";
 export const valueUserTagCreate = (state, action) => {
   const { parentOutputId, objCreateValueUserTag } = action.payload;
 
-  console.log(
-    "objCreateValueUserTag:rdfsdgfhfb ",
-    parentOutputId,
-    objCreateValueUserTag,
-  );
   state[parentOutputId].currentValues.pageOutputMainConfigUseCase.valueUserTags[
     objCreateValueUserTag.keyName
   ] = { defaultValue: objCreateValueUserTag.defaultValue };
 };
 
 export const validateValueUserTagNotUsed = (state, action) => {
-  //linkstep
   for (const linkStepId in state[parentOutputId].currentValues
     .pageOutputMainConfigUseCase.linkSteps) {
-    console.log("linkStepId: ", linkStepId);
   }
 };
 
-// function scanLogicalElements(set, logicalElements) {
-//   if (!logicalElements) return;
-
-//   Object.values(logicalElements).forEach((el) => {
-//     addTagsFromObjectValues(set, el.partitionKeyValueUserTags);
-//     addTagsFromObjectValues(set, el.sortKeyValueUserTags);
-
-//     if (el.conditionalFieldValues) {
-//       el.conditionalFieldValues.forEach((cond) => {
-//         addTags(set, cond.includeValueUserTags);
-//         addTags(set, cond.excludeValueUserTags);
-//       });
-//     }
-
-//     addTagsFromObjectValues(set, el.requestProperties);
-//   });
-// }
-
-// function scanTraversalSteps(set, traversalSteps) {
-//   if (!traversalSteps) return;
-
-//   Object.values(traversalSteps).forEach((step) => {
-//     if (step.fieldValueUserTags) {
-//       step.fieldValueUserTags.forEach((obj) => {
-//         addTagsFromObjectValues(set, obj);
-//       });
-//     }
-//   });
-// }
-
-// function scanSortFields(set, sortFields) {
-//   if (!sortFields) return;
-
-//   sortFields.forEach((sf) => {
-//     addTags(set, sf.sortByValueUserTags);
-//   });
-// }
-
-// function scanCombinations(set, combinations) {
-//   if (!combinations) return;
-
-//   Object.values(combinations).forEach((c) => {
-//     scanLogicalElements(set, c.logicalElements);
-//   });
-// }
-
-//------------------------
 const addTags = (usedSet, tagKeys, arr) => {
-  console.log(
-    "usedSet, tagKeys, arr:addTags:xzxzxawffbbc ",
-    usedSet,
-    tagKeys,
-    arr,
-  );
   if (!Array.isArray(arr)) return;
 
   for (const v of arr) {
@@ -91,12 +31,6 @@ const addTagsFromObjectValues = (usedSet, tagKeys, obj) => {
 };
 
 function scanLogicalElements(usedSet, tagKeys, logicalElements) {
-  console.log(
-    "logicalElements:dxczxcvasrfdwaefasdf ",
-    usedSet,
-    tagKeys,
-    logicalElements,
-  );
   if (!logicalElements) return;
 
   for (const el of Object.values(logicalElements)) {
@@ -104,14 +38,6 @@ function scanLogicalElements(usedSet, tagKeys, logicalElements) {
 
     addTagsFromObjectValues(usedSet, tagKeys, el.sortKeyValueUserTags);
 
-    // if (el.conditionalFieldValues) {
-    //   for (const cond of el.conditionalFieldValues) {
-    //     addTags(usedSet, tagKeys, cond.includeValueUserTags);
-
-    //     addTags(usedSet, tagKeys, cond.excludeValueUserTags);
-    //   }
-    // }
-
     addTagsFromObjectValues(usedSet, tagKeys, el.requestProperties);
   }
 }
@@ -133,7 +59,6 @@ function scanRequiredDataLinkSteps(usedSet, tagKeys, steps) {
 
   for (const step of Object.values(steps)) {
     addTagsFromObjectValues(usedSet, tagKeys, step.requestProperties);
-    console.log("step: dfcvxbcxb", step);
     if (step.filterElements) {
       scanLogicalElements(
         usedSet,
@@ -183,6 +108,5 @@ export function findUsedUserTagsFast(param) {
 
   scanCombinations(used, tagKeys, param.perParentCombinations);
 
-  console.log("used:wsdxcvzvxcv ", used, tagKeys);
   return used;
 }

package/src/index.js

@@ -7,3 +7,4 @@ export { FieldNameComponent } from "./valueUserTags/fieldNameComponent.jsx";
 export { sendExtraReducerLibCreateLinkStepAndComplexFilter } from "./function/createActionLibCreateLinkStepAndComplexFilter";
 export { successFilterElement } from "./function/complexFilterFunction";
 export { successRequiredData } from "./function/linkStepFunction";
+export { findUsedUserTagsFast } from "./function/valueUserTagFunction";