@followupus/common 0.8.4 → 0.8.6

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/delta.d.ts

@@ -5,6 +5,14 @@ export declare const DELTA_SCHEMA_NAME: {
     GROUPS: string;
     ITEMS: string;
     FOLDERS: string;
+    BOARD_HEADERS: string;
+    BOARD_VIEWS: string;
+    ITEM_NOTES: string;
+    FORMS: string;
+    WORKSPACES: string;
+    LINKED_COLUMNS: string;
+    LINKED_ITEMS: string;
+    DROPDOWNS: string;
 };
 export declare const DELTA_ACTION: {
     DELETE: string;

package/dist/shared/delta.js

@@ -5,6 +5,14 @@ export const DELTA_SCHEMA_NAME = {
     GROUPS: "GROUPS",
     ITEMS: "ITEMS",
     FOLDERS: "FOLDERS",
+    BOARD_HEADERS: "BOARD_HEADERS",
+    BOARD_VIEWS: "BOARD_VIEWS",
+    ITEM_NOTES: "ITEM_NOTES",
+    FORMS: "FORMS",
+    WORKSPACES: "WORKSPACES",
+    LINKED_COLUMNS: "LINKED_COLUMNS",
+    LINKED_ITEMS: "LINKED_ITEMS",
+    DROPDOWNS: "DROPDOWNS",
 };
 export const DELTA_ACTION = {
     DELETE: "D",

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,6 +52,7 @@ export declare const DATE_GROUPS: {
     THIS_MONTH: string;
     FUTURE: string;
 };
+export declare const isLinkedColumns: (columnType?: string) => boolean;
 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[];

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,11 @@ 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 getColumnValueType = (columnType) => {
     switch (columnType) {
         case COLUMN_TYPES.PEOPLE:
@@ -117,6 +128,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:
@@ -169,7 +181,13 @@ export const getValidConditions = (filter, headers, currentUserId) => {
     }
     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)
+            return;
+        if (checkHeader?.type === COLUMN_TYPES.PEOPLE) {
             if (c.value?.find(val => val === THEMSELVES) && currentUserId) {
                 const idx = c.value.findIndex(val => val === THEMSELVES);
                 if (idx > -1)
@@ -182,21 +200,28 @@ export const getValidConditions = (filter, headers, currentUserId) => {
         const validHeader = headers.find(h => h.columnId === c.columnId);
         if (!validHeader)
             return false;
-        const validOperate = COLUMN_OP_TYPES[validHeader.type].includes(c.op);
+        let checkHeader = validHeader;
+        if (isLinkedColumns(validHeader.type)) {
+            checkHeader = validHeader.linked;
+        }
+        if (!checkHeader)
+            return false;
+        const validOperate = COLUMN_OP_TYPES[checkHeader.type]?.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(checkHeader.type);
         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)))));
+                            c.value.some(v => checkHeader.dropdowns?.find(d => d.key === v)))));
             case OP_TYPES.EMPTY:
             case OP_TYPES.NOT_EMPTY:
                 return true;
@@ -264,16 +289,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 +373,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.4",
+  "version": "0.8.6",
   "description": "followup common utils npm package with TypeScript and VSCode",
   "main": "./dist/index.js",
   "module": "./dist/index.js",