Merge branch '2.0.x' into 2.1.x

AntoineRelief · AntoineRelief · commit e5339a378f6b · 2023-05-16T09:13:55.000+04:00
diff --git a/CHANGELOG/CHANGELOG_beta.md b/CHANGELOG/CHANGELOG_beta.md
@@ -0,0 +1,18 @@
+# [2.0.0-beta.11](https://github.com/ReliefApplications/oort-backend/compare/v2.0.0-beta.10...v2.0.0-beta.11) (2023-05-15)
+
+
+### Bug Fixes
+
+* problems regarding calculated fields ([0c457eb](https://github.com/ReliefApplications/oort-backend/commit/0c457eb0b94ee3730e96602b0b09e4df2fbec78e))
+
+
+### Features
+
+* add manage distribution list permission migration ([03b14c0](https://github.com/ReliefApplications/oort-backend/commit/03b14c0f9309596fc7fec79ca14f3b789250250f))
+
+# [2.0.0-beta.10](https://github.com/ReliefApplications/oort-backend/compare/v2.0.0-beta.9...v2.0.0-beta.10) (2023-05-15)
+
+
+### Features
+
+* use column width to generate email table ([a1f9c81](https://github.com/ReliefApplications/oort-backend/commit/a1f9c81c366da1d2586b13910b3015827884e63b))
diff --git a/migrations/1663832564479-generate-aggregations.ts b/migrations/1663832564479-generate-aggregations.ts
@@ -1,10 +1,43 @@
 import { startDatabaseForMigration } from '../src/utils/migrations/database.helper';
 import get from 'lodash/get';
 import set from 'lodash/set';
-import { contentType } from '@const/enumTypes';
-import { Application, Dashboard, Page, Aggregation, Form } from '../src/models';
+import {
+  Application,
+  Dashboard,
+  Aggregation,
+  Form,
+  Step,
+  Page,
+  Workflow,
+} from '../src/models';
 import { logger } from '../src/services/logger.service';
 
+/**
+ * Get parent application from dashboard. Including dashboard in step.
+ *
+ * @param dashboardId Id of the dashboard.
+ * @param applications List of populated applications.
+ * @param populatedApplications List of fully populated applications.
+ * @returns Parent application.
+ */
+const getApplication = (
+  dashboardId: any,
+  applications: Application[],
+  populatedApplications: Application[]
+): Application => {
+  const application = applications.find((app) =>
+    app.pages.some((page) => (page as Page)?.content?.equals(dashboardId))
+  );
+  if (!!application) return application;
+  return populatedApplications.find((app) =>
+    app.pages.some((page) =>
+      ((page as Page)?.content as Workflow)?.steps?.some((step) =>
+        (step as Step)?.content?.equals(dashboardId)
+      )
+    )
+  );
+};
+
 /**
  * Use to aggregations migrate up.
  *
@@ -13,89 +46,99 @@ import { logger } from '../src/services/logger.service';
 export const up = async () => {
   await startDatabaseForMigration();
   try {
+    const dashboards = await Dashboard.find({});
     const applications = await Application.find()
       .populate({
         path: 'pages',
         model: 'Page',
       })
       .select('name pages');
-
-    for (const application of applications) {
-      if (application.pages.length > 0) {
-        // Update dashboard pages
-        const dashboards = await Dashboard.find({
-          _id: {
-            $in: application.pages
-              .filter((x: Page) => x.type === contentType.dashboard)
-              .map((x: any) => x.content),
+    const populatedApplications = await Application.find()
+      .populate({
+        path: 'pages',
+        model: 'Page',
+        populate: {
+          path: 'content',
+          model: 'Workflow',
+          populate: {
+            path: 'steps',
+            model: 'Step',
           },
-        });
-        for (const dashboard of dashboards) {
-          if (!!dashboard.structure) {
-            let index = 0;
-            for (const widget of dashboard.structure) {
-              if (
-                widget &&
-                widget.component == 'chart' &&
-                get(widget, 'settings.chart.aggregation', null) &&
-                !get(widget, 'settings.chart.aggregationId', null)
-              ) {
-                if (widget.settings?.chart.aggregation.dataSource) {
-                  const aggregation: Aggregation = get(
-                    widget,
-                    'settings.chart.aggregation',
-                    null
-                  );
-                  aggregation.name = `${widget.settings.title} - ${application.name}`;
-                  const dataSourceId = get(
-                    widget,
-                    'settings.chart.aggregation.dataSource',
-                    null
-                  );
+        },
+      })
+      .select('name pages');
+    for (const dashboard of dashboards) {
+      if (!!dashboard.structure) {
+        let index = 0;
+        for (const widget of dashboard.structure) {
+          if (
+            widget &&
+            widget.component == 'chart' &&
+            get(widget, 'settings.chart.aggregation', null) &&
+            !get(widget, 'settings.chart.aggregationId', null)
+          ) {
+            if (widget.settings?.chart.aggregation.dataSource) {
+              const aggregation: Aggregation = get(
+                widget,
+                'settings.chart.aggregation',
+                null
+              );
+              const application = await getApplication(
+                dashboard._id,
+                applications,
+                populatedApplications
+              );
+              aggregation.name = `${widget.settings.title} - ${application?.name}`;
+              const dataSourceId = get(
+                widget,
+                'settings.chart.aggregation.dataSource',
+                null
+              );
 
-                  if (dataSourceId) {
-                    //get form and resource
-                    const form = await Form.findById(dataSourceId).populate(
-                      'resource'
-                    );
+              if (dataSourceId) {
+                //get form and resource
+                const form = await Form.findById(dataSourceId).populate(
+                  'resource'
+                );
 
-                    if (form) {
-                      form.resource.aggregations.push(aggregation);
+                if (form) {
+                  form.resource.aggregations.push(aggregation);
 
-                      //save aggregation object in the resource
-                      const resource = await form.resource.save();
+                  //save aggregation object in the resource
+                  const resource = await form.resource.save();
+                  logger.info(
+                    `Add Aggregation ${aggregation.name} to Resource ${resource.name}`
+                  );
 
-                      set(widget, 'settings.resource', resource.id);
-                      set(
-                        widget,
-                        'settings.chart.aggregationId',
-                        resource.aggregations.pop().id
-                      );
-                      set(
-                        widget,
-                        'settings.chart.mapping',
-                        get(widget, 'settings.chart.aggregation.mapping', null)
-                      );
+                  set(widget, 'settings.resource', resource.id);
+                  set(
+                    widget,
+                    'settings.chart.aggregationId',
+                    resource.aggregations.pop().id
+                  );
+                  set(
+                    widget,
+                    'settings.chart.mapping',
+                    get(widget, 'settings.chart.aggregation.mapping', null)
+                  );
 
-                      dashboard.structure[index] = widget;
+                  dashboard.structure[index] = widget;
 
-                      //add aggregation id in the dashboard documents
-                      await Dashboard.findByIdAndUpdate(
-                        dashboard._id,
-                        {
-                          structure: dashboard.structure,
-                        },
-                        { new: true }
-                      );
-                    } else {
-                      logger.info('skip: related resource / form not found');
-                    }
-                  }
+                  //add aggregation id in the dashboard documents
+                  await Dashboard.findByIdAndUpdate(
+                    dashboard._id,
+                    {
+                      structure: dashboard.structure,
+                    },
+                    { new: true }
+                  );
+                } else {
+                  logger.info('skip: related resource / form not found');
                 }
               }
-              index++;
             }
           }
+          index++;
         }
       }
     }
diff --git a/migrations/1684161314765-add-manage-distribution-list-and-template-permissions.ts b/migrations/1684161314765-add-manage-distribution-list-and-template-permissions.ts
@@ -0,0 +1,40 @@
+import { Permission } from '@models/permission.model';
+import { logger } from '@services/logger.service';
+import { startDatabaseForMigration } from '../src/utils/migrations/database.helper';
+
+/**
+ * Sample function of up migration
+ *
+ * @returns just migrate data.
+ */
+export const up = async () => {
+  await startDatabaseForMigration();
+  const types = ['can_manage_distribution_lists', 'can_manage_templates'];
+
+  for (const type in types) {
+    // check if permission already exists
+    const permissionExists = await Permission.exists({ type, global: false });
+    if (permissionExists) {
+      logger.info(`${type} permission already exists`);
+      return;
+    }
+
+    const permission = new Permission({
+      type,
+      global: false,
+    });
+    await permission.save();
+    logger.info(`${type} application's permission created`);
+  }
+};
+
+/**
+ * Sample function of down migration
+ *
+ * @returns just migrate data.
+ */
+export const down = async () => {
+  /*
+      Code you downgrade script here!
+   */
+};
diff --git a/src/i18n/en.json b/src/i18n/en.json
@@ -220,6 +220,7 @@
 		"resource": {
 			"edit": {
 				"errors": {
+					"calculatedFieldTooLong": "The expression is too big.",
 					"field": {
 						"missingReadPermissionOnResource": "Please provide permission to read or create records before setting visible fields.",
 						"missingWritePermissionOnResource": "Please provide permission to update or create records before setting editable fields.",
diff --git a/src/i18n/test.json b/src/i18n/test.json
@@ -220,6 +220,7 @@
 		"resource": {
 			"edit": {
 				"errors": {
+					"calculatedFieldTooLong": "******",
 					"field": {
 						"missingReadPermissionOnResource": "******",
 						"missingWritePermissionOnResource": "******",
diff --git a/src/routes/email/index.ts b/src/routes/email/index.ts
@@ -39,7 +39,13 @@ const generateEmail = async (req, res) => {
   if (args.attachment || args.body.includes(Placeholder.DATASET)) {
     await extractGridData(args, req.headers.authorization)
       .then((x) => {
-        columns = x.columns;
+        columns = x.columns.map((column: any) => {
+          const field = args.fields.find((y: any) => y.name === column.name);
+          if (field && field.width) {
+            column.width = field.width;
+          }
+          return column;
+        });
         rows = x.rows;
       })
       .catch((err) => logger.error(err.message, { stack: err.stack }));
diff --git a/src/schema/mutation/editResource.mutation.ts b/src/schema/mutation/editResource.mutation.ts
@@ -12,6 +12,7 @@ import { buildTypes } from '@utils/schema';
 import { AppAbility } from '@security/defineUserAbility';
 import { get, has, isArray, isEqual } from 'lodash';
 import { logger } from '@services/logger.service';
+import buildCalculatedFieldPipeline from '@utils/aggregation/buildCalculatedFieldPipeline';
 
 /** Simple resource permission change type */
 type SimplePermissionChange =
@@ -684,6 +685,22 @@ export default {
       // Update calculated fields
       if (args.calculatedField) {
         const calculatedField: CalculatedFieldChange = args.calculatedField;
+
+        // Check if calculated field expression is too long
+        if (calculatedField.add || calculatedField.update) {
+          const expression =
+            calculatedField.add?.expression ??
+            calculatedField.update?.expression;
+          const pipeline = buildCalculatedFieldPipeline(expression, '');
+          if (pipeline[0].$facet.calcFieldFacet.length > 50) {
+            throw new GraphQLError(
+              context.i18next.t(
+                'mutations.resource.edit.errors.calculatedFieldTooLong'
+              )
+            );
+          }
+        }
+
         // Add new calculated field
         if (calculatedField.add) {
           const expression = getExpressionFromString(
@@ -776,6 +793,7 @@ export default {
       );
     } catch (err) {
       logger.error(err.message, { stack: err.stack });
+      if (err instanceof GraphQLError) throw err;
       throw new GraphQLError(
         context.i18next.t('common.errors.internalServerError')
       );
diff --git a/src/utils/aggregation/buildCalculatedFieldPipeline.ts b/src/utils/aggregation/buildCalculatedFieldPipeline.ts
@@ -125,7 +125,7 @@ const resolveSingleOperator = (
 
   const getValueString = () => {
     const value = getSimpleOperatorValue(operator);
-    if (value) return value;
+    if (!isNil(value)) return value; // check that not null or undefined, so 0 works
 
     // if is an expression, add to dependencies array,
     // that will be resolved before, since will be appended
@@ -188,7 +188,7 @@ const resolveDoubleOperator = (
   const getValueString = (i: number) => {
     const selectedOperator = i === 1 ? operator1 : operator2;
     const value = getSimpleOperatorValue(selectedOperator);
-    if (value) return value;
+    if (!isNil(value)) return value; // check that not null or undefined, so 0 works
 
     // if is an expression, add to dependencies array,
     // that will be resolved before, since will be appended
@@ -415,7 +415,22 @@ const buildCalculatedFieldPipeline = (
   name: string
 ): any[] => {
   const operation = getExpressionFromString(expression);
-  return buildPipeline(operation, name);
+  const pipeline = buildPipeline(operation, name);
+  return [
+    {
+      $facet: {
+        calcFieldFacet: pipeline,
+      },
+    },
+    {
+      $unwind: '$calcFieldFacet',
+    },
+    {
+      $replaceRoot: {
+        newRoot: '$calcFieldFacet',
+      },
+    },
+  ];
 };
 
 export default buildCalculatedFieldPipeline;
diff --git a/src/utils/email/gridEmailBuilder.ts b/src/utils/email/gridEmailBuilder.ts
@@ -124,7 +124,9 @@ const datasetToHTML = (columns: any[], rows: any[]): string => {
   table += '<tr>';
   for (const column of columns) {
     const colspan = column.subColumns?.length || 1;
-    table += `<th colspan="${colspan}" style="background-color: #008dc9; color: white; text-align: center; border: 1px solid black;"><b>`;
+    table += `<th colspan="${colspan}" style="background-color: #008dc9; color: white; text-align: center; border: 1px solid black${
+      column.width ? `; width: ${column.width}px` : ''
+    }"><b>`;
     table += column.title;
     table += '</b></th>';
   }
diff --git a/src/utils/schema/resolvers/Query/all.ts b/src/utils/schema/resolvers/Query/all.ts
