@followupus/common 0.10.20 → 0.10.22

package/dist/shared/shared.d.ts

@@ -22,24 +22,25 @@ export declare const OBJECT_TYPE: {
     ACTION: string;
 };
 export declare const COLUMN_TYPES: {
-    NUMBER: string;
     TEXT: string;
-    DROPDOWN: string;
     DATE: string;
     STATUS: string;
     PRIORITY: string;
-    LINK: string;
-    TAGS: string;
-    EMAIL: string;
     PEOPLE: string;
-    LINKED_COLUMN: string;
-    REF_LINED_COLUMN: string;
-    FILES: string;
+    EMAIL: string;
+    PHONE: string;
     HOURS: string;
+    TIME_TRACKING: string;
     TIMELINE: string;
-    PHONE: string;
     CURRENCY: string;
-    TIME_TRACKING: string;
+    NUMBER: string;
+    DROPDOWN: string;
+    TAGS: string;
+    LINK: string;
+    FILES: string;
+    AUTO_NUMBER: string;
+    LINKED_COLUMN: string;
+    REF_LINED_COLUMN: string;
     CREATED_BY: string;
     CREATED_AT: string;
 };
@@ -99,7 +100,12 @@ export declare const getColumnTypeFromId: (columnId: string) => string | undefin
 export declare const getColumnValueType: (columnType: string) => "string" | "number" | "object" | "stringArray" | "objectArray";
 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 getValidConditions: (filter: IFilter, headers?: IBaseCustomColumn[], currentUserId?: string, escapeHeaderCheck?: boolean) => IFilterCondition[];
+export declare const isDateMatchConditionValue: (dateVal: string, conditionValue: string | {
+    start: string;
+    end: string;
+}) => boolean;
 export declare const isDateInConditionValues: (itemVal: any, condition: IFilterCondition) => boolean;
 export declare const filterItemsByConditions: (groups: IBaseGroup[], filter: IFilter, headers?: IBaseCustomColumn[], currentUserId?: string) => IBaseGroup[];
 export declare const isItemMatchedByConditions: (item: IBaseItem, filter: IFilter, headers?: IBaseCustomColumn[], currentUserId?: string) => boolean;

package/dist/shared/shared.js

@@ -1,5 +1,7 @@
+import { phoneCountryList } from "./phone.js";
 import dayjs from "dayjs";
 import _ from "lodash";
+// the key order is used for Add Column Menu order, keep it
 //One-to-One Matching UI.
 export const ACTION_TYPE = {
     CREATE: "CREATE",
@@ -25,24 +27,25 @@ export const OBJECT_TYPE = {
     ACTION: "action",
 };
 export const COLUMN_TYPES = {
-    NUMBER: "number",
     TEXT: "string",
-    DROPDOWN: "dropdown",
     DATE: "date",
     STATUS: "status",
     PRIORITY: "priority",
-    LINK: "link",
-    TAGS: "tags",
-    EMAIL: "email",
     PEOPLE: "people",
-    LINKED_COLUMN: "linked_column",
-    REF_LINED_COLUMN: "ref_linked_column",
-    FILES: "files",
+    EMAIL: "email",
+    PHONE: "phone",
     HOURS: "hours",
+    TIME_TRACKING: "time_tracking",
     TIMELINE: "timeline",
-    PHONE: "phone",
     CURRENCY: "currency",
-    TIME_TRACKING: "time_tracking",
+    NUMBER: "number",
+    DROPDOWN: "dropdown",
+    TAGS: "tags",
+    LINK: "link",
+    FILES: "files",
+    AUTO_NUMBER: "auto_number",
+    LINKED_COLUMN: "linked_column",
+    REF_LINED_COLUMN: "ref_linked_column",
     CREATED_BY: "created_by",
     CREATED_AT: "created_at",
 };
@@ -72,6 +75,18 @@ export const COLUMN_OP_TYPES = {
         OP_TYPES.EMPTY,
         OP_TYPES.NOT_EMPTY,
     ],
+    [COLUMN_TYPES.LINK]: [
+        OP_TYPES.CONTAINS,
+        OP_TYPES.NOT_CONTAINS,
+        OP_TYPES.EMPTY,
+        OP_TYPES.NOT_EMPTY,
+    ],
+    [COLUMN_TYPES.PHONE]: [
+        OP_TYPES.CONTAINS,
+        OP_TYPES.NOT_CONTAINS,
+        OP_TYPES.EMPTY,
+        OP_TYPES.NOT_EMPTY,
+    ],
     [COLUMN_TYPES.EMAIL]: [
         OP_TYPES.CONTAINS,
         OP_TYPES.NOT_CONTAINS,
@@ -168,6 +183,8 @@ export const AUTOMATION_OP_TYPES = {
         OP_TYPES.NOT_EMPTY,
     ],
     [COLUMN_TYPES.EMAIL]: [OP_TYPES.CONTAINS, OP_TYPES.NOT_CONTAINS],
+    [COLUMN_TYPES.LINK]: [OP_TYPES.CONTAINS, OP_TYPES.NOT_CONTAINS],
+    [COLUMN_TYPES.PHONE]: [OP_TYPES.CONTAINS, OP_TYPES.NOT_CONTAINS],
     // [COLUMN_TYPES.DATE]: [
     //   OP_TYPES.EQUAL,
     //   OP_TYPES.NOT_EQUAL,
@@ -236,6 +253,7 @@ export const getColumnValueType = (columnType) => {
         case COLUMN_TYPES.TIMELINE:
         case COLUMN_TYPES.TIME_TRACKING:
         case COLUMN_TYPES.LINK:
+        case COLUMN_TYPES.PHONE:
             return "object";
         case COLUMN_TYPES.NUMBER:
         case COLUMN_TYPES.HOURS:
@@ -311,6 +329,22 @@ export const getDateGroupKey = (dateStr) => {
     }
     return DATE_GROUPS.FUTURE;
 };
+export const extractDomain = (url) => {
+    const regex = /^(?:https?:\/\/)?(?:www\.)?([^/:]+)/i;
+    const match = url?.match(regex);
+    return match ? match[1] : undefined;
+};
+// export const extractDomainName = (url?: string) => {
+//   const regex = /^(?:https?:\/\/)?(?:www\.)?([^/:]+)/i;
+//   const match = url?.match(regex);
+//   if (!match) return undefined;
+//   const domainParts = match[1].split(".");
+//   if (domainParts.length > 1) {
+//     domainParts.pop();
+//   }
+//
+//   return domainParts.join(".");
+// };
 export const getValidConditions = (filter, headers, currentUserId, escapeHeaderCheck) => {
     const newFilter = _.cloneDeep(filter);
     if (!newFilter?.criteria?.length || !headers?.length) {
@@ -413,29 +447,34 @@ const isInConditionValues = (itemVal, valueType, condition) => {
     }
     return false;
 };
+export const isDateMatchConditionValue = (dateVal, conditionValue) => {
+    const checkDate = dayjs(dateVal);
+    if (!checkDate.isValid())
+        return false;
+    if (conditionValue && typeof conditionValue === "object") {
+        // range
+        const startDt = dayjs(conditionValue.start);
+        const endDt = dayjs(conditionValue.end);
+        return (startDt.isValid() &&
+            endDt.isValid() &&
+            (checkDate.isAfter(startDt, "date") ||
+                checkDate.isSame(startDt, "date")) &&
+            (checkDate.isBefore(endDt, "date") || checkDate.isSame(endDt, "date")));
+    }
+    else if (dayjs(conditionValue).isValid()) {
+        return checkDate.isSame(dayjs(conditionValue), "date");
+    }
+    else {
+        const groupKeys = getFilterDateGroupKeys(dateVal);
+        return !!groupKeys?.includes(conditionValue);
+    }
+};
 export const isDateInConditionValues = (itemVal, condition) => {
     if (!itemVal || !dayjs(itemVal).isValid()) {
         return !!condition.blank;
     }
-    const itemDate = dayjs(itemVal);
     return !!condition.value?.some(c => {
-        if (c && typeof c === "object") {
-            // range
-            const startDt = dayjs(c.start);
-            const endDt = dayjs(c.end);
-            return (startDt.isValid() &&
-                endDt.isValid() &&
-                (itemDate.isAfter(startDt, "date") ||
-                    itemDate.isSame(startDt, "date")) &&
-                (itemDate.isBefore(endDt, "date") || itemDate.isSame(endDt, "date")));
-        }
-        else if (dayjs(c).isValid()) {
-            return itemDate.isSame(dayjs(c), "date");
-        }
-        else {
-            const groupKeys = getFilterDateGroupKeys(itemVal);
-            return !!groupKeys?.includes(c);
-        }
+        return isDateMatchConditionValue(itemVal, c);
     });
     // if (!groupKey) return !!condition.blank;
     // return !!condition.value?.find((dateGroup) => dateGroup === groupKey);
@@ -466,7 +505,13 @@ const isDateAfterConditionValues = (itemVal, condition) => {
         }
     });
 };
-const isEmpty = (itemVal, valueType) => {
+const isEmpty = (itemVal, valueType, columnType) => {
+    const isLink = columnType === COLUMN_TYPES.LINK;
+    const isPhone = columnType === COLUMN_TYPES.PHONE;
+    if (isLink)
+        return !itemVal?.url;
+    if (isPhone)
+        return !itemVal?.value;
     switch (valueType) {
         case "number":
         case "string":
@@ -482,13 +527,28 @@ const isEmpty = (itemVal, valueType) => {
     }
     return true;
 };
-const isContains = (itemVal, valueType, condition) => {
+const isContains = (itemVal, valueType, condition, columnType) => {
+    const isLink = columnType === COLUMN_TYPES.LINK;
+    const isPhone = columnType === COLUMN_TYPES.PHONE;
     const checkVal = condition.value?.length
         ? condition.value[0]
         : "";
     const ignoreCaseCheck = (val, contains) => {
         return !!val?.toLowerCase()?.includes(contains?.toLowerCase());
     };
+    if (isLink) {
+        return (ignoreCaseCheck(itemVal?.title ?? "", checkVal) ||
+            ignoreCaseCheck(extractDomain(itemVal?.url ?? "") ?? "", checkVal));
+    }
+    if (isPhone) {
+        const phoneNum = itemVal?.value && itemVal?.iso2
+            ? (phoneCountryList.find(k => k.iso2 === itemVal.iso2)?.code ?? "") +
+                itemVal.value
+            : "";
+        return !!phoneNum
+            ?.replaceAll(/\D/g, "")
+            ?.includes(checkVal?.replaceAll(/\D/g, ""));
+    }
     switch (valueType) {
         case "number":
             return itemVal || itemVal === 0
@@ -595,16 +655,16 @@ const checkItemMatched = (item, validConditions, headers, matchAny) => {
                     match = isDate && isDateAfterConditionValues(itemVal, condition);
                     break;
                 case OP_TYPES.EMPTY:
-                    match = isEmpty(itemVal, valueType);
+                    match = isEmpty(itemVal, valueType, checkHeader?.type);
                     break;
                 case OP_TYPES.NOT_EMPTY:
-                    match = !isEmpty(itemVal, valueType);
+                    match = !isEmpty(itemVal, valueType, checkHeader?.type);
                     break;
                 case OP_TYPES.CONTAINS:
-                    match = isContains(itemVal, valueType, condition);
+                    match = isContains(itemVal, valueType, condition, checkHeader?.type);
                     break;
                 case OP_TYPES.NOT_CONTAINS:
-                    match = !isContains(itemVal, valueType, condition);
+                    match = !isContains(itemVal, valueType, condition, checkHeader?.type);
                     break;
                 case OP_TYPES.EQUAL:
                     match = isEquals(itemVal, valueType, condition);

package/package.json

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