@dmptool/utils 1.0.11 → 1.0.13

package/dist/maDMP.js

@@ -116,7 +116,7 @@ const loadDefaultMemberRole = async (rdsConnectionParams) => {
     rdsConnectionParams.logger.debug({ sql }, 'Fetching default role');
     const resp = await (0, rds_1.queryTable)(rdsConnectionParams, sql, []);
     if (resp && Array.isArray(resp.results) && resp.results.length > 0) {
-        return resp.results[0].id;
+        return resp.results[0].uri;
     }
     return undefined;
 };
@@ -228,7 +228,8 @@ async function loadContactFromPlanOwner(rdsConnectionParams, ownerId) {
 const loadMemberInfo = async (rdsConnectionParams, planId) => {
     const sql = `
     SELECT pc.id, a.uri, a.name, pctr.email, pctr.givenName, pctr.surName,
-           pctr.orcid, pc.isPrimaryContact, GROUP_CONCAT(r.uri) as roles
+           pctr.orcid, pc.isPrimaryContact,
+           CONCAT('["', GROUP_CONCAT(r.uri SEPARATOR '","'), '"]') as roles
     FROM planMembers pc
       LEFT JOIN planMemberRoles pcr ON pc.id = pcr.planMemberId
         LEFT JOIN memberRoles r ON pcr.memberRoleId = r.id
@@ -488,9 +489,7 @@ const buildContributors = (applicationName, env, planId, projectId, members, def
     }
     return members.map((member) => {
         // Make sure that we always have roles as an array
-        const roles = member.roles && member.roles.includes('[')
-            ? JSON.parse(member.roles)
-            : [defaultRole];
+        const roles = member.roles ? JSON.parse(member.roles) : [defaultRole];
         // Combine the member's given name and surname into a single name'
         const contrib = {
             name: [member.givenName, member.surName]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dmptool/utils",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "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",