@followupus/common 0.7.6 → 0.7.8

package/dist/shared/delta.d.ts

@@ -32,6 +32,7 @@ export interface DeltaMessages {
     payload: {
         syncData: DeltaObject[];
         lastSyncId: number;
+        rootType: keyof typeof DELTA_ROOT_SCHEMA_NAME;
     };
 }
 export declare const PREFIX_PK: {

package/dist/shared/delta.js

@@ -7,9 +7,9 @@ export const DELTA_SCHEMA_NAME = {
     FOLDER: "FOLDER",
 };
 export const DELTA_ACTION = {
-    DELETE: "D",
-    UPDATE: "U",
-    CREATE: "C",
+    DELETE: "delete",
+    UPDATE: "update",
+    CREATE: "create",
 };
 export const DELTA_ROOT_SCHEMA_NAME = {
     USERS: "USERS",

package/dist/shared/shared.d.ts

@@ -39,6 +39,10 @@ export declare const COLUMN_OP_TYPES: {
 export declare const AUTOMATION_OP_TYPES: {
     [x: string]: string[];
 };
+export declare const DYNAMIC_VIEW_OP_TYPES: {
+    [x: string]: string[];
+};
+export declare const THEMSELVES = "self";
 export declare const DATE_GROUPS: {
     OVERDUE: string;
     TODAY: string;
@@ -50,6 +54,6 @@ export declare const DATE_GROUPS: {
 };
 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[]) => IFilterCondition[];
-export declare const filterItemsByConditions: (groups: IBaseGroup[], filter: IFilter, headers?: IBaseCustomColumn[]) => IBaseGroup[];
-export declare const filterBoardTree: (board: IPureBoard, filter: IFilter) => IPureBoard;
+export declare const getValidConditions: (filter: IFilter, headers?: IBaseCustomColumn[], currentUserId?: string) => 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,4 +1,4 @@
-import * as _ from "lodash";
+import { cloneDeep, isEqual } from "lodash";
 import dayjs from "dayjs";
 export const COLUMN_TYPES = {
     NUMBER: "number",
@@ -96,6 +96,11 @@ export const AUTOMATION_OP_TYPES = {
         OP_TYPES.NOT_EMPTY,
     ],
 };
+export const DYNAMIC_VIEW_OP_TYPES = {
+    ...COLUMN_OP_TYPES,
+    [COLUMN_TYPES.TEXT]: [OP_TYPES.CONTAINS, OP_TYPES.NOT_CONTAINS],
+};
+export const THEMSELVES = "self";
 export const DATE_GROUPS = {
     OVERDUE: "overdue",
     TODAY: "today",
@@ -157,12 +162,23 @@ export const getDateGroupKey = (dateStr) => {
     }
     return DATE_GROUPS.FUTURE;
 };
-export const getValidConditions = (filter, headers) => {
-    if (!filter.criteria?.length || !headers?.length) {
+export const getValidConditions = (filter, headers, currentUserId) => {
+    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) {
+            if (c.value?.find(val => val === THEMSELVES) && currentUserId) {
+                const idx = c.value.findIndex(val => val === THEMSELVES);
+                if (idx > -1)
+                    c.value.splice(idx, 1, 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 filter.criteria.filter(c => {
+    return newFilter.criteria.filter(c => {
         const validHeader = headers.find(h => h.columnId === c.columnId);
         if (!validHeader)
             return false;
@@ -210,11 +226,11 @@ const isInConditionValues = (itemVal, valueType, condition) => {
                 condition.value.some(val => Array.isArray(itemVal) && itemVal?.includes(val)));
         case "object":
             return ((condition.blank && !itemVal) ||
-                !!condition.value.find(val => _.isEqual(val, itemVal)));
+                !!condition.value.find(val => isEqual(val, itemVal)));
         case "objectArray":
             return ((condition.blank && !itemVal?.length) ||
                 condition.value.some(val => Array.isArray(itemVal) &&
-                    itemVal.find(existVal => _.isEqual(val, existVal))));
+                    itemVal.find(existVal => isEqual(val, existVal))));
         default:
             break;
     }
@@ -274,7 +290,7 @@ const isEquals = (itemVal, valueType, condition) => {
         case "string":
             return !!itemVal && checkVal === itemVal;
         case "object":
-            return _.isEqual(itemVal, checkVal);
+            return isEqual(itemVal, checkVal);
         default:
             break;
     }
@@ -320,10 +336,10 @@ const isLessEqual = (itemVal, condition) => {
         return parseVal ? itemVal <= parseVal : false;
     }
 };
-export const filterItemsByConditions = (groups, filter, headers) => {
+export const filterItemsByConditions = (groups, filter, headers, currentUserId) => {
     if (!headers?.length)
         return groups;
-    const validConditions = getValidConditions(filter, headers);
+    const validConditions = getValidConditions(filter, headers, currentUserId);
     if (!validConditions?.length) {
         return groups;
     }
@@ -397,11 +413,11 @@ export const filterItemsByConditions = (groups, filter, headers) => {
     });
     return groups;
 };
-export const filterBoardTree = (board, filter) => {
+export const filterBoardTree = (board, filter, currentUserId) => {
     if (!board?.groups?.length || !board?.headers?.length || !filter)
         return board;
     return {
         ...board,
-        groups: filterItemsByConditions(board.groups, filter, board.headers),
+        groups: filterItemsByConditions(board.groups, filter, board.headers, currentUserId),
     };
 };

package/package.json

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