@pega/custom-dx-components 0.25.47 → 0.25.48

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pega/custom-dx-components",
-  "version": "0.25.47",
+  "version": "0.25.48",
   "description": "Utility for building custom UI components",
   "bin": "./bin/index.js",
   "scripts": {

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

@@ -97,7 +97,9 @@ export const updateAllMigrateToLibChanges = async() => {
 
   }
 
+  console.log();
   console.log(`${chalk.green(`>> Code base was upgraded.  You may still have some lint errors that need to be fixed manually.`)}`);
+  console.log(`${chalk.green(`>> Run ${chalk.bold(`npm run validateAll`)} to check for issues.`)}`);
 
 }
 

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

@@ -150,7 +150,7 @@ addDebugLog("deletePublished", "END", "-");
         // No library with that name
         const serverConfig = await getPegaServerConfig();
         console.log("");
-        console.log(chalk.redBright(`No server component libraries exist in current authenticated application.`));
+        console.log(chalk.redBright(`No server component libraries exist in current application ${chalk.redBright.bold(`${app_name} - ${app_version}`)}.`));
 
         addDebugLog("listPublished", "END", "-");
         process.exit(1);

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

@@ -382,19 +382,19 @@ export const importArch = async(filePath, fileName, hadArchive) => {
     if (hadArchive) {
 
       if (orgLibName === configDef.currentOrgLib && version === configDef.version) {
-        console.log(`\n${chalk.green(`${fileName}`)} has been imported!`);
+        console.log(`\n${chalk.bold.green(`${fileName}`)} has been imported!`);
         console.log(`It is the same library/version as your current source.`);
-        console.log(`--> You can retrieve and replace current source via ${chalk.green(`npm run restoreLibVersion`)}.`);
+        console.log(`--> You can retrieve and replace current source via ${chalk.bold.green(`npm run restoreLibVersion`)}.`);
         console.log("\n");
       }
       else if (orgLibName === configDef.currentOrgLib && version != configDef.version) {
-        console.log(`\n${chalk.green(`${fileName}`)} has been imported!`);
-        console.log(`--> You can switch to ${chalk.green(`${orgLibName}/${version}`)} via ${chalk.green(`npm run switchLibVersion`)}.`);
+        console.log(`\n${chalk.bold.green(`${fileName}`)} has been imported!`);
+        console.log(`--> You can switch to ${chalk.bold.green(`${orgLibName}/${version}`)} via ${chalk.bold.green(`npm run switchLibVersion`)}.`);
         console.log("\n");
       }
       else {
-        console.log(`\n${chalk.green(`${fileName}`)} has been imported!`);
-        console.log(`--> You can switch to ${chalk.green(`${orgLibName}/${version}`)} via ${chalk.green(`npm run switchLib`)}.`);
+        console.log(`\n${chalk.bold.green(`${fileName}`)} has been imported!`);
+        console.log(`--> You can switch to ${chalk.bold.green(`${orgLibName}/${version}`)} via ${chalk.bold.green(`npm run switchLib`)}.`);
         console.log("\n");
       }
 
@@ -595,19 +595,19 @@ addDebugLog("importArch", `filePath: ${filePath}, fileName: ${fileName}`, "");
 
   if (hadArchive) {
       if (orgLibName === configDef.currentOrgLib && version === configDef.version) {
-        console.log(`\n${chalk.green(`${fileName}`)} has been imported!`);
+        console.log(`\n${chalk.bold.green(`${fileName}`)} has been imported!`);
         console.log(`It is the same library/version as your current source.`);
-        console.log(`--> You can retrieve and replace current source via ${chalk.green(`npm run restoreLibVersion`)}.`);
+        console.log(`--> You can retrieve and replace current source via ${chalk.bold.green(`npm run restoreLibVersion`)}.`);
         console.log("\n");
       }
       else if (orgLibName === configDef.currentOrgLib && version != configDef.version) {
-        console.log(`\n${chalk.green(`${fileName}`)} has been imported!`);
-        console.log(`--> You can switch to ${chalk.green(`${orgLibName}/${version}`)} via ${chalk.green(`npm run switchLibVersion`)}.`);
+        console.log(`\n${chalk.bold.green(`${fileName}`)} has been imported!`);
+        console.log(`--> You can switch to ${chalk.bold.green(`${orgLibName}/${version}`)} via ${chalk.bold.green(`npm run switchLibVersion`)}.`);
         console.log("\n");
       }
       else {
-        console.log(`\n${chalk.green(`${fileName}`)} has been imported!`);
-        console.log(`--> You can switch to ${chalk.green(`${orgLibName}/${version}`)} via ${chalk.green(`npm run switchLib`)}.`);
+        console.log(`\n${chalk.bold.green(`${fileName}`)} has been imported!`);
+        console.log(`--> You can switch to ${chalk.bold.green(`${orgLibName}/${version}`)} via ${chalk.bold.green(`npm run switchLib`)}.`);
         console.log("\n");
       }
 

package/src/tasks/init/template/package.json.mustache

@@ -108,7 +108,7 @@
     "@babel/preset-react": "^7.27.1",
     "@babel/preset-typescript": "^7.27.1",
     "@pega/configs": "^0.16.3",
-    "@pega/custom-dx-components": "~0.25.47",
+    "@pega/custom-dx-components": "~0.25.48",
     "@pega/pcore-pconnect-typedefs": "^4.1.0-alpha.1",
     "@storybook/addon-actions": "^8.6.14",
     "@storybook/addon-essentials": "^8.6.14",

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

@@ -162,6 +162,7 @@ addDebugLog("listPublished", "", "+");
     const isLibraryBasedCL =  getLibraryBasedCL();
     if (isLibraryBasedCL) {
       const arLibs = await getInfinityLibraries();
+      const {app_name, app_version } = await getApplicationAndVersionFromToken();
 
       if (arLibs && arLibs.pxResults && arLibs.pxResults.length > 0) {
 
@@ -169,7 +170,7 @@ addDebugLog("listPublished", "", "+");
         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(`List of libraries (including built on) for Application: ${chalk.bold.green(`${app_name} - ${app_version}`)}`);
@@ -207,7 +208,7 @@ addDebugLog("listPublished", "", "+");
       else {
         // No library with that name
         const serverConfig = await getPegaServerConfig();
-        console.log(chalk.redBright(`No server component libraries exist in authenticated application.`));
+        console.log(chalk.redBright(`No server component libraries exist in application ${chalk.redBright.bold(`${app_name} - ${app_version}`)}.`));
         // 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", "-");

package/src/tasks/publish/index.js

@@ -23,6 +23,7 @@ import {
   getInputConfigForCommand,
   convertYNToBoolean,
   checkForBranch,
+  getApplicationAndVersionFromToken,
   applyPegaData } from '../../util.js';
 
 import { getPublishComponentQuestions, publishComponentToServer, zipComponent } from './helper.js';
@@ -64,10 +65,13 @@ addDebugLog("publish", "", "+");
     const serverConfg = await getPegaServerConfig();
     let configJson = {};
     await applyPegaData(configJson);
+    const {app_name, app_version, sub } = await getApplicationAndVersionFromToken();
 
     console.log();
     console.log(`Publishing to server: ${chalk.green.bold(`${serverConfg.server}`)}`);
     console.log(`Cosmos version: ${chalk.green.bold(`${configJson.packageCosmosVersion}`)}`);
+    console.log(`Application: ${chalk.green.bold(`${app_name} - ${app_version}`)} for ${chalk.magentaBright.bold(`${sub}`)}`);
+    console.log();
 
     if (useInputConfig) {
       const inputConfig = await getInputConfigForCommand("publish");

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

@@ -8,7 +8,7 @@ import {
   checkLibraryAndArchives,
   getPegaServerConfig,
   getLibraryBasedCL,
-  applyPegaData } from '../../util.js';
+  getApplicationAndVersionFromToken } from '../../util.js';
 
 export const showCurrentStatus = async () => {
 
@@ -17,6 +17,7 @@ export const showCurrentStatus = async () => {
   const isLibraryBased = getLibraryBased();
   const isLibraryBasedCL = getLibraryBasedCL();
   const pegaServer = await getPegaServerConfig(true);
+  const { app_name, app_version } = await getApplicationAndVersionFromToken();
 
   console.log("");
   console.log("\tCurrent status");
@@ -33,7 +34,13 @@ export const showCurrentStatus = async () => {
     }
   }
 
-  console.log(`\tComponent count: ${chalk.bold.green(`${componentList.length}`)}`);
+  if (componentList.length === 0) {
+    console.log(`\tComponent count: ${chalk.bold.yellow(`${componentList.length}`)}`);
+  }
+  else {
+    console.log(`\tComponent count: ${chalk.bold.green(`${componentList.length}`)}`);
+  }
+
 
   console.log("");
 
@@ -42,10 +49,15 @@ export const showCurrentStatus = async () => {
   }
   else {
 
-    console.log(`\tPublish to:\t ${chalk.bold.green(`${pegaServer.server}`)} `);
-    // console.log("\t---------------------");
-    console.log(`\tRuleSet:\t ${chalk.bold.green(`${pegaServer.rulesetName}`)}`);
-    console.log(`\tRuleSet Version: ${chalk.bold.green(`${pegaServer.rulesetVersion}`)}`);
+    console.log(`\tPublish configuration`)
+    console.log(`\t  Server:\t ${chalk.bold.green(`${pegaServer.server}`)} `);
+    if (app_name === "**") {
+      console.log(`\t  Application:\t ${chalk.bold.yellow(`Need to authenticate`)}`);
+    }
+    else {
+      console.log(`\t  Application:\t ${chalk.bold.green(`${app_name} - ${app_version}`)}`);
+    }
+    console.log(`\t  Ruleset:\t ${chalk.bold.green(`${pegaServer.rulesetName}:`)}${chalk.bold.magenta(`${pegaServer.rulesetVersion}`)}`);
     console.log("");
   }
 

package/src/util.js

@@ -75,6 +75,7 @@ let defaultConfigs = {
   useInputConfig: false
 };
 
+
 let pegaConfig = null;
 let pegaData = null;
 let sPegaData;
@@ -407,9 +408,11 @@ export const checkJWTExpiration = async () => {
   const isLibraryBased = getLibraryBased();
   const isLibraryBasedCL = getLibraryBasedCL();
 
-  if (tokenAndStaticServer.C11NB2S === undefined) {
-    console.log(chalk.redBright("Need to authenticate, missing services token.\nBuilding a library requires authentication to acquire a token to build."));
-    process.exit(1);
+  if (!isLibraryBasedCL && isLibraryBased) {
+    if (tokenAndStaticServer.C11NB2S === undefined) {
+      console.log(chalk.redBright("Need to authenticate, missing services token.\nBuilding a library requires authentication to acquire a token to build."));
+      process.exit(1);
+    }
   }
 
   const jwt = jwtDecode(tokenAndStaticServer.C11NB2S);
@@ -444,26 +447,36 @@ export const checkAccessTokenExpiration = async() => {
   }
 
   const jwt = jwtDecode(tokenAndStaticServer.access_token);
-  const  { exp, customer_org } = jwt;
+  const  { exp, customer_org, sub, app_name, app_version, operator_access } = jwt;
+
+
   if (exp < (new Date().getTime() + 1) / 1000) {
     console.log(chalk.redBright("Authentication token has expired, please reauthenticate."));
     process.exit(1);
   }
 
 
+
 }
 
+
+
 export const getApplicationAndVersionFromToken = async() => {
   const tokenAndStaticServer = await getC11NB2STokenAndStaticServer();
 
   if (tokenAndStaticServer.access_token === undefined) {
-    console.log(chalk.redBright("Need to authenticate, missing token.\n"));
-    process.exit(1);
+    // console.log(chalk.redBright("Need to authenticate, missing token.\n"));
+    // process.exit(1);
+    const app_name = "**";
+    const app_version = "**";
+    const sub = "**";
+    const operator_access = "**";
+    return { app_name, app_version, sub, operator_access};
   }
 
   const jwt = jwtDecode(tokenAndStaticServer.access_token);
-  const { app_name, app_version } = jwt;
-  return { app_name, app_version };
+  const { app_name, app_version, sub, operator_access } = jwt;
+  return { app_name, app_version, sub, operator_access};
 
 }
 
@@ -767,7 +780,8 @@ if (showDebug) addDebugLog("restoreTopLevelConfigFiles", `directory: ${directory
 
   if (configFiles && configFiles.length > 0) {
     for (const configF of configFiles) {
-      if (configF !== "package-lock.json" && configF !== "package.json") {
+      // don't want to restore package, package-lock or an archive file
+      if (configF !== "package-lock.json" && configF !== "package.json" && (configF.indexOf(".zip") < 0) ) {
         fs.copyFileSync(join(tempDirectory, configF), join(directory, configF));
       }
     }
@@ -2261,8 +2275,12 @@ if (showDebug) addDebugLog("updateComponentTaskConfig", "", "");
   // restore ruleset and verion
   originalContentsData["server-config"].rulesetName = orgRuleset;
   originalContentsData["server-config"].rulesetVersion = orgRulesetVersion;
-  originalContentsData["server-config"].archiveRulesetName = orgArchiveRuleset;
-  originalContentsData["server-config"].archiveRulesetVersion = orgArchiveRulesetVersion;
+
+  // replace if exists
+  if (orgArchiveRuleset) {
+    originalContentsData["server-config"].archiveRulesetName = orgArchiveRuleset;
+    originalContentsData["server-config"].archiveRulesetVersion = orgArchiveRulesetVersion;
+  }
 
 
   // if we don't have a devServerPort, add the default