@followupus/common 0.9.11 → 0.9.13

package/dist/shared/shared.d.ts

@@ -18,6 +18,8 @@ export declare const COLUMN_TYPES: {
     PHONE: string;
     CURRENCY: string;
     TIME_TRACKING: string;
+    CREATED_BY: string;
+    CREATED_AT: string;
 };
 export declare const OP_TYPES: {
     CONTAINS: string;

package/dist/shared/shared.js

@@ -19,6 +19,8 @@ export const COLUMN_TYPES = {
     PHONE: "phone",
     CURRENCY: "currency",
     TIME_TRACKING: "time_tracking",
+    CREATED_BY: "created_by",
+    CREATED_AT: "created_at",
 };
 export const OP_TYPES = {
     CONTAINS: "like",
@@ -51,6 +53,12 @@ export const COLUMN_OP_TYPES = {
         OP_TYPES.BEFORE,
         OP_TYPES.AFTER,
     ],
+    [COLUMN_TYPES.CREATED_AT]: [
+        OP_TYPES.IS,
+        OP_TYPES.IS_NOT,
+        OP_TYPES.BEFORE,
+        OP_TYPES.AFTER,
+    ],
     [COLUMN_TYPES.NUMBER]: [
         OP_TYPES.EQUAL,
         OP_TYPES.NOT_EQUAL,
@@ -91,6 +99,12 @@ export const COLUMN_OP_TYPES = {
         OP_TYPES.EMPTY,
         OP_TYPES.NOT_EMPTY,
     ],
+    [COLUMN_TYPES.CREATED_BY]: [
+        OP_TYPES.IS,
+        OP_TYPES.IS_NOT,
+        OP_TYPES.EMPTY,
+        OP_TYPES.NOT_EMPTY,
+    ],
 };
 export const AUTOMATION_OP_TYPES = {
     ...COLUMN_OP_TYPES,
@@ -105,6 +119,16 @@ export const AUTOMATION_OP_TYPES = {
         OP_TYPES.EMPTY,
         OP_TYPES.NOT_EMPTY,
     ],
+    [COLUMN_TYPES.CREATED_AT]: [
+        OP_TYPES.EQUAL,
+        OP_TYPES.NOT_EQUAL,
+        OP_TYPES.GREATER,
+        OP_TYPES.GREATER_EQUAL,
+        OP_TYPES.LESS,
+        OP_TYPES.LESS_EQUAL,
+        OP_TYPES.EMPTY,
+        OP_TYPES.NOT_EMPTY,
+    ],
 };
 export const DYNAMIC_VIEW_OP_TYPES = {
     ...COLUMN_OP_TYPES,
@@ -147,6 +171,7 @@ export const getColumnTypeFromId = (columnId) => {
 export const getColumnValueType = (columnType) => {
     switch (columnType) {
         case COLUMN_TYPES.PEOPLE:
+        case COLUMN_TYPES.CREATED_BY:
         case COLUMN_TYPES.FILES:
         case COLUMN_TYPES.TAGS:
             return "stringArray";
@@ -241,15 +266,16 @@ export const getValidConditions = (filter, headers, currentUserId, escapeHeaderC
         if (!checkHeader && !escapeHeaderCheck)
             return;
         if (checkHeader?.type === COLUMN_TYPES.PEOPLE ||
-            c.columnId?.startsWith(COLUMN_TYPES.PEOPLE)) {
+            checkHeader?.type === COLUMN_TYPES.CREATED_BY) {
             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);
             }
         }
-        if (checkHeader?.type === COLUMN_TYPES.DATE) {
-            _.remove(c.value, v => v === Object.values(SpecialKeyInDateFilter).includes(v));
+        if (checkHeader?.type === COLUMN_TYPES.DATE ||
+            checkHeader?.type === COLUMN_TYPES.CREATED_AT) {
+            _.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
@@ -275,7 +301,8 @@ export const getValidConditions = (filter, headers, currentUserId, escapeHeaderC
             COLUMN_TYPES.PRIORITY,
             COLUMN_TYPES.TAGS,
         ].includes(columnType);
-        const isDate = columnType === COLUMN_TYPES.DATE;
+        const isDate = columnType === COLUMN_TYPES.DATE ||
+            columnType === COLUMN_TYPES.CREATED_AT;
         switch (c.op) {
             case OP_TYPES.IS:
             case OP_TYPES.IS_NOT:
@@ -328,8 +355,9 @@ const isInConditionValues = (itemVal, valueType, condition) => {
     return false;
 };
 const isDateInConditionValues = (itemVal, condition) => {
-    if (condition.blank && (!itemVal || !dayjs(itemVal).isValid()))
-        return true;
+    if (!itemVal || !dayjs(itemVal).isValid()) {
+        return !!condition.blank;
+    }
     const itemDate = dayjs(itemVal);
     return !!condition.value?.some(c => {
         if (c && typeof c === "object") {
@@ -483,11 +511,13 @@ const checkItemMatched = (item, validConditions, headers) => {
         if (isLinkedColumn) {
             checkHeader = header?.linked;
         }
-        const isPeople = checkHeader?.type === COLUMN_TYPES.PEOPLE;
+        const isPeople = checkHeader?.type === COLUMN_TYPES.PEOPLE ||
+            checkHeader?.type === COLUMN_TYPES.CREATED_BY;
         const valueType = getColumnValueType(checkHeader?.type ?? "");
         const checkConditionFn = (itemVal) => {
             let match = false;
-            const isDate = checkHeader?.type === COLUMN_TYPES.DATE;
+            const isDate = checkHeader?.type === COLUMN_TYPES.DATE ||
+                checkHeader?.type === COLUMN_TYPES.CREATED_AT;
             switch (condition.op) {
                 case OP_TYPES.IS:
                     match = isDate

package/dist/shared/types.d.ts

@@ -32,9 +32,14 @@ export interface IBaseItem {
     subs?: IBaseItem[];
     index?: number;
     deleted?: boolean;
+    expand?: boolean;
+    createdBy?: string[];
+    createdAt?: string;
 }
 export interface IColumnSetting {
     currency?: string;
+    multiple?: boolean;
+    notify?: boolean;
 }
 export interface IDropdownOption {
     key: string;

package/package.json

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