@followupus/common 0.10.26 → 0.10.28

package/dist/shared/shared.d.ts

@@ -62,15 +62,17 @@ export declare const OP_TYPES: {
     LESS: string;
     BEFORE: string;
     AFTER: string;
+    CHECKED: string;
+    NOT_CHECKED: string;
 };
 export declare const COLUMN_OP_TYPES: {
-    readonly [x: string]: readonly [string, string, string, string, string, string] | readonly [string, string, string, string] | readonly [string, string, string, string, string, string, string, string];
+    readonly [x: string]: readonly [string, string, string, string, string, string] | readonly [string, string, string, string] | readonly [string, string, string, string, string, string, string, string] | readonly [string, string];
 };
 export declare const AUTOMATION_OP_TYPES: {
-    [x: string]: string[] | readonly [string, string, string, string, string, string] | readonly [string, string, string, string] | readonly [string, string, string, string, string, string, string, string];
+    [x: string]: string[] | readonly [string, string, string, string, string, string] | readonly [string, string, string, string] | readonly [string, string, string, string, string, string, string, string] | readonly [string, string];
 };
 export declare const DYNAMIC_VIEW_OP_TYPES: {
-    [x: string]: string[] | readonly [string, string, string, string, string, string] | readonly [string, string, string, string] | readonly [string, string, string, string, string, string, string, string];
+    [x: string]: string[] | readonly [string, string, string, string, string, string] | readonly [string, string, string, string] | readonly [string, string, string, string, string, string, string, string] | readonly [string, string];
 };
 export declare const THEMSELVES = "self";
 export declare const DATE_GROUPS: {

package/dist/shared/shared.js

@@ -68,6 +68,8 @@ export const OP_TYPES = {
     LESS: "lt",
     BEFORE: "before",
     AFTER: "after",
+    CHECKED: "checked",
+    NOT_CHECKED: "not_checked",
 };
 export const COLUMN_OP_TYPES = {
     [COLUMN_TYPES.TEXT]: [
@@ -127,6 +129,14 @@ export const COLUMN_OP_TYPES = {
         OP_TYPES.GREATER_EQUAL,
         OP_TYPES.LESS,
         OP_TYPES.LESS_EQUAL,
+    ],
+    [COLUMN_TYPES.PERCENTAGE]: [
+        OP_TYPES.EQUAL,
+        OP_TYPES.NOT_EQUAL,
+        OP_TYPES.GREATER,
+        OP_TYPES.GREATER_EQUAL,
+        OP_TYPES.LESS,
+        OP_TYPES.LESS_EQUAL,
         OP_TYPES.EMPTY,
         OP_TYPES.NOT_EMPTY,
     ],
@@ -186,6 +196,7 @@ export const COLUMN_OP_TYPES = {
         OP_TYPES.EMPTY,
         OP_TYPES.NOT_EMPTY,
     ],
+    [COLUMN_TYPES.CHECKBOX]: [OP_TYPES.CHECKED, OP_TYPES.NOT_CHECKED],
 };
 export const AUTOMATION_OP_TYPES = {
     ...COLUMN_OP_TYPES,
@@ -402,7 +413,7 @@ export const getValidConditions = (filter, headers, currentUserId, escapeHeaderC
         }
         if (checkHeader?.type === COLUMN_TYPES.DATE ||
             checkHeader?.type === COLUMN_TYPES.CREATED_AT) {
-            _.remove(c.value, v => Object.values(SpecialKeyInDateFilter).includes(v));
+            _.remove(c.value ?? [], v => Object.values(SpecialKeyInDateFilter).includes(v));
         }
     });
     // for dropdown, if set the option is in filter condition, and user delete the option. should ignore it or make the option can't be deleted
@@ -455,6 +466,9 @@ export const getValidConditions = (filter, headers, currentUserId, escapeHeaderC
             case OP_TYPES.AFTER:
                 return (isDate &&
                     !!c.value?.filter(v => v === FILTER_DATE_GROUPS.TODAY || dayjs(v).isValid())?.length);
+            case OP_TYPES.CHECKED:
+            case OP_TYPES.NOT_CHECKED:
+                return true;
             default:
                 return false;
         }
@@ -465,16 +479,16 @@ const isInConditionValues = (itemVal, valueType, condition) => {
         case "number":
         case "string":
             return ((condition.blank && !itemVal) ||
-                !!condition.value.find(val => val === itemVal));
+                !!condition.value?.find(val => val === itemVal));
         case "stringArray":
             return ((condition.blank && !itemVal?.length) ||
-                condition.value.some(val => Array.isArray(itemVal) && itemVal?.includes(val)));
+                !!condition.value?.some(val => Array.isArray(itemVal) && itemVal?.includes(val)));
         case "object":
             return ((condition.blank && !itemVal) ||
-                !!condition.value.find(val => _.isEqual(val, itemVal)));
+                !!condition.value?.find(val => _.isEqual(val, itemVal)));
         case "objectArray":
             return ((condition.blank && !itemVal?.length) ||
-                condition.value.some(val => Array.isArray(itemVal) &&
+                !!condition.value?.some(val => Array.isArray(itemVal) &&
                     itemVal.find(existVal => _.isEqual(val, existVal))));
         default:
             break;
@@ -730,6 +744,12 @@ const checkItemMatched = (item, validConditions, headers, matchAny) => {
                     match =
                         typeof itemVal === "number" ? isLess(itemVal, condition) : false;
                     break;
+                case OP_TYPES.CHECKED:
+                    match = !!itemVal;
+                    break;
+                case OP_TYPES.NOT_CHECKED:
+                    match = !itemVal;
+                    break;
                 default:
                     break;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@followupus/common",
-  "version": "0.10.26",
+  "version": "0.10.28",
   "description": "followup common utils npm package with TypeScript and VSCode",
   "main": "./dist/index.js",
   "module": "./dist/index.js",