@outliant/sunrise-utils 1.2.4 → 1.3.0

package/CHANGELOG.md

@@ -4,8 +4,22 @@ 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.3.0](https://github.com/outliant/sunrise-utils/compare/1.2.5...1.3.0)
+
+- chore: fix boolean columns [`17269be`](https://github.com/outliant/sunrise-utils/commit/17269be8df001b5f625a98a85fc045eb85d916ce)
+
+#### [1.2.5](https://github.com/outliant/sunrise-utils/compare/1.2.4...1.2.5)
+
+> 6 December 2024
+
+- chore: added task archived status [`602a04a`](https://github.com/outliant/sunrise-utils/commit/602a04a95d8592c85237a74607e3acea130ec278)
+- chore(release): 1.2.5 [`9172f49`](https://github.com/outliant/sunrise-utils/commit/9172f49da27b2a4c02d5c60acd02b3013433f3a0)
+
 #### [1.2.4](https://github.com/outliant/sunrise-utils/compare/1.2.3...1.2.4)
 
+> 8 October 2024
+
+- chore(release): 1.2.4 [`d681a97`](https://github.com/outliant/sunrise-utils/commit/d681a970cf3363e1eec51a637c91a76f27e5bbca)
 - chore: Rough DC Inspection banner [`6bbc072`](https://github.com/outliant/sunrise-utils/commit/6bbc07291cec53eb6061f022248f2924f86f02b9)
 
 #### [1.2.3](https://github.com/outliant/sunrise-utils/compare/1.2.2...1.2.3)

package/helpers/projectFilter/index.js

@@ -42,7 +42,8 @@ module.exports.defaultCustomColumns = [
     name: 'Cancelled',
     value: 'on_hold',
     type: 'on_hold',
-    field_type: 'select',
+    field_type: 'boolean',
+    // Not used anymore
     select_fields: ['on_hold']
   },
   {
@@ -51,7 +52,8 @@ module.exports.defaultCustomColumns = [
     name: 'Is Paused',
     value: 'is_paused',
     type: 'is_paused',
-    field_type: 'select',
+    field_type: 'boolean',
+    // Not used anymore
     options: [
       {
         label: 'Yes',
@@ -68,7 +70,8 @@ module.exports.defaultCustomColumns = [
     name: 'Is Generated',
     value: 'is_generated',
     type: 'is_generated',
-    field_type: 'select',
+    field_type: 'boolean',
+    // Not used anymore
     select_fields: ['is_generated']
   },
   {

package/helpers/projectFilter/isGeneratedFilter.js

@@ -1,5 +1,9 @@
 module.exports = (filter) => {
   switch (filter.condition) {
+    case 'is_true':
+      return module.exports.isTrue();
+    case 'is_false':
+      return module.exports.isFalse();
     case 'is_equal':
       return module.exports.isEqual();
     case 'not_equal':
@@ -39,3 +43,42 @@ module.exports.isNotEqual = () => {
     }
   };
 };
+
+exports.isTrue = () => {
+  return {
+    bool: {
+      must: [
+        {
+          term: {
+            is_generated: {
+              value: true
+            }
+          }
+        }
+      ]
+    }
+  };
+};
+
+module.exports.isFalse = () => {
+  return {
+    bool: {
+      should: [
+        {
+          match: {
+            is_generated: false
+          }
+        },
+        {
+          bool: {
+            must_not: {
+              exists: {
+                field: 'is_generated'
+              }
+            }
+          }
+        }
+      ]
+    }
+  };
+};

package/helpers/projectFilter/isPausedFilter.js

@@ -1,5 +1,9 @@
 module.exports = (filter) => {
   switch (filter.condition) {
+    case 'is_true':
+      return module.exports.isTrue();
+    case 'is_false':
+      return module.exports.isFalse();
     case 'is_equal':
       return module.exports.isEqual();
     case 'not_equal':
@@ -39,3 +43,42 @@ module.exports.isNotEqual = () => {
     }
   };
 };
+
+module.exports.isTrue = () => {
+  return {
+    bool: {
+      must: [
+        {
+          term: {
+            is_paused: {
+              value: true
+            }
+          }
+        }
+      ]
+    }
+  };
+};
+
+module.exports.isFalse = () => {
+  return {
+    bool: {
+      should: [
+        {
+          match: {
+            is_paused: false
+          }
+        },
+        {
+          bool: {
+            must_not: {
+              exists: {
+                field: 'is_paused'
+              }
+            }
+          }
+        }
+      ]
+    }
+  };
+};

package/helpers/projectFilter/onHoldFilter.js

@@ -1,5 +1,9 @@
 module.exports = (filter) => {
   switch (filter.condition) {
+    case 'is_true':
+      return module.exports.isTrue();
+    case 'is_false':
+      return module.exports.isFalse();
     case 'is_equal':
       return module.exports.isEqual();
     case 'not_equal':
@@ -39,3 +43,44 @@ module.exports.isNotEqual = () => {
     }
   };
 };
+
+module.exports.isTrue = () => {
+  return {
+    bool: {
+      must: [
+        {
+          term: {
+            on_hold: {
+              value: true
+            }
+          }
+        }
+      ]
+    }
+  };
+};
+
+module.exports.isFalse = () => {
+  return {
+    bool: {
+      should: [
+        {
+          term: {
+            on_hold: {
+              value: false
+            }
+          }
+        },
+        {
+          bool: {
+            must_not: {
+              exists: {
+                field: 'on_hold'
+              }
+            }
+          }
+        }
+      ]
+    }
+  };
+};

package/helpers/projectFilter/projectFieldFilter.js

@@ -46,10 +46,7 @@ module.exports = (filter) => {
     case 'not_equal':
       return module.exports.isNotEqual(filter);
     case 'is_none_of':
-      return isNoneOf(
-        filter,
-        module.exports.isEqual
-      );
+      return isNoneOf(filter, module.exports.isEqual);
     case 'before':
     case 'less_than':
       return module.exports.isBefore(filter);
@@ -514,12 +511,9 @@ module.exports.nextNDays = (filter) => {
       return null;
     }
 
-    const today = moment()
-      .startOf('day');
+    const today = moment().startOf('day');
 
-    const nextNDays = moment()
-      .add(filter.value, 'd')
-      .endOf('day');
+    const nextNDays = moment().add(filter.value, 'd').endOf('day');
 
     const res = {
       bool: {
@@ -566,12 +560,9 @@ module.exports.lastNDays = (filter) => {
       return null;
     }
 
-    const today = moment()
-      .startOf('day');
+    const today = moment().startOf('day');
 
-    const lastNDays = moment()
-      .subtract(filter.value, 'd')
-      .endOf('day');
+    const lastNDays = moment().subtract(filter.value, 'd').endOf('day');
 
     const res = {
       bool: {
@@ -617,9 +608,7 @@ module.exports.greaterNDaysAgo = (filter) => {
     return null;
   }
 
-  const greaterNDaysAgo = moment()
-    .subtract(filter.value, 'd')
-    .endOf('day');
+  const greaterNDaysAgo = moment().subtract(filter.value, 'd').endOf('day');
 
   const res = {
     bool: {
@@ -654,7 +643,7 @@ module.exports.greaterNDaysAgo = (filter) => {
   };
 
   return res;
-}
+};
 
 module.exports.isBeforeIncludeParam = (filter) => {
   if (!!filter.field_id) {

package/helpers/taskFilter/index.js

@@ -9,6 +9,7 @@ const buildIsPausedFilter = require('./isPausedFilter');
 const buildIsStarredFilter = require('./isStarredFilter');
 const buildDaysToCompleteFilter = require('./daysToComplete');
 const buildAgeColorFilter = require('./buildAgeColorFilter');
+const buildWasMarkedIncompleteFilter = require('./wasMarkedIncomplete');
 const buildProjectFieldFilter = require('../projectFilter/projectFieldFilter');
 const { PROJECT_BANNERS } = require('../../constants');
 const splitString = require('../splitString');
@@ -39,6 +40,10 @@ module.exports.taskStatusOptions = [
       validator && (validator.isCommercial() || validator.isService()),
     label: 'Paused',
     value: 'paused'
+  },
+  {
+    label: 'Archived',
+    value: 'archived'
   }
 ];
 
@@ -110,7 +115,7 @@ module.exports.defaultCustomColumns = [
     type: 'status',
     field_type: 'select',
     options: [],
-    select_fields: ['is_complete', 'is_ready']
+    select_fields: ['is_complete', 'is_ready', 'deleted']
   },
   {
     name: 'Region',
@@ -131,7 +136,8 @@ module.exports.defaultCustomColumns = [
     name: 'Cancelled',
     value: 'on_hold',
     type: 'on_hold',
-    field_type: 'select',
+    field_type: 'boolean',
+    // Not used anymore
     options: [
       {
         label: 'Yes',
@@ -150,7 +156,8 @@ module.exports.defaultCustomColumns = [
     name: 'Is Paused',
     value: 'is_paused',
     type: 'is_paused',
-    field_type: 'select',
+    field_type: 'boolean',
+    // Not used anymore
     options: [
       {
         label: 'Yes',
@@ -225,7 +232,8 @@ module.exports.defaultCustomColumns = [
     name: 'Was Marked Incomplete',
     value: 'was_marked_incomplete',
     type: 'was_marked_incomplete',
-    field_type: 'select',
+    field_type: 'boolean',
+    // Not used anymore
     options: [
       {
         label: 'Yes',
@@ -323,6 +331,8 @@ module.exports.buildTaskPipelineFilter = (filter, starredTaskIds) => {
       return buildOnHoldFilter(filter);
     case 'is_paused':
       return buildIsPausedFilter(filter);
+    case 'was_marked_incomplete':
+      return buildWasMarkedIncompleteFilter(filter);
     case 'days_to_complete':
       return buildDaysToCompleteFilter(filter);
     // Always expected as is_equal condition

package/helpers/taskFilter/isPausedFilter.js

@@ -3,6 +3,10 @@ const { isNoneOf } = require('../common');
 
 module.exports = (filter) => {
   switch (filter.condition) {
+    case 'is_true':
+      return module.exports.isTrue();
+    case 'is_false':
+      return module.exports.isFalse();
     case 'is_empty':
       return module.exports.isEmpty();
     case 'is_not_empty':
@@ -14,10 +18,7 @@ module.exports = (filter) => {
     case 'is_any_of':
       return module.exports.isAnyOf(filter); // if is any, means all tasks that have value
     case 'is_none_of':
-      return isNoneOf(
-        filter,
-        module.exports.isEqual
-      );
+      return isNoneOf(filter, module.exports.isEqual);
     default:
       return null;
   }
@@ -95,9 +96,7 @@ module.exports.isEqual = (filter) => {
 module.exports.isNotEqual = (filter) => {
   return {
     bool: {
-      must_not: [
-        module.exports.isEqual(filter)
-      ]
+      must_not: [module.exports.isEqual(filter)]
     }
   };
 };
@@ -125,4 +124,43 @@ module.exports.isAnyOf = (filter) => {
       should
     }
   };
-};
+};
+
+module.exports.isTrue = () => {
+  return {
+    bool: {
+      must: [
+        {
+          term: {
+            is_paused: {
+              value: true
+            }
+          }
+        }
+      ]
+    }
+  };
+};
+
+module.exports.isFalse = () => {
+  return {
+    bool: {
+      should: [
+        {
+          match: {
+            is_paused: false
+          }
+        },
+        {
+          bool: {
+            must_not: {
+              exists: {
+                field: 'is_paused'
+              }
+            }
+          }
+        }
+      ]
+    }
+  };
+};

package/helpers/taskFilter/onHoldFilter.js

@@ -3,6 +3,10 @@ const { isNoneOf } = require('../common');
 
 module.exports = (filter) => {
   switch (filter.condition) {
+    case 'is_true':
+      return module.exports.isTrue();
+    case 'is_false':
+      return module.exports.isFalse();
     case 'is_empty':
       return module.exports.isEmpty();
     case 'is_not_empty':
@@ -14,10 +18,7 @@ module.exports = (filter) => {
     case 'is_any_of':
       return module.exports.isAnyOf(filter); // if is any, means all tasks that have value
     case 'is_none_of':
-      return isNoneOf(
-        filter,
-        module.exports.isEqual
-      );
+      return isNoneOf(filter, module.exports.isEqual);
     default:
       return null;
   }
@@ -106,4 +107,45 @@ module.exports.isAnyOf = (filter) => {
       should
     }
   };
-};
+};
+
+module.exports.isTrue = () => {
+  return {
+    bool: {
+      must: [
+        {
+          term: {
+            on_hold: {
+              value: true
+            }
+          }
+        }
+      ]
+    }
+  };
+};
+
+module.exports.isFalse = () => {
+  return {
+    bool: {
+      should: [
+        {
+          term: {
+            on_hold: {
+              value: false
+            }
+          }
+        },
+        {
+          bool: {
+            must_not: {
+              exists: {
+                field: 'on_hold'
+              }
+            }
+          }
+        }
+      ]
+    }
+  };
+};

package/helpers/taskFilter/statusFilter.js

@@ -14,10 +14,7 @@ module.exports = (filter) => {
     case 'is_any_of':
       return module.exports.isAnyOf(filter);
     case 'is_none_of':
-      return isNoneOf(
-        filter,
-        module.exports.isEqual
-      );
+      return isNoneOf(filter, module.exports.isEqual);
     default:
       return null;
   }
@@ -41,6 +38,11 @@ module.exports.isEmpty = () => {
           exists: {
             field: 'on_hold'
           }
+        },
+        {
+          exists: {
+            field: 'deleted'
+          }
         }
       ]
     }
@@ -173,6 +175,18 @@ module.exports.isEqual = (filter) => {
           ]
         }
       };
+    case 'archived':
+      return {
+        bool: {
+          must: [
+            {
+              term: {
+                deleted: true
+              }
+            }
+          ]
+        }
+      };
     default:
       return null;
   }
@@ -214,4 +228,4 @@ module.exports.isNotEqual = (filter) => {
   }
 
   return null;
-};
+};

package/helpers/taskFilter/wasMarkedIncomplete.js

@@ -0,0 +1,51 @@
+module.exports = (filter) => {
+  switch (filter.condition) {
+    case 'is_true':
+      return module.exports.isTrue();
+    case 'is_false':
+      return module.exports.isFalse();
+    default:
+      return null;
+  }
+};
+
+module.exports.isTrue = () => {
+  return {
+    bool: {
+      must: [
+        {
+          term: {
+            was_marked_incomplete: {
+              value: true
+            }
+          }
+        }
+      ]
+    }
+  };
+};
+
+module.exports.isFalse = () => {
+  return {
+    bool: {
+      should: [
+        {
+          term: {
+            was_marked_incomplete: {
+              value: false
+            }
+          }
+        },
+        {
+          bool: {
+            must_not: {
+              exists: {
+                field: 'was_marked_incomplete'
+              }
+            }
+          }
+        }
+      ]
+    }
+  };
+};

package/package.json

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

package/test/helpers/taskFilter/statusFilter.spec.js

@@ -96,9 +96,7 @@ describe('taskFilter/statusFilter', function () {
       },
       output: {
         bool: {
-          must: [
-            { term: { is_paused: true } }
-          ]
+          must: [{ term: { is_paused: true } }]
         }
       }
     },
@@ -128,6 +126,21 @@ describe('taskFilter/statusFilter', function () {
         }
       }
     },
+    {
+      input: {
+        condition: 'is_equal',
+        field_id: '',
+        type: 'status',
+        field_type: 'select',
+        value: 'archived',
+        second_value: ''
+      },
+      output: {
+        bool: {
+          must: [{ term: { deleted: true } }]
+        }
+      }
+    },
     {
       input: {
         condition: 'is_empty',
@@ -142,7 +155,8 @@ describe('taskFilter/statusFilter', function () {
           must_not: [
             { exists: { field: 'is_complete' } },
             { exists: { field: 'is_ready' } },
-            { exists: { field: 'on_hold' } }
+            { exists: { field: 'on_hold' } },
+            { exists: { field: 'deleted' } }
           ]
         }
       }
@@ -163,7 +177,8 @@ describe('taskFilter/statusFilter', function () {
               must_not: [
                 { exists: { field: 'is_complete' } },
                 { exists: { field: 'is_ready' } },
-                { exists: { field: 'on_hold' } }
+                { exists: { field: 'on_hold' } },
+                { exists: { field: 'deleted' } }
               ]
             }
           }
@@ -281,9 +296,7 @@ describe('taskFilter/statusFilter', function () {
             },
             {
               bool: {
-                must: [
-                  { term: { on_hold: true } }
-                ]
+                must: [{ term: { on_hold: true } }]
               }
             }
           ]
@@ -312,9 +325,7 @@ describe('taskFilter/statusFilter', function () {
             },
             {
               bool: {
-                must: [
-                  { term: { on_hold: true } }
-                ]
+                must: [{ term: { on_hold: true } }]
               }
             }
           ]

package/test/lib/taskPipeline.spec.js

@@ -756,6 +756,7 @@ describe('taskPipeline', function () {
           'is_starred',
           'marked_incomplete_at',
           'was_marked_incomplete',
+          'deleted',
           'updated_at'
         ],
         script_fields: {