@followupus/common 0.9.10 → 0.9.12

package/dist/shared/shared.d.ts

@@ -32,15 +32,17 @@ export declare const OP_TYPES: {
     NOT_EQUAL: string;
     LESS_EQUAL: string;
     LESS: string;
+    BEFORE: string;
+    AFTER: string;
 };
 export declare const COLUMN_OP_TYPES: {
-    [x: string]: string[];
+    readonly [x: string]: readonly [string, string, string, string, string, string] | readonly [string, string, string, string] | readonly [string, string, string, string, string, string, string, string];
 };
 export declare const AUTOMATION_OP_TYPES: {
-    [x: string]: string[];
+    [x: string]: string[] | readonly [string, string, string, string, string, string] | readonly [string, string, string, string] | readonly [string, string, string, string, string, string, string, string];
 };
 export declare const DYNAMIC_VIEW_OP_TYPES: {
-    [x: string]: string[];
+    [x: string]: string[] | readonly [string, string, string, string, string, string] | readonly [string, string, string, string] | readonly [string, string, string, string, string, string, string, string];
 };
 export declare const THEMSELVES = "self";
 export declare const DATE_GROUPS: {
@@ -52,9 +54,20 @@ export declare const DATE_GROUPS: {
     THIS_MONTH: string;
     FUTURE: string;
 };
+export declare const FILTER_DATE_GROUPS: {
+    TODAY: string;
+    THIS_WEEK: string;
+    THIS_MONTH: string;
+};
+export declare const DATE_VALUE_FORMAT = "YYYY-MM-DD";
+export declare enum SpecialKeyInDateFilter {
+    SelectDate = "selectDate",
+    SelectRange = "selectRange"
+}
 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 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 filterItemsByConditions: (groups: IBaseGroup[], filter: IFilter, headers?: IBaseCustomColumn[], currentUserId?: string) => IBaseGroup[];

package/dist/shared/shared.js

@@ -33,6 +33,8 @@ export const OP_TYPES = {
     NOT_EQUAL: "neq",
     LESS_EQUAL: "lte",
     LESS: "lt",
+    BEFORE: "before",
+    AFTER: "after",
 };
 export const COLUMN_OP_TYPES = {
     [COLUMN_TYPES.TEXT]: [
@@ -46,8 +48,8 @@ export const COLUMN_OP_TYPES = {
     [COLUMN_TYPES.DATE]: [
         OP_TYPES.IS,
         OP_TYPES.IS_NOT,
-        OP_TYPES.EMPTY,
-        OP_TYPES.NOT_EMPTY,
+        OP_TYPES.BEFORE,
+        OP_TYPES.AFTER,
     ],
     [COLUMN_TYPES.NUMBER]: [
         OP_TYPES.EQUAL,
@@ -123,6 +125,17 @@ export const DATE_GROUPS = {
     THIS_MONTH: "thisMonth",
     FUTURE: "future",
 };
+export const FILTER_DATE_GROUPS = {
+    TODAY: "today",
+    THIS_WEEK: "thisWeek",
+    THIS_MONTH: "thisMonth",
+};
+export const DATE_VALUE_FORMAT = "YYYY-MM-DD";
+export var SpecialKeyInDateFilter;
+(function (SpecialKeyInDateFilter) {
+    SpecialKeyInDateFilter["SelectDate"] = "selectDate";
+    SpecialKeyInDateFilter["SelectRange"] = "selectRange";
+})(SpecialKeyInDateFilter || (SpecialKeyInDateFilter = {}));
 export const isLinkedColumns = (columnType) => {
     if (!columnType)
         return false;
@@ -151,6 +164,36 @@ export const getColumnValueType = (columnType) => {
             return "string";
     }
 };
+export const getFilterDateGroupKeys = (dateStr) => {
+    const keys = [];
+    if (!dateStr)
+        return null;
+    const current = dayjs();
+    const day = dayjs(dateStr);
+    if (current.isSame(day, "date")) {
+        keys.push(FILTER_DATE_GROUPS.TODAY);
+        keys.push(FILTER_DATE_GROUPS.THIS_WEEK);
+        keys.push(FILTER_DATE_GROUPS.THIS_MONTH);
+        return keys;
+    }
+    const startDayOfThisWeek = current.set("day", 0);
+    const endDayOfThisWeek = current.set("day", 6);
+    const startDayOfThisMonth = current.set("date", 1);
+    const endDayOfThisMonth = current.set("date", current.daysInMonth());
+    if ((day.isAfter(startDayOfThisWeek, "date") ||
+        day.isSame(startDayOfThisWeek, "date")) &&
+        (day.isBefore(endDayOfThisWeek, "date") ||
+            day.isSame(endDayOfThisWeek, "date"))) {
+        keys.push(FILTER_DATE_GROUPS.THIS_WEEK);
+    }
+    if ((day.isAfter(startDayOfThisMonth, "date") ||
+        day.isSame(startDayOfThisMonth, "date")) &&
+        (day.isBefore(endDayOfThisMonth, "date") ||
+            day.isSame(endDayOfThisMonth, "date"))) {
+        keys.push(FILTER_DATE_GROUPS.THIS_MONTH);
+    }
+    return keys;
+};
 export const getDateGroupKey = (dateStr) => {
     if (!dateStr)
         return null;
@@ -205,6 +248,9 @@ export const getValidConditions = (filter, headers, currentUserId, escapeHeaderC
                     c.value.splice(idx, 1, currentUserId);
             }
         }
+        if (checkHeader?.type === COLUMN_TYPES.DATE) {
+            _.remove(c.value, v => Object.values(SpecialKeyInDateFilter).includes(v));
+        }
     });
     // 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 => {
@@ -229,6 +275,7 @@ export const getValidConditions = (filter, headers, currentUserId, escapeHeaderC
             COLUMN_TYPES.PRIORITY,
             COLUMN_TYPES.TAGS,
         ].includes(columnType);
+        const isDate = columnType === COLUMN_TYPES.DATE;
         switch (c.op) {
             case OP_TYPES.IS:
             case OP_TYPES.IS_NOT:
@@ -250,6 +297,10 @@ export const getValidConditions = (filter, headers, currentUserId, escapeHeaderC
             case OP_TYPES.LESS:
             case OP_TYPES.LESS_EQUAL:
                 return !!c.value?.length;
+            case OP_TYPES.BEFORE:
+            case OP_TYPES.AFTER:
+                return (isDate &&
+                    !!c.value?.filter(v => v === FILTER_DATE_GROUPS.TODAY || dayjs(v).isValid())?.length);
             default:
                 return false;
         }
@@ -277,12 +328,57 @@ const isInConditionValues = (itemVal, valueType, condition) => {
     return false;
 };
 const isDateInConditionValues = (itemVal, condition) => {
-    if (condition.blank && !itemVal)
-        return true;
-    const groupKey = getDateGroupKey(itemVal);
-    if (!groupKey)
+    if (!itemVal || !dayjs(itemVal).isValid()) {
         return !!condition.blank;
-    return !!condition.value?.find(dateGroup => dateGroup === groupKey);
+    }
+    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);
+        }
+    });
+    // if (!groupKey) return !!condition.blank;
+    // return !!condition.value?.find((dateGroup) => dateGroup === groupKey);
+};
+const isDateBeforeConditionValues = (itemVal, condition) => {
+    if (!itemVal || !dayjs(itemVal).isValid())
+        return false;
+    const itemDate = dayjs(itemVal);
+    return !!condition.value?.some(c => {
+        if (dayjs(c).isValid()) {
+            return itemDate.isBefore(dayjs(c));
+        }
+        else if (c === FILTER_DATE_GROUPS.TODAY) {
+            return itemDate.isBefore(dayjs(), "date");
+        }
+    });
+};
+const isDateAfterConditionValues = (itemVal, condition) => {
+    if (!itemVal || !dayjs(itemVal).isValid())
+        return false;
+    const itemDate = dayjs(itemVal);
+    return !!condition.value?.some(c => {
+        if (dayjs(c).isValid()) {
+            return itemDate.isAfter(dayjs(c));
+        }
+        else if (c === FILTER_DATE_GROUPS.TODAY) {
+            return itemDate.isAfter(dayjs(), "date");
+        }
+    });
 };
 const isEmpty = (itemVal, valueType) => {
     switch (valueType) {
@@ -404,6 +500,12 @@ const checkItemMatched = (item, validConditions, headers) => {
                         ? !isDateInConditionValues(itemVal, condition)
                         : !isInConditionValues(itemVal, valueType, condition);
                     break;
+                case OP_TYPES.BEFORE: // only for date type
+                    match = isDate && isDateBeforeConditionValues(itemVal, condition);
+                    break;
+                case OP_TYPES.AFTER:
+                    match = isDate && isDateAfterConditionValues(itemVal, condition);
+                    break;
                 case OP_TYPES.EMPTY:
                     match = isEmpty(itemVal, valueType);
                     break;

package/dist/shared/types.d.ts

@@ -4,6 +4,7 @@ export interface IBaseUser {
     email: string;
     firstname: string;
     lastname: string;
+    displayName: string;
 }
 export interface ILinkedSource {
     boardId: string;
@@ -15,8 +16,12 @@ export interface ILinkedSource {
     dropdowns?: {
         key: string;
         value: string;
+        attr?: {
+            color?: string;
+        };
     }[];
     setting?: IColumnSetting;
+    linkedGroup?: string;
 }
 export interface IBaseItem {
     itemId: string;
@@ -31,16 +36,20 @@ export interface IBaseItem {
 export interface IColumnSetting {
     currency?: string;
 }
+export interface IDropdownOption {
+    key: string;
+    value?: string;
+    index?: number;
+    attr?: {
+        color?: string;
+    };
+}
 export interface IBaseCustomColumn {
     columnId: string;
     type: string;
     name: string;
     description?: string;
-    dropdowns?: {
-        key: string;
-        value: string;
-    }[];
-    linkedGroup?: string;
+    dropdowns?: IDropdownOption[];
     linked?: ILinkedSource;
     index?: number;
     deleted?: boolean;
@@ -51,10 +60,12 @@ export interface IBaseGroup {
     description?: string;
     items?: IBaseItem[];
     deleted?: boolean;
+    index?: number;
 }
 export interface IBaseBoard {
     name: string;
     boardId: string;
+    viewId?: string;
     type?: "board";
     folderId?: string;
     policyId?: string;
@@ -78,7 +89,7 @@ export interface IFilterCondition {
     conditionId?: string;
     columnId: string;
     op: string;
-    value: string[] | number[];
+    value: any[];
     blank?: boolean;
 }
 export interface IFilter {
@@ -94,3 +105,7 @@ export interface IDynamicView {
     allowComment?: boolean;
     step: "itemsSetting" | "customizeView" | "itemDetail" | "customizeForm" | "shareSetting";
 }
+export interface ActionEvent {
+    actionBy: "user" | "ai";
+    actionId?: string;
+}

package/package.json

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