@followupus/common 0.8.5 → 0.8.7

package/README.md

@@ -1,6 +1,7 @@
 # common
 
 ## add a changelog after some modifications
+
 ```sh
 pnpm changeset
 ```

package/dist/index.d.ts

@@ -1,2 +1,2 @@
-export * from './shared/index.js';
-export * from './utils/index.js';
+export * from "./shared/index.js";
+export * from "./utils/index.js";

package/dist/index.js

@@ -1,2 +1,2 @@
-export * from './shared/index.js';
-export * from './utils/index.js';
+export * from "./shared/index.js";
+export * from "./utils/index.js";

package/dist/shared/shared.d.ts

@@ -1,4 +1,4 @@
-import { IBaseCustomColumn, IBaseGroup, IFilter, IFilterCondition, IPureBoard } from './types';
+import { IBaseCustomColumn, IBaseGroup, IFilter, IFilterCondition, IPureBoard } from "./types";
 export declare const COLUMN_TYPES: {
     NUMBER: string;
     TEXT: string;
@@ -52,8 +52,10 @@ export declare const DATE_GROUPS: {
     THIS_MONTH: string;
     FUTURE: string;
 };
+export declare const isLinkedColumns: (columnType?: string) => boolean;
+export declare const getColumnTypeFromId: (columnId: string) => string | undefined;
 export declare const getColumnValueType: (columnType: string) => "string" | "number" | "object" | "stringArray" | "objectArray";
 export declare const getDateGroupKey: (dateStr: string) => string | null;
-export declare const getValidConditions: (filter: IFilter, headers?: IBaseCustomColumn[], currentUserId?: string) => IFilterCondition[];
+export declare const getValidConditions: (filter: IFilter, headers?: IBaseCustomColumn[], currentUserId?: string, escapeHeaderCheck?: boolean) => IFilterCondition[];
 export declare const filterItemsByConditions: (groups: IBaseGroup[], filter: IFilter, headers?: IBaseCustomColumn[], currentUserId?: string) => IBaseGroup[];
 export declare const filterBoardTree: (board: IPureBoard, filter: IFilter, currentUserId?: string) => IPureBoard;

package/dist/shared/shared.js

@@ -1,5 +1,5 @@
 import dayjs from "dayjs";
-import _ from 'lodash';
+import _ from "lodash";
 export const COLUMN_TYPES = {
     NUMBER: "number",
     TEXT: "string",
@@ -75,6 +75,12 @@ export const COLUMN_OP_TYPES = {
         OP_TYPES.EMPTY,
         OP_TYPES.NOT_EMPTY,
     ],
+    [COLUMN_TYPES.TAGS]: [
+        OP_TYPES.IS,
+        OP_TYPES.IS_NOT,
+        OP_TYPES.EMPTY,
+        OP_TYPES.NOT_EMPTY,
+    ],
     [COLUMN_TYPES.PEOPLE]: [
         OP_TYPES.IS,
         OP_TYPES.IS_NOT,
@@ -110,6 +116,14 @@ export const DATE_GROUPS = {
     THIS_MONTH: "thisMonth",
     FUTURE: "future",
 };
+export const isLinkedColumns = (columnType) => {
+    if (!columnType)
+        return false;
+    return [COLUMN_TYPES.LINKED_COLUMN, COLUMN_TYPES.REF_LINED_COLUMN].includes(columnType);
+};
+export const getColumnTypeFromId = (columnId) => {
+    return Object.values(COLUMN_TYPES).find(type => columnId.startsWith(type));
+};
 export const getColumnValueType = (columnType) => {
     switch (columnType) {
         case COLUMN_TYPES.PEOPLE:
@@ -117,6 +131,7 @@ export const getColumnValueType = (columnType) => {
         case COLUMN_TYPES.TAGS:
             return "stringArray";
         case COLUMN_TYPES.TIMELINE:
+        case COLUMN_TYPES.TIME_TRACKING:
             return "object";
         case COLUMN_TYPES.NUMBER:
         case COLUMN_TYPES.HOURS:
@@ -162,14 +177,21 @@ export const getDateGroupKey = (dateStr) => {
     }
     return DATE_GROUPS.FUTURE;
 };
-export const getValidConditions = (filter, headers, currentUserId) => {
+export const getValidConditions = (filter, headers, currentUserId, escapeHeaderCheck) => {
     const newFilter = _.cloneDeep(filter);
     if (!newFilter.criteria?.length || !headers?.length) {
         return [];
     }
     newFilter.criteria.forEach(c => {
         const validHeader = headers.find(h => h.columnId === c.columnId);
-        if (validHeader?.type === COLUMN_TYPES.PEOPLE) {
+        let checkHeader = validHeader;
+        if (isLinkedColumns(validHeader?.type)) {
+            checkHeader = validHeader?.linked;
+        }
+        if (!checkHeader && !escapeHeaderCheck)
+            return;
+        if (checkHeader?.type === COLUMN_TYPES.PEOPLE ||
+            c.columnId?.startsWith(COLUMN_TYPES.PEOPLE)) {
             if (c.value?.find(val => val === THEMSELVES) && currentUserId) {
                 const idx = c.value.findIndex(val => val === THEMSELVES);
                 if (idx > -1)
@@ -180,23 +202,34 @@ export const getValidConditions = (filter, headers, currentUserId) => {
     // 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
     return newFilter.criteria.filter(c => {
         const validHeader = headers.find(h => h.columnId === c.columnId);
-        if (!validHeader)
+        if (!validHeader && !escapeHeaderCheck)
+            return false;
+        let checkHeader = validHeader;
+        if (isLinkedColumns(validHeader?.type)) {
+            checkHeader = validHeader?.linked;
+        }
+        if (!checkHeader && !escapeHeaderCheck)
+            return false;
+        const columnType = checkHeader?.type || getColumnTypeFromId(c.columnId);
+        if (!columnType)
             return false;
-        const validOperate = COLUMN_OP_TYPES[validHeader.type].includes(c.op);
+        const validOperate = COLUMN_OP_TYPES[columnType]?.includes(c.op);
         if (!validOperate)
             return false;
         const isDropdown = [
             COLUMN_TYPES.DROPDOWN,
             COLUMN_TYPES.STATUS,
             COLUMN_TYPES.PRIORITY,
-        ].includes(validHeader.type);
+            COLUMN_TYPES.TAGS,
+        ].includes(columnType);
         switch (c.op) {
             case OP_TYPES.IS:
             case OP_TYPES.IS_NOT:
                 return (c.blank ||
                     (!!c.value?.filter(v => !!v || v === 0)?.length &&
                         (!isDropdown ||
-                            c.value.some(v => validHeader.dropdowns?.find(d => d.key === v)))));
+                            escapeHeaderCheck ||
+                            c.value.some(v => checkHeader?.dropdowns?.find(d => d.key === v)))));
             case OP_TYPES.EMPTY:
             case OP_TYPES.NOT_EMPTY:
                 return true;
@@ -264,16 +297,19 @@ const isContains = (itemVal, valueType, condition) => {
     const checkVal = condition.value?.length
         ? condition.value[0]
         : "";
+    const ignoreCaseCheck = (val, contains) => {
+        return !!val?.toLowerCase()?.includes(contains?.toLowerCase());
+    };
     switch (valueType) {
         case "number":
             return itemVal || itemVal === 0
-                ? itemVal.toString().includes(checkVal)
+                ? itemVal?.toString()?.includes(checkVal)
                 : false;
         case "string":
-            return !!itemVal && itemVal.includes(checkVal);
+            return !!itemVal && ignoreCaseCheck(itemVal, checkVal);
         case "stringArray":
             return itemVal?.length
-                ? itemVal.some(val => val.includes(checkVal))
+                ? itemVal.some(val => ignoreCaseCheck(val, checkVal))
                 : false;
         default:
             break;
@@ -345,70 +381,92 @@ export const filterItemsByConditions = (groups, filter, headers, currentUserId)
     }
     groups.forEach(g => {
         g.items = g.items?.filter(item => {
-            let match = false;
+            let isItemMatched = false;
             for (const condition of validConditions) {
                 const header = headers?.find(h => h.columnId === condition.columnId);
-                const valueType = getColumnValueType(header?.type ?? "");
-                const itemVal = item.data?.[condition.columnId]?.value;
-                const isDate = header?.type === COLUMN_TYPES.DATE;
-                switch (condition.op) {
-                    case OP_TYPES.IS:
-                        match = isDate
-                            ? isDateInConditionValues(itemVal, condition)
-                            : isInConditionValues(itemVal, valueType, condition);
-                        break;
-                    case OP_TYPES.IS_NOT:
-                        match = isDate
-                            ? !isDateInConditionValues(itemVal, condition)
-                            : !isInConditionValues(itemVal, valueType, condition);
-                        break;
-                    case OP_TYPES.EMPTY:
-                        match = isEmpty(itemVal, valueType);
-                        break;
-                    case OP_TYPES.NOT_EMPTY:
-                        match = !isEmpty(itemVal, valueType);
-                        break;
-                    case OP_TYPES.CONTAINS:
-                        match = isContains(itemVal, valueType, condition);
-                        break;
-                    case OP_TYPES.NOT_CONTAINS:
-                        match = !isContains(itemVal, valueType, condition);
-                        break;
-                    case OP_TYPES.EQUAL:
-                        match = isEquals(itemVal, valueType, condition);
-                        break;
-                    case OP_TYPES.NOT_EQUAL:
-                        match = !isEquals(itemVal, valueType, condition);
-                        break;
-                    case OP_TYPES.GREATER:
-                        match =
-                            typeof itemVal === "number"
-                                ? isGreater(itemVal, condition)
-                                : false;
-                        break;
-                    case OP_TYPES.GREATER_EQUAL:
-                        match =
-                            typeof itemVal === "number"
-                                ? isGreaterEqual(itemVal, condition)
-                                : false;
-                        break;
-                    case OP_TYPES.LESS_EQUAL:
-                        match =
-                            typeof itemVal === "number"
-                                ? isLessEqual(itemVal, condition)
-                                : false;
-                        break;
-                    case OP_TYPES.LESS:
-                        match =
-                            typeof itemVal === "number" ? isLess(itemVal, condition) : false;
-                        break;
-                    default:
-                        break;
+                const isLinkedColumn = isLinkedColumns(header?.type);
+                let checkHeader = header;
+                if (isLinkedColumn) {
+                    checkHeader = header?.linked;
+                }
+                const valueType = getColumnValueType(checkHeader?.type ?? "");
+                const checkConditionFn = (itemVal) => {
+                    let match = false;
+                    const isDate = checkHeader?.type === COLUMN_TYPES.DATE;
+                    switch (condition.op) {
+                        case OP_TYPES.IS:
+                            match = isDate
+                                ? isDateInConditionValues(itemVal, condition)
+                                : isInConditionValues(itemVal, valueType, condition);
+                            break;
+                        case OP_TYPES.IS_NOT:
+                            match = isDate
+                                ? !isDateInConditionValues(itemVal, condition)
+                                : !isInConditionValues(itemVal, valueType, condition);
+                            break;
+                        case OP_TYPES.EMPTY:
+                            match = isEmpty(itemVal, valueType);
+                            break;
+                        case OP_TYPES.NOT_EMPTY:
+                            match = !isEmpty(itemVal, valueType);
+                            break;
+                        case OP_TYPES.CONTAINS:
+                            match = isContains(itemVal, valueType, condition);
+                            break;
+                        case OP_TYPES.NOT_CONTAINS:
+                            match = !isContains(itemVal, valueType, condition);
+                            break;
+                        case OP_TYPES.EQUAL:
+                            match = isEquals(itemVal, valueType, condition);
+                            break;
+                        case OP_TYPES.NOT_EQUAL:
+                            match = !isEquals(itemVal, valueType, condition);
+                            break;
+                        case OP_TYPES.GREATER:
+                            match =
+                                typeof itemVal === "number"
+                                    ? isGreater(itemVal, condition)
+                                    : false;
+                            break;
+                        case OP_TYPES.GREATER_EQUAL:
+                            match =
+                                typeof itemVal === "number"
+                                    ? isGreaterEqual(itemVal, condition)
+                                    : false;
+                            break;
+                        case OP_TYPES.LESS_EQUAL:
+                            match =
+                                typeof itemVal === "number"
+                                    ? isLessEqual(itemVal, condition)
+                                    : false;
+                            break;
+                        case OP_TYPES.LESS:
+                            match =
+                                typeof itemVal === "number"
+                                    ? isLess(itemVal, condition)
+                                    : false;
+                            break;
+                        default:
+                            break;
+                    }
+                    return match;
+                };
+                const itemValue = isLinkedColumn
+                    ? item.data?.[condition.columnId]
+                    : item.data?.[condition.columnId]?.value;
+                if (isLinkedColumn) {
+                    isItemMatched = !!itemValue?.some((item) => {
+                        const val = item.value;
+                        return checkConditionFn(val);
+                    });
+                }
+                else {
+                    isItemMatched = checkConditionFn(itemValue);
                 }
-                if (!match)
+                if (!isItemMatched)
                     return false;
             }
-            return match;
+            return isItemMatched;
         });
     });
     return groups;

package/package.json

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