update

.dockerignore

@@ -0,0 +1,19 @@
+*.md
+*.yml
+*.yaml
+.env*
+.git*
+.prettierrc
+.snyk
+Dockerfile*
+google_cred.json.sample
+scripts
+*.tar.gz
+automations
+elkSyncer
+email-verifier
+logger
+engages-email-sender
+dashboard
+dist
+node_modules

.env.sample

@@ -11,6 +11,7 @@ MONGO_URL=mongodb://localhost/erxes
 REDIS_HOST=localhost
 REDIS_PORT=6379
 REDIS_PASSWORD=
+REDIS_DB=
 
 # RabbitMQ
 RABBITMQ_HOST=amqp://localhost

.vscode/launch.json

@@ -0,0 +1,18 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Launch Program",
+      "program": "${workspaceFolder}/dist/index.js",
+      "request": "launch",
+      "skipFiles": ["<node_internals>/**"],
+      "type": "pwa-node",
+      "preLaunchTask": "tsc: build - tsconfig.json",
+      "envFile": "${workspaceRoot}/.env",
+      "outFiles": ["${workspaceFolder}/dist/**/*.js"]
+    }    
+  ]
+}

Dockerfile

@@ -0,0 +1,29 @@
+FROM node:12.16.3-slim
+
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update && \
+    apt-get install -y gnupg2 && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 && \
+    echo "deb http://repo.mongodb.org/apt/debian stretch/mongodb-org/3.6 main" | tee /etc/apt/sources.list.d/mongodb-org-3.6.list
+
+RUN apt-get update && \
+    apt-get install -y \
+    rsync python build-essential mongodb-org-shell mongodb-org-tools git nano curl && \
+    rm -rf /var/lib/apt/lists/*
+
+WORKDIR /erxes-api/
+
+COPY --chown=node:node . /erxes-api
+
+RUN chown -R node:node /erxes-api
+
+USER node
+
+RUN yarn
+
+RUN yarn build
+
+EXPOSE 3300
+
+ENTRYPOINT [ "node", "--max_old_space_size=8192", "dist" ]

elkSyncer/main.py

@@ -26,6 +26,9 @@
 }
 
 customer_mapping = {
+    'createdAt': {
+        'type': 'date',
+    },
     'state': {
         'type': 'keyword',
     },
@@ -71,6 +74,9 @@
 }
 
 company_mapping = {
+    'createdAt': {
+        'type': 'date',
+    },
     'primaryEmail': {
         'type': 'text',
         'analyzer': 'uax_url_email_analyzer',
@@ -153,7 +159,7 @@ def put_mappings(index, mapping):
         print(e)
 
 
-db_name = pymongo.uri_parser.parse_uri(MONGO_URL)['database']
+db_name = pymongo.uri_parser.parse_uri(MONGO_URL)['database'].lower()
 
 put_mappings('%s__customers' % db_name, customer_mapping)
 put_mappings('%s__companies' % db_name, company_mapping)

email-verifier/src/redisClient.ts

@@ -9,11 +9,13 @@ const {
   REDIS_PORT = 6379,
   REDIS_PASSWORD,
   NODE_ENV,
+  REDIS_DB,
 }: {
   REDIS_HOST?: string;
   REDIS_PORT?: number;
   REDIS_PASSWORD?: string;
   NODE_ENV?: string;
+  REDIS_DB?: number;
 } = process.env;
 
 let client;
@@ -23,6 +25,7 @@ export const initRedis = (callback?: (client) => void) => {
     host: REDIS_HOST,
     port: REDIS_PORT,
     password: REDIS_PASSWORD,
+    db: REDIS_DB,
     connect_timeout: 15000,
     enable_offline_queue: true,
     retry_unfulfilled_commands: true,

engages-email-sender/.dockerignore

@@ -2,7 +2,7 @@
 *.yml
 .dockerignore
 .git*
+.env*
 .prettierrc
 Dockerfile*
-src
 *.tar.gz

engages-email-sender/Dockerfile

@@ -1,7 +1,19 @@
 FROM node:12.18-slim
+
+RUN apt-get update && \
+    apt-get install -y \
+    nano curl
+
 WORKDIR /erxes-engages
 RUN chown -R node:node /erxes-engages
 COPY --chown=node:node . /erxes-engages
+
 USER node
+
+RUN yarn
+
+RUN yarn build
+
 EXPOSE 3900
-ENTRYPOINT ["node", "--max_old_space_size=8192", "--experimental-worker", "dist"]
+
+ENTRYPOINT [ "node", "--max_old_space_size=8192", "dist" ]

logger/Dockerfile

@@ -1,7 +1,19 @@
 FROM node:12.18-slim
+
+RUN apt-get update && \
+    apt-get install -y \
+    nano curl
+
 WORKDIR /erxes-logger/
 RUN chown -R node:node /erxes-logger
 COPY --chown=node:node . /erxes-logger
+
 USER node
+
+RUN yarn
+
+RUN yarn build
+
 EXPOSE 3800
+
 ENTRYPOINT [ "node", "--max_old_space_size=8192", "dist" ]

package.json

@@ -27,6 +27,7 @@
     "test": "node --expose-gc --max_old_space_size=4000 ./node_modules/.bin/jest --forceExit --silent --logHeapUsage",
     "loadInitialData": "ts-node ./src/commands/loadInitialData.ts",
     "loadPermission": "ts-node ./src/commands/loadPermissionData.ts",
+    "loadEsData": "ts-node --transpile-only ./src/commands/loadEsData.ts",
     "loadGrowthHackData": "ts-node ./src/commands/loadGrowthHackData.ts",
     "loadTestData": "ts-node ./src/commands/loadTestData.ts",
     "initProject": "ts-node ./src/commands/initProject.ts",
@@ -37,6 +38,7 @@
     "runEsCommand": "ts-node ./src/commands/runEsCommand.ts",
     "trackTelemetry": "node ./dist/commands/trackTelemetry.js",
     "migrate": "NODE_ENV=command migrate --migrations-dir='./dist/migrations' --store='./db-migrate-store.js' up",
+    "migrate-win": "set NODE_ENV=command migrate --migrations-dir='./dist/migrations' --store='./db-migrate-store.js' up",
     "release": "release-it"
   },
   "lint-staged": {
@@ -89,10 +91,13 @@
     "graphql-tools": "^4.0.3",
     "handlebars": "^4.7.3",
     "helmet": "^3.23.3",
+    "ibm-watson": "^7.1.1",
     "ioredis": "^3.2.2",
     "json2csv": "^5.0.1",
     "jsonwebtoken": "^8.1.0",
+    "libphonenumber-js": "^1.9.10",
     "meteor-random": "^0.0.3",
+    "migrate": "^1.6.2",
     "moment": "^2.18.1",
     "moment-timezone": "^0.5.31",
     "mongo-uri": "^0.1.2",
@@ -114,8 +119,7 @@
     "vm2": "^3.9.2",
     "xlsx-populate": "^1.20.1",
     "xlsx-stream-reader": "^1.1.0",
-    "xss": "^1.0.6",
-    "migrate": "^1.6.2"
+    "xss": "^1.0.6"
   },
   "peerOptionalDependencies": {
     "kerberos": "^1.0.0"

src/__tests__/knowledgeBaseDb.test.ts

@@ -209,7 +209,7 @@ describe('test knowledge base models', () => {
         _id: topicB._id.toString(),
       });
 
-      if (!topicAObj || !topicAObj.categoryIds || (!topicBObj || !topicBObj.categoryIds)) {
+      if (!topicAObj || !topicAObj.categoryIds || !topicBObj || !topicBObj.categoryIds) {
         throw new Error('Topic not found');
       }
 
@@ -277,7 +277,7 @@ describe('test knowledge base models', () => {
         _id: topicB._id.toString(),
       });
 
-      if (!topicAObj || !topicAObj.categoryIds || (!topicBObj || !topicBObj.categoryIds)) {
+      if (!topicAObj || !topicAObj.categoryIds || !topicBObj || !topicBObj.categoryIds) {
         throw new Error('Topic not found');
       }
 
@@ -395,7 +395,7 @@ describe('test knowledge base models', () => {
         _id: categoryB._id.toString(),
       });
 
-      if (!categoryAObj || !categoryAObj.articleIds || (!categoryBObj || !categoryBObj.articleIds)) {
+      if (!categoryAObj || !categoryAObj.articleIds || !categoryBObj || !categoryBObj.articleIds) {
         throw new Error('Topic not found');
       }
 
@@ -449,7 +449,7 @@ describe('test knowledge base models', () => {
         _id: categoryB._id.toString(),
       });
 
-      if (!categoryAObj || !categoryAObj.articleIds || (!categoryBObj || !categoryBObj.articleIds)) {
+      if (!categoryAObj || !categoryAObj.articleIds || !categoryBObj || !categoryBObj.articleIds) {
         throw new Error('Topic not found');
       }
 

src/__tests__/pipelineTemplateDb.test.ts

@@ -88,7 +88,10 @@ describe('Test pipeline template model', () => {
 
     // Creating test data
     const template = await pipelineTemplateFactory({
-      stages: [{ name: 'stage 1', formId: form1._id }, { name: 'stage 2', formId: form2._id }],
+      stages: [
+        { name: 'stage 1', formId: form1._id },
+        { name: 'stage 2', formId: form2._id },
+      ],
     });
 
     const duplicated = await PipelineTemplates.duplicatePipelineTemplate(template._id);

src/__tests__/pipelineTemplateMutations.test.ts

@@ -133,7 +133,10 @@ describe('PipelineTemplates mutations', () => {
 
     // Creating test data
     const template = await pipelineTemplateFactory({
-      stages: [{ name: 'stage 1', formId: form1._id }, { name: 'stage 2', formId: form2._id }],
+      stages: [
+        { name: 'stage 1', formId: form1._id },
+        { name: 'stage 2', formId: form2._id },
+      ],
     });
 
     const duplicated = await graphqlRequest(mutation, 'pipelineTemplatesDuplicate', { _id: template._id });

src/apolloClient.ts

@@ -62,6 +62,15 @@ const apolloServer = new ApolloServer({
       cookies: req.cookies,
     };
 
+    if (user) {
+      Users.update(
+        { _id: user._id },
+        {
+          lastSeenAt: new Date(),
+        },
+      ).exec();
+    }
+
     if (USE_BRAND_RESTRICTIONS !== 'true') {
       return {
         brandIdSelector: {},
@@ -90,10 +99,33 @@ const apolloServer = new ApolloServer({
         scopeBrandIds = brandIds;
       }
 
-      if (!user.isOwner) {
+      if (!user.isOwner && scopeBrandIds.length) {
+        // Select non-existent or empty arrays too
+        scopeBrandIds.push(null);
+        scopeBrandIds.push([]);
+
         brandIdSelector = { _id: { $in: scopeBrandIds } };
         commonQuerySelector = { scopeBrandIds: { $in: scopeBrandIds } };
-        commonQuerySelectorElk = { terms: { scopeBrandIds } };
+        commonQuerySelectorElk = {
+          bool: {
+            should: [
+              {
+                terms: {
+                  scopeBrandIds: scopeBrandIds.filter(c => typeof c === 'string'),
+                },
+              },
+              {
+                bool: {
+                  must_not: {
+                    exists: {
+                      field: 'scopeBrandIds',
+                    },
+                  },
+                },
+              },
+            ],
+          },
+        };
         userBrandIdsSelector = { brandIds: { $in: scopeBrandIds } };
         singleBrandIdSelector = { brandId: { $in: scopeBrandIds } };
       }
@@ -102,7 +134,10 @@ const apolloServer = new ApolloServer({
     return {
       brandIdSelector,
       singleBrandIdSelector,
-      docModifier: doc => ({ ...doc, scopeBrandIds }),
+      docModifier: doc => ({
+        ...doc,
+        scopeBrandIds: scopeBrandIds.filter((c: any) => c?.length),
+      }),
       commonQuerySelector,
       commonQuerySelectorElk,
       userBrandIdsSelector,

src/commands/initFlow.ts

@@ -0,0 +1,54 @@
+import { connect, disconnect } from '../db/connection';
+import { FlowActionTypes } from '../db/models';
+
+connect()
+  .then(async () => {
+    let flowActionTypes = await FlowActionTypes.find({});
+
+    if (!flowActionTypes || !flowActionTypes.length) {
+      flowActionTypes = [
+        'erxes.action.root',
+        'erxes.action.define.department',
+        'erxes.action.define.tabulation',
+        'erxes.action.transfer.to.agent',
+        'erxes.action.put.in.queue',
+        'erxes.action.finish.attendance',
+        'erxes.action.auto.distribute',
+        'erxes.action.define.bot',
+        'erxes.action.define.tags',
+        'erxes.action.add.tags',
+        'erxes.action.send.message',
+        'erxes.action.send.template.message',
+        'erxes.action.dispatch.to.app',
+        'erxes.action.send.sms',
+        'erxes.action.define.timeout',
+        'erxes.action.send.internal.message',
+        'erxes.action.execute.automation.flow',
+        'erxes.action.execute.action',
+        'erxes.action.conditional',
+        'erxes.action.wait.for.interaction',
+        'erxes.action.define.workflow',
+        'erxes.action.send.feedback',
+        'erxes.action.add.comment.timeline',
+        'erxes.action.choose.department',
+        'erxes.action.to.ask',
+        'erxes.action.send.request',
+        'erxes.action.send.email',
+        'erxes.action.send.file',
+        'erxes.action.execute.javascript',
+        'erxes.action.define.virtual.agent',
+        'erxes.action.define.owner',
+        'erxes.action.pause',
+      ].map(type => new FlowActionTypes({ type, createdAt: new Date() }));
+
+      return FlowActionTypes.insertMany(flowActionTypes);
+    }
+  })
+
+  .then(() => {
+    return disconnect();
+  })
+
+  .then(() => {
+    process.exit();
+  });