Merge branch 'dev' of github.com:erxes/erxes into dev

cli/commands/update.js

@@ -1,15 +1,14 @@
 const fse = require("fs-extra");
-const execa = require("execa");
 const start = require('./start');
 const { filePath, log, execCommand } = require('./utils');
+const { execSync } = require('child_process');
 
 module.exports = async function() {
   try {
     log('Stopping pm2 processes ...');
 
-    // stop services
     try {
-      await execa("pm2", ["delete", 'all']);
+      execSync("pm2 delete all", { stdio: 'inherit' });
     } catch (e) {
       console.log(e.message);
     }

cli/commands/utils.js

@@ -1,12 +1,12 @@
 const chalk = require('chalk');
-const execa = require('execa');
 const fs = require('fs');
 const cliProgress = require('cli-progress');
 const request = require('request');
 const fse = require('fs-extra');
 const { resolve } = require('path');
 const exec = require('child_process').exec;
 const colors = require('colors');
+const { execSync } = require('child_process');
 
 const filePath = pathName => {
   if (pathName) {
@@ -145,14 +145,6 @@ module.exports.downloadLatesVersion = async configs => {
   await fse.copy(filePath('build.tar.gz'), filePath('build-backup.tar.gz'));
 };
 
-const runCommand = (command, args, pipe) => {
-  if (pipe) {
-    return execa(command, args).stdout.pipe(process.stdout);
-  }
-
-  return execa(command, args);
-};
-
 module.exports.startServices = async configs => {
   log('Starting services using pm2 ...');
 
@@ -482,7 +474,8 @@ module.exports.startServices = async configs => {
     )}`
   );
 
-  return runCommand('pm2', ['start', filePath('ecosystem.config.js')], false);
+  const ecosystemPath = filePath('ecosystem.config.js');
+  return execSync(`pm2 start ${ecosystemPath}`);
 };
 
 const generateNginxConf = async ({
@@ -555,6 +548,5 @@ const generateNginxConf = async ({
   );
 };
 
-module.exports.runCommand = runCommand;
 module.exports.downloadFile = downloadFile;
 module.exports.execCurl = execCurl;

cli/installer/index.js

@@ -1,18 +1,9 @@
 
 var amqplib = require('amqplib');
-var shell = require('shelljs');
 
 var open = amqplib.connect(process.env.RABBITMQ_HOST);
 var queueName = 'managePluginInstall';
-
-var runCommand = (command, method='exec') => {
-  return new Promise((resolve) => {
-    setTimeout(() => {
-      shell[method](command);
-      resolve('done');
-    }, 500)
-  });
-}
+const { execSync } = require('child_process');
 
 var sleep = ms => {
   return new Promise(resolve => {
@@ -50,43 +41,43 @@ open
 
             sendMessage(ch, 'started');
 
-            await runCommand('..', 'cd');
+            execSync('cd ..');
 
             // Update configs.json
-            await runCommand(`npm run erxes installer-update-configs ${data.type} ${data.name}`);
+            execSync(`npm run erxes installer-update-configs ${data.type} ${data.name}`);
 
             if (data.type === 'install') {
               sendMessage(ch, 'Running up ....');
-              await runCommand(`npm run erxes up -- --fromInstaller`);
+              execSync(`npm run erxes up -- --fromInstaller`);
 
               sendMessage(ch, 'Syncing ui ....');
-              await runCommand(`npm run erxes syncui ${data.name}`);
+              execSync(`npm run erxes syncui ${data.name}`);
 
               sendMessage(ch, 'Restarting coreui ....');
-              await runCommand(`npm run erxes restart coreui`);
+              execSync(`npm run erxes restart coreui`);
 
               sendMessage(ch, 'Waiting for 10 seconds for plugin api....');
               await sleep(10000);
 
               sendMessage(ch, 'Restarting gateway ...');
-              await runCommand(`npm run erxes restart gateway`);
+              execSync(`npm run erxes restart gateway`);
             }
 
             if (data.type === 'uninstall') {
               sendMessage(ch, 'Running up');
-              await runCommand(`npm run erxes up -- --fromInstaller`);
+              execSync(`npm run erxes up -- --fromInstaller`);
 
               sendMessage(ch, `Removing ${data.name} service ....`);
-              await runCommand(`npm run erxes remove-service erxes_plugin_${data.name}_api`);
+              execSync(`npm run erxes remove-service erxes_plugin_${data.name}_api`);
 
               sendMessage(ch, `Restarting coreui ....`);
-              await runCommand(`npm run erxes restart coreui`);
+              execSync(`npm run erxes restart coreui`);
 
               sendMessage(ch, `Restarting gateway ....`);
-              await runCommand(`npm run erxes restart gateway`);
+              execSync(`npm run erxes restart gateway`);
             }
 
-            await runCommand('installer', 'cd');
+            execSync('cd installer');
 
             sendMessage(ch, `done`);
 

cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "erxes",
-  "version": "0.4.24",
+  "version": "0.4.25",
   "description": "Free and open fair-code licensed all-in-one growth marketing & management software",
   "homepage": "https://erxes.io",
   "repository": "https://github.com/erxes/erxes",
@@ -25,15 +25,13 @@
     "colors": "^1.4.0",
     "commander": "^6.2.0",
     "dotenv": "^16.0.3",
-    "execa": "^4.1.0",
     "figlet": "^1.5.0",
     "fs-extra": "^9.0.1",
     "jsonwebtoken": "^8.5.1",
     "kill-port": "^1.6.1",
     "lodash": "^4.17.21",
     "pm2": "^5.2.2",
     "request": "^2.88.2",
-    "shelljs": "^0.8.5",
     "yaml": "^1.10.2"
   }
 }

packages/plugin-products-api/src/dataloaders/resolvers/queries/products.ts

@@ -7,7 +7,10 @@ import { PRODUCT_STATUSES } from '../../../models/definitions/products';
 import { escapeRegExp } from '@erxes/api-utils/src/core';
 import { IContext, IModels } from '../../../connectionResolver';
 import messageBroker, { sendTagsMessage } from '../../../messageBroker';
-import { getSimilaritiesProducts } from '../../../maskUtils';
+import {
+  getSimilaritiesProducts,
+  getSimilaritiesProductsCount
+} from '../../../maskUtils';
 import { Builder, countBySegment, countByTag } from '../../../utils';
 
 interface IQueryParams {
@@ -236,6 +239,10 @@ const productQueries = {
       params
     );
 
+    if (params.groupedSimilarity) {
+      return await getSimilaritiesProductsCount(models, filter, params);
+    }
+
     return models.Products.find(filter).count();
   },
 

packages/plugin-products-api/src/maskUtils.ts

@@ -171,8 +171,8 @@ export const checkSameMaskConfig = async (models: IModels, doc: IProduct) => {
   return undefined;
 };
 
-export const groupBySameMasksAggregator = () => {
-  return [
+export const groupBySameMasksAggregator = (isCount = false) => {
+  const sameArr = [
     {
       $addFields: {
         sameMasksLen: {
@@ -197,7 +197,28 @@ export const groupBySameMasksAggregator = () => {
     },
     {
       $unwind: '$sameMasks'
-    },
+    }
+  ];
+
+  if (isCount) {
+    return [
+      ...sameArr,
+      {
+        $group: {
+          _id: { sameMasks: '$sameMasks' },
+          product: { $first: '$code' }
+        }
+      },
+      {
+        $group: {
+          _id: { code: '$product' }
+        }
+      }
+    ];
+  }
+
+  return [
+    ...sameArr,
     { $sort: { 'product.code': 1 } },
     {
       $group: {
@@ -217,8 +238,8 @@ export const groupBySameMasksAggregator = () => {
   ];
 };
 
-export const groupByCategoryAggregator = () => {
-  return [
+export const groupByCategoryAggregator = (isCount = false) => {
+  const sameArr = [
     {
       $lookup: {
         from: 'product_categories',
@@ -248,7 +269,22 @@ export const groupByCategoryAggregator = () => {
           }
         }
       }
-    },
+    }
+  ];
+
+  if (isCount) {
+    return [
+      ...sameArr,
+      {
+        $group: {
+          _id: { same: '$same' }
+        }
+      }
+    ];
+  }
+
+  return [
+    ...sameArr,
     {
       $group: {
         _id: { same: '$same' },
@@ -281,3 +317,17 @@ export const getSimilaritiesProducts = async (models, filter, params) => {
     hasSimilarity: gd.count > 1
   }));
 };
+
+export const getSimilaritiesProductsCount = async (models, filter, params) => {
+  const aggregates =
+    params.groupedSimilarity === 'config'
+      ? groupBySameMasksAggregator(true)
+      : groupByCategoryAggregator(true);
+  const groupedData = await models.Products.aggregate([
+    { $match: filter },
+    ...aggregates,
+    { $group: { _id: {}, count: { $sum: 1 } } }
+  ]);
+
+  return ((groupedData || [])[0] || {}).count || 0;
+};

packages/plugin-timeclock-api/src/graphql/resolvers/utils.ts

@@ -259,6 +259,20 @@ export const timeclockReportByUser = async (
     ]
   });
 
+  const requestsOfSelectedMonth = await models.Absences.find({
+    $and: [
+      { userId },
+      { solved: true },
+      { status: 'Approved' },
+      {
+        startTime: {
+          $gte: startOfSelectedMonth,
+          $lte: startOfNextMonth
+        }
+      }
+    ]
+  });
+
   let scheduledShiftStartSelectedDay;
   let scheduledShiftEndSelectedDay;
 
@@ -465,6 +479,7 @@ export const timeclockReportByUser = async (
       totalHoursBreakScheduled,
       totalHoursBreakSelecteDay,
 
+      requests: requestsOfSelectedMonth,
       scheduledShifts: scheduleShiftsSelectedMonth,
       timeclocks: timeclocksOfSelectedMonth,
 

packages/plugin-timeclock-api/src/graphql/schema.ts

@@ -181,7 +181,8 @@ export const types = `
 
     scheduledShifts: [Shift]
     timeclocks: [Timeclock]
-    
+    requests: [Absence]
+
     totalHoursWorkedSelectedDay: Float
     totalHoursScheduledSelectedDay: Float
     totalMinsLateSelectedDay: Float

packages/plugin-timeclock-ui/src/components/schedule/ScheduleForm.tsx

@@ -17,7 +17,6 @@ import {
   FlexRow,
   MarginX,
   MarginY,
-  CustomBoxWrapper,
   SortItem,
   CustomContainer
 } from '../../styles';
@@ -37,7 +36,6 @@ import Datetime from '@nateradebaugh/react-datetime';
 import { dateFormat, timeFormat } from '../../constants';
 import { IUser } from '@erxes/ui/src/auth/types';
 import { FormControl } from '@erxes/ui/src/components/form';
-import Box from '@erxes/ui/src/components/Box';
 
 import * as icons from 'react-bootstrap-icons';