@followupus/common 0.10.17 → 0.10.18

package/dist/shared/delta.js

@@ -70,7 +70,7 @@ export const PREFIX_PK = {
     TIME_TRACKING_log: "TG",
     AI_USER_AGENT: "AG",
     ITEM_RELATIONSHIP: "IR",
-    WORKFLOW: "WF",
+    WORKFLOW: 'WF',
     WORKFLOW_LOG: "WG",
-    APP: "AP"
+    APP: 'AP',
 };

package/dist/shared/shared.d.ts

@@ -42,6 +42,7 @@ export declare const COLUMN_TYPES: {
     CREATED_BY: string;
     CREATED_AT: string;
 };
+export declare const NAME_COLUMN = "name";
 export declare const OP_TYPES: {
     CONTAINS: string;
     NOT_CONTAINS: string;
@@ -82,6 +83,11 @@ export declare const FILTER_DATE_GROUPS: {
     THIS_WEEK: string;
     THIS_MONTH: string;
 };
+export declare const INBOX_DATE_GROUPS: {
+    TODAY: string;
+    YESTERDAY: string;
+    BEFORE_YESTERDAY: string;
+};
 export declare const DATE_VALUE_FORMAT = "YYYY-MM-DD";
 export declare enum SpecialKeyInDateFilter {
     SelectDate = "selectDate",
@@ -93,6 +99,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 getValidConditions: (filter: IFilter, headers?: IBaseCustomColumn[], currentUserId?: string, escapeHeaderCheck?: boolean) => IFilterCondition[];
+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;
 export declare const filterBoardTree: (board: IPureBoard, filter: IFilter, currentUserId?: string) => IPureBoard;

package/dist/shared/shared.js

@@ -45,6 +45,7 @@ export const COLUMN_TYPES = {
     CREATED_BY: "created_by",
     CREATED_AT: "created_at",
 };
+export const NAME_COLUMN = "name";
 export const OP_TYPES = {
     CONTAINS: "like",
     NOT_CONTAINS: "not_like",
@@ -159,20 +160,25 @@ export const COLUMN_OP_TYPES = {
 };
 export const AUTOMATION_OP_TYPES = {
     ...COLUMN_OP_TYPES,
-    [COLUMN_TYPES.TEXT]: [OP_TYPES.CONTAINS, OP_TYPES.NOT_CONTAINS],
-    [COLUMN_TYPES.EMAIL]: [OP_TYPES.CONTAINS, OP_TYPES.NOT_CONTAINS],
-    [COLUMN_TYPES.DATE]: [
-        OP_TYPES.EQUAL,
-        OP_TYPES.NOT_EQUAL,
-        OP_TYPES.BEFORE,
-        OP_TYPES.AFTER,
-    ],
-    [COLUMN_TYPES.CREATED_AT]: [
-        OP_TYPES.EQUAL,
-        OP_TYPES.NOT_EQUAL,
-        OP_TYPES.BEFORE,
-        OP_TYPES.AFTER,
+    [COLUMN_TYPES.TEXT]: [
+        OP_TYPES.CONTAINS,
+        OP_TYPES.NOT_CONTAINS,
+        OP_TYPES.EMPTY,
+        OP_TYPES.NOT_EMPTY,
     ],
+    [COLUMN_TYPES.EMAIL]: [OP_TYPES.CONTAINS, OP_TYPES.NOT_CONTAINS],
+    // [COLUMN_TYPES.DATE]: [
+    //   OP_TYPES.EQUAL,
+    //   OP_TYPES.NOT_EQUAL,
+    //   OP_TYPES.BEFORE,
+    //   OP_TYPES.AFTER,
+    // ],
+    // [COLUMN_TYPES.CREATED_AT]: [
+    //   OP_TYPES.EQUAL,
+    //   OP_TYPES.NOT_EQUAL,
+    //   OP_TYPES.BEFORE,
+    //   OP_TYPES.AFTER,
+    // ],
 };
 export const DYNAMIC_VIEW_OP_TYPES = {
     ...COLUMN_OP_TYPES,
@@ -198,6 +204,11 @@ export const FILTER_DATE_GROUPS = {
     THIS_WEEK: "thisWeek",
     THIS_MONTH: "thisMonth",
 };
+export const INBOX_DATE_GROUPS = {
+    TODAY: "today",
+    YESTERDAY: "yesterday",
+    BEFORE_YESTERDAY: "before_yesterday",
+};
 export const DATE_VALUE_FORMAT = "YYYY-MM-DD";
 export var SpecialKeyInDateFilter;
 (function (SpecialKeyInDateFilter) {
@@ -210,7 +221,9 @@ export const isLinkedColumns = (columnType) => {
     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));
+    if (columnId === NAME_COLUMN)
+        return COLUMN_TYPES.TEXT;
+    return Object.values(COLUMN_TYPES).find(type => columnId.startsWith(type + '_'));
 };
 export const getColumnValueType = (columnType) => {
     switch (columnType) {
@@ -399,7 +412,7 @@ const isInConditionValues = (itemVal, valueType, condition) => {
     }
     return false;
 };
-const isDateInConditionValues = (itemVal, condition) => {
+export const isDateInConditionValues = (itemVal, condition) => {
     if (!itemVal || !dayjs(itemVal).isValid()) {
         return !!condition.blank;
     }
@@ -547,7 +560,7 @@ const isLessEqual = (itemVal, condition) => {
         return parseVal ? itemVal <= parseVal : false;
     }
 };
-const checkItemMatched = (item, validConditions, headers) => {
+const checkItemMatched = (item, validConditions, headers, matchAny) => {
     let isItemMatched = false;
     for (const condition of validConditions) {
         const header = headers?.find(h => h.columnId === condition.columnId);
@@ -650,8 +663,10 @@ const checkItemMatched = (item, validConditions, headers) => {
                             return checkConditionFn(subValue);
                         }));
         }
-        if (!isItemMatched)
+        if (!isItemMatched && !matchAny)
             return false;
+        if (isItemMatched && matchAny)
+            return true;
     }
     return isItemMatched;
 };
@@ -662,9 +677,10 @@ export const filterItemsByConditions = (groups, filter, headers, currentUserId)
     if (!validConditions?.length) {
         return groups;
     }
+    const matchAny = filter.andOr === "or";
     groups.forEach(g => {
         g.items = g.items?.filter(item => {
-            return checkItemMatched(item, validConditions, headers);
+            return checkItemMatched(item, validConditions, headers, matchAny);
         });
     });
     return groups;
@@ -676,7 +692,7 @@ export const isItemMatchedByConditions = (item, filter, headers, currentUserId)
     if (!validConditions?.length) {
         return true;
     }
-    return checkItemMatched(item, validConditions, headers);
+    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

@@ -10,7 +10,7 @@ export interface ILinkedSource {
     boardId: string;
     boardName?: string;
     columnId: string;
-    deleted?: number;
+    deleted?: boolean;
     type: string;
     name: string;
     dropdowns?: {
@@ -49,6 +49,7 @@ export interface IDropdownOption {
     attr?: {
         color?: string;
     };
+    deleted?: number;
 }
 export interface IBaseCustomColumn {
     columnId: string;

package/package.json

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