@pega/custom-dx-components 0.25.45 → 0.25.47

package/src/tasks/list-pub/index.js

@@ -89,7 +89,8 @@ addDebugLog("listPublished", "", "+");
     // local
     const arLibs = await getLocalLibraries();
 
-    if (libraryName === "") {
+    if (arLibs && arLibs.length > 0) {
+         if (libraryName === "") {
       const libAnswers = await inquirer.prompt([
         {
           name: 'library',
@@ -139,16 +140,22 @@ addDebugLog("listPublished", "", "+");
         console.log(chalk.bold.blueBright(`\nList of ${chalk.inverse(`Local`)} ${libraryName}:${selectedVersion} components built on ${builtOn}.`));
         console.table(libData, ['Component', 'Label', 'Version', 'Type', 'Sub Type']);
 
+      }
+      else {
+        // No library with that name
+        console.log(chalk.redBright(`No local library named: ${libraryName} exists.`));
+        console.log(chalk.redBright(`You need to publish library: ${libraryName} first.`));
+  addDebugLog("listPublished", "END", "-");
+        process.exit(1);
+
+      }
+
     }
     else {
-      // No library with that name
-      console.log(chalk.redBright(`No local library named: ${libraryName} exists.`));
-      console.log(chalk.redBright(`You need to publish library: ${libraryName} first.`));
-addDebugLog("listPublished", "END", "-");
-      process.exit(1);
-
+      console.log(chalk.redBright(`\nNo local libraries exist.`));
     }
 
+
   }
   else {
 
@@ -158,21 +165,22 @@ addDebugLog("listPublished", "END", "-");
 
       if (arLibs && arLibs.pxResults && arLibs.pxResults.length > 0) {
 
-        const libs = arLibs.pxResults.map((oLib, index) => ({ name: oLib.pyLabel, value: index}));
+        // const libs = arLibs.pxResults.map((oLib, index) => ({ name: oLib.pyLabel, value: index}));
+        const libs = arLibs.pxResults.map((oLib, index) => ({ name: oLib.pyLabel + " (" + oLib.pyRuleSet + ":" + oLib.pyRuleSetVersion + ")", value: index}));
 
 
         const {app_name, app_version } = await getApplicationAndVersionFromToken();
         const serverConfig = await getPegaServerConfig();
         console.log(`\nServer ${chalk.green.bold(`${serverConfig.server}`)}.`);
-        console.log(chalk.green(`List of libraries for Application: ${chalk.bold.green(`${app_name} - ${app_version}`)}`));
-        console.log(`in ruleset: ${chalk.green.bold(`${serverConfig.rulesetName}:${serverConfig.rulesetVersion}`)}`);
+        console.log(`List of libraries (including built on) for Application: ${chalk.bold.green(`${app_name} - ${app_version}`)}`);
+        // console.log(`in ruleset: ${chalk.green.bold(`${serverConfig.rulesetName}:${serverConfig.rulesetVersion}`)}`);
 
 
         const libAnswers = await inquirer.prompt([
           {
             name: 'library',
             type: 'rawlist',
-            message: 'Pick library',
+            message: 'Pick component library',
             choices: libs
           }
         ]);
@@ -199,8 +207,9 @@ addDebugLog("listPublished", "END", "-");
       else {
         // No library with that name
         const serverConfig = await getPegaServerConfig();
-        console.log(chalk.redBright(`No server component libraries exist in given ruleset ${chalk.bold(`${serverConfig.rulesetName}:${serverConfig.rulesetVersion}`)}`));
-        console.log(chalk.redBright(`You need to publish a library to this ruleset first.`));
+        console.log(chalk.redBright(`No server component libraries exist in authenticated application.`));
+        // console.log(chalk.redBright(`No server component libraries exist in given ruleset ${chalk.bold(`${serverConfig.rulesetName}:${serverConfig.rulesetVersion}`)}`));
+        console.log(chalk.redBright(`You need to publish a library to a ruleset in this application first.`));
   addDebugLog("listPublished", "END", "-");
         process.exit(1);
 

package/src/tasks/publish-archive/helper.js

@@ -28,7 +28,7 @@ addDebugLog("getPublishComponentQuestions", `componentKey: ${componentKey}`, "")
     {
       name: 'rulesetName',
       message: 'Enter ruleset name',
-      default: defaultPegaConfig.rulesetName,
+      default: defaultPegaConfig.archiveRulesetName,
       validate: value => {
         if (value.trim()) {
           return true;
@@ -42,7 +42,7 @@ addDebugLog("getPublishComponentQuestions", `componentKey: ${componentKey}`, "")
     {
       name: 'rulesetVersion',
       message: 'Enter ruleset version',
-      default: defaultPegaConfig.rulesetVersion,
+      default: defaultPegaConfig.archiveRulesetVersion,
       validate: value => {
         if (validateRulesetVersion(value)) {
           return true;

package/src/tasks/publish-archive/index.js

@@ -5,7 +5,15 @@ import { join } from 'path';
 import fs from 'fs';
 import ora from 'ora';
 
-import { zipUnArchiveToTempAndReturnBuffer, constructCompleteUrl, getHttpsAgent, getPegaServerConfig, addDebugLog, getConfigDefaults } from '../../util.js';
+import {
+  zipUnArchiveToTempAndReturnBuffer,
+  constructCompleteUrl,
+  getHttpsAgent,
+  getPegaServerConfig,
+  addDebugLog,
+  getConfigDefaults,
+  zipVersionAndArchive,
+  updateServerConfigArchiveRuleSetAndVersion } from '../../util.js';
 
 import { getPublishComponentQuestions } from './helper.js';
 
@@ -126,10 +134,6 @@ export const publishComponentLibraryArchiveToServer = async (data, zipContent, d
 
 
 
-
-
-
-
 export default async (orgLibName, selectedVersion) => {
   // console.log(orgLibName + ", " + selectedVersion);
   const configDef = await getConfigDefaults();
@@ -147,15 +151,15 @@ export default async (orgLibName, selectedVersion) => {
     rulesetName, rulesetVersion
   };
 
+  // update so will get archived
+  updateServerConfigArchiveRuleSetAndVersion(content.rulesetName, content.rulesetVersion);
 
   if (orgLibName === configDef.currentOrgLib && selectedVersion === configDef.buildVersion) {
 
     archiveBeforeStore = true;
 
-
     if (archiveBeforeStore) {
 
-
       const archiveFileName = `${orgLibName}_${selectedVersion}.arch.zip`;
       const archiveDirectory = join (mainDirectory, ARCHIVES_PATH, `${orgLibName}`, `${selectedVersion}`);
       const defaultPegaConfig = await getPegaServerConfig();
@@ -171,6 +175,9 @@ export default async (orgLibName, selectedVersion) => {
          let spinner;
           try {
             console.log("");
+            // archive it, which will save updated archiveRuleset/Version
+            await zipVersionAndArchive(content.libraryName, content.version);
+
             spinner = ora(`Exporting to server ${defaultPegaConfig.server}. \n`).start();
             publishComponentLibraryArchiveToServer(content, zipContent, true )
             .then( () => {
@@ -235,4 +242,6 @@ export default async (orgLibName, selectedVersion) => {
 
   }
 
+
+
 };

package/src/tasks/show-status/index.js

@@ -16,7 +16,7 @@ export const showCurrentStatus = async () => {
   const componentList = await getComponents();
   const isLibraryBased = getLibraryBased();
   const isLibraryBasedCL = getLibraryBasedCL();
-  const pegaServer = await getPegaServerConfig();
+  const pegaServer = await getPegaServerConfig(true);
 
   console.log("");
   console.log("\tCurrent status");

package/src/tasks/validator/index.js

@@ -47,7 +47,6 @@ const schema = {
     organization: { type: 'string' },
     version: { type: 'string' },
     library: { type: 'string' },
-    allowedApplications: { type: 'array' },
     type: { type: 'string', enum: COMPONENT_SCHEMA.type.map(({ value }) => value) },
     subtype: {
       anyOf: [{ type: 'string' }, { type: 'array' }],
@@ -184,7 +183,6 @@ const overrideSchema = {
     organization: { type: 'string' },
     version: { type: 'string' },
     library: { type: 'string' },
-    allowedApplications: { type: 'array' },
     type: { type: 'string', enum: COMPONENT_SCHEMA.type.map(({ value }) => value) },
     subtype: {
       anyOf: [{ type: 'string' }, { type: 'array' }],