@followupus/common 0.10.25 → 0.10.27

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: {
@@ -103,6 +105,7 @@ export declare const getColumnValueType: (columnType: string) => "string" | "num
 export declare const getFilterDateGroupKeys: (dateStr: string) => string[] | null;
 export declare const getDateGroupKey: (dateStr: string) => string | null;
 export declare const extractDomain: (url?: string) => string | undefined;
+export declare const hasDynamicCondition: (filter: IFilter, headers?: IBaseCustomColumn[]) => boolean;
 export declare const getValidConditions: (filter: IFilter, headers?: IBaseCustomColumn[], currentUserId?: string, escapeHeaderCheck?: boolean) => IFilterCondition[];
 export declare const isDateMatchConditionValue: (dateVal: string, conditionValue: string | {
     start: string;

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,
@@ -362,6 +373,23 @@ export const extractDomain = (url) => {
 //
 //   return domainParts.join(".");
 // };
+export const hasDynamicCondition = (filter, headers) => {
+    if (!filter?.criteria?.length || !headers?.length) {
+        return false;
+    }
+    return filter.criteria?.some(c => {
+        const validHeader = headers.find(h => h.columnId === c.columnId);
+        let checkHeader = validHeader;
+        if (isLinkedColumns(validHeader?.type)) {
+            checkHeader = validHeader?.linked;
+        }
+        if (checkHeader?.type === COLUMN_TYPES.PEOPLE ||
+            checkHeader?.type === COLUMN_TYPES.CREATED_BY) {
+            return c.value?.find(val => val === THEMSELVES);
+        }
+        return false;
+    });
+};
 export const getValidConditions = (filter, headers, currentUserId, escapeHeaderCheck) => {
     const newFilter = _.cloneDeep(filter);
     if (!newFilter?.criteria?.length || !headers?.length) {
@@ -438,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;
         }
@@ -713,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.25",
+  "version": "0.10.27",
   "description": "followup common utils npm package with TypeScript and VSCode",
   "main": "./dist/index.js",
   "module": "./dist/index.js",