@dmptool/utils 1.0.37 → 1.0.39

package/README.md

@@ -797,13 +797,16 @@ The code will use that value to construct the appropriate prefix for the key. Fo
 ```typescript
 import {EnvironmentEnum, initializeLogger, getSSMParameter, LogLevelEnum } from '@dmptool/utils';
 
-process.env.AWS_REGION = 'us-west-2';
-
 // Initialize a logger
 const logger: Logger = initializeLogger('exampleSSM', LogLevelEnum.DEBUG);
 
 const paramName = 'RdsDatabase';
 
+const configParams = {
+  logger,
+  region: process.env.AWS_REGION,
+}
+
 const response = await getSSMParameter(logger, paramName, EnvironmentEnum.DEV);
 
 if (response) {

package/dist/dynamo.js

@@ -10,8 +10,13 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteDMP = exports.tombstoneDMP = exports.updateDMP = exports.createDMP = exports.getDMPs = exports.getDMPVersions = exports.getAllUniqueDMPIds = exports.DMPExists = exports.DMP_TOMBSTONE_VERSION = exports.DMP_LATEST_VERSION = void 0;
+const http_1 = __importDefault(require("http"));
+const node_http_handler_1 = require("@aws-sdk/node-http-handler");
 const util_dynamodb_1 = require("@aws-sdk/util-dynamodb");
 const client_dynamodb_1 = require("@aws-sdk/client-dynamodb");
 const general_1 = require("./general");
@@ -50,7 +55,14 @@ const getDynamoDBClient = (dynamoConfigParams) => {
     // If an endpoint was specified, we are running in a local environment
     return endpoint === undefined
         ? new client_dynamodb_1.DynamoDBClient({ region, maxAttempts })
-        : new client_dynamodb_1.DynamoDBClient({ region, maxAttempts, endpoint });
+        : new client_dynamodb_1.DynamoDBClient({
+            region,
+            maxAttempts,
+            endpoint,
+            requestHandler: new node_http_handler_1.NodeHttpHandler({
+                httpAgent: new http_1.default.Agent({ keepAlive: true }),
+            }),
+        });
 };
 /**
  * Lightweight query just to check if the DMP exists.

package/dist/general.js

@@ -132,7 +132,7 @@ const isJSON = (str) => {
     try {
         JSON.parse(str);
     }
-    catch (e) {
+    catch (_a) {
         return false;
     }
     return true;

package/dist/maDMP.js

@@ -236,7 +236,7 @@ const loadMemberInfo = async (rdsConnectionParams, planId) => {
       LEFT JOIN projectMembers pctr ON pc.projectMemberId = pctr.id
         LEFT JOIN affiliations a ON pctr.affiliationId = a.uri
     WHERE pc.planId = ?
-    GROUP BY a.uri, a.name, pctr.email, pctr.givenName, pctr.surName,
+    GROUP BY pc.id, a.uri, a.name, pctr.email, pctr.givenName, pctr.surName,
       pctr.orcid, pc.isPrimaryContact;
   `;
     rdsConnectionParams.logger.debug({ planId, sql }, 'Fetching plan member information');
@@ -383,7 +383,6 @@ const loadNarrativeTemplateInfo = async (rdsConnectionParams, planId) => {
         section: [],
     };
     results.forEach((row) => {
-        var _a;
         if (row.sectionId !== null && row.sectionId !== undefined) {
             // Sections may have several rows in the results, so we need to check if we
             // already have the section defined.
@@ -401,8 +400,6 @@ const loadNarrativeTemplateInfo = async (rdsConnectionParams, planId) => {
                 narrative.section.push(curSection);
             }
             if (row.questionId !== null && row.questionId !== undefined) {
-                const questionType = ((_a = row.questionJSON) === null || _a === void 0 ? void 0 : _a.type) || 'textArea';
-                const defaultAnswer = types_1.AnswerDefaultMap[questionType] || types_1.DefaultTextAreaAnswer;
                 // Every row in the results represents a single question/answer pair
                 curSection.question.push({
                     id: row.questionId,
@@ -886,7 +883,6 @@ const validateDMPToolExtensions = (logger, dmpId, dmp) => {
         const msg = `Invalid DMP Tool extensions: ${validationErrors.join('; ')}`;
         logger.warn({ dmpId }, msg);
         logger.warn({ dmp }, 'Full DMP Tool extensions');
-        console.log(validationErrors);
         throw new DMPValidationError(msg);
     }
     return dmp;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dmptool/utils",
-  "version": "1.0.37",
+  "version": "1.0.39",
   "description": "Helper/Utility functions for use in the DMP Tool services. Particularly AWS tooling and maDMP serialization",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -31,6 +31,9 @@
     "trivy-high": "./scripts/trivy-high.sh",
     "trivy-med": "./scripts/trivy-med.sh"
   },
+  "overrides": {
+    "fast-xml-parser": "5.3.4"
+  },
   "dependencies": {
     "@dmptool/types": "2.3.2",
     "@elastic/ecs-pino-format": "^1.5.0",
@@ -43,10 +46,11 @@
   "peerDependencies": {
     "@aws-sdk/client-cloudformation": "^3.980.0",
     "@aws-sdk/client-dynamodb": "^3.980.0",
-    "@aws-sdk/client-sqs": "^3.980.0",
     "@aws-sdk/client-s3": "^3.980.0",
     "@aws-sdk/client-sns": "^3.980.0",
+    "@aws-sdk/client-sqs": "^3.980.0",
     "@aws-sdk/client-ssm": "^3.980.0",
+    "@aws-sdk/node-http-handler": "^3.370.0",
     "@aws-sdk/s3-request-presigner": "^3.980.0",
     "@aws-sdk/util-dynamodb": "^3.980.0"
   },