@followupus/common 0.7.0 → 0.7.2

package/dist/shared/shared.d.ts

@@ -17,6 +17,7 @@ export declare const COLUMN_TYPES: {
     TIMELINE: string;
     PHONE: string;
     CURRENCY: string;
+    TIME_TRACKING: string;
 };
 export declare const OP_TYPES: {
     CONTAINS: string;
@@ -35,6 +36,9 @@ export declare const OP_TYPES: {
 export declare const COLUMN_OP_TYPES: {
     [x: string]: string[];
 };
+export declare const AUTOMATION_OP_TYPES: {
+    [x: string]: string[];
+};
 export declare const DATE_GROUPS: {
     OVERDUE: string;
     TODAY: string;

package/dist/shared/shared.js

@@ -18,6 +18,7 @@ export const COLUMN_TYPES = {
     TIMELINE: "timeline",
     PHONE: "phone",
     CURRENCY: "currency",
+    TIME_TRACKING: "time_tracking",
 };
 export const OP_TYPES = {
     CONTAINS: "like",
@@ -81,6 +82,20 @@ export const COLUMN_OP_TYPES = {
         OP_TYPES.NOT_EMPTY,
     ],
 };
+export const AUTOMATION_OP_TYPES = {
+    ...COLUMN_OP_TYPES,
+    [COLUMN_TYPES.TEXT]: [OP_TYPES.CONTAINS, OP_TYPES.NOT_CONTAINS],
+    [COLUMN_TYPES.DATE]: [
+        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 DATE_GROUPS = {
     OVERDUE: "overdue",
     TODAY: "today",
@@ -147,8 +162,8 @@ export const getValidConditions = (filter, headers) => {
         return [];
     }
     // 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) => {
-        const validHeader = headers.find((h) => h.columnId === c.columnId);
+    return filter.criteria.filter(c => {
+        const validHeader = headers.find(h => h.columnId === c.columnId);
         if (!validHeader)
             return false;
         const validOperate = COLUMN_OP_TYPES[validHeader.type].includes(c.op);
@@ -163,9 +178,9 @@ export const getValidConditions = (filter, headers) => {
             case OP_TYPES.IS:
             case OP_TYPES.IS_NOT:
                 return (c.blank ||
-                    (!!c.value?.filter((v) => !!v || v === 0)?.length &&
+                    (!!c.value?.filter(v => !!v || v === 0)?.length &&
                         (!isDropdown ||
-                            c.value.some((v) => validHeader.dropdowns?.find((d) => d.key === v)))));
+                            c.value.some(v => validHeader.dropdowns?.find(d => d.key === v)))));
             case OP_TYPES.EMPTY:
             case OP_TYPES.NOT_EMPTY:
                 return true;
@@ -189,17 +204,17 @@ const isInConditionValues = (itemVal, valueType, condition) => {
         case "number":
         case "string":
             return ((condition.blank && !itemVal) ||
-                !!condition.value.find((val) => val === itemVal));
+                !!condition.value.find(val => val === itemVal));
         case "stringArray":
             return ((condition.blank && !itemVal?.length) ||
-                condition.value.some((val) => Array.isArray(itemVal) && itemVal?.includes(val)));
+                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))));
+                condition.value.some(val => Array.isArray(itemVal) &&
+                    itemVal.find(existVal => _.isEqual(val, existVal))));
         default:
             break;
     }
@@ -211,7 +226,7 @@ const isDateInConditionValues = (itemVal, condition) => {
     const groupKey = getDateGroupKey(itemVal);
     if (!groupKey)
         return !!condition.blank;
-    return !!condition.value?.find((dateGroup) => dateGroup === groupKey);
+    return !!condition.value?.find(dateGroup => dateGroup === groupKey);
 };
 const isEmpty = (itemVal, valueType) => {
     switch (valueType) {
@@ -242,7 +257,7 @@ const isContains = (itemVal, valueType, condition) => {
             return !!itemVal && itemVal.includes(checkVal);
         case "stringArray":
             return itemVal?.length
-                ? itemVal.some((val) => val.includes(checkVal))
+                ? itemVal.some(val => val.includes(checkVal))
                 : false;
         default:
             break;
@@ -312,11 +327,11 @@ export const filterItemsByConditions = (groups, filter, headers) => {
     if (!validConditions?.length) {
         return groups;
     }
-    groups.forEach((g) => {
-        g.items = g.items?.filter((item) => {
+    groups.forEach(g => {
+        g.items = g.items?.filter(item => {
             let match = false;
             for (const condition of validConditions) {
-                const header = headers?.find((h) => h.columnId === condition.columnId);
+                const header = headers?.find(h => h.columnId === condition.columnId);
                 const valueType = getColumnValueType(header?.type ?? "");
                 const itemVal = item.data?.[condition.columnId]?.value;
                 const isDate = header?.type === COLUMN_TYPES.DATE;

package/dist/utils/validator.js

@@ -14,7 +14,8 @@ const descriptor = {
     },
     phone: {
         type: "string", //+1 (408) 888-8888
-        pattern: /^(\+?1)?\(?[2-9]\d{2}\)?\s?\d{3}-?\d{4}$/,
+        pattern: /^(\+?\d+)?\(?\d?\)?\s?\d?-?\d+$/, // temp for all countries
+        // pattern: /^(\+?1)?\(?[2-9]\d{2}\)?\s?\d{3}-?\d{4}$/,
     },
 };
 const validator = new Schema(descriptor);

package/package.json

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