@followupus/common 0.10.32 → 0.10.33

package/dist/shared/shared.d.ts

@@ -1,4 +1,4 @@
-import { IBaseCustomColumn, IBaseGroup, IFilter, IFilterCondition, IPureBoard, IBaseItem } from "./types";
+import type { IBaseCustomColumn, IBaseGroup, IFilter, IFilterCondition, IPureBoard, IBaseItem } from "./types";
 export declare const COLUMN_TYPES: {
     TEXT: string;
     DROPDOWN: string;
@@ -17,12 +17,18 @@ export declare const COLUMN_TYPES: {
     TIMELINE: string;
     CURRENCY: string;
     PERCENTAGE: string;
+    VOTE: string;
+    LONGTEXT: string;
+    FORMULA: string;
     LINKED_COLUMN: string;
     REF_LINED_COLUMN: string;
+    ROLLUP: string;
     TIME_TRACKING: string;
     AUTO_NUMBER: string;
     CREATED_BY: string;
     CREATED_AT: string;
+    DATETIME: string;
+    TEAM: string;
 };
 export declare const ACTION_TYPE: {
     CREATE: string;
@@ -48,6 +54,8 @@ export declare const OBJECT_TYPE: {
     ACTION: string;
 };
 export declare const NAME_COLUMN = "name";
+export declare const GATE_COLUMN = "string_gate";
+export declare const PROGRESS_COLUMN = "string_progress";
 export declare const OP_TYPES: {
     CONTAINS: string;
     NOT_CONTAINS: string;
@@ -113,6 +121,7 @@ export declare const isDateMatchConditionValue: (dateVal: string, conditionValue
     end: string;
 }) => boolean;
 export declare const isDateInConditionValues: (itemVal: any, condition: IFilterCondition) => boolean;
+export declare const isEqValInConditionValues: (itemVal: any, condition: IFilterCondition, checkHeader?: IBaseCustomColumn) => 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;
 export declare const filterBoardTree: (board: IPureBoard, filter: IFilter, currentUserId?: string) => IPureBoard;

package/dist/shared/shared.js

@@ -20,14 +20,19 @@ export const COLUMN_TYPES = {
     TIMELINE: "timeline",
     CURRENCY: "currency",
     PERCENTAGE: "percent",
+    VOTE: "vote",
+    LONGTEXT: "long_text",
+    FORMULA: "formula",
     LINKED_COLUMN: "linked_column",
     REF_LINED_COLUMN: "ref_linked_column",
+    ROLLUP: "rollup",
     TIME_TRACKING: "time_tracking",
     AUTO_NUMBER: "auto_number",
     CREATED_BY: "created_by",
     CREATED_AT: "created_at",
+    DATETIME: "datetime",
+    TEAM: "team",
 };
-// the key order is used for Add Column Menu order, keep it
 //One-to-One Matching UI.
 export const ACTION_TYPE = {
     CREATE: "CREATE",
@@ -54,6 +59,8 @@ export const OBJECT_TYPE = {
     ACTION: "action",
 };
 export const NAME_COLUMN = "name";
+export const GATE_COLUMN = "string_gate";
+export const PROGRESS_COLUMN = "string_progress";
 export const OP_TYPES = {
     CONTAINS: "like",
     NOT_CONTAINS: "not_like",
@@ -266,11 +273,20 @@ export const isLinkedColumns = (columnType) => {
 export const getColumnTypeFromId = (columnId) => {
     if (columnId === NAME_COLUMN)
         return COLUMN_TYPES.TEXT;
-    return Object.values(COLUMN_TYPES).find(type => columnId.startsWith(type + '_'));
+    if (columnId.startsWith("graph_d_")) {
+        return COLUMN_TYPES.DROPDOWN;
+    }
+    else if (columnId.startsWith("graph_")) {
+        // temp for special relation column
+        return COLUMN_TYPES.TAGS;
+    }
+    const lastIdx = columnId.lastIndexOf("_");
+    return lastIdx === -1 ? undefined : columnId.substring(0, lastIdx);
 };
 export const getColumnValueType = (columnType) => {
     switch (columnType) {
         case COLUMN_TYPES.PEOPLE:
+        case COLUMN_TYPES.VOTE:
         case COLUMN_TYPES.CREATED_BY:
         case COLUMN_TYPES.FILES:
         case COLUMN_TYPES.TAGS:
@@ -288,6 +304,7 @@ export const getColumnValueType = (columnType) => {
             return "number";
         case COLUMN_TYPES.LINKED_COLUMN:
         case COLUMN_TYPES.REF_LINED_COLUMN:
+        case COLUMN_TYPES.ROLLUP:
             return "objectArray";
         case COLUMN_TYPES.CHECKBOX:
             return "bool";
@@ -449,7 +466,7 @@ export const getValidConditions = (filter, headers, currentUserId, escapeHeaderC
                     (!!c.value?.filter(v => !!v || v === 0)?.length &&
                         (!isDropdown ||
                             escapeHeaderCheck ||
-                            c.value.some(v => checkHeader?.dropdowns?.find(d => d.key === v)))));
+                            c.value.some(v => checkHeader?.dropdowns?.find(d => d.key === v || d.eqVal === v)))));
             case OP_TYPES.EMPTY:
             case OP_TYPES.NOT_EMPTY:
                 return true;
@@ -554,6 +571,19 @@ const isDateAfterConditionValues = (itemVal, condition) => {
         }
     });
 };
+export const isEqValInConditionValues = (itemVal, condition, checkHeader) => {
+    if (condition.blank && !itemVal)
+        return true;
+    return !!condition.value?.some(c => {
+        const itemDropdown = checkHeader?.dropdowns?.find(d => d.key === itemVal);
+        if (itemDropdown) {
+            return itemDropdown.value === c || itemDropdown.eqVal === c;
+        }
+        return false;
+    });
+    // if (!groupKey) return !!condition.blank;
+    // return !!condition.value?.find((dateGroup) => dateGroup === groupKey);
+};
 const isEmpty = (itemVal, valueType, columnType) => {
     const isLink = columnType === COLUMN_TYPES.LINK;
     const isPhone = columnType === COLUMN_TYPES.PHONE;
@@ -690,16 +720,22 @@ const checkItemMatched = (item, validConditions, headers, matchAny) => {
             }
             const isDate = checkHeader?.type === COLUMN_TYPES.DATE ||
                 checkHeader?.type === COLUMN_TYPES.CREATED_AT;
+            const isHasEqVal = checkHeader?.dropdowns?.some(d => !!d.eqVal);
+            // FIX LATER: this judgement is not strong, fix it later when has better way;
             switch (condition.op) {
                 case OP_TYPES.IS:
                     match = isDate
                         ? isDateInConditionValues(itemVal, condition)
-                        : isInConditionValues(itemVal, valueType, condition);
+                        : isHasEqVal
+                            ? isEqValInConditionValues(itemVal, condition, checkHeader)
+                            : isInConditionValues(itemVal, valueType, condition);
                     break;
                 case OP_TYPES.IS_NOT:
                     match = isDate
                         ? !isDateInConditionValues(itemVal, condition)
-                        : !isInConditionValues(itemVal, valueType, condition);
+                        : isHasEqVal
+                            ? !isEqValInConditionValues(itemVal, condition, checkHeader)
+                            : !isInConditionValues(itemVal, valueType, condition);
                     break;
                 case OP_TYPES.BEFORE: // only for date type
                     match = isDate && isDateBeforeConditionValues(itemVal, condition);
@@ -812,7 +848,7 @@ export const isItemMatchedByConditions = (item, filter, headers, currentUserId)
     if (!validConditions?.length) {
         return true;
     }
-    return checkItemMatched(item, validConditions, headers, filter?.andOr === 'or');
+    return checkItemMatched(item, validConditions, headers, filter?.andOr === "or");
 };
 export const filterBoardTree = (board, filter, currentUserId) => {
     if (!board?.groups?.length || !board?.headers?.length || !filter)

package/dist/shared/types.d.ts

@@ -13,15 +13,20 @@ export interface ILinkedSource {
     deleted?: boolean;
     type: string;
     name: string;
-    dropdowns?: {
-        key: string;
-        value: string;
-        attr?: {
-            color?: string;
-        };
-    }[];
-    setting?: IColumnSetting;
-    linkedGroup?: string;
+    displayMode?: string;
+    condition: {
+        andOr?: string;
+        criteria?: {
+            op?: string;
+            linkedColumnId?: string;
+            conditionId?: string;
+            blank?: boolean;
+            value?: {
+                val?: any[] | undefined;
+                columnId?: string | undefined;
+            };
+        }[];
+    };
 }
 export interface IBaseItem {
     itemId: string;
@@ -35,6 +40,15 @@ export interface IBaseItem {
     expand?: boolean;
     createdBy?: string;
     createdAt?: string;
+    updatedBy?: string;
+    updatedAt?: string;
+    actionNum?: number;
+    rollbackColumns?: Record<string, any>;
+}
+export interface IColumnSettingRule {
+    target: string;
+    compare: ">" | "<" | ">=" | "<=";
+    allowEmpty?: boolean;
 }
 export interface IColumnSetting {
     currency?: string;
@@ -43,6 +57,24 @@ export interface IColumnSetting {
     autoParseUrl?: boolean;
     prefix?: string | null;
     startNumber?: number;
+    numRange?: (number | undefined)[];
+    textLength?: number;
+    emailDomains?: string[];
+    dateRange?: (string | undefined)[];
+    fileTypes?: string[];
+    fileSize?: string;
+    formula?: string;
+    depColumnIds?: string[];
+    formulaDisplay?: string;
+    system?: boolean;
+    hidden?: boolean;
+    relate?: {
+        r: string;
+        s: string;
+        t: string;
+    };
+    rules?: IColumnSettingRule[];
+    link_to?: string;
 }
 export interface IDropdownOption {
     key: string;
@@ -51,9 +83,15 @@ export interface IDropdownOption {
     attr?: {
         color?: string;
     };
+    setting?: {
+        link_to?: string;
+        hidden?: boolean;
+    };
     deleted?: number;
+    eqVal?: string;
 }
 export interface IBaseCustomColumn {
+    boardId?: string;
     columnId: string;
     type: string;
     name: string;
@@ -85,6 +123,7 @@ export interface IBaseBoard {
     orgId?: string;
     description?: string;
     workspaceId?: string;
+    appId?: string;
     createdBy?: string;
     updatedBy?: string;
     createdAt?: string;
@@ -98,9 +137,11 @@ export interface IPureBoard extends IBaseBoard {
 export interface IFilterCondition {
     conditionId?: string;
     columnId: string;
+    targetKey: string;
     op: string;
-    value: any[];
+    value?: any[];
     blank?: boolean;
+    disabled?: boolean;
 }
 export interface IFilter {
     andOr: "and" | "or";

package/package.json

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