dataverse-utils 2.4.0 → 2.5.0

package/lib/dataverse.service.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTableMetadata = exports.publish = exports.addToSolution = exports.ComponentType = void 0;
 const node_1 = require("dataverse-webapi/lib/node");
+const logger_1 = require("./logger");
 var ComponentType;
 (function (ComponentType) {
     ComponentType[ComponentType["WebResource"] = 61] = "WebResource";
@@ -19,6 +20,7 @@ async function addToSolution(id, solution, type, apiConfig) {
         AddRequiredComponents: false,
         IncludedComponentSettingsValues: null
     };
+    logger_1.logger.info(`add component ${id} to solution ${solution}`);
     await (0, node_1.unboundAction)(apiConfig, 'AddSolutionComponent', data);
 }
 exports.addToSolution = addToSolution;

package/lib/deploy.js

@@ -12,15 +12,16 @@ const webResourceDeploy_1 = require("./webResourceDeploy");
 const node_1 = require("dataverse-webapi/lib/node");
 const auth_1 = require("./auth");
 async function deploy(type, files) {
-    if (!type || (type !== 'webresource' && type !== 'assembly')) {
-        const invalid = type !== undefined && type !== 'webresource' && type !== 'assembly';
-        const invalidMessage = invalid ? `${type} is not a valid project type.` : '';
+    if (!type || (type !== 'webresource' && type !== 'assembly' && type !== 'pcf')) {
+        const invalid = type !== undefined && type !== 'webresource' && type !== 'assembly' && type !== 'pcf';
+        const invalidMessage = invalid ? `${type} is not a valid project type. ` : '';
         const { typePrompt } = await (0, prompts_1.default)({
             type: 'select',
             name: 'typePrompt',
-            message: `${invalidMessage} select project type to deploy`,
+            message: `${invalidMessage}select project type to deploy`,
             choices: [
                 { title: 'web resource', value: 'webresource' },
+                { title: 'pcf', value: 'webresource' },
                 { title: 'plugin or workflow activity', value: 'assembly' }
             ]
         });
@@ -53,6 +54,9 @@ async function deploy(type, files) {
         case 'assembly':
             await (0, assemblyDeploy_1.assemblyDeploy)(creds, apiConfig);
             break;
+        case 'pcf':
+            logger_1.logger.error('PCF deploy coming soon');
+            break;
         default:
             break;
     }

package/lib/index.js

@@ -15,7 +15,7 @@ commander_1.program
 // Deploy command
 commander_1.program
     .command('deploy')
-    .description('Deploy file(s) to dataverse (webresource, plugin, workflow)')
+    .description('Deploy file(s) to dataverse (webresource, assembly, pcf)')
     .argument('[type]', 'Type of project to deploy')
     .argument('[files]', 'Comma separate list of files to deploy')
     .action((type, files) => {

package/lib/models/pluginImage.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.deployImage = void 0;
 const logger_1 = require("../logger");
 const node_1 = require("dataverse-webapi/lib/node");
-async function deployImage(stepId, image, message, apiConfig) {
+async function deployImage(stepId, stepName, image, message, apiConfig) {
     image['sdkmessageprocessingstepid@odata.bind'] = `/sdkmessageprocessingsteps(${stepId})`;
     switch (message) {
         case 'Create':
@@ -25,7 +25,7 @@ async function deployImage(stepId, image, message, apiConfig) {
     let imageId = await retrieveImage(stepId, image, apiConfig);
     if (imageId != '') {
         try {
-            await updateImage(imageId, image, apiConfig);
+            await updateImage(imageId, image, stepName, apiConfig);
         }
         catch (error) {
             throw new Error(`failed to update plugin image: ${error.message}`);
@@ -33,7 +33,7 @@ async function deployImage(stepId, image, message, apiConfig) {
     }
     else {
         try {
-            imageId = await createImage(image, apiConfig);
+            imageId = await createImage(image, stepName, apiConfig);
         }
         catch (error) {
             throw new Error(`failed to create plugin image: ${error.message}`);
@@ -47,15 +47,15 @@ async function retrieveImage(stepId, image, apiConfig) {
     const result = await (0, node_1.retrieveMultiple)(apiConfig, 'sdkmessageprocessingstepimages', options);
     return result.value.length > 0 ? result.value[0].sdkmessageprocessingstepimageid : '';
 }
-async function createImage(image, apiConfig) {
-    logger_1.logger.info(`create plugin image ${image.name}`);
+async function createImage(image, stepName, apiConfig) {
+    logger_1.logger.info(`create plugin image ${image.name} for step ${stepName}`);
     const result = await (0, node_1.createWithReturnData)(apiConfig, 'sdkmessageprocessingstepimages', image, '$select=sdkmessageprocessingstepimageid');
     if (result.error) {
         throw new Error(result.error.message);
     }
     return result.sdkmessageprocessingstepimageid;
 }
-async function updateImage(id, image, apiConfig) {
-    logger_1.logger.info(`update plugin image ${image.name}`);
+async function updateImage(id, image, stepName, apiConfig) {
+    logger_1.logger.info(`update plugin image ${image.name} for step ${stepName}`);
     return (0, node_1.update)(apiConfig, 'sdkmessageprocessingstepimages', id, image);
 }

package/lib/models/pluginPackage.js

@@ -67,7 +67,7 @@ async function retrievePackage(prefix, name, apiConfig) {
     return result.value.length > 0 ? result.value[0].pluginassemblyid : '';
 }
 async function createPackage(config, content, apiConfig) {
-    logger_1.logger.info(`create assembly ${config.name}`);
+    logger_1.logger.info(`create package ${config.name}`);
     const pluginPackage = {
         name: `${config.prefix}_${config.name}`,
         version: config.version,
@@ -80,7 +80,7 @@ async function createPackage(config, content, apiConfig) {
     return result.pluginpackageid;
 }
 async function updatePackage(id, config, content, apiConfig) {
-    logger_1.logger.info(`update assembly ${config.name}`);
+    logger_1.logger.info(`update package ${config.name}`);
     const assembly = {
         content: content,
         version: config.version

package/lib/models/pluginStep.js

@@ -53,7 +53,7 @@ async function deployStep(step, typeId, apiConfig, solution) {
     }
     if (images && images.length > 0) {
         try {
-            const promises = images.map(image => (0, pluginImage_1.deployImage)(stepId, image, message, apiConfig));
+            const promises = images.map(image => (0, pluginImage_1.deployImage)(stepId, step.name, image, message, apiConfig));
             await Promise.all(promises);
         }
         catch (error) {

package/license

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 Derek Finlinson
+Copyright (c) 2022 Derek Finlinson
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dataverse-utils",
-  "version": "2.4.0",
+  "version": "2.5.0",
   "license": "MIT",
   "description": "Utilities for interacting with Dataverse environments",
   "main": "lib/index.js",
@@ -23,7 +23,7 @@
     "@azure/msal-node": "^1.12.0",
     "commander": "^8.3.0",
     "cryptr": "^6.0.3",
-    "dataverse-webapi": "^2.1.0",
+    "dataverse-webapi": "^2.2.0",
     "envinfo": "^7.8.1",
     "figures": "^3.2.0",
     "glob": "^7.2.0",