Add 'archived' field to defaultRecordFields and tweak pci custom scripts

src/const/defaultRecordFields.ts

@@ -72,6 +72,12 @@ export const defaultRecordFields: {
       $toString: '$_id',
     },
   },
+  {
+    field: 'archived',
+    type: GraphQLBoolean,
+    filterType: GraphQLBoolean,
+    selectable: true,
+  },
   {
     field: 'incrementalId',
     type: GraphQLID,

src/schema/query/recordsAggregation.query.ts

@@ -45,6 +45,7 @@ const DEFAULT_FIELDS = [
   'lastUpdateForm',
   'createdAt',
   'createdBy',
+  'archived',
   'modifiedAt',
   'id',
   'incrementalId',

src/utils/files/getColumns.ts

@@ -18,6 +18,10 @@ export const getColumns = async (
 ): Promise<any[]> => {
   const columns = [];
   for (const field of fields) {
+    // Skip fields that should be omitted on the xlsx template.
+    if (field.showOnXlsxTemplate === false) {
+      continue;
+    }
     switch (field.type) {
       case 'checkbox':
       case 'tagbox': {

src/utils/files/getUploadColumns.ts

@@ -8,6 +8,10 @@
 export const getUploadColumns = (fields: any[], headers: any[]): any[] => {
   const columns = [];
   for (const field of fields) {
+    // Skip fields that should be omitted on the xlsx template.
+    if (field.showOnXlsxTemplate === false) {
+      continue;
+    }
     switch (field.type) {
       case 'checkbox':
       case 'tagbox': {

src/utils/form/extractFields.ts

@@ -14,7 +14,9 @@ import { validateGraphQLFieldName } from '@utils/validators';
 export const extractFields = async (object, fields, core): Promise<void> => {
   if (object.elements) {
     for (const element of object.elements) {
-      if (element.omitField) continue;
+      if (element.omitField) {
+        continue;
+      }
       if (element.type === 'panel') {
         await extractFields(element, fields, core);
       } else {
@@ -29,12 +31,14 @@ export const extractFields = async (object, fields, core): Promise<void> => {
           type,
           name: element.valueName,
           isRequired: element.isRequired ? element.isRequired : false,
+          showOnXlsxTemplate: !element.omitOnXlsxTemplate,
           readOnly: element.readOnly ? element.readOnly : false,
           isCore: core,
           ...(element.hasOwnProperty('defaultValue')
             ? { defaultValue: element.defaultValue }
             : {}),
         };
+        console.log(field.name, field);
         // ** Resource **
         if (element.type === 'resource' || element.type === 'resources') {
           if (element.relatedName) {

src/utils/form/metadata.helper.ts

@@ -234,6 +234,15 @@ export const getMetaData = async (
       editor: 'datetime',
       canUpdate: false,
     });
+
+    // Archived
+    metaData.push({
+      automated: true,
+      name: 'archived',
+      type: 'boolean',
+      editor: 'boolean',
+      canUpdate: false,
+    });
   }
 
   /**

src/utils/pci/setupCustomListeners.ts

@@ -2,9 +2,10 @@ import { Schema, Types } from 'mongoose';
 import config from 'config';
 import { Form, Record } from '@models';
 import { getNextId } from '@utils/form';
+import { cloneDeep } from 'lodash';
 
 /** Whether or not the current environment is PCI */
-const IS_PCI = config.get('server.url') === 'https://pci.oortcloud.tech/api';
+const IS_PCI = config.get('server.url') === 'https://ltkmp.oortcloud.tech/api';
 
 /** Location form id */
 const LOCATION_FORM_ID = new Types.ObjectId('65d61bfbccb8d36936d10cb6');
@@ -49,6 +50,10 @@ const createTensionIndicatorEntry = async (record: Record) => {
       label: 'High tension',
     },
   };
+  const skip = !!record.data?.__automated;
+  if (skip) {
+    return;
+  }
   const status = record.data?.status;
 
   const entryForm = await Form.findById(INDICATOR_ENTRY_FORM_ID);
@@ -70,6 +75,7 @@ const createTensionIndicatorEntry = async (record: Record) => {
       qualitative_value: statusMap[status].label,
       unit: 'Scale (1-3)',
       location: record._id.toString(),
+      __automated: true,
     },
     _form: {
       _id: entryForm._id,
@@ -98,6 +104,50 @@ export const setupCustomPCIListeners = <DocType>(schema: Schema<DocType>) => {
     const rec = doc as Record;
     if (LOCATION_FORM_ID.equals(rec.form)) {
       await createTensionIndicatorEntry(rec);
+    } else if (INDICATOR_ENTRY_FORM_ID.equals(rec.form)) {
+      // we should update the location status from the indicator entry
+      const { location: locationID, indicator, date } = rec.data;
+
+      const newStatus =
+        rec.data.value === 1
+          ? 'low'
+          : rec.data.value === 2
+          ? 'moderate'
+          : 'high';
+
+      // we now check if there is a newer entry for the same location and indicator
+      const moreRecentEntry = await Record.exists({
+        form: INDICATOR_ENTRY_FORM_ID,
+        'data.location': locationID,
+        'data.indicator': indicator,
+        'data.date': { $gte: date },
+        archived: false,
+      }).sort({ createdAt: -1 });
+
+      const ind = await Record.findById(indicator);
+      const correctUnit = await Record.findById(ind.data.unit);
+
+      // If the unit is incorrect, we update it
+      if (correctUnit.data?.unit !== rec.data.unit) {
+        rec.data.unit = correctUnit.data?.unit;
+        rec.markModified('data');
+        await rec.save();
+      }
+
+      // If adding an older entry, we should not update the location status
+      // as that displays the most recent status
+      if (moreRecentEntry && !moreRecentEntry._id.equals(rec._id)) {
+        return;
+      }
+
+      // we update the location status
+      const location = await Record.findOne({
+        _id: locationID,
+      });
+      const newData = cloneDeep(location.data) || {};
+      Object.assign(newData, { status: newStatus, __automated: true });
+      location.data = newData;
+      await location.save();
     }
   });
 

src/utils/schema/resolvers/Query/all.ts

@@ -306,6 +306,7 @@ export default (entityName: string, fieldsByName: any, idsByName: any) =>
               [`_${resource}.id`]: { $toString: `$_${resource}._id` },
               [`_${resource}.data.id`]: { $toString: `$_${resource}._id` },
               [`_${resource}.data._id`]: { $toString: `$_${resource}._id` },
+              [`_${resource}.data.archived`]: `$_${resource}.archived`,
             },
           },
         ]);

src/utils/schema/resolvers/Query/getFilter.ts

@@ -28,6 +28,10 @@ const DEFAULT_FIELDS = [
     name: 'lastUpdateForm',
     type: 'text',
   },
+  {
+    name: 'archived',
+    type: 'boolean',
+  },
 ];
 
 /** Maps oort simple operators to their mongo counterparts */