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

package/index.js

@@ -19,9 +19,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import SearchSortSharedLib from './src/SearchSortSharedLib.js';
 import FiltersSharedLib from './src/FiltersSharedLib.js'
 import DataFieldsSharedLib from './src/DataFieldsSharedLib.js'
+import LogicalStructureSharedLib from './src/LogicalStructureSharedLib.js';
 
 export {
   SearchSortSharedLib,
   FiltersSharedLib,
-  DataFieldsSharedLib
+  DataFieldsSharedLib,
+  LogicalStructureSharedLib
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-shared-search-and-sort",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "Shared Libraries frontend/backend for Search and Sort stack",
   "main": "index.js",
   "scripts": {
@@ -25,7 +25,9 @@
     "@izara_project/izara-core-library-core": "^1.0.13",
     "@izara_project/izara-core-library-external-request": "^1.0.13",
     "@izara_project/izara-core-library-search-result": "^1.0.6",
+    "@izara_project/izara-core-library-service-schemas": "^1.0.105",
     "@izara_project/izara-shared": "^1.0.109",
+    "@izara_project/izara-shared-service-schemas": "^1.0.35",
     "object-hash": "^3.0.0"
   }
 }

package/src/DataFieldsSharedLib.js

@@ -967,7 +967,7 @@ function checkConditionsLinkStep(
     canCombine: canCombine,
     canPerParent: canPerParent,
     canFilters: canFilters,
-    requestProperties: requestProperties //use when linkConfig has request but set no set perParent : false, use requestPropertyType: value
+    // requestProperties: requestProperties //use when linkConfig has request but set no set perParent : false, use requestPropertyType: value
   }
 }
 

package/src/FiltersSharedLib.js

@@ -1131,410 +1131,6 @@ function filterLogicalElements(
 
 };
 
-
-
-function combineLogicalStructure(
-  objType,
-  initialLogicalElementId,
-  logicalElements,
-) {
-  console.log('combineLogicalStructure: ', {
-    objType,
-    initialLogicalElementId,
-    logicalElements,
-  });
-
-  let returnInitialElementId = null;
-  let initialLogicalElementObject = logicalElements[initialLogicalElementId]
-  if (initialLogicalElementObject.logicalElementType !== 'logicalStructure') {
-    returnInitialElementId = initialLogicalElementId;
-  } else {
-    returnInitialElementId = logicalElements[initialLogicalElementId].initialLogicalElementId;
-  };
-  console.log('returnInitialElementId', returnInitialElementId);
-
-  let previousLogicalElementId = null;
-  let previousLogicalElementObject = null;
-
-  let operationLogicalElementId = null;
-  let operationLogicalElementObject = null;
-
-  let nextLogicalElementId = null;
-  let nextLogicalElementObject = null;
-
-  let returnLogicalElements = {};
-
-  let errorsObject = {};
-  let errorsFound = [];
-
-  for (const [logicalElementId, logicalElementObject] of Object.entries(logicalElements)) {
-    console.log('extract logicalELements: ', { initialLogicalElementId, logicalElementId, logicalElementObject });
-
-    if (initialLogicalElementId !== logicalElementId) {
-      continue;
-    };
-
-    let logicalElementType = logicalElementObject.logicalElementType;
-    console.log('logicalElementType: ', logicalElementType);
-
-    if (logicalElementType === 'openBracket') {
-      console.log('----------type: openBracket ----------');
-      if (!logicalElementObject.hasOwnProperty('previousLogicalElementId')) {
-        errorsObject[logicalElementId] = `this logical structure is not set previousLogicalElementId`;
-        errorsFound.push(`this logical structure logicalElementId: ${logicalElementId} is not set previousLogicalElementId`);
-      };
-      if (!logicalElementObject.hasOwnProperty('nextLogicalElementId')) {
-        errorsObject[logicalElementId] = `this logical structure is not set nextLogicalElementId`;
-        errorsFound.push(`this logical structure logicalElementId: ${logicalElementId} is not set nextLogicalElementId`);
-      };
-
-      nextLogicalElementId = logicalElementId;
-      nextLogicalElementObject = { [nextLogicalElementId]: logicalElementObject };
-      initialLogicalElementId = logicalElementObject.nextLogicalElementId;
-
-    } else if (logicalElementType === 'logicalStructure') {
-      console.log('----------type: logicalStructure ----------');
-
-      if (!logicalElementObject.hasOwnProperty('objType')) {
-        errorsObject[logicalElementId] = `this logical structure is not set objType`;
-        errorsFound.push(`this logical structure logicalElementId: ${logicalElementId} is not set objType`);
-      };
-      if (!logicalElementObject.hasOwnProperty('initialLogicalElementId')) {
-        errorsObject[logicalElementId] = `this logical structure is not set initialLogicalElementId`;
-        errorsFound.push(`this logical structure logicalElementId: ${logicalElementId} is not set initialLogicalElementId`);
-      };
-      if (!logicalElementObject.hasOwnProperty('previousLogicalElementId')) {
-        errorsObject[logicalElementId] = `this logical structure is not set previousLogicalElementId`;
-        errorsFound.push(`this logical structure logicalElementId: ${logicalElementId} is not set previousLogicalElementId`);
-      };
-      if (!logicalElementObject.hasOwnProperty('nextLogicalElementId')) {
-        errorsObject[logicalElementId] = `this logical structure is not set nextLogicalElementId`;
-        errorsFound.push(`this logical structure logicalElementId: ${logicalElementId} is not set nextLogicalElementId`);
-      };
-      if (!logicalElementObject.hasOwnProperty('logicalElements')) {
-        errorsObject[logicalElementId] = `this logical structure is not set logicalElements`;
-        errorsFound.push(`this logical structure logicalElementId: ${logicalElementId} is not set logicalElements`);
-      };
-
-      nextLogicalElementId = logicalElementObject.initialLogicalElementId;
-      nextLogicalElementObject = logicalElementObject.logicalElements;
-
-      if (logicalElementObject.nextLogicalElementId !== null) {
-        initialLogicalElementId = logicalElementObject.nextLogicalElementId;
-      };
-
-    } else if (logicalElementType === 'operation') {
-      console.log('----------type: operation ----------');
-      if (!logicalElementObject.hasOwnProperty('previousLogicalElementId')) {
-        errorsObject[logicalElementId] = `this logical structure is not set previousLogicalElementId`;
-        errorsFound.push(`this logical structure logicalElementId: ${logicalElementId} is not set previousLogicalElementId`);
-      };
-      if (!logicalElementObject.hasOwnProperty('nextLogicalElementId')) {
-        errorsObject[logicalElementId] = `this logical structure is not set nextLogicalElementId`;
-        errorsFound.push(`this logical structure logicalElementId: ${logicalElementId} is not set nextLogicalElementId`);
-      };
-      if (!logicalElementObject.hasOwnProperty('operation')) {
-        errorsObject[logicalElementId] = `this logical structure is not set operation`;
-        errorsFound.push(`this logical structure logicalElementId: ${logicalElementId} is not set operation`);
-      };
-
-      operationLogicalElementId = logicalElementId;
-      operationLogicalElementObject = logicalElementObject;
-      initialLogicalElementId = logicalElementObject.nextLogicalElementId;
-      continue;
-
-    } else if (logicalElementType === 'closeBracket') {
-      console.log('----------type: closeBracket ----------');
-      if (!logicalElementObject.hasOwnProperty('previousLogicalElementId')) {
-        errorsObject[logicalElementId] = `this logical structure is not set previousLogicalElementId`;
-        errorsFound.push(`this logical structure logicalElementId: ${logicalElementId} is not set previousLogicalElementId`);
-      };
-      if (!logicalElementObject.hasOwnProperty('nextLogicalElementId')) {
-        errorsObject[logicalElementId] = `this logical structure is not set nextLogicalElementId`;
-        errorsFound.push(`this logical structure logicalElementId: ${logicalElementId} is not set nextLogicalElementId`);
-      };
-
-      nextLogicalElementId = logicalElementId;
-      nextLogicalElementObject = { [nextLogicalElementId]: logicalElementObject };
-      initialLogicalElementId = logicalElementObject.nextLogicalElementId;
-
-    } else {
-      //* error
-      errorsObject[logicalElementId] = `has error on logicalElementType: ${logicalElementType}`;
-      errorsFound.push(`has error on logicalElementType in logicalElementId: ${logicalElementId}`);
-    };
-
-    if (errorsFound.length > 0) {
-      return [null, errorsObject, errorsFound];
-    };
-
-    let operations = null;
-    let operationErrorObjects = {};
-    let operationErrors = [];
-
-    [
-      previousLogicalElementId,
-      previousLogicalElementObject,
-      operations,
-      operationErrorObjects,
-      operationErrors
-    ] = combineOperation(
-      previousLogicalElementId,
-      previousLogicalElementObject,
-      operationLogicalElementId,
-      operationLogicalElementObject,
-      nextLogicalElementId,
-      nextLogicalElementObject
-    );
-    console.log('return combineOperation: ', {
-      previousLogicalElementId,
-      previousLogicalElementObject,
-      operations,
-      operationErrors
-    });
-
-    if (operationErrors.length > 0) {
-      Object.assign(errorsObject, operationErrorObjects);
-    };
-
-    if (operations !== null) {
-      Object.assign(returnLogicalElements, operations);
-      operationLogicalElementId = null;
-      operationLogicalElementObject = null;
-    } else {
-      Object.assign(returnLogicalElements, previousLogicalElementObject);
-    };
-
-  } //end iterate logicalElements
-
-  console.log('returnLogicalElements: ', { returnLogicalElements });
-
-  let returnComplexLogicalStructure = {
-    objType: objType,
-    initialLogicalElementId: returnInitialElementId,
-    logicalElements: returnLogicalElements
-  };
-
-  return [returnComplexLogicalStructure, errorsObject, errorsFound];
-
-};
-
-function combineOperation(
-  previousLogicalElementId,
-  previousLogicalElementObject,
-  operationLogicalElementId,
-  operationLogicalElementObject,
-  nextLogicalElementId,
-  nextLogicalElementObject
-) {
-  console.log('combineOperation: ', {
-    previousLogicalElementId,
-    previousLogicalElementObject,
-    operationLogicalElementId,
-    operationLogicalElementObject,
-    nextLogicalElementId,
-    nextLogicalElementObject
-  });
-
-  let errorsObject = {};
-  let errorsFound = []
-
-  if (!nextLogicalElementObject) {
-    errorsFound.push('cannot found current filterElement object')
-    return [null, null, null, errorsObject, errorsFound];
-  };
-
-  if (!previousLogicalElementObject) {
-    return [nextLogicalElementId, nextLogicalElementObject, null, errorsObject, errorsFound];
-  };
-
-  if (!operationLogicalElementObject) {
-    console.log('------------ previous & current ------------', {
-      previousLogicalElementId,
-      previousLogicalElementObject,
-      operationLogicalElementId,
-      operationLogicalElementObject,
-      nextLogicalElementId,
-      nextLogicalElementObject
-    });
-
-    let operations = {};
-    let returnnextElementId = null;
-    let returnNextElementObject = null;
-
-    if (previousLogicalElementObject[previousLogicalElementId].logicalElementType === 'openBracket') {
-      if (nextLogicalElementObject[nextLogicalElementId].logicalElementType === 'closeBracket') {
-
-        if (Object.entries(previousLogicalElementObject).length <= 2) {
-
-          previousLogicalElementObject[previousLogicalElementId].nextLogicalElementId = nextLogicalElementId;
-          nextLogicalElementObject[nextLogicalElementId].previousLogicalElementId = previousLogicalElementId;
-
-        } else {
-
-          if (previousLogicalElementObject[previousLogicalElementId].nextLogicalElementId === null) {
-            previousLogicalElementObject[previousLogicalElementId].nextLogicalElementId = nextLogicalElementId;
-            nextLogicalElementObject[nextLogicalElementId].previousLogicalElementId = previousLogicalElementId;
-
-          } else {
-
-            let checkNextLogicalElementId = previousLogicalElementObject[previousLogicalElementId].nextLogicalElementId;
-            console.log('checkNextLogicalElementId:', checkNextLogicalElementId);
-
-            for (let i = 0; i < Object.entries(previousLogicalElementObject).length; i++) {
-              let [logicalElementId, logicalObject] = Object.entries(previousLogicalElementObject)[i];
-              console.log('extract logical element: ', { logicalElementId, logicalObject });
-
-              if (logicalElementId !== checkNextLogicalElementId) {
-                continue;
-              };
-
-              console.log('------------- has next logicalElemet to continue -------------');
-
-              if (logicalObject.nextLogicalElementId !== null) {
-                checkNextLogicalElementId = logicalObject.nextLogicalElementId;
-                continue;
-              } else {
-                previousLogicalElementObject[logicalElementId].nextLogicalElementId = nextLogicalElementId;
-                nextLogicalElementObject[nextLogicalElementId].previousLogicalElementId = logicalElementId;
-              };
-            };
-          };
-        };
-
-        operations = Object.assign(previousLogicalElementObject, nextLogicalElementObject);
-        console.log('operations: ', operations);
-
-        returnnextElementId = nextLogicalElementId;
-        returnNextElementObject = nextLogicalElementObject;
-
-      } else {
-
-        previousLogicalElementObject[previousLogicalElementId].nextLogicalElementId = nextLogicalElementId;
-        nextLogicalElementObject[nextLogicalElementId].previousLogicalElementId = previousLogicalElementId;
-
-        operations = Object.assign(previousLogicalElementObject, nextLogicalElementObject);
-
-        console.log('operations: ', operations);
-        returnnextElementId = nextLogicalElementId;
-        returnNextElementObject = nextLogicalElementObject;
-
-      };
-
-    } else if (previousLogicalElementObject[previousLogicalElementId].logicalElementType === 'closeBracket') {
-
-      if (nextLogicalElementObject[nextLogicalElementId].logicalElementType === 'closeBracket') {
-
-        previousLogicalElementObject[previousLogicalElementId].nextLogicalElementId = nextLogicalElementId;
-        nextLogicalElementObject[nextLogicalElementId].previousLogicalElementId = previousLogicalElementId;
-
-        operations = Object.assign(previousLogicalElementObject, nextLogicalElementObject);
-        console.log('operations: ', operations);
-
-        returnnextElementId = nextLogicalElementId;
-        returnNextElementObject = nextLogicalElementObject;
-
-      } else {
-        errorsObject[nextLogicalElementId] = 'this path has logical structure error';
-        errorsFound.push(`${nextLogicalElementId}: this path has logical structure error`);
-      };
-
-    } else {
-
-      if (nextLogicalElementObject[nextLogicalElementId].logicalElementType === 'closeBracket') {
-
-        console.log('previousLogicalElementObject: ', previousLogicalElementObject);
-
-        if (Object.entries(previousLogicalElementObject).length <= 2) {
-
-          previousLogicalElementObject[previousLogicalElementId].nextLogicalElementId = nextLogicalElementId;
-          nextLogicalElementObject[nextLogicalElementId].previousLogicalElementId = previousLogicalElementId;
-
-        } else {
-
-          if (previousLogicalElementObject[previousLogicalElementId].nextLogicalElementId === null) {
-            previousLogicalElementObject[previousLogicalElementId].nextLogicalElementId = nextLogicalElementId;
-            nextLogicalElementObject[nextLogicalElementId].previousLogicalElementId = previousLogicalElementId;
-
-          } else {
-
-            let checkNextLogicalElementId = previousLogicalElementObject[previousLogicalElementId].nextLogicalElementId;
-            console.log('checkNextLogicalElementId:', checkNextLogicalElementId);
-
-            for (let i = 0; i < Object.entries(previousLogicalElementObject).length; i++) {
-              let [logicalElementId, logicalObject] = Object.entries(previousLogicalElementObject)[i];
-              console.log('extract logical element: ', { logicalElementId, logicalObject });
-
-              if (logicalElementId !== checkNextLogicalElementId) {
-                continue;
-              };
-
-              console.log('------------- has next logicalElemet to continue -------------');
-
-              if (logicalObject.nextLogicalElementId !== null) {
-                checkNextLogicalElementId = logicalObject.nextLogicalElementId;
-                continue;
-              } else {
-                previousLogicalElementObject[logicalElementId].nextLogicalElementId = nextLogicalElementId;
-                nextLogicalElementObject[nextLogicalElementId].previousLogicalElementId = logicalElementId;
-              };
-            };
-          };
-        };
-
-        operations = Object.assign(previousLogicalElementObject, nextLogicalElementObject);
-        console.log("operations: ", operations);
-
-        returnnextElementId = nextLogicalElementId;
-        returnNextElementObject = nextLogicalElementObject;
-
-      } else {
-        errorsObject[nextLogicalElementId] = 'this path has logical structure error';
-        errorsFound.push(`${nextLogicalElementId}: this path has logical structure error`);
-      };
-    };
-    return [returnnextElementId, returnNextElementObject, operations, errorsObject, errorsFound];
-  };
-
-  if (previousLogicalElementObject && operationLogicalElementObject && nextLogicalElementObject) {
-    console.log('------------ previous & operation & current ------------', {
-      previousLogicalElementId,
-      previousLogicalElementObject,
-      operationLogicalElementId,
-      operationLogicalElementObject,
-      nextLogicalElementId,
-      nextLogicalElementObject
-    });
-
-    let operations = {};
-
-    previousLogicalElementObject[previousLogicalElementId].nextLogicalElementId = operationLogicalElementId;
-    nextLogicalElementObject[nextLogicalElementId].previousLogicalElementId = operationLogicalElementId;
-
-    operationLogicalElementObject.previousLogicalElementId = previousLogicalElementId;
-    operationLogicalElementObject.nextLogicalElementId = nextLogicalElementId;
-
-    console.log('after set previous and next: ', {
-      previousLogicalElementObject,
-      operationLogicalElementObject,
-      nextLogicalElementObject
-    });
-
-    operations = Object.assign(previousLogicalElementObject, { [operationLogicalElementId]: operationLogicalElementObject }, nextLogicalElementObject);
-
-    return [nextLogicalElementId, nextLogicalElementObject, operations, errorsObject, errorsFound];
-
-  } else {
-    errorsObject[previousLogicalElementId] = 'found error that incorrect of logical structure';
-    errorsObject[currentLogicalElementId] = 'found error that incorrect of logical structure';
-    errorsObject[operationLogicalElementId] = 'found error that incorrect of logical structure';
-    errorsFound.push('found error that incorrect of logical structure');
-
-    return [null, null, null, errorsObject, errorsFound];
-  };
-
-};
-
 function splitFilterElements(
   runningFilterMainId,
   runningFilterObject,
@@ -1610,8 +1206,4 @@ export default {
   // validateOperation,
   filterLogicalElements,
   // splitFilterElements,
-
-  combineLogicalStructure,
-  // combineOperation,
-
 }