@izara_project/izara-shared-search-and-sort 1.0.6 → 1.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-shared-search-and-sort",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "Shared Libraries frontend/backend for Search and Sort stack",
   "main": "index.js",
   "scripts": {

package/src/DataFieldsSharedLib.js

@@ -35,6 +35,7 @@ async function createRequiredData(
   requiredDataLinkStepObjects,
   requiredDataLinkSteps,
   values,
+  // getSchemaFn
 ) {
   console.log('createRequiredData: ', {
     objType,
@@ -43,6 +44,7 @@ async function createRequiredData(
     perParentCombinations,
     requiredDataLinkStepObjects,
     values,
+    // getSchemaFn
   });
 
   let errorsObject = {};
@@ -73,6 +75,7 @@ async function createRequiredData(
       perParentCombinations,
       complexFilterCombinations,
       values,
+      // getSchemaFn,
       errorsObject,
       errorsFound
     );
@@ -266,6 +269,7 @@ async function createLinkPath(
   perParentCombinations,
   complexFilterCombinations,
   values,
+  // getSchemaFn,
   errorsObject,
   errorsFound,
   index = 0,
@@ -325,6 +329,7 @@ async function createLinkPath(
       linkSteps,
       requiredDataLinkStepObjects,
       requiredDataLinkSteps,
+      // getSchemaFn,
       errorsObject,
       errorsFound
     );
@@ -336,6 +341,7 @@ async function createLinkPath(
       perParentCombinations,
       complexFilterCombinations,
       values,
+      // getSchemaFn,
       errorsObject,
       errorsFound,
       index + 1
@@ -576,6 +582,7 @@ async function checkConditionsLink(
   linkSteps,
   requiredDataLinkStepObjects,
   requiredDataLinkSteps,
+  // getSchemaFn,
   errorsObject,
   errorsFound
 ) {
@@ -588,6 +595,7 @@ async function checkConditionsLink(
     linkSteps,
     requiredDataLinkStepObjects,
     requiredDataLinkSteps,
+    // getSchemaFn,
     errorsObject,
     errorsFound
   });
@@ -660,6 +668,7 @@ async function checkConditionsLink(
         perParentCombinations,
         complexFilterCombinations,
         values,
+        // getSchemaFn,
         errorsObject,
         errorsFound
       );

package/src/FiltersSharedLib.js

@@ -20,7 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import { objectHash as hash } from '@izara_project/izara-shared-core';  //const hash = require('@izara_project/izara-shared-core').objectHash;
 import lodash from 'lodash';
 const { isEmpty } = lodash;
-import complexFilterShared from '@izara_project/izara-core-library-complex-filter';
 
 function validateFilterElement(
   filterElements,

package/src/LogicalStructureSharedLib.js

@@ -23,6 +23,7 @@ import lodash from 'lodash';
 const { isEmpty } = lodash;
 import { v4 as uuidV4 } from 'uuid'; //const { v4: uuidv4 } = require('uuid');
 import { getObjectSchema } from '@izara_project/izara-core-library-service-schemas';
+// import { getObjectSchema } from '@izara_project/izara-shared-service-schemas';
 const MAX_ITER = 4;
 
 
@@ -593,12 +594,15 @@ async function changeObjTypePath(
   requiredObjType,
   filtersStructure,
   path = null,
+  // getSchemaFn,
+  PATHCONSTANCES = null,
 ) {
   try {
     console.log('----- function validateSearchTypeFilterType -----', {
       requiredObjType,
       filtersStructure,
-      path
+      path,
+      // getSchemaFn,
     });
 
     let filterLogicalStructure = {};
@@ -733,27 +737,37 @@ async function changeObjTypePath(
 
                       //* delete level of objType
                       let checkChild = false;
-                      for (const objType of PATHCONSTANCES.objTypes) {
-                        if (checkObjType(objType, childLogicalElement.objType) === true) {
-                          if (!childLogicalElement.hasOwnProperty('childLogicalElementId')) {
-
-                            // let childSchema = await getObjectSchema.getObjSchemaS3(
-                            let childSchema = await getObjectSchema.getObjSchemaS3WithoutHierarchy(
-                              {},  //_izContext maybe delete
-                              childLogicalElement.objType
-                            );
-                            console.log('childSchema: ', childSchema);
-
-                            if (childSchema.hasOwnProperty('extendObjType')) {
-                              if (checkObjType(requiredObjType, childSchema.extendObjType) === true) {
-                                checkChild = false;
-                                break;
+
+                      if (PATHCONSTANCES != null) {
+
+                        for (const objType of PATHCONSTANCES.objTypes) {
+                          if (checkObjType(objType, childLogicalElement.objType) === true) {
+                            if (!childLogicalElement.hasOwnProperty('childLogicalElementId')) {
+
+                              // let childSchema = await getObjectSchema.getObjSchemaS3WithCache(
+                              let childSchema = await getObjectSchema.getObjSchemaS3WithoutHierarchy(
+                                {},// _izContext, maybe delete
+                                childLogicalElement.objType
+                              );
+                              // let childSchema = await getObjectSchema.getObjSchemaWithoutHierarchy(
+                              //   getSchemaFn,
+                              //   childLogicalElement.objType
+                              // );
+                              console.log('childSchema: ', childSchema);
+
+                              if (childSchema.hasOwnProperty('extendObjType')) {
+                                if (checkObjType(requiredObjType, childSchema.extendObjType) === true) {
+                                  checkChild = false;
+                                  break;
+                                };
                               };
                             };
+                            checkChild = true;
+                            break;
                           };
-                          checkChild = true;
-                          break;
                         };
+                      } else {
+                        checkChild = true;
                       };
 
                       if (checkChild) {
@@ -794,7 +808,6 @@ async function changeObjTypePath(
 
                   let logicalStructure = {};
                   [previousLogicalElementId, previousLogicalElement, logicalStructure, errorsFound] = createChildComplexFilterStructure(
-                    _izContext,
                     logicalElements,
                     previousLogicalElementId,
                     previousLogicalElement,
@@ -844,7 +857,6 @@ async function changeObjTypePath(
                 let logicalStructure = {};
                 // change function name ==> set logicalElementId
                 [previousLogicalElementId, previousLogicalElement, logicalStructure, errorsFound] = createChildComplexFilterStructure(
-                  _izContext,
                   logicalElements,
                   previousLogicalElementId,
                   previousLogicalElement,
@@ -888,7 +900,7 @@ async function changeObjTypePath(
     return [filterLogicalStructure, errorsObject, errorsFound];
 
   } catch (err) {
-    _izContext.logger.error('error ValidateSearchTypeFilterType: ', err)
+    console.log('error ValidateSearchTypeFilterType: ', err)
     throw (err);
   };
 
@@ -944,17 +956,21 @@ function createChildComplexFilterStructure(
 async function findObjTypePathToAnotherObjType(
   fromObjType,
   toObjType,
-  PATHCONSTANCES
+  PATHCONSTANCES,
+  // getSchemaFn
 ) {
   console.log('----- function findObjTypePathToAnotherObjType -----', {
     fromObjType,
-    toObjType
+    toObjType,
+    PATHCONSTANCES,
+    // getSchemaFn
   });
 
   let [path, errorsObject, errorsFound] = await recursiveFindObjTypeTypePathToAnotherObjType(
     PATHCONSTANCES,
     fromObjType,
     toObjType,
+    // getSchemaFn
   );
   console.log('return path', {
     path,
@@ -975,12 +991,14 @@ async function recursiveFindObjTypeTypePathToAnotherObjType(
   PATHCONSTANCES,
   fromObjType,
   toObjType,
+  // getSchemaFn,
   iter = 1
 ) {
   console.log('----- function recursiveFindObjTypeTypePathToAnotherObjType -----', {
     PATHCONSTANCES,
     fromObjType,
     toObjType,
+    // getSchemaFn,
     iter
   });
 
@@ -1014,6 +1032,10 @@ async function recursiveFindObjTypeTypePathToAnotherObjType(
       {},  //_izContext maybe delete
       fromObjType
     );
+    // const objectRelationship = await getObjectSchema.getObjectRelationship(
+    //   getSchemaFn,
+    //   fromObjType
+    // )
     console.log("objectRelationship: ", { fromObjType, objectRelationship });
 
     let path = null;
@@ -1048,6 +1070,10 @@ async function recursiveFindObjTypeTypePathToAnotherObjType(
         {}, //_izContext maybe delete
         toObjType,
       );
+      // const objectSchema = await getObjectSchema.getObjSchemaWithoutHierarchy(
+      //   getSchemaFn,
+      //   toObjType,
+      // )
       console.log('objectSchema: ', objectSchema);
       console.log('before relationshipObject: ', {
         from: fromObjType,
@@ -1077,6 +1103,7 @@ async function recursiveFindObjTypeTypePathToAnotherObjType(
         PATHCONSTANCES,
         otherObjType,
         toObjType,
+        // getSchemaFn,
         iter + 1
       );
       console.log('return recursive path: ', {
@@ -1141,12 +1168,15 @@ async function recursiveFindObjTypeTypePathToAnotherObjType(
 
 
 export default {
-  combineLogicalStructure,
-  // combineOperation,
-  // combineLogicalElements,
+  //* front-end
+  changeObjTypePath,
+  findObjTypePathToAnotherObjType,
+
 
+  //* use in back-end
+  combineLogicalStructure,
   checkAndCreateBracket,
+  // changeObjTypePath,
+  // findObjTypePathToAnotherObjType,
 
-  changeObjTypePath,
-  findObjTypePathToAnotherObjType
 }

package/src/SearchSortSharedLib.js

@@ -34,7 +34,8 @@ async function createSearchRequest(
   perParentCombinations,
   requiredDataLinkStepObjects,
   requiredDataLinkSteps,
-  values
+  values,
+  // getSchemaFn
 ) {
   console.log('createSearchResult: ', {
     objType,
@@ -45,7 +46,8 @@ async function createSearchRequest(
     perParentCombinations,
     requiredDataLinkStepObjects,
     requiredDataLinkSteps,
-    values
+    values,
+    // getSchemaFn
   });
 
   let filterElements = {};
@@ -61,6 +63,7 @@ async function createSearchRequest(
     requiredDataLinkStepObjects,
     requiredDataLinkSteps,
     values,
+    // getSchemaFn
   );
 
   //* create complexFilter normalize to send backend
@@ -162,7 +165,8 @@ async function createSortRequest(
   requiredDataLinkStepObjects,
   requiredDataLinkSteps,
   sortFields,
-  values
+  values,
+  // getSchemaFn
 ) {
   console.log('createSortResult: ', {
     objType,
@@ -174,7 +178,8 @@ async function createSortRequest(
     requiredDataLinkStepObjects,
     requiredDataLinkSteps,
     sortFields,
-    values
+    values,
+    // getSchemaFn
   });
 
   let sortFieldMain = []
@@ -217,7 +222,8 @@ async function createSortRequest(
     perParentCombinations,
     requiredDataLinkStepObjects,
     requiredDataLinkSteps,
-    values
+    values,
+    // getSchemaFn
   );
   console.log('SearchResultRequest: ', {
     searchResultRequest,
@@ -268,4 +274,9 @@ export default {
   //* create request to backend to sort and search
   createSearchRequest,
   createSortRequest
-}
+}
+
+
+// getSchemaFn = {
+
+// }