@outliant/sunrise-utils 1.1.4 → 1.1.6

package/.eslintrc

@@ -48,6 +48,7 @@
     "space-infix-ops": "error",
     "no-undef": "error",
     "object-curly-spacing": ["error", "always"],
+    "no-unused-vars": "error",
     "indent": [
       "error",
       2,

package/CHANGELOG.md

@@ -4,9 +4,25 @@ 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.1.6](https://github.com/outliant/sunrise-utils/compare/1.1.5...1.1.6)
+
+- chore: change logic for last/next n days filter [`#10`](https://github.com/outliant/sunrise-utils/pull/10)
+
+#### [1.1.5](https://github.com/outliant/sunrise-utils/compare/1.1.4...1.1.5)
+
+> 19 May 2023
+
+- Task/project banner #866a3c0ug [`#9`](https://github.com/outliant/sunrise-utils/pull/9)
+- chore: filter checkbox [`fb8d601`](https://github.com/outliant/sunrise-utils/commit/fb8d6015b1ee2092fc69b64d10b0a26b59958574)
+- chore: update spec [`bcbfd9a`](https://github.com/outliant/sunrise-utils/commit/bcbfd9ad5a21b412c160a85b05d63a43771bc084)
+- chore: add checkbox filter [`dba4385`](https://github.com/outliant/sunrise-utils/commit/dba43855f8d9665325f5ba2dbec17f50abb3bb0b)
+
 #### [1.1.4](https://github.com/outliant/sunrise-utils/compare/1.1.3...1.1.4)
 
+> 8 May 2023
+
 - chore: support user field type project fields #860qfghzp [`7f4688b`](https://github.com/outliant/sunrise-utils/commit/7f4688b270fe8734153613650c87eef28483068a)
+- chore(release): 1.1.4 [`e3a9285`](https://github.com/outliant/sunrise-utils/commit/e3a9285af6da87760a8c1487542d2473bd3ee2ac)
 
 #### [1.1.3](https://github.com/outliant/sunrise-utils/compare/1.1.2...1.1.3)
 

package/constants.js

@@ -0,0 +1,18 @@
+module.exports.PROJECT_BANNERS = [
+  {
+    label: 'Whale',
+    value: 'whale',
+  },
+  {
+    label: 'VIP',
+    value: 'vip',
+  },
+  {
+    label: 'Legal',
+    value: 'legal',
+  },
+  {
+    label: 'Escalation',
+    value: 'escalation',
+  }
+];

package/helpers/projectFilter/index.js

@@ -5,6 +5,7 @@ const buildIsGeneratedFilter = require('./isGeneratedFilter');
 const buildTagFilter = require('./tagFilter');
 const buildProjectFieldFilter = require('./projectFieldFilter');
 const buildProjectFilter = require('./projectFilter');
+const { PROJECT_BANNERS } = require('../../constants');
 
 module.exports.defaultCustomColumns = [
   {
@@ -72,6 +73,13 @@ module.exports.defaultCustomColumns = [
     value: 'updated_at',
     type: 'updated_at',
     field_type: 'date'
+  },
+  {
+    name: 'Notable',
+    value: 'banner',
+    type: 'banner',
+    field_type: 'checkbox',
+    options: PROJECT_BANNERS
   }
 ];
 

package/helpers/projectFilter/onHoldFilter.js

@@ -9,7 +9,7 @@ module.exports = (filter) => {
   }
 };
 
-module.exports.isEqual = (filter) => {
+module.exports.isEqual = () => {
   return {
     match: {
       on_hold: true
@@ -17,7 +17,7 @@ module.exports.isEqual = (filter) => {
   };
 };
 
-module.exports.isNotEqual = (filter) => {
+module.exports.isNotEqual = () => {
   return {
     bool: {
       should: [

package/helpers/projectFilter/projectFieldFilter.js

@@ -597,7 +597,6 @@ module.exports.lastNDays = (filter) => {
       }
     };
 
-    console.log(JSON.stringify(res, null, 2));
     return res;
   }
 

package/helpers/projectFilter/projectFilter.js

@@ -35,13 +35,24 @@ module.exports.isEmpty = (filter) => {
 
   return {
     bool: {
-      must: [
+      should: [
         {
           term: {
             [filter.type]: {
               value: ''
             }
           }
+        },
+        {
+          bool: {
+            must_not: [
+              {
+                exists: {
+                  field: filter.type
+                }
+              }
+            ]
+          }
         }
       ]
     }
@@ -63,6 +74,13 @@ module.exports.isNotEmpty = (filter) => {
             }
           }
         }
+      ],
+      must: [
+        {
+          exists: {
+            field: filter.type
+          }
+        }
       ]
     }
   };
@@ -108,21 +126,34 @@ module.exports.isEqual = (filter) => {
     }
 
     if (filter.field_type === 'checkbox') {
-      const value =
-        typeof filter.value === 'string' ? value.split(';') : filter.value;
+      const value = typeof filter.value === 'string'
+        ? filter.value.split(';')
+        : filter.value;
+
+      const should = [];
+
+      value.forEach((x) => {
+        should.push({
+          match: {
+            [`${filter.type}.analyzed`]: {
+              query: x,
+              operator: 'and'
+            }
+          }
+        });
+
+        should.push({
+          term: {
+            [filter.type]: {
+              value: x
+            }
+          }
+        });
+      });
 
       return {
         bool: {
-          should: value.map((x) => {
-            return {
-              match: {
-                [`${filter.type}.analyzed`]: {
-                  query: x,
-                  operator: 'and'
-                }
-              }
-            };
-          })
+          should
         }
       };
     }
@@ -350,6 +381,39 @@ module.exports.isNotEqual = (filter) => {
       };
     }
 
+    if (filter.field_type === 'checkbox') {
+      const value = typeof filter.value === 'string'
+        ? filter.value.split(';')
+        : filter.value;
+
+      const should = [];
+
+      value.forEach((x) => {
+        should.push({
+          match: {
+            [`${filter.type}.analyzed`]: {
+              query: x,
+              operator: 'and'
+            }
+          }
+        });
+
+        should.push({
+          term: {
+            [filter.type]: {
+              value: x
+            }
+          }
+        });
+      });
+
+      return {
+        bool: {
+          should
+        }
+      };
+    }
+
     return {
       term: {
         [filter.type]: {

package/helpers/taskFilter/index.js

@@ -7,6 +7,7 @@ const buildCriticalPathFilter = require('./criticalPathFilter');
 const buildOnHoldFilter = require('./onHoldFilter');
 const buildAgeColorFilter = require('./buildAgeColorFilter');
 const buildProjectFieldFilter = require('../projectFilter/projectFieldFilter');
+const { PROJECT_BANNERS } = require('../../constants');
 
 module.exports.taskStatusOptions = [
   {
@@ -177,6 +178,13 @@ module.exports.defaultCustomColumns = [
     value: 'marked_incomplete_at',
     type: 'marked_incomplete_at',
     field_type: 'date'
+  },
+  {
+    name: 'Notable',
+    value: 'project_banner',
+    type: 'project_banner',
+    field_type: 'checkbox',
+    options: PROJECT_BANNERS
   }
 ];
 

package/helpers/taskFilter/taskFieldFilter.js

@@ -227,7 +227,9 @@ module.exports.isEqual = (filter) => {
         }
       }
     };
-  } else if (filter.field_type === 'textarea') {
+  }
+
+  if (filter.field_type === 'textarea') {
     return {
       query_string: {
         fields: [filter.type],
@@ -236,6 +238,39 @@ module.exports.isEqual = (filter) => {
     };
   }
 
+  if (filter.field_type === 'checkbox') {
+    const value = typeof filter.value === 'string'
+      ? filter.value.split(';')
+      : filter.value;
+
+    const should = [];
+
+    value.forEach((x) => {
+      should.push({
+        match: {
+          [`${filter.type}.analyzed`]: {
+            query: x,
+            operator: 'and'
+          }
+        }
+      });
+
+      should.push({
+        term: {
+          [filter.type]: {
+            value: x
+          }
+        }
+      });
+    });
+
+    return {
+      bool: {
+        should
+      }
+    };
+  }
+
   return {
     bool: {
       must: [
@@ -299,18 +334,11 @@ module.exports.nextNDays = (filter) => {
     return null;
   }
 
-  const today = moment()
-    .startOf('day');
-
-  const nextNDays = moment()
-    .add(filter.value, 'd')
-    .endOf('day');
-
   return {
     range: {
       [filter.type]: {
-        gt: today.valueOf(),
-        lt: nextNDays.valueOf()
+        lt: `now/d+${filter.value}d`,
+        gt: 'now/d'
       }
     }
   };
@@ -321,29 +349,11 @@ module.exports.lastNDays = (filter) => {
     return null;
   }
 
-  const today = moment()
-    .startOf('day');
-
-  const lastNDays = moment()
-    .subtract(filter.value, 'd')
-    .endOf('day');
-
-  const info = {
-    today: {
-      format: today.format('YYYY-MM-DD'),
-      value: today.valueOf()
-    },
-    lastNDays: {
-      format: lastNDays.format('YYYY-MM-DD'),
-      value: lastNDays.valueOf()
-    }
-  };
-
   return {
     range: {
       [filter.type]: {
-        lt: today.valueOf(),
-        gt: lastNDays.valueOf()
+        gt: `now/d-${filter.value}d`,
+        lt: 'now/d'
       }
     }
   };

package/package.json

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

package/test/helpers/projectFilter/projectFieldFilter.spec.js

@@ -3,6 +3,8 @@
 /* eslint-env node, mocha */
 const { expect } = require('chai');
 
+const moment = require('moment');
+
 // To test
 const projectFieldFilter = require('../../../helpers/projectFilter/projectFieldFilter');
 const projectFilter = require('../../../helpers/projectFilter/projectFilter');
@@ -1016,8 +1018,13 @@ describe('projectFilter/projectFilter', () => {
             {
               range: {
                 created_at: {
-                  gt: 1682524800000,
-                  lt: 1683043199999
+                  gt: moment()
+                    .startOf('day')
+                    .valueOf(),
+                  lt: moment()
+                    .add(5, 'd')
+                    .endOf('day')
+                    .valueOf()
                 }
               }
             }
@@ -1040,8 +1047,13 @@ describe('projectFilter/projectFilter', () => {
             {
               range: {
                 created_at: {
-                  lt: 1682524800000,
-                  gt: 1682351999999
+                  lt: moment()
+                    .startOf('day')
+                    .valueOf(),
+                  gt: moment()
+                    .subtract(3, 'd')
+                    .endOf('day')
+                    .valueOf()
                 }
               }
             }
@@ -1060,13 +1072,24 @@ describe('projectFilter/projectFilter', () => {
       },
       output: {
         bool: {
-          must: [
+          should: [
             {
               term: {
                 created_at: {
                   value: ""
                 }
               }
+            },
+            {
+              bool: {
+                must_not: [
+                  {
+                    exists: {
+                      field: "created_at"
+                    }
+                  }
+                ]
+              }
             }
           ]
         }
@@ -1091,6 +1114,13 @@ describe('projectFilter/projectFilter', () => {
                 }
               }
             }
+          ],
+          must: [
+            {
+              exists: {
+                field: "created_at"
+              }
+            }
           ]
         }
       }
@@ -1101,6 +1131,7 @@ describe('projectFilter/projectFilter', () => {
     it(`${filter.input.condition}: ${JSON.stringify(
       filter.input.value
     )}`, (done) => {
+
       const observed = projectFilter(filter.input);
 
       expect(observed).to.deep.equal(filter.output);

package/test/lib/taskPipeline.spec.js

@@ -367,7 +367,7 @@ describe('taskPipeline', function () {
             script: {
               lang: 'painless',
               source:
-                "\n        try {\n          String textInfo = '';\n          def fields = params._source.fields;\n\n          for (int i=0; i<fields.size(); i++) {\n            if (fields[i].id.equals(params.value)) {\n\n              if (fields[i].number != null) {\n                return '';\n              }\n              \n              textInfo = fields[i].text == null ? '' : fields[i].text;\n            }\n\n          }\n\n          return textInfo;\n        } catch (Exception err) {\n          return '';\n        }\n      ",
+                "\n        try {\n          String textInfo = '';\n          def fields = params._source.fields;\n\n          for (int i=0; i<fields.size(); i++) {\n            if (fields[i].id.equals(params.value)) {\n\n              if (fields[i].number != null) {\n                return '';\n              }\n\n              textInfo = fields[i].text == null ? '' : fields[i].text;\n              if (fields[i].containsKey('computedText')) {\n                textInfo = fields[i].computedText == null ? textInfo : fields[i].computedText;\n              }\n            }\n          }\n\n          return textInfo;\n        } catch (Exception err) {\n          return '';\n        }\n      ",
               params: { value: '38d423bf-fc24-4183-b8b7-15420c89e318' }
             },
             order: 'desc'