@pega/custom-dx-components 0.25.22 → 0.25.24

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

@@ -4,8 +4,7 @@ import fetch from 'node-fetch';
 import { join } from 'path';
 import fs from 'fs';
 
-
-import { zipUnArchiveToTempAndReturnBuffer, constructCompleteUrl, getHttpsAgent, getPegaServerConfig, addDebugLog, getConfigDefaults, zipVersionAndArchiveAndReturnBuffer } from '../../util.js';
+import { zipUnArchiveToTempAndReturnBuffer, constructCompleteUrl, getHttpsAgent, getPegaServerConfig, addDebugLog, getConfigDefaults } from '../../util.js';
 
 import { getPublishComponentQuestions } from './helper.js';
 
@@ -18,9 +17,9 @@ import {
 } from '../../constants.js';
 
 
-export const publishComponentLibraryArchiveToServer = async (data, doFetch) => {
+export const publishComponentLibraryArchiveToServer = async (data, zipContent, doFetch) => {
   addDebugLog("publishComponentToServer", `data: ${data}`, "");
-    const { zipContent, rulesetName, rulesetVersion, libraryName, version } = data;
+    const { rulesetName, rulesetVersion, libraryName, version } = data;
 
     const defaultPegaServerConfig = await getPegaServerConfig();
     const { serverType, isolationId } = defaultPegaServerConfig;
@@ -30,35 +29,24 @@ export const publishComponentLibraryArchiveToServer = async (data, doFetch) => {
       isolationId || 'undefined'
     );
     let apiBody;
+    let urlParams;
 
     if (isLaunchpad) {
       // currently no launchpad records to rule resolve a library
 
-      // apiBody = {
-      //   type: 'CustomComponent',
-      //   zipContent,
-      //   componentName: JSON.parse(configContent).componentKey,
-      //   pxUpdateDateTime: '',
-      //   environmentID: defaultPegaServerConfig.isolationId
-      // };
     } else {
-      apiBody = {
-        zipContent,
-        publishFor: 'constellation',
-        rulesetName,
-        rulesetVersion,
-        libraryName,
-        version,
-        category: ''
-      };
+      urlParams = `/library-name/${libraryName}/library-version/${version}/rulesetname/${rulesetName}/rulesetversion/${rulesetVersion}`;
+
     }
 
     const defaultPegaConfig = await getPegaServerConfig();
-    const url = constructCompleteUrl(
+    let url = constructCompleteUrl(
       defaultPegaConfig.server,
       isLaunchpad ? launchpadRestEndpoint : PUBLISH_COMPONENT_LIBRARY_ARCHIVE_SERVICE_REST_ENDPOINT
     );
 
+    url = url.concat(urlParams);
+
     if (doFetch) {
       try {
         const OauthData = fs.readFileSync(TOKEN_PATH, 'utf8');
@@ -76,13 +64,15 @@ export const publishComponentLibraryArchiveToServer = async (data, doFetch) => {
             headers['Content-Type'] = 'application/json';
           } else {
             headers.Authorization = `${tokenType} ${accessToken}`;
+            headers['Content-Type'] = 'application/json';
           }
 
+
           const response = await fetch(url, {
             method: 'POST',
             agent: getHttpsAgent(defaultPegaConfig),
             headers,
-            body: JSON.stringify(apiBody)
+            body: JSON.stringify(zipContent)
           });
 
           status = response.status;
@@ -114,6 +104,7 @@ export const publishComponentLibraryArchiveToServer = async (data, doFetch) => {
             }
           } catch (err) {
             if (status === 500) {
+              const respData = isLaunchpad ? await response.text() : await response.json();
               throw new Error(
                 `Error occurred in authentication. Please regenerate using authenticate`
               );
@@ -147,6 +138,7 @@ export default async (orgLibName, selectedVersion) => {
   const rulesetQuestions = await getPublishComponentQuestions();
   const rulesetAnswers = await inquirer.prompt(rulesetQuestions);
   const { rulesetName, rulesetVersion} = rulesetAnswers;
+  const mainDirectory = process.cwd();
 
   let content = {
     libraryName : orgLibName,
@@ -157,38 +149,25 @@ export default async (orgLibName, selectedVersion) => {
 
   if (orgLibName === configDef.currentOrgLib && selectedVersion === configDef.buildVersion) {
 
-    /*
-    console.log("\nYou've selected the current working library/version.");
-    console.log("Export store or the current.");
-    const archAnswers = await inquirer.prompt([
-      {
-        name: 'currentOrStore',
-        type: 'rawlist',
-        message: 'Select current or store',
-        default: "Current",
-        choices: ["Current", "Store"]
-      },
-    ]);
-
-    const currentOrStore = archAnswers.currentOrStore;
-
-    if (currentOrStore === "Current") {
-      archiveBeforeStore = true;
-    }
-    */
     archiveBeforeStore = true;
 
+
     if (archiveBeforeStore) {
 
-      // returns both the output promise and the buffer that can be sent to PegaInfinity
-      let zipBuffer = await zipVersionAndArchiveAndReturnBuffer(configDef.currentOrgLib, configDef.buildVersion);
 
-      zipBuffer.output.on('close', function() {
-        if (zipBuffer.zipContent != null) {
-          content = { ...content, zipContent: zipBuffer.zipContent};
+      const archiveFileName = `${orgLibName}_${selectedVersion}.arch.zip`;
+      const archiveDirectory = join (mainDirectory, ARCHIVES_PATH, `${orgLibName}`, `${selectedVersion}`);
+      if (fs.existsSync(archiveDirectory)) {
+        const archiveFile = join(archiveDirectory, archiveFileName);
+
+        let zipContent = fs.readFileSync(archiveFile).toString("base64");
+
+        if (zipContent != null) {
+
+          zipContent = zipContent.replaceAll('"', "");
 
           try {
-            publishComponentLibraryArchiveToServer(content, true )
+            publishComponentLibraryArchiveToServer(content, zipContent, true )
             .then( () => {
               console.log(chalk.green.bold(`Success: Published Archive ${content.libraryName}/${content.version} to server.`));
             })
@@ -200,9 +179,10 @@ export default async (orgLibName, selectedVersion) => {
             console.log(chalk.bold.red(err.toString()));
           }
 
-        }
 
-      });
+
+        }
+      }
 
       return;
 
@@ -213,48 +193,38 @@ export default async (orgLibName, selectedVersion) => {
     // for now, to get a "buffer" from a zip file, need to unzip it in a /temp directory
     // then re-zip.  During the re-zip, create a buffer that can be passed to PegaInfinity
 
-    const mainDirectory = process.cwd();
-    const archiveFileName = `${orgLibName}_${selectedVersion}.arch.zip`;
-    const archiveDirectory = join (mainDirectory, ARCHIVES_PATH, `${orgLibName}`, `${selectedVersion}`);
-    if (fs.existsSync(archiveDirectory)) {
-      const archiveFile = join(archiveDirectory, archiveFileName);
-
-      // unzip to /temp, then re-zip and retrieve the buffer (remove /temp later)
-      let zipBuffer = await zipUnArchiveToTempAndReturnBuffer(orgLibName, selectedVersion);
-
-      zipBuffer.output.on('close', function() {
-
-        // get rid of temp directory, regardless
-        const tempDirectory = join (mainDirectory, TEMP_PATH);
-        if (fs.existsSync(tempDirectory)) {
-          fs.rmSync(tempDirectory, { recursive: true });
-        }
-
-        if (zipBuffer.zipContent != null) {
+    // unzip to /temp, then re-zip and retrieve the buffer (remove /temp later)
+    let zipBuffer = await zipUnArchiveToTempAndReturnBuffer(orgLibName, selectedVersion);
 
-          content = { ...content, zipContent: zipBuffer.zipContent};
+    zipBuffer.output.on('close', function() {
 
-          try {
-            publishComponentLibraryArchiveToServer(content, true )
-            .then( () => {
-              console.log(chalk.green.bold(`Success: Published Archive ${content.libraryName}/${content.version} to server.`));
-            })
-            .catch( (err) =>  {
-              console.log(chalk.red.bold(err));
-            })
-          }
-          catch (err) {
-            console.log(chalk.bold.red(err.toString()));
-          }
+      // get rid of temp directory, regardless
+      const tempDirectory = join (mainDirectory, TEMP_PATH);
+      if (fs.existsSync(tempDirectory)) {
+        fs.rmSync(tempDirectory, { recursive: true });
+      }
 
+      if (zipBuffer.zipContent != null) {
 
+        content = { ...content, zipContent: zipBuffer.zipContent};
 
+        try {
+          publishComponentLibraryArchiveToServer(content, zipBuffer.zipContent, true )
+          .then( () => {
+            console.log(chalk.green.bold(`Success: Published Archive ${content.libraryName}/${content.version} to server.`));
+          })
+          .catch( (err) =>  {
+            console.log(chalk.red.bold(err));
+          })
+        }
+        catch (err) {
+          console.log(chalk.bold.red(err.toString()));
         }
 
-      });
-
-    }
+      }
 
+    });
 
   }
+
 };

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

@@ -12,7 +12,6 @@ import { lintComponent } from '../linter/index.js';
 import { constructCompleteUrl, getComponentDirectoryPath, getHttpsAgent, getPegaServerConfig, showVersion, getC11NB2STokenAndStaticServer, getLocalLibraryVersions, getLibraryBased, getLibraryBasedCL, deletePublishExtras, addDebugLog, checkLibraryAndArchives, checkJWTExpiration, getConfigDefaults } from '../../util.js';
 
 import { publishLib, listLibJSONResponse, deleteLibVersion } from '@pega/constellation-dx-components-build-utils/index.js';
-import { default as buildLibrary } from '../build-lib/index.js';
 
 import { getLibraryVersionQuestion } from './helper.js';
 
@@ -99,7 +98,6 @@ addDebugLog("zipLibraryComponent", `libraryName: ${libraryName}, libraryVersion:
     archive.file(localizationsJson, { name: path.basename(localizationsJson) });
   }
 
-
   await archive.finalize();
 
   const zipBuffer = Buffer.concat(zipChunks);
@@ -140,13 +138,6 @@ addDebugLog("publishComponentToServer", `data: ${data}`, "");
   if (isLaunchpad) {
     // currently no launchpad records to rule resolve a library
 
-    // apiBody = {
-    //   type: 'CustomComponent',
-    //   zipContent,
-    //   componentName: JSON.parse(configContent).componentKey,
-    //   pxUpdateDateTime: '',
-    //   environmentID: defaultPegaServerConfig.isolationId
-    // };
   } else {
     apiBody = {
       configContent,
@@ -257,20 +248,12 @@ addDebugLog("publishComponentToServer", `data: ${data}`, "");
 export const publishUILibraryComponentToInfinity = async (content) => {
 addDebugLog("publishUILibraryComponentToInfinity", `content: ${content}`, "");
 
-  // const compDef =  getConfigDefaults();
-  // const organization = compDef.organization;
-  // const library = compDef.library;
-  // const version = compDef.buildVersion;
-  // // const currentOrgLib = organization.concat('_').concat(library);
-  // const currentOrgLib = compDef.currentOrgLib;
-
   console.log(chalk.green(`Publishing ${content.libraryName}/${content.version} to server...`));
 
   const fromZip = await zipLibraryComponent(content.libraryName, content.version);
 
   content = {  ...fromZip, ...content };
 
-  // console.log(content);
   try {
     await publishComponentLibraryToServer(content, true );
     // console.log(chalk.green.bold(`Success: Published ${content.libraryName}/${content.version} to server as a CL.`));
@@ -318,9 +301,6 @@ addDebugLog("publishLib", "services call", "");
   await publishLib(libraryName, version, tokenAndStaticServer.C11NB2S, tokenAndStaticServer.appStaticContentServer);
 addDebugLog("deleteLib", "services end", "");
 
-
-
-
 }
 
 
@@ -375,7 +355,6 @@ addDebugLog("publishLibrary", "", "+");
     const orgLib = getConfigDefaults();
     library = orgLib.library;
     organization = orgLib.organization;
-    // libraryName = `${organization}_${library}`;
     libraryName = orgLib.currentOrgLib;
 
     version = orgLib.buildVersion;
@@ -394,8 +373,6 @@ addDebugLog("publishLibrary", "", "+");
     const compDef =  getConfigDefaults();
     organization = compDef.organization;
     library = compDef.library;
-
-    // libraryName = `${organization}_${library}`;
     libraryName = compDef.currentOrgLib;
 
     try {

package/src/tasks/rename/index.js

@@ -7,7 +7,15 @@ import inquirer from 'inquirer';
 import ncp from 'ncp';
 import chalk from 'chalk';
 
-import { checkPathAccess, showVersion, getComponentsObj, getDirectoryFiles, addDebugLog, checkLibraryAndArchives, getConfigDefaults, getLibraryBased } from '../../util.js';
+import {
+  checkPathAccess,
+  showVersion,
+  getComponentsObj,
+  getDirectoryFiles,
+  addDebugLog,
+  checkLibraryAndArchives,
+  getConfigDefaults,
+  getLibraryBased } from '../../util.js';
 import { TASKS_CONFIG_JSON_FILENAME, COMPONENTS_DIRECTORY_PATH, COMPONENTS_PATH } from '../../constants.js';
 
 

package/src/tasks/restore/index.js

@@ -34,14 +34,25 @@ addDebugLog("restoreComponent", "", "+");
   console.log(chalk.bold.yellow('\nChanges not saved to local storage will be LOST, code will be restored from local storage.'));
   console.log("");
 
-  const restoreFromStore = await inquirer.prompt([
-    {
-      name: 'confirmRestore',
-      type: 'confirm',
-      message: `Restoring ${chalk.bold.green(`${confDef.displayLibVersion}`)} from local storage, proceed ?`,
-      default: true
-    }
-  ]);
+  let restoreFromStore = {};
+
+  if (options.params.length === 4) {
+    const optConfirm = options.params[3];
+    restoreFromStore["confirmRestore"] = optConfirm === 'Y' || optConfirm === 'y' || optConfirm === true || optConfirm === 'true' ? true : false;
+  }
+  else {
+    restoreFromStore = await inquirer.prompt([
+      {
+        name: 'confirmRestore',
+        type: 'confirm',
+        message: `Restoring ${chalk.bold.green(`${confDef.displayLibVersion}`)} from local storage, proceed ?`,
+        default: true
+      }
+    ]);
+  }
+
+
+
 
   if (restoreFromStore.confirmRestore) {
     const switchToFileName = `${confDef.currentOrgLib}_${confDef.version}.arch.zip`;
@@ -50,7 +61,6 @@ addDebugLog("restoreComponent", "", "+");
         {
           title: `Restoring ${confDef.displayLibVersion}`,
           task: async () => {
-            // await zipVersionAndArchive(confDef.currentOrgLib, confDef.buildVersion);
             await restoreFromArchive(switchToFileName, confDef.currentOrgLib, confDef.version);
           }
         }
@@ -69,10 +79,6 @@ addDebugLog("restoreComponent", "", "+");
     await showCurrentStatus();
   }
 
-
-
-
-
 addDebugLog("restoreComponent", "", "-");
 
 };

package/src/tasks/set-perm/index.js

@@ -1,5 +1,3 @@
-import fs from 'fs';
-import path from 'path';
 import inquirer from 'inquirer';
 import chalk from 'chalk';
 

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

@@ -1,8 +1,4 @@
-import fs from 'fs';
-import path from 'path';
-
 import chalk from 'chalk';
-
 import { showVersion, getLibraryBased, getLibraryBasedCL } from '../../util.js';
 
 export const showCurrentStatus = async () => {
@@ -116,7 +112,7 @@ export const showHelpV2 = (isCL) => {
 
   console.log(`\n${chalk.underline(`Notes`)}`);
   console.log(`The following commands will store existing version in storage before executing the command:`);
-  console.log(`${chalk.cyan(`createLib, switchLib, createLibVersion, switchLibVersion, publishLibVersion, exportLibVersion`)}`);
+  console.log(`${chalk.cyan(`createLib, switchLib, createLibVersion, switchLibVersion, publishLibVersion, exportLibVersion, storeLibVersion`)}`);
   console.log(`\nWhen editing in an IDE, always ${chalk.yellow("SAVE")} changes to components before doing a library/version context switch`);
   console.log(`or changes will be lost!`);
   console.log(`\nStoring is to LOCAL storage and is not backed up.  You should export your library/versions archives to ${chalk.yellow("git")}`);

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

@@ -1,15 +1,20 @@
-import fs from 'fs';
-import path from 'path';
-
 import chalk from 'chalk';
 
-import { showVersion, getLibraryBased, addDebugLog, getConfigDefaults, getComponents, checkLibraryAndArchives, getLibraryBasedCL } from '../../util.js';
+import {
+  showVersion,
+  getLibraryBased,
+  getConfigDefaults,
+  getComponents,
+  checkLibraryAndArchives,
+  getPegaServerConfig,
+  getLibraryBasedCL } from '../../util.js';
 
 export const showCurrentStatus = async () => {
 
   const configDefaults = getConfigDefaults();
   const componentList = await getComponents();
   const isLibraryBasedCL = getLibraryBasedCL();
+  const pegaServer = await getPegaServerConfig();
 
   console.log("");
   console.log("\tCurrent status");
@@ -30,7 +35,15 @@ export const showCurrentStatus = async () => {
 
   console.log("");
 
-}
+  if (isLibraryBasedCL) {
+
+    console.log(`\tRuleSet:\t ${chalk.bold.green(`${pegaServer.rulesetName}`)}`);
+    console.log(`\tRuleSet Version: ${chalk.bold.green(`${pegaServer.rulesetVersion}`)}`);
+    console.log("");
+  }
+
+
+};
 
 
 export default async options => {
@@ -46,4 +59,4 @@ export default async options => {
 
 
 
-}
+};

package/src/tasks/store/index.js

@@ -1,9 +1,9 @@
 
 import { Listr } from 'listr2';
 import chalk from 'chalk';
+import inquirer from 'inquirer';
 
 import {
-
   showVersion,
   addDebugLog,
   checkLibraryAndArchives,
@@ -26,30 +26,51 @@ addDebugLog("storeComponents", "", "+");
     console.log(`Command only supported for ${chalk.bold.green('library mode')} components.`)
     process.exit();
   }
+  const confDef = getConfigDefaults();
+
 
   console.log(chalk.bold.yellow('\nBe sure to SAVE all changes before storing, or changes will NOT be stored.'));
 
+  let answers = {};
 
-  console.log("");
-  const confDef = getConfigDefaults();
-  const tasks = new Listr(
-    [
+  if (options.params.length === 4) {
+    const optConfirm = options.params[3];
+    answers["confirmStore"] = optConfirm === 'Y' || optConfirm === 'y' || optConfirm === true || optConfirm === 'true' ? true : false;
+  }
+  else {
+
+    answers = await inquirer.prompt([
       {
-        title: `Store ${confDef.displayLibVersion}`,
-        task: async () => {
-          await zipVersionAndArchive(confDef.currentOrgLib, confDef.buildVersion);
-        }
+        name: 'confirmStore',
+        type: 'confirm',
+        message: `Storing ${chalk.green(`${confDef.currentOrgLib}/${confDef.buildVersion}`)} to local storage, proceed ?`,
+        default: true
       }
-    ],
-    { concurrent: false, exitOnError: true }
-  );
+    ]);
+  }
 
-  await tasks.run().catch(err => {
-    console.log(chalk.bold.red(err.toString()));
-addDebugLog("storeComponents", "", "-");
-    process.exit(1);
-  });
-  console.log(chalk.greenBright('\nComponents Stored'));
+  if (answers.confirmStore) {
+    console.log("");
+
+    const tasks = new Listr(
+      [
+        {
+          title: `Store ${confDef.displayLibVersion}`,
+          task: async () => {
+            await zipVersionAndArchive(confDef.currentOrgLib, confDef.buildVersion);
+          }
+        }
+      ],
+      { concurrent: false, exitOnError: true }
+    );
+
+    await tasks.run().catch(err => {
+      console.log(chalk.bold.red(err.toString()));
+  addDebugLog("storeComponents", "", "-");
+      process.exit(1);
+    });
+    console.log(chalk.greenBright('\nComponents Stored'));
+  }
 
 addDebugLog("storeComponents", "", "-");
 

package/src/tasks/switch-lib/helper.js

@@ -8,7 +8,6 @@ import {
   getComponents,
   getPegaServerConfig,
   updateConfigVersion,
-  getLibraryArchiveDirectories,
   getLibraryArchivesVersions,
   addDebugLog,
   getConfigDefaults

package/src/tasks/validator/index.js

@@ -318,8 +318,10 @@ export default async (option) => {
 // addDebugLog("validate","", "");
 
   let componentToValidate = null;
+  let throwTheError = false;
   if (option.params && option.params[3]) {
     componentToValidate = option.params[3];
+    throwTheError = true;
   } else if (option && option.task === 'validateSchema') {
     const localComponents = await getComponents();
     const answer = await inquirer.prompt({
@@ -332,8 +334,10 @@ export default async (option) => {
     componentToValidate = answer.component;
   } else if (option.name) {
     componentToValidate = option.value;
+    throwTheError = true;
   } else {
     componentToValidate = option;
+    throwTheError = true;
   }
 
   const componentDirectory = await getComponentDirectoryPath(componentToValidate);
@@ -369,13 +373,14 @@ export default async (option) => {
       componentToValidate &&
       !/^[A-Za-z0-9]+_[A-Za-z0-9]+_[A-Za-z0-9]+$/.test(componentToValidate)
     ) {
-      const ootbComponents = await getOOTBComponents();
-      if (ootbComponents.includes(componentToValidate)) {
-        throw new Error(`Invalid: Error occurred in validating ${componentToValidate}`);
-      }
-    }
 
+      if (throwTheError) {
+        throw new Error (`${chalk.redBright(`Error: Invalid name of component '${componentToValidate}' .\n Component name (and component folder) MUST be of the form: 'Org_Lib_ComponentName'.`)}`);
 
+      }
+      console.log(`${chalk.redBright(`Error: Invalid name of component '${componentToValidate}' .\n Component name (and component folder) MUST be of the form: 'Org_Lib_ComponentName'.`)}`);
+      process.exit(1);
+    }
 
     console.log(`${chalk.bold.green(componentToValidate)} schema is valid`);
   } else {