@outliant/sunrise-utils 1.0.4 → 1.0.6

package/.eslintrc

@@ -42,7 +42,25 @@
     "import/no-extraneous-dependencies": "off",
     "no-shadow": "off",
     "no-else-return": "off",
-    "no-restricted-globals": "off"
+    "no-restricted-globals": "off",
+    "semi": ["error", "always"],
+    "quote-props": ["error", "as-needed"],
+    "space-infix-ops": "error",
+    "object-curly-spacing": ["error", "always"],
+    "indent": [
+      "error",
+      2,
+      {
+        "SwitchCase": 1
+      }
+    ],
+    "no-multiple-empty-lines": [
+      "error",
+      {
+        "max": 1,
+        "maxEOF": 0
+      }
+    ]
   },
   "parser": "@babel/eslint-parser",
   "parserOptions": {

package/CHANGELOG.md

@@ -4,9 +4,26 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [1.0.6](https://github.com/outliant/sunrise-utils/compare/1.0.5...1.0.6)
+
+- Task/string contains filters #860pq6e4d [`#2`](https://github.com/outliant/sunrise-utils/pull/2)
+- chore: string contains filters [`2d80b31`](https://github.com/outliant/sunrise-utils/commit/2d80b31ac08ff5c1710373ccaae7c641333b5557)
+- chore: add contains  any/none filters [`eeec3bd`](https://github.com/outliant/sunrise-utils/commit/eeec3bdbce07ce6a9a782db3953c6926bfd24e4d)
+- chore: revert pushes to main [`21cba44`](https://github.com/outliant/sunrise-utils/commit/21cba44219188192dc806fed59df2bdab1b63e88)
+
+#### [1.0.5](https://github.com/outliant/sunrise-utils/compare/1.0.4...1.0.5)
+
+> 7 March 2023
+
+- chore(release): 1.0.5 [`51f1f27`](https://github.com/outliant/sunrise-utils/commit/51f1f2766ad028f6769ed43625dd6b7eb977c4de)
+- chore: update custom sorting to be prepended on the list [`6d8c7e3`](https://github.com/outliant/sunrise-utils/commit/6d8c7e3f665fad6203b700fb4a104a8670572cb0)
+
 #### [1.0.4](https://github.com/outliant/sunrise-utils/compare/1.0.3...1.0.4)
 
+> 28 February 2023
+
 - chore: project pipeline default columns #860pt9g1t [`194852e`](https://github.com/outliant/sunrise-utils/commit/194852e8250a92c82775187588c427ed5b7aaef8)
+- chore(release): 1.0.4 [`b4e435b`](https://github.com/outliant/sunrise-utils/commit/b4e435ba367db2ba1400bc6f65f6362f66970e56)
 
 #### [1.0.3](https://github.com/outliant/sunrise-utils/compare/1.0.2...1.0.3)
 

package/helpers/projectFilter/projectFieldFilter.js

@@ -1,8 +1,33 @@
 const moment = require('moment');
 const { escapeElasticQuery } = require('../es');
 
+function getContainsMappingValue (filter) {
+  if (['text', 'textarea'].includes(filter.field_type)) {
+    return {
+      bool: {
+        must: [
+          {
+            match: {
+              [`fields.text.analyzed`]: {
+                query: filter.value,
+                operator: 'and'
+              }
+            }
+          }
+        ]
+      }
+    };
+  }
+
+  return {};
+}
+
 module.exports = (filter) => {
   switch (filter.condition) {
+    case 'contains_any':
+      return module.exports.containsAny(filter);
+    case 'contains_none':
+      return module.exports.containsNone(filter);
     case 'is_empty':
       return module.exports.isEmpty(filter);
     case 'is_not_empty':
@@ -30,6 +55,94 @@ module.exports = (filter) => {
   }
 };
 
+module.exports.containsAny = (filter) => {
+  if (!!filter.field_id) {
+    const mapping = getContainsMappingValue(filter);
+
+    if (!mapping) {
+      return null;
+    }
+
+    return {
+      bool: {
+        must: [
+          {
+            nested: {
+              path: 'fields',
+              query: {
+                bool: {
+                  must: [
+                    {
+                      term: {
+                        'fields.id': {
+                          value: filter.field_id
+                        }
+                      }
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          {
+            nested: {
+              path: 'fields',
+              query: mapping
+            }
+          }
+        ]
+      }
+    };
+  }
+
+  return null;
+};
+
+module.exports.containsNone = (filter) => {
+  if (!!filter.field_id) {
+    const mapping = getContainsMappingValue(filter);
+
+    if (!mapping) {
+      return null;
+    }
+
+    return {
+      bool: {
+        must: [
+          {
+            nested: {
+              path: 'fields',
+              query: {
+                bool: {
+                  must: [
+                    {
+                      term: {
+                        'fields.id': {
+                          value: filter.field_id
+                        }
+                      }
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        ],
+        must_not: [
+          {
+            nested: {
+              path: 'fields',
+              query: mapping
+            }
+          }
+        ]
+      }
+    };
+  }
+
+  return null;
+};
+
 module.exports.isAnyOf = (filter) => {
   let value = filter.value;
 

package/helpers/taskFilter/taskFieldFilter.js

@@ -2,6 +2,10 @@ const moment = require('moment');
 
 module.exports = (filter) => {
   switch (filter.condition) {
+    case 'contains_any':
+      return module.exports.containsAny(filter);
+    case 'contains_none':
+      return module.exports.containsNone(filter);
     case 'is_empty':
       return module.exports.isEmpty(filter);
     case 'is_any_of':
@@ -29,6 +33,63 @@ module.exports = (filter) => {
   }
 };
 
+
+module.exports.containsAny = (filter) => {
+  /**
+   * Field type is for custom columns
+   */
+  const type = filter.field_type || filter.type;
+
+  if (['text', 'textarea'].includes(type)) {
+    const value = String(filter.value || '').split(';');
+
+    return {
+      bool: {
+        should: value.map(val => {
+          return {
+            match: {
+              [filter.type]: {
+                query: val,
+                operator: 'and'
+              }
+            }
+          };
+        })
+      }
+    };
+  }
+
+  return null;
+};
+
+module.exports.containsNone = (filter) => {
+  /**
+   * Field type is for custom columns
+   */
+  const type = filter.field_type || filter.type;
+
+  if (['text', 'textarea'].includes(type)) {
+    const value = String(filter.value || '').split(';');
+
+    return {
+      bool: {
+        must_not: value.map(val => {
+          return {
+            match: {
+              [filter.type]: {
+                query: val,
+                operator: 'and'
+              }
+            }
+          };
+        })
+      }
+    };
+  }
+
+  return null;
+};
+
 module.exports.isAnyOf = (filter) => {
   let value = filter.value;
 

package/lib/fieldConditions.js

@@ -19,6 +19,14 @@ module.exports.conditions = {
     {
       label: 'Is any of',
       value: 'is_any_of'
+    },
+    {
+      label: 'Contains Any',
+      value: 'contains_any'
+    },
+    {
+      label: 'Contains None',
+      value: 'contains_none'
     }
   ],
   textarea: [
@@ -41,6 +49,14 @@ module.exports.conditions = {
     {
       label: 'Is any of',
       value: 'is_any_of'
+    },
+    {
+      label: 'Contains Any',
+      value: 'contains_any'
+    },
+    {
+      label: 'Contains None',
+      value: 'contains_none'
     }
   ],
   number: [

package/lib/projectPipeline.js

@@ -92,7 +92,7 @@ class ProjectPipeline {
     }
 
     if (customSort.length > 0) {
-      customSort.forEach((cSort) => projectPipelinesSort.push(cSort));
+      projectPipelinesSort = [...customSort, ...projectPipelinesSort];
     }
 
     if (!!query.search) {

package/lib/taskPipeline.js

@@ -127,7 +127,7 @@ class TaskPipeline {
     }
 
     if (customSort.length > 0) {
-      customSort.forEach((cSort) => taskPipelinesSort.push(cSort));
+      taskPipelinesSort = [...customSort, ...taskPipelinesSort];
     }
 
     return taskPipelinesSort;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@outliant/sunrise-utils",
   "description": "Helper functions for project Sunrise",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "license": "ISC",
   "author": "Outliant",
   "main": "index.js",