@pega/custom-dx-components 0.25.30 → 0.25.31

package/package.json

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

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

@@ -138,7 +138,7 @@ addDebugLog("deletePublished", "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(`No server component libraries exist in given ruleset ${chalk.bold(`${rulesetName}:${rulesetVersion}`)}`));
   addDebugLog("listPublished", "END", "-");
         process.exit(1);
 

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

@@ -24,13 +24,15 @@ import {
   unZipFromArchive,
   zipVersionAndArchive,
   getLibraryArchiveDirectories,
+  getHaveDependencyDifference,
   hasLibraryAndVersion,
   cleanUpTemp,
   hasArchives,
   restoreFromArchive,
   forceDefaultsUpdate,
   getUseInputConfig,
-  getInputConfigForCommand
+  getInputConfigForCommand,
+  getPegaServerConfig
  } from '../../util.js';
 import { TASKS_CONFIG_JSON_FILENAME, ARCHIVES_PATH, TEMP_PATH } from '../../constants.js';
 import { getFilePathQuestions, getFileNameQuestions, updateTempArchive, updateSavedFilePath, getServerOrDirectoryQuestion, getLibraryArchiveQuestion, getServerLibraryArchives, getServerLibraryArchive  } from './helper.js';
@@ -409,10 +411,13 @@ export const importArch = async(filePath, fileName, hadArchive) => {
       await forceDefaultsUpdate();
       await showCurrentStatus();
 
-      console.log('\n***************************************************************');
-      console.log(chalk.bold.yellow('Dependencies have changed between versions, recommend updating.'));
-      console.log(`>>> PLEASE run ${chalk.bold.yellow("'npm update'")}.`);
-      console.log('***************************************************************\n');
+      if (getHaveDependencyDifference()) {
+        console.log('\n***************************************************************');
+        console.log(chalk.bold.yellow('Dependencies have changed between versions, recommend updating.'));
+        console.log(`>>> PLEASE run ${chalk.bold.yellow("'npm update'")}.`);
+        console.log('***************************************************************\n');
+      }
+
     }
 
 
@@ -604,10 +609,13 @@ addDebugLog("importArch", `filePath: ${filePath}, fileName: ${fileName}`, "");
     await forceDefaultsUpdate();
     await showCurrentStatus();
 
-    console.log('\n***************************************************************');
-    console.log(chalk.bold.yellow('Dependencies have changed between versions, recommend updating.'));
-    console.log(`>>> PLEASE run ${chalk.bold.yellow("'npm update'")}.`);
-    console.log('***************************************************************\n');
+    if (getHaveDependencyDifference()) {
+      console.log('\n***************************************************************');
+      console.log(chalk.bold.yellow('Dependencies have changed between versions, recommend updating.'));
+      console.log(`>>> PLEASE run ${chalk.bold.yellow("'npm update'")}.`);
+      console.log('***************************************************************\n');
+    }
+
   }
 
 
@@ -749,6 +757,9 @@ export default async options => {
 
         if (archiveVersions && archiveVersions.pxResults.length > 0) {
           // ALL option
+          const defaultPegaServerConfig = await getPegaServerConfig();
+
+          console.log(`\nRetrieved archives from server ${chalk.bold.green(`${defaultPegaServerConfig.server}`)}.`)
 
           // to name value pairs
           const archiveResults = archiveVersions["pxResults"].map( archive => ( { value: `${archive.pyApplicationName},${archive.pyFileName},${archive.pyFileType},${archive.pyRuleSet},${archive.pyRuleSetVersion}`, name: `${archive.pyLabel}, ${archive.pyRuleSet}:${archive.pyRuleSetVersion}` }) );

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

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

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

@@ -162,7 +162,10 @@ addDebugLog("listPublished", "END", "-");
 
 
         const {app_name, app_version } = await getApplicationAndVersionFromToken();
-        console.log(chalk.green(`\nList of libraries for Application: ${chalk.bold.green(`${app_name} - ${app_version}`)}\n`));
+        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}`)}`);
 
 
         const libAnswers = await inquirer.prompt([

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

@@ -84,9 +84,6 @@ addDebugLog("copyWebPack","", "");
   }
 
 
-
-
-
 }
 
 

package/src/tasks/publish/index.js

@@ -119,6 +119,8 @@ addDebugLog("publish", "", "+");
         // };
         options.params.push(answers.rulesetName);
         options.params.push(answers.rulesetVersion);
+
+        updateServerConfigRuleSetAndVersion(answers.rulesetName, answers.rulesetVersion);
       }
     }
 

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

@@ -158,6 +158,7 @@ export default async (orgLibName, selectedVersion) => {
 
       const archiveFileName = `${orgLibName}_${selectedVersion}.arch.zip`;
       const archiveDirectory = join (mainDirectory, ARCHIVES_PATH, `${orgLibName}`, `${selectedVersion}`);
+      const defaultPegaConfig = await getPegaServerConfig();
       if (fs.existsSync(archiveDirectory)) {
         const archiveFile = join(archiveDirectory, archiveFileName);
 
@@ -170,7 +171,7 @@ export default async (orgLibName, selectedVersion) => {
          let spinner;
           try {
             console.log("");
-            spinner = ora('Exporting to server...\n').start();
+            spinner = ora(`Exporting to server ${defaultPegaConfig.server}. \n`).start();
             publishComponentLibraryArchiveToServer(content, zipContent, true )
             .then( () => {
               spinner.stop();

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

@@ -51,6 +51,10 @@ export const showHelpV1 = () => {
   console.log(`${chalk.cyan('npm run publishAll       ')}\tpublish ALL components to server`);
 
   console.log("");
+  console.log(`\n${chalk.underline(`Notes`)}`);
+  console.log(`Cannot publish a component with prefix (Org_Lib) that matches a Rule-UI-ComponentLibrary (libraryModeCL) in same ruleset.`);
+
+  console.log("");
 
 };
 
@@ -77,8 +81,8 @@ export const showHelpV2 = (isCL) => {
   console.log(`\n${chalk.underline(`Library Versions`)}`);
   console.log(`${chalk.cyan('npm run createLibVersion')}\tcreate a new version within the current library`);
   console.log(`${chalk.cyan('npm run switchLibVersion')}\tswitch to different version within the current library`);
-  console.log(`${chalk.cyan('npm run deleteLibVersion')}\tdelete current version, move to another version`);
-  console.log(`${chalk.cyan('npm run restoreLibVersion ')}\trestore current version from local storage (current changes will be LOST)`);
+  console.log(`${chalk.cyan('npm run deleteLibVersion')}\tdelete current version, move to another version, delete is permanent`);
+  console.log(`${chalk.cyan('npm run restoreLibVersion ')}\trestores to current version from local storage (current changes will be LOST)`);
   console.log(`${chalk.cyan('npm run storeLibVersion ')}\tstore current version to local storage (must SAVE components before)`);
   if (isCL) {
     console.log(`${chalk.cyan('npm run exportLibVersion')}\texport current version as a zip file to a given local path or a server (must SAVE components before)`);
@@ -107,7 +111,10 @@ export const showHelpV2 = (isCL) => {
   console.log(`${chalk.cyan('npm run list       ')}\t\tget list of components`);
   console.log(`${chalk.cyan('npm run delete     ')}\t\tdelete a component`);
   console.log(`${chalk.cyan('npm run deleteAll  ')}\t\tdelete ALL components`);
+
+  console.log("");
   console.log(`${chalk.cyan('npm run startStorybook')}\t\tstorybook components for testing`);
+  console.log(`${chalk.cyan('npm run test')}\t\t\trun component unit tests`);
   console.log("");
 
   console.log(`\n${chalk.underline(`Notes`)}`);

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

@@ -13,6 +13,7 @@ export const showCurrentStatus = async () => {
 
   const configDefaults = getConfigDefaults();
   const componentList = await getComponents();
+  const isLibraryBased = getLibraryBased();
   const isLibraryBasedCL = getLibraryBasedCL();
   const pegaServer = await getPegaServerConfig();
 
@@ -35,8 +36,13 @@ export const showCurrentStatus = async () => {
 
   console.log("");
 
-  if (isLibraryBasedCL) {
+  if (isLibraryBased && !isLibraryBasedCL ) {
+    // no publishing for just libraryBased, that goes to App Static
+  }
+  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("");

package/tests/functional/localCreateAllListDeleteAll.test.js

@@ -28,6 +28,10 @@ describe(`createAll list deleteAll local: ${serverDir} - ${compType}` , () => {
     // make non libraryBased
     isLibraryBasedCL = false;
     tasksConfigJSON['libraryModeCL'] = isLibraryBasedCL;
+
+    // delete if exists
+    delete tasksConfigJSON['libraryMode'];
+
     compType = isLibraryBasedCL ? "library" : "original";
     fs.writeFileSync(tasksConfigDir, JSON.stringify(tasksConfigJSON, null, 4), { encoding: 'utf8' });
 

package/tests/functional/localCreateBuildAllDeleteAll.test.js

@@ -27,6 +27,10 @@ describe(`create buildAll deleteAll local: ${serverDir} - ${compType}`, () => {
     // make non libraryBased
     isLibraryBasedCL = false;
     tasksConfigJSON['libraryModeCL'] = isLibraryBasedCL;
+
+    // delete if exists
+    delete tasksConfigJSON['libraryMode'];
+
     compType = isLibraryBasedCL ? "library" : "original";
     fs.writeFileSync(tasksConfigDir, JSON.stringify(tasksConfigJSON, null, 4), { encoding: 'utf8' });
 

package/tests/functional/localCreateBuildDelete.test.js

@@ -29,6 +29,10 @@ describe(`create library delete Library: ${serverDir} - ${compType}`, () => {
     // make non libraryBased
     isLibraryBasedCL = false;
     tasksConfigJSON['libraryModeCL'] = isLibraryBasedCL;
+
+    // delete if exists
+    delete tasksConfigJSON['libraryMode'];
+
     compType = isLibraryBasedCL ? "library" : "original";
     fs.writeFileSync(tasksConfigDir, JSON.stringify(tasksConfigJSON, null, 4), { encoding: 'utf8' });
 

package/tests/functional/localCreateListDelete.test.js

@@ -12,21 +12,26 @@ const packageJSONDir = path.resolve('../../..', 'package.json');
 const packageJSONData = fs.readFileSync(packageJSONDir, { encoding: 'utf8'});
 let packageJSON = JSON.parse(packageJSONData);
 
-let isLibraryBasedCL = tasksConfigJSON['librayModeCL'];
-const savedLibraryBased = isLibraryBasedCL;
+
+let isLibraryBasedCL = tasksConfigJSON['libraryModeCL'];
+const savedLibraryBasedCL = isLibraryBasedCL;
 const savedOrganization = packageJSON.organization;
 
 const serverType = tasksConfigJSON['server-config'].serverType;
 const serverDir = serverType === 'launchpad' ? 'Launchpad' : 'Constellation';
 let compType = isLibraryBasedCL ? "library" : "original";
 
-describe(`createLib createAll list deleteLib: ${serverDir} - ${compType}`, () => {
+describe(`create list delete: ${serverDir} - ${compType}`, () => {
 
   beforeAll( async() => {
 
     // make non libraryBased
     isLibraryBasedCL = false;
-    tasksConfigJSON['librayModeCL'] = isLibraryBasedCL;
+    tasksConfigJSON['libraryModeCL'] = isLibraryBasedCL;
+
+    // delete if exists
+    delete tasksConfigJSON['libraryMode'];
+
     compType = isLibraryBasedCL ? "library" : "original";
     fs.writeFileSync(tasksConfigDir, JSON.stringify(tasksConfigJSON, null, 4), { encoding: 'utf8' });
 
@@ -48,8 +53,8 @@ describe(`createLib createAll list deleteLib: ${serverDir} - ${compType}`, () =>
   afterAll( async() => {
 
     //restore
-    isLibraryBasedCL = savedLibraryBased
-    tasksConfigJSON['librayModeCL'] = isLibraryBasedCL;
+    isLibraryBasedCL = savedLibraryBasedCL;
+    tasksConfigJSON['libraryModeCL'] = isLibraryBasedCL;
 
     fs.writeFileSync(tasksConfigDir, JSON.stringify(tasksConfigJSON, null, 4), { encoding: 'utf8' });
 

package/tests/functional/localCreatePublishAllDeleteAll.test.js

@@ -27,6 +27,10 @@ describe(`create publish deleteAll local: ${serverDir} - ${compType}`, () => {
     // make non libraryBased
     isLibraryBasedCL = false;
     tasksConfigJSON['libraryModeCL'] = isLibraryBasedCL;
+
+    // delete if exists
+    delete tasksConfigJSON['libraryMode'];
+
     compType = isLibraryBasedCL ? "library" : "original";
     fs.writeFileSync(tasksConfigDir, JSON.stringify(tasksConfigJSON, null, 4), { encoding: 'utf8' });
 

package/tests/functional/localCreatePublishDelete.test.js

@@ -27,6 +27,10 @@ describe(`create publish delete local: ${serverDir} - ${compType}`, () => {
     // make non libraryBased
     isLibraryBasedCL = false;
     tasksConfigJSON['libraryModeCL'] = isLibraryBasedCL;
+
+    // delete if exists
+    delete tasksConfigJSON['libraryMode'];
+
     compType = isLibraryBasedCL ? "library" : "original";
     fs.writeFileSync(tasksConfigDir, JSON.stringify(tasksConfigJSON, null, 4), { encoding: 'utf8' });
 

package/tests/functional/localCreateRenameDelete.test.js

@@ -27,6 +27,10 @@ describe(`create rename delete local: ${serverDir} - ${compType}`, () => {
     // make non libraryBased
     isLibraryBasedCL = false;
     tasksConfigJSON['libraryModeCL'] = isLibraryBasedCL;
+
+    // delete if exists
+    delete tasksConfigJSON['libraryMode'];
+
     compType = isLibraryBasedCL ? "library" : "original";
     fs.writeFileSync(tasksConfigDir, JSON.stringify(tasksConfigJSON, null, 4), { encoding: 'utf8' });
 

package/tests/functional/localLibCreateLibValidateDeleteLib.test.js

@@ -152,7 +152,7 @@ describe(`createLib create validate deleteLib: ${serverDir} - ${compType}` , ()
     //   // remove it
     //   fs.rmdirSync(fileDir, { recursive: true });
     // }
-  }, 10000);
+  }, 30000);
 
   it('npm run create Local details', async () => {
     const fileName = 'MyTestDetails';
@@ -184,7 +184,7 @@ describe(`createLib create validate deleteLib: ${serverDir} - ${compType}` , ()
     //   // remove it
     //   fs.rmdirSync(fileDir, { recursive: true });
     // }
-  }, 10000);
+  }, 30000);
 
   it(`npm run validate Pega_DXIL_MyTestText - ${isLibraryBasedCL}`, async() => {
 
@@ -205,7 +205,7 @@ describe(`createLib create validate deleteLib: ${serverDir} - ${compType}` , ()
     expect(stdout).toContain('Pega_DXIL_MyTestPage schema is valid');
     expect(stdout).toContain('Pega_DXIL_MyTestDetails schema is valid');
 
-    expect(stdout).toContain('Validation compile...');
+    expect(stdout).toContain('Validation via build library...');
     expect(stdout).toContain('Done.');
 
   }, 200000);

package/tests/functional/localPromoteRevertWP.test.js

@@ -12,22 +12,23 @@ const packageJSONDir = path.resolve('../../..', 'package.json');
 const packageJSONData = fs.readFileSync(packageJSONDir, { encoding: 'utf8'});
 let packageJSON = JSON.parse(packageJSONData);
 
-let isLibraryBased = tasksConfigJSON['libraryMode'];
-const savedLibraryBased = isLibraryBased;
+let isLibraryBasedCL = tasksConfigJSON['libraryModeCL'];
+const savedLibraryBasedCL = isLibraryBasedCL;
+
 const savedOrganization = packageJSON.organization;
 
 const serverType = tasksConfigJSON['server-config'].serverType;
 const serverDir = serverType === 'launchpad' ? 'Launchpad' : 'Constellation';
-let compType = isLibraryBased ? "library" : "original";
+let compType = isLibraryBasedCL ? "library" : "original";
 
 describe(`promote revert webpack: ${serverDir} - ${compType}`, () => {
 
   beforeAll( async() => {
 
     // make non libraryBased
-    isLibraryBased = false;
-    tasksConfigJSON['libraryMode'] = isLibraryBased;
-    compType = isLibraryBased ? "library" : "original";
+    isLibraryBasedCL = false;
+    tasksConfigJSON['libraryModeCL'] = isLibraryBasedCL;
+    compType = isLibraryBasedCL ? "library" : "original";
     fs.writeFileSync(tasksConfigDir, JSON.stringify(tasksConfigJSON, null, 4), { encoding: 'utf8' });
 
     // make organzation Pega
@@ -48,8 +49,8 @@ describe(`promote revert webpack: ${serverDir} - ${compType}`, () => {
   afterAll( async() => {
 
     //restore
-    isLibraryBased = savedLibraryBased
-    tasksConfigJSON['libraryMode'] = isLibraryBased;
+    isLibraryBasedCL = savedLibraryBasedCL
+    tasksConfigJSON['libraryModeCL'] = isLibraryBasedCL;
 
     fs.writeFileSync(tasksConfigDir, JSON.stringify(tasksConfigJSON, null, 4), { encoding: 'utf8' });