@followupus/common 0.8.6 → 0.8.7

package/dist/shared/shared.d.ts

@@ -53,8 +53,9 @@ export declare const DATE_GROUPS: {
     FUTURE: string;
 };
 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 getDateGroupKey: (dateStr: string) => string | null;
-export declare const getValidConditions: (filter: IFilter, headers?: IBaseCustomColumn[], currentUserId?: string) => IFilterCondition[];
+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[];
 export declare const filterBoardTree: (board: IPureBoard, filter: IFilter, currentUserId?: string) => IPureBoard;

package/dist/shared/shared.js

@@ -121,6 +121,9 @@ export const isLinkedColumns = (columnType) => {
         return false;
     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));
+};
 export const getColumnValueType = (columnType) => {
     switch (columnType) {
         case COLUMN_TYPES.PEOPLE:
@@ -174,7 +177,7 @@ export const getDateGroupKey = (dateStr) => {
     }
     return DATE_GROUPS.FUTURE;
 };
-export const getValidConditions = (filter, headers, currentUserId) => {
+export const getValidConditions = (filter, headers, currentUserId, escapeHeaderCheck) => {
     const newFilter = _.cloneDeep(filter);
     if (!newFilter.criteria?.length || !headers?.length) {
         return [];
@@ -185,9 +188,10 @@ export const getValidConditions = (filter, headers, currentUserId) => {
         if (isLinkedColumns(validHeader?.type)) {
             checkHeader = validHeader?.linked;
         }
-        if (!checkHeader)
+        if (!checkHeader && !escapeHeaderCheck)
             return;
-        if (checkHeader?.type === COLUMN_TYPES.PEOPLE) {
+        if (checkHeader?.type === COLUMN_TYPES.PEOPLE ||
+            c.columnId?.startsWith(COLUMN_TYPES.PEOPLE)) {
             if (c.value?.find(val => val === THEMSELVES) && currentUserId) {
                 const idx = c.value.findIndex(val => val === THEMSELVES);
                 if (idx > -1)
@@ -198,15 +202,18 @@ export const getValidConditions = (filter, headers, 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 newFilter.criteria.filter(c => {
         const validHeader = headers.find(h => h.columnId === c.columnId);
-        if (!validHeader)
+        if (!validHeader && !escapeHeaderCheck)
             return false;
         let checkHeader = validHeader;
-        if (isLinkedColumns(validHeader.type)) {
-            checkHeader = validHeader.linked;
+        if (isLinkedColumns(validHeader?.type)) {
+            checkHeader = validHeader?.linked;
         }
-        if (!checkHeader)
+        if (!checkHeader && !escapeHeaderCheck)
+            return false;
+        const columnType = checkHeader?.type || getColumnTypeFromId(c.columnId);
+        if (!columnType)
             return false;
-        const validOperate = COLUMN_OP_TYPES[checkHeader.type]?.includes(c.op);
+        const validOperate = COLUMN_OP_TYPES[columnType]?.includes(c.op);
         if (!validOperate)
             return false;
         const isDropdown = [
@@ -214,14 +221,15 @@ export const getValidConditions = (filter, headers, currentUserId) => {
             COLUMN_TYPES.STATUS,
             COLUMN_TYPES.PRIORITY,
             COLUMN_TYPES.TAGS,
-        ].includes(checkHeader.type);
+        ].includes(columnType);
         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 => checkHeader.dropdowns?.find(d => d.key === v)))));
+                            escapeHeaderCheck ||
+                            c.value.some(v => checkHeader?.dropdowns?.find(d => d.key === v)))));
             case OP_TYPES.EMPTY:
             case OP_TYPES.NOT_EMPTY:
                 return true;

package/package.json

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