@pega/custom-dx-components 0.242.26 → 0.242.28

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

@@ -1,37 +1,11 @@
 import inquirer from 'inquirer';
 import chalk from 'chalk';
 
-import {showVersion, getC11NB2STokenAndStaticServer, getLocalLibraryVersions, getLocalLibraryVersionData, getLibraryBased, addDebugLog } from '../../util.js';
+import {showVersion, getLibraryBased, addDebugLog, checkLibraryAndArchives, getLibraryArchivesVersions, getConfigDefaults, getLocalArchivedLibrraryVersionData, getComponentsConfigs } from '../../util.js';
+import { getArchiveLibraryQuestions } from './helper.js';
 
-import { listLibJSONResponse } from '@pega/constellation-dx-components-build-utils/index.js';
+const isLibraryBased =  getLibraryBased();
 
-import { getListLibraryQuestions, getLibraryVersionQuestion, getOrgLib, SOURCE_OF_COMPONENT_TYPES } from './helper.js';
-
-const isLibraryBased = await getLibraryBased();
-
-export const getServerLibraryVersions = async(libraryName) => {
-addDebugLog("getServerLibraryVersions", `libraryName: ${libraryName}`, "");
-
-    // server
-    const tokenAndStaticServer = await getC11NB2STokenAndStaticServer();
-
-    if (tokenAndStaticServer.C11NB2S === undefined) {
-      console.log(chalk.redBright("Need to authenticate, missing services token.\nDeleting a library requires authentication to acquire a token to delete."));
-      process.exit(1);
-    }
-
-addDebugLog("listLibJSONResponse", "services call", "");
-  const oLibList = await listLibJSONResponse(tokenAndStaticServer.C11NB2S, tokenAndStaticServer.appStaticContentServer);
-addDebugLog("listLibJSONResponse", "services end", "");
-
-  let versionList = null;
-  if (oLibList && oLibList[libraryName]) {
-    versionList = oLibList[libraryName];
-  }
-
-  return versionList;
-
-}
 
 export default async (options) => {
 
@@ -41,128 +15,112 @@ export default async (options) => {
   }
 
   await showVersion();
+  await checkLibraryAndArchives();
 addDebugLog("listLibrary", "", "+");
 
   let sourceOfLibrary;
   let organization;
   let library;
 
-  const compDef = await getOrgLib();
+  const compDef = getConfigDefaults();
   organization = compDef.organization;
   library = compDef.library;
-  const libraryName = organization.concat("_").concat(library);
+  let libraryName;
+  const currnetVersion = compDef.buildVersion;
   let selectedVersion;
   let libVersions = [];
 
   if (options.params.length >= 5) {
-    sourceOfLibrary = options.params[3];
-    selectedVersion = options.params[4];
+    // sourceOfLibrary = options.params[3];
+    // selectedVersion = options.params[4];
 
-    libVersions.push(selectedVersion);
+    // libVersions.push(selectedVersion);
 
   }
-  else {
 
-    const questions = await getListLibraryQuestions(libraryName);
-    const answers = await inquirer.prompt(questions);
-    ({ sourceOfLibrary } = answers);
+  const questions = await getArchiveLibraryQuestions();
+  const answers = await inquirer.prompt(questions);
+  ({ libraryName } = answers);
 
+  try {
+    libVersions = await getLibraryArchivesVersions(libraryName, "");
   }
+  catch (ex) {}
 
-  if (sourceOfLibrary === SOURCE_OF_COMPONENT_TYPES.LOCAL ) {
-    // local
 
-    if (libVersions.length == 0) {
-      try {
-        libVersions = await getLocalLibraryVersions(libraryName);
-      }
-      catch (ex) {
-      }
+  if (libVersions.length > 0) {
 
-    }
+      if (selectedVersion === undefined) {
+        const libAnswers = await inquirer.prompt([
 
-    if (libVersions.length > 0) {
+          {
+            name: 'libVersion',
+            type: 'rawlist',
+            message: 'Enter version',
+            choices: libVersions
+          },
+        ]);
 
-        if (selectedVersion === undefined) {
-          const libAnswers = await inquirer.prompt([
+        selectedVersion = libAnswers.libVersion;
+      }
 
-            {
-              name: 'libVersion',
-              type: 'rawlist',
-              message: 'Enter version',
-              choices: libVersions
-            },
-          ]);
+      let data;
+      // get built on from first component if exists
+      let builtOn = "(date unavailable)";
 
-          selectedVersion = libAnswers.libVersion;
+      if (libraryName === compDef.currentOrgLib && selectedVersion === compDef.buildVersion) {
+
+        console.log("\nYou've selected the current working library/version.");
+        console.log("You can list current components or the last archive of this library/version.");
+        const archAnswers = await inquirer.prompt([
+          {
+            name: 'currentOrArchive',
+            type: 'rawlist',
+            message: 'Select current or archive',
+            default: "Current",
+            choices: ["Current", "Archive"]
+          },
+        ]);
+
+        const currentOrArchive = archAnswers.currentOrArchive;
+
+        if (currentOrArchive === "Current") {
+          data = await getComponentsConfigs();
+          builtOn = "(no date - current)";
         }
+        else {
+          data = await getLocalArchivedLibrraryVersionData(libraryName, selectedVersion);
+          data = JSON.parse(data);
 
-        let data = await getLocalLibraryVersionData(libraryName, selectedVersion);
+          if (data[0] && data[0].buildDate) {
+            builtOn = data[0].buildDate;
+          }
+        }
+
+      }
+      else {
+        data = await getLocalArchivedLibrraryVersionData(libraryName, selectedVersion);
         data = JSON.parse(data);
 
-        // get built on from first component if exists
-        let builtOn = "(date unavailable)";
         if (data[0] && data[0].buildDate) {
           builtOn = data[0].buildDate;
         }
-
-        let libData = data.map((component) => ( {'Component': component.name, 'Label': component.label, 'Version': component.version, 'Type': component.type, 'Sub Type' : component.subtype}));
-        console.log(chalk.bold.blueBright(`\nList of ${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 build library: ${libraryName} first.`));
-addDebugLog("listLibrary", "END", "-");
-      process.exit(1);
-
-    }
-
-  }
-  else {
-    const libVersions = await getServerLibraryVersions(libraryName);
-
-    if (libVersions) {
-      const keys = Object.keys(libVersions);
-      const libAnswers = await inquirer.prompt([
-
-        {
-          name: 'libVersion',
-          type: 'rawlist',
-          message: 'Enter version',
-          choices: keys
-        },
-      ]);
-
-      const selectedVersion = libAnswers.libVersion;
-
-      const versionData = libVersions[selectedVersion];
-      const data = JSON.parse(versionData);
-
-      // get built on from first component if exists
-      let builtOn = "(date unavailable)";
-      if (data[0] && data[0].buildDate) {
-        builtOn = data[0].buildDate;
       }
 
       let libData = data.map((component) => ( {'Component': component.name, 'Label': component.label, 'Version': component.version, 'Type': component.type, 'Sub Type' : component.subtype}));
       console.log(chalk.bold.blueBright(`\nList of ${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 server library named: ${libraryName} exists.`));
-      console.log(chalk.redBright(`You need to build library: ${libraryName} and publish this library.`));
+  }
+  else {
+    // No library with that name
+    console.log(chalk.redBright(`No other library versions for ${libraryName} exist other than current library version.`));
+    console.log(chalk.redBright(`To see contents for the currnet library version, enter 'npm run list'.`));
 addDebugLog("listLibrary", "END", "-");
-      process.exit(1);
-
-    }
-
+    process.exit();
   }
 
+
 addDebugLog("listLibrary", "END", "-");
 
   return true;

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

@@ -0,0 +1,42 @@
+import chalk from 'chalk';
+
+import {
+  getPegaServerConfig,
+  addDebugLog
+} from '../../util.js';
+
+export const SOURCE_OF_COMPONENT_TYPES = {
+  SERVER: 'Server',
+  LOCAL: 'Local'
+};
+
+
+export const getListLibraryQuestions = async (libraryName)  => {
+addDebugLog("getListLibraryQuestions", `libraryName: ${libraryName}`, "");
+  const defaultPegaConfig = await getPegaServerConfig();
+
+
+  return [
+    {
+      name: 'sourceOfLibrary',
+      type: 'rawlist',
+      message: `List library ${chalk.bold.green(`${libraryName}`)} from Server or Local ?`,
+      choices: Object.values(SOURCE_OF_COMPONENT_TYPES),
+      default: defaultPegaConfig.sourceOfComponents,
+    }
+  ];
+};
+
+
+export const getLibraryVersionQuestion = async(libraryName, libVersions) => {
+addDebugLog("getLibraryVersionQuestion", `libraryName: ${libraryName}, libVersions: ${libVersions}`, "");
+    return [
+      {
+        name: 'version',
+        type: 'rawlist',
+        message: `Select ${chalk.green.bold(`${libraryName}`)} library version (or ALL) to delete`,
+        choices: libVersions
+      }
+    ];
+
+}

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

@@ -0,0 +1,170 @@
+import inquirer from 'inquirer';
+import chalk from 'chalk';
+
+import {showVersion, getC11NB2STokenAndStaticServer, getLocalLibraryVersions, getLocalLibraryVersionData, getLibraryBased, addDebugLog, checkLibraryAndArchives, getConfigDefaults } from '../../util.js';
+
+import { listLibJSONResponse } from '@pega/constellation-dx-components-build-utils/index.js';
+
+import { getListLibraryQuestions, SOURCE_OF_COMPONENT_TYPES } from './helper.js';
+
+const isLibraryBased =  getLibraryBased();
+
+export const getServerLibraryVersions = async(libraryName) => {
+addDebugLog("getServerLibraryVersions", `libraryName: ${libraryName}`, "");
+
+    // server
+    const tokenAndStaticServer = await getC11NB2STokenAndStaticServer();
+
+    if (tokenAndStaticServer.C11NB2S === undefined) {
+      console.log(chalk.redBright("Need to authenticate, missing services token.\nDeleting a library requires authentication to acquire a token to delete."));
+      process.exit(1);
+    }
+
+addDebugLog("listLibJSONResponse", "services call", "");
+  const oLibList = await listLibJSONResponse(tokenAndStaticServer.C11NB2S, tokenAndStaticServer.appStaticContentServer);
+addDebugLog("listLibJSONResponse", "services end", "");
+
+  let versionList = null;
+  if (oLibList && oLibList[libraryName]) {
+    versionList = oLibList[libraryName];
+  }
+
+  return versionList;
+
+}
+
+export default async (options) => {
+
+  if (!isLibraryBased) {
+    console.log(`Command only supported for ${chalk.bold.green('library based')} components.`)
+    process.exit();
+  }
+
+  await showVersion();
+  await checkLibraryAndArchives();
+addDebugLog("listPublished", "", "+");
+
+  let sourceOfLibrary;
+  let organization;
+  let library;
+
+  const compDef = getConfigDefaults();
+  organization = compDef.organization;
+  library = compDef.library;
+  const libraryName = compDef.currentOrgLib;
+  let selectedVersion;
+  let libVersions = [];
+
+  if (options.params.length >= 5) {
+    sourceOfLibrary = options.params[3];
+    selectedVersion = options.params[4];
+
+    libVersions.push(selectedVersion);
+
+  }
+  else {
+
+    const questions = await getListLibraryQuestions(libraryName);
+    const answers = await inquirer.prompt(questions);
+    ({ sourceOfLibrary } = answers);
+
+  }
+
+  if (sourceOfLibrary === SOURCE_OF_COMPONENT_TYPES.LOCAL ) {
+    // local
+
+    if (libVersions.length == 0) {
+      try {
+        libVersions = await getLocalLibraryVersions(libraryName);
+      }
+      catch (ex) {
+      }
+
+    }
+
+    if (libVersions.length > 0) {
+
+        if (selectedVersion === undefined) {
+          const libAnswers = await inquirer.prompt([
+
+            {
+              name: 'libVersion',
+              type: 'rawlist',
+              message: 'Enter version',
+              choices: libVersions
+            },
+          ]);
+
+          selectedVersion = libAnswers.libVersion;
+        }
+
+        let data = await getLocalLibraryVersionData(libraryName, selectedVersion);
+        data = JSON.parse(data);
+
+        // get built on from first component if exists
+        let builtOn = "(date unavailable)";
+        if (data[0] && data[0].buildDate) {
+          builtOn = data[0].buildDate;
+        }
+
+        let libData = data.map((component) => ( {'Component': component.name, 'Label': component.label, 'Version': component.version, 'Type': component.type, 'Sub Type' : component.subtype}));
+        console.log(chalk.bold.blueBright(`\nList of ${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 {
+    const libVersions = await getServerLibraryVersions(libraryName);
+
+    if (libVersions) {
+      const keys = Object.keys(libVersions);
+      const libAnswers = await inquirer.prompt([
+
+        {
+          name: 'libVersion',
+          type: 'rawlist',
+          message: 'Enter version',
+          choices: keys
+        },
+      ]);
+
+      const selectedVersion = libAnswers.libVersion;
+
+      const versionData = libVersions[selectedVersion];
+      const data = JSON.parse(versionData);
+
+      // get built on from first component if exists
+      let builtOn = "(date unavailable)";
+      if (data[0] && data[0].buildDate) {
+        builtOn = data[0].buildDate;
+      }
+
+      let libData = data.map((component) => ( {'Component': component.name, 'Label': component.label, 'Version': component.version, 'Type': component.type, 'Sub Type' : component.subtype}));
+      console.log(chalk.bold.blueBright(`\nList of ${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 server library named: ${libraryName} exists.`));
+      console.log(chalk.redBright(`You need to publish library: ${libraryName} first.`));
+addDebugLog("listPublished", "END", "-");
+      process.exit(1);
+
+    }
+
+  }
+
+addDebugLog("listLibrary", "END", "-");
+
+  return true;
+};

package/src/tasks/promote-webpack/index.js

@@ -21,7 +21,7 @@ import {
   BUILDER_DIR_FILE_PATH
 } from '../../constants.js';
 
-const isLibraryBased = await getLibraryBased();
+const isLibraryBased = getLibraryBased();
 
 
 export const copyWebPack = async () => {

package/src/tasks/publish/helper.js

@@ -177,64 +177,64 @@ addDebugLog("publishComponentToServer", `data: ${data}`, "");
           // refresh_token: refreshToken
         } = JSON.parse(OauthData);
         let status = 500;
-        const headers = {
-          Authorization: `${tokenType} ${accessToken}`
-        };
+        let headers = {};
 
         if (isLaunchpad) {
           headers.cookie = `Pega-AAT=${accessToken}`;
           headers['Content-Type'] = 'application/json';
+        } else {
+          headers.Authorization = `${tokenType} ${accessToken}`;
         }
 
-        fetch(url, {
+        const response = await fetch(url, {
           method: 'POST',
           agent: getHttpsAgent(defaultPegaConfig),
           headers,
           body: JSON.stringify(apiBody)
-        })
-          .then(response => {
-            status = response.status;
-            return response.text();
-          })
-          .then(resp => {
-            const respData = isLaunchpad ? resp : JSON.parse(resp);
-            if (status === 401) {
-              throw new Error(
-                'Error occurred in authentication. Please regenerate using authenticate'
-              );
-              // console.log(accessTokenUri, refreshToken);
-              /* TODO - Handle refresh_token */
-            } else if (status === 200 || status === 201) {
-              console.log(
-                chalk.bold.green(`Success : ${isLaunchpad ? respData : respData.message}`)
-              );
-            } else {
-              throw new Error(`${respData.message}`);
-            }
-          })
-          .catch(e => {
-            if (e.code === 'ECONNREFUSED' || status === 401) {
-              // eslint-disable-next-line prefer-promise-reject-errors
-              Promise.reject(
-                `${chalk.bold.red(
-                  'Error occurred in authentication. Please regenerate using authenticate'
-                )}`
-              );
-            } else if (status === 403) {
-              // eslint-disable-next-line prefer-promise-reject-errors
-              Promise.reject(
-                `${chalk.bold.red('Error forbidden: User does not have privileges to Publish.')}`
-              );
-            } else {
-              // eslint-disable-next-line prefer-promise-reject-errors
-              Promise.reject(`${chalk.bold.red(e)}`);
-            }
-          });
+        });
+
+        status = response.status;
+        if (!response.ok) {
+          if (status === 401) {
+            throw new Error(
+              'Error occurred in authentication. Please regenerate using authenticate'
+            );
+            // console.log(accessTokenUri, refreshToken);
+            /* TODO - Handle refresh_token */
+          } else if (status === 404) {
+            throw new Error('404: Server resource not found');
+          } else if (status === 405) {
+            throw new Error('405: Server method not allowed');
+          } else if (status === 408) {
+            throw new Error('408: Server timed out');
+          } else if (response.status === 403) {
+            throw new Error('Error forbidden: User does not have privileges to Publish.');
+          }
+        }
+
+        try {
+          const respData = isLaunchpad ? await response.text() : await response.json();
+          console.log(chalk.bold.green(`Success : ${isLaunchpad ? respData : respData.message}`));
+
+          if (status === 500) {
+            status = 999;
+            throw new Error(respData.message);
+          }
+        } catch (err) {
+          if (status === 500) {
+            throw new Error(
+              `Error occurred in authentication. Please regenerate using authenticate`
+            );
+          } else if (status === 999) {
+            throw new Error(err);
+          }
+        }
       } else {
         throw new Error(`Error occurred in authentication. Please regenerate using authenticate`);
       }
     } catch (err) {
-      throw new Error(`Error occurred in authentication. Please regenerate using authenticate`);
+      // throw new Error(`Error occurred in authentication. Please regenerate using authenticate`);
+      throw new Error(err);
     }
   }
 };

package/src/tasks/publish/index.js

@@ -5,19 +5,74 @@ import chalk from 'chalk';
 import validate from '../validator/index.js';
 import bundleComponent from '../bundle/index.js';
 import { lintComponent } from '../linter/index.js';
-import { getComponentDirectoryPath, showVersion, getLibraryBased, addDebugLog } from '../../util.js';
+import { getComponentDirectoryPath, showVersion, getLibraryBased, addDebugLog, getPegaServerConfig, updateServerConfigRuleSetAndVersion, checkLibraryAndArchives, getConfigDevBuild, checkJWTExpiration, getConfigDefaults } from '../../util.js';
 
 import { getPublishComponentQuestions, publishComponentToServer, zipComponent } from './helper.js';
+import { default as buildLibrary } from '../build-lib/index.js';
+import { default as publishLibrary } from '../publish-lib/index.js';
 
-const isLibraryBased = await getLibraryBased();
+const isLibraryBased = getLibraryBased();
 
 export default async options => {
+
+  await showVersion();
+  await checkLibraryAndArchives();
+
   if (isLibraryBased) {
-    console.log(`Command only supported for ${chalk.bold.green('non library based')} components.`)
-    process.exit();
+
+    await checkJWTExpiration();
+
+    const devBuild = await getConfigDevBuild();
+    let okToPublish = false;
+
+    const orgLib =  getConfigDefaults();
+    const currentOrgLib = orgLib.currentOrgLib;
+    // const currentVersion = devBuild ? `${orgLib.version}-dev`: orgLib.version;
+    const currentVersion = orgLib.buildVersion;
+
+
+
+    const publishThisVersion = await inquirer.prompt([
+      {
+        name: 'confirmPublish',
+        type: 'confirm',
+        message: `Publish ${chalk.bold.green(`${orgLib.displayLibVersion}`)}, proceed ?`,
+        default: true
+      }
+    ]);
+
+    if (publishThisVersion.confirmPublish) {
+      okToPublish = true;
+    }
+
+    if (okToPublish && !devBuild) {
+      okToPublish = false;
+      console.log("");
+      const publishAnswers = await inquirer.prompt([
+        {
+          name: 'confirmPublish',
+          type: 'confirm',
+          message: `You are about to publish a ${chalk.bold.yellow('PRODUCTION')} version which can ${chalk.bold.yellow('NOT')} be deleted, proceed ?`,
+          default: false
+        }
+      ]);
+      if (publishAnswers.confirmPublish) {
+        okToPublish = true;
+      }
+    }
+
+    if (okToPublish) {
+      // marking as intenral, so no questions will be ask
+      options.params.push("internal");
+
+      await buildLibrary(options);
+      await publishLibrary(options);
+    }
+
+    return true;
   }
 
-  await showVersion();
+
 
 addDebugLog("publish", "", "+");
 
@@ -27,6 +82,8 @@ addDebugLog("publish", "", "+");
   let content;
 
   let doFetch = true;
+  // const defaultPegaConfig = await getPegaServerConfig();
+  const componentDefaults = getConfigDefaults();
 
   if (options.params.length >= 7) {
     componentKey = options.params[3];
@@ -55,6 +112,11 @@ addDebugLog("publish", "", "+");
     };
   }
 
+  // update ruleset and version config for future
+  if (componentDefaults.serverType === "infinity") {
+    updateServerConfigRuleSetAndVersion(content.rulesetName, content.rulesetVersion);
+  }
+
   const sDevBuild = devBuild ? '(dev build)' : '';
   const tasks = new Listr(
     [
@@ -100,6 +162,9 @@ addDebugLog("publish", "", "+");
     console.log(chalk.bold.red(err.toString()));
   });
 
+
 addDebugLog("publish", "END", "-");
+
+
   return true;
 };