@pega/custom-dx-components 0.25.45 → 0.25.46

package/src/tasks/create/templates/Launchpad/Widget/PAGE-CASE/config.json.mustache

@@ -5,7 +5,6 @@
   "organization": "{{ORGANIZATION}}",
   "version": "{{VERSION}}",
   "library": "{{LIBRARY}}",
-  "allowedApplications": {{{ALLOWEDAPPS}}},
   "componentKey": "{{COMPONENT_KEY}}",
   "type": "{{TYPE}}",
   "subtype": {{{SUB_TYPE}}},

package/src/tasks/create-all/index.js

@@ -25,7 +25,8 @@ import { checkPathAccess, showVersion ,
   checkLibraryAndArchives,
   getConfigDefaults,
   getSubTypeLabel,
-  getMaxPrefixCount
+  getMaxPrefixCount,
+  getStandaloneMaxPrefixCount
 } from '../../util.js';
 
 import { COMPONENT_SCHEMA, COMPONENTS_DIRECTORY_PATH, TASKS_CONFIG_JSON_FILENAME, COMPONENTS_PATH, CATEGORY_CONSTELLATION, SHARED_FILE_NAMES } from '../../constants.js';
@@ -57,7 +58,7 @@ const copyComponentTemplate = async (options) => {
 
 export const compileMustacheTemplates = async (
   componentDirectory,
-  { componentKey, componentName, componentLabel, library, version, type, subtype, description, organization, allowedApplications = '' }
+  { componentKey, componentName, componentLabel, library, version, type, subtype, description, organization }
 ) => {
   const files = fs.readdirSync(componentDirectory);
   const componentClassName = convertIntoPascalCase(componentKey);
@@ -101,17 +102,17 @@ export const compileMustacheTemplates = async (
 
   const isPicklist = subtype === 'Picklist';
 
-  if (allowedApplications.trim() === '') {
-    allowedApplications = [];
-  } else {
-    if (allowedApplications.indexOf(',') !== -1) {
-      allowedApplications = allowedApplications.split(',');
-    }
-    allowedApplications = [].concat(allowedApplications);
-  }
+  // if (allowedApplications.trim() === '') {
+  //   allowedApplications = [];
+  // } else {
+  //   if (allowedApplications.indexOf(',') !== -1) {
+  //     allowedApplications = allowedApplications.split(',');
+  //   }
+  //   allowedApplications = [].concat(allowedApplications);
+  // }
 
 
-  allowedApplications = allowedApplications.filter((el) => !!el.trim()).map((el) => el.trim());
+  // allowedApplications = allowedApplications.filter((el) => !!el.trim()).map((el) => el.trim());
   files.forEach((file) => {
     const filePath = path.join(componentDirectory, file);
 
@@ -125,7 +126,6 @@ export const compileMustacheTemplates = async (
       ORGANIZATION: organization,
       VERSION: version,
       LIBRARY: library,
-      ALLOWEDAPPS: JSON.stringify(allowedApplications),
       TYPE: type,
       SUB_TYPE: JSON.stringify(mustacheSubType),
       SUB_TYPE_LABEL: subTypeLabel,
@@ -173,7 +173,7 @@ export const compileMustacheTemplates = async (
 };
 
 export const validateCompile = async (
-  { library, organization, componentName, componentLabel, version, framework, type, subtype, description, allowedApplications },
+  { library, organization, componentName, componentLabel, version, framework, type, subtype, description },
   options
 ) => {
   let sSubType = subtype;
@@ -257,14 +257,13 @@ export const validateCompile = async (
     type,
     subtype,
     description,
-    organization,
-    allowedApplications
+    organization
   });
 
   console.log(chalk.green(`created ${componentKey} component in ${targetDirectory}`));
 };
 
-export const validateCompileAll = async ({ prefix, library, version, allowedApplications, organization }, options) => {
+export const validateCompileAll = async ({ prefix, library, version, organization }, options) => {
   const defaultPegaServerConfig = await getPegaServerConfig();
 
   // eslint-disable-next-line no-restricted-syntax, guard-for-in
@@ -287,8 +286,7 @@ export const validateCompileAll = async ({ prefix, library, version, allowedAppl
         version,
         type,
         subtype,
-        description,
-        allowedApplications
+        description
       },
       options
     );
@@ -321,8 +319,7 @@ export const validateCompileAll = async ({ prefix, library, version, allowedAppl
         version,
         type,
         subtype,
-        description,
-        allowedApplications
+        description
       },
       options
     );
@@ -353,8 +350,7 @@ export const validateCompileAll = async ({ prefix, library, version, allowedAppl
         version,
         type,
         subtype,
-        description,
-        allowedApplications
+        description
       },
       options
     );
@@ -390,27 +386,25 @@ addDebugLog("createAll", "", "+");
   const componentDefaults = getConfigDefaults();
   componentDefaults.library = library;
 
-  if (options.params.length >= 8) {
+  if (options.params.length >= 7) {
     const prefix = options.params[3];
     const version = options.params[4];
     library = options.params[5];
-    const allowedApplications = options.params[6];
 
     // overwrite
-    organization = options.params[7];
+    organization = options.params[6];
 
     await validateCompileAll(
       {
         prefix,
         library,
         version,
-        allowedApplications,
         organization
       },
       options
     );
   } else {
-    const maxPrefixCount = getMaxPrefixCount();
+    const maxPrefixCount = isLibraryBased ? getMaxPrefixCount() : getStandaloneMaxPrefixCount();
     const questions = [
       {
         name: 'prefix',
@@ -458,12 +452,6 @@ addDebugLog("createAll", "", "+");
           return 'Only alphanumeric values are allowed, starting with alphabets';
         },
         when: () => !isLibraryBased
-      },
-      {
-        name: 'allowedApplications',
-        message: 'Please enter the application names to be supported (comma-separated). ',
-        suffix: 'Keep empty for all applications',
-        when: () => !isLibraryBased
       }
     ];
 
@@ -476,7 +464,7 @@ addDebugLog("createAll", "", "+");
         library = orgLib.library;
       }
 
-      const { version, allowedApplications } = answers;
+      const { version } = answers;
       let { prefix } = answers;
       prefix = prefix.replace(/[^a-zA-Z0-9 ]/g, '');
       await validateCompileAll(
@@ -484,7 +472,6 @@ addDebugLog("createAll", "", "+");
           prefix,
           library,
           version,
-          allowedApplications,
           organization
         },
         options

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

@@ -122,7 +122,8 @@ addDebugLog("fetchComponenLibrariessFromInfinity", `apiUrl: ${apiUrl}`, "");
   });
 }
 
-export const getInfinityLibraries = async(rulesetName, rulesetVersion) => {
+//  const getInfinityLibraries = async(rulesetName, rulesetVersion) => {
+export const getInfinityLibraries = async() => {
 addDebugLog("getInfinityLibraries", '', "");
 
   const { app_name, app_version } = await getApplicationAndVersionFromToken();
@@ -140,10 +141,9 @@ addDebugLog("getInfinityLibraries", '', "");
 
   // inquire
 
-  let urlParams = `/app-name/${ApplicationName}/app-version/${ApplicationVersion}/rulesetname/${rulesetName}/rulesetversion/${rulesetVersion}`;
-  //let urlParams = `&ApplicationName=${ApplicationName}&ApplicationVersion=${ApplicationVersion}&RulesetName=${rulesetName}&RulesetVersion=${rulesetVersion}`;
-  //urlParams = encodeURIComponent(urlParams);
-
+  // want to get a list of all for application, so make ruleset/version blank
+  let urlParams = `/app-name/${ApplicationName}/app-version/${ApplicationVersion}/rulesetname/""/rulesetversion/""`;
+  // let urlParams = `/app-name/${ApplicationName}/app-version/${ApplicationVersion}/rulesetname/${rulesetName}/rulesetversion/${rulesetVersion}`;
 
   url = url.concat(urlParams);
 

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

@@ -3,7 +3,7 @@ import ora from 'ora';
 
 import chalk from 'chalk';
 
-import { showVersion, getC11NB2STokenAndStaticServer, getLocalLibraryVersions, getLibraryBased, deleteLocalLibrary, deleteLocalLibraryVersion, addDebugLog, getConfigDefaults, getLibraryBasedCL, getPegaServerConfig, deleteInfinityServerComponentLibrary, checkAccessTokenExpiration } from '../../util.js';
+import { showVersion, getC11NB2STokenAndStaticServer, getLocalLibraryVersions, getLibraryBased, deleteLocalLibrary, deleteLocalLibraryVersion, addDebugLog, getConfigDefaults, getLibraryBasedCL, getPegaServerConfig, deleteInfinityServerComponentLibrary, checkAccessTokenExpiration, getApplicationAndVersionFromToken } from '../../util.js';
 import { deleteLib } from '@pega/constellation-dx-components-build-utils/index.js';
 
 import { getDeleteLibraryQuestions, getLibraryVersionQuestion, getRulesetAndVersionQuestion, SOURCE_OF_COMPONENT_TYPES, getInfinityLibraries } from './helper.js';
@@ -94,19 +94,27 @@ addDebugLog("deletePublished", "END", "-");
     if (isLibraryBasedCL) {
 
       const serverConfg = await getPegaServerConfig();
+      const { app_name, app_version } = await getApplicationAndVersionFromToken();
 
       console.log();
       console.log(`Current server: ${chalk.green.bold(`${serverConfg.server}`)}`);
+      console.log(`List of libraries for Application: ${chalk.green.bold(`${app_name} - ${app_version}`)}`);
+      console.log(chalk.bold.yellow(`>> Caution...`));
+      console.log(chalk.bold.yellow(`>> This list may contain built on libraries if your application is built on an application.`));
+      console.log(chalk.bold.yellow(`>> Deleting built on libraries may cause issues with built on application.`));
 
-      const questions = await getRulesetAndVersionQuestion(serverConfg);
-      const answers = await inquirer.prompt(questions);
-      const { rulesetName, rulesetVersion } = answers;
 
-      const arLibs = await getInfinityLibraries(rulesetName, rulesetVersion);
+      // want to get all in application, so ignore ruleset/version questions
+      // const questions = await getRulesetAndVersionQuestion(serverConfg);
+      // const answers = await inquirer.prompt(questions);
+      // const { rulesetName, rulesetVersion } = answers;
+
+      // const arLibs = await getInfinityLibraries(rulesetName, rulesetVersion);
+      const arLibs = await getInfinityLibraries();
 
       if (arLibs && arLibs.pxResults && arLibs.pxResults.length > 0) {
 
-        const libs = arLibs.pxResults.map((oLib, index) => ({ name: oLib.pyLabel, value: oLib.pyRuleName}));
+        const libs = arLibs.pxResults.map((oLib, index) => ({ name: oLib.pyLabel + " (" + oLib.pyRuleSet + ":" + oLib.pyRuleSetVersion + ")", value: index}));
 
         const libAnswers = await inquirer.prompt([
           {
@@ -117,7 +125,9 @@ addDebugLog("deletePublished", "END", "-");
           }
         ]);
 
-        const libraryName = libAnswers.library;
+        const libraryName = arLibs.pxResults[libAnswers.library].pyRuleName;
+        const rulesetName = arLibs.pxResults[libAnswers.library].pyRuleSet;
+        const rulesetVersion = arLibs.pxResults[libAnswers.library].pyRuleSetVersion;
         // let spinner;
 
 
@@ -138,8 +148,10 @@ 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(`${rulesetName}:${rulesetVersion}`)}`));
-  addDebugLog("listPublished", "END", "-");
+        // console.log(chalk.redBright(`No server component libraries exist in given ruleset ${chalk.bold(`${rulesetName}:${rulesetVersion}`)}`));
+        console.log(chalk.redBright(`No server component libraries exist in given application`));
+
+        addDebugLog("listPublished", "END", "-");
         process.exit(1);
 
       }

package/src/tasks/init/index.js

@@ -1,25 +1,30 @@
-
 import path from 'path';
 import fs from 'fs';
 import { fileURLToPath } from 'url';
 import { promisify } from 'util';
+import { exec } from 'child_process';
+
 import chalk from 'chalk';
 import { execa } from 'execa';
+import ncp from 'ncp';
 import { Listr } from 'listr2';
 import gitignore from 'gitignore';
 import inquirer from 'inquirer';
-import { compileMustacheTemplate, isPascalCase, convertIntoPascalCase, sanitize } from '../../util.js';
-import { getInitProjectQuestions } from './helper.js';
 
-const writeGitignore = promisify(gitignore.writeFile);
+import {
+  compileMustacheTemplate,
+  isPascalCase,
+  convertIntoPascalCase,
+  sanitize
+} from '../../util.js';
 
+import { getInitProjectQuestions } from './helper.js';
 
-const copyProjectDir = async (src, dest) => {
-  if (typeof fs.cp === 'function') {
-    await fs.promises.cp(src, dest, { recursive: true, errorOnExist: false, force: false });
-  }
-};
+const execPromise = promisify(exec);
 
+const copy = promisify(ncp);
+const writeGitignore = promisify(gitignore.writeFile);
+const writeFile = promisify(fs.writeFile);
 
 const createGitignore = async options => {
   const file = fs.createWriteStream(path.join(options.targetDirectory, '.gitignore'), {
@@ -32,54 +37,51 @@ const createGitignore = async options => {
 };
 
 const createLicense = async options => {
-  // Write LICENSE file directly
   const targetPath = path.join(options.targetDirectory, 'LICENSE');
   const licenseContent = 'Enter license text here';
-  await fs.promises.writeFile(targetPath, licenseContent, 'utf8');
+  return writeFile(targetPath, licenseContent, 'utf8');
 };
 
-
 const copyProjectTemplate = async options => {
-  // Use fast copy
-  await copyProjectDir(options.templateDirectory, options.targetDirectory);
+  await copy(options.templateDirectory, options.targetDirectory, {
+    clobber: false
+  });
   const packageJsonPath = path.join(options.targetDirectory, 'package.json.mustache');
   const templateNPMRCPath = path.join(options.targetDirectory, 'templateNPMRC.txt');
 
   let { organization, projectName } = options;
+
   projectName = sanitize(projectName).toLowerCase();
+
   organization = sanitize(organization);
   if (!isPascalCase(organization)) {
     organization = convertIntoPascalCase(organization);
   }
-  options = { ...options, organization, projectName };
 
-  // Compile and write package.json in one go
+  options = {
+    ...options,
+    organization,
+    projectName
+  };
   const output = compileMustacheTemplate(packageJsonPath, options);
-  await fs.promises.writeFile(packageJsonPath, output);
-  await fs.promises.rename(packageJsonPath, packageJsonPath.replace('.mustache', ''));
-
-  // Rename templateNPMRC.txt to .npmrc if exists
-  try {
-    await fs.promises.rename(templateNPMRCPath, templateNPMRCPath.replace('templateNPMRC.txt', '.npmrc'));
-  } catch (e) {
-    // ignore if not present
-  }
+  fs.writeFileSync(packageJsonPath, output);
+  fs.renameSync(packageJsonPath, packageJsonPath.replace('.mustache', ''));
+
+  // rename template NPMRC to .npmrc, need to do this because npmjs won't publish an .npmrc file
+  fs.renameSync(templateNPMRCPath, templateNPMRCPath.replace('templateNPMRC.txt', '.npmrc'));
 
   await createLicense(options);
 };
 
-
 const initGit = async options => {
-  // Use execa for async git init
   const result = await execa('git', ['init'], {
     cwd: options.targetDirectory
   });
   if (result.failed) {
-    throw new Error('Failed to initialize git');
+    return Promise.reject(new Error('Failed to initialize git'));
   }
 };
 
-
 export default async options => {
   options.templateDirectory = path.resolve(
     path.dirname(fileURLToPath(import.meta.url)),
@@ -88,28 +90,32 @@ export default async options => {
   let projectName = 'test';
 
   const questions = getInitProjectQuestions();
-  const answers = await inquirer.prompt(questions);
-  projectName = sanitize(answers.projectName).toLowerCase();
-  options = { ...options, ...answers };
-
-  const projectDirectory = `./${projectName}`;
-  if (!fs.existsSync(projectDirectory)) {
-    fs.mkdirSync(projectDirectory);
-  } else {
-    console.log(chalk.bold.red(`A project with name ${projectName} already exists. Exiting...`));
-    process.exit();
-  }
 
-  const targetDirectory = options.targetDirectory || process.cwd();
-  options.targetDirectory = path.join(targetDirectory, projectName);
-  options.componentDirectory = path.join(
-    options.targetDirectory,
-    'node_modules/@pega/custom-dx-components'
-  );
-  options.componentLibraryUtilsDirectory = path.join(
-    options.targetDirectory,
-    'node_modules/@pega/constellation-dx-components-build-utils'
-  );
+  await inquirer.prompt(questions).then(async answers => {
+    projectName = answers.projectName;
+    projectName = sanitize(projectName).toLowerCase();
+    options = { ...options, ...answers };
+
+    const projectDirectory = `./${projectName}`;
+
+    if (!fs.existsSync(projectDirectory)) {
+      fs.mkdirSync(projectDirectory);
+    } else {
+      console.log(chalk.bold.red(`A project with name ${projectName} already exists. Exiting...`));
+      process.exit();
+    }
+
+    const targetDirectory = options.targetDirectory || process.cwd();
+    options.targetDirectory = path.join(targetDirectory, projectName);
+    options.componentDirectory = path.join(
+      options.targetDirectory,
+      'node_modules/@pega/custom-dx-components'
+    );
+    options.componentLibraryUtilsDirectory = path.join(
+      options.targetDirectory,
+      'node_modules/@pega/constellation-dx-components-build-utils'
+    );
+  });
 
   const installDependenciesText = `Installing dependencies. This will take a couple of minutes.`;
 
@@ -132,38 +138,35 @@ export default async options => {
       {
         title: installDependenciesText,
         task: () =>
-          execa('npm', ['i', '--force', '--production=false'], { cwd: options.targetDirectory })
+          execPromise('npm i --force --production=false', { cwd: options.targetDirectory })
       },
       */
       {
         title: installDependenciesText,
         task: () =>
-          execa('npm', ['ci', '--force', '--no-audit', '--no-fund', '--loglevel=error'], { cwd: options.targetDirectory })
+          execPromise('npm i --force --include=dev', { cwd: options.targetDirectory })
       },
       /*
       {
         title: 'Installing tasks dependencies',
         task: () =>
-          execa('npm', ['i', '--force', '--production=false'], { cwd: options.componentDirectory })
+          execPromise('npm i --force --production=false', { cwd: options.componentDirectory })
       },
       {
         title: 'Installing tasks library dependencies',
         task: () =>
-          execa('npm', ['i', '--force', '--production=false'], {
+          execPromise('npm i --force --production=false', {
             cwd: options.componentLibraryUtilsDirectory
           })
       },
       */
-
-      /*
       {
         title: 'Updating',
-        task: () => execa('npm', ['update', '--dev', '--no-audit', '--no-fund', '--loglevel=error'], { cwd: options.targetDirectory })
+        task: () => execPromise('npm update --dev', { cwd: options.targetDirectory })
       }
-      */
       /* {
         title: 'Installing quick run',
-        task: () => execa('npm', ['i', '-g', 'npm-quick-run'], { cwd: options.targetDirectory })
+        task: () => execPromise('npm i -g npm-quick-run', { cwd: options.targetDirectory })
       } */
     ],
     {

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

@@ -99,6 +99,7 @@
     "react-is": "^18.3.1",
     "react-redux": "^7.2.9",
     "serve": "^14.2.4",
+    "shelljs": "^0.8.5",
     "styled-components": "^5.3.11",
     "ts-loader": "^9.5.2"
   },
@@ -107,7 +108,7 @@
     "@babel/preset-react": "^7.27.1",
     "@babel/preset-typescript": "^7.27.1",
     "@pega/configs": "^0.16.3",
-    "@pega/custom-dx-components": "~25.1.10",
+    "@pega/custom-dx-components": "~0.25.46",
     "@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/helper.js

@@ -136,10 +136,13 @@ addDebugLog("getInfinityLibraries", '', "");
 
   const ApplicationName = app_name;
   const ApplicationVersion = app_version;
-  const rulesetName = defaultPegaServerConfig.rulesetName;
-  const rulesetVersion = defaultPegaServerConfig.rulesetVersion;
+  // const rulesetName = defaultPegaServerConfig.rulesetName;
+  // const rulesetVersion = defaultPegaServerConfig.rulesetVersion;
+  // let urlParams = `/app-name/${ApplicationName}/app-version/${ApplicationVersion}/rulesetname/${rulesetName}/rulesetversion/${rulesetVersion}`;
+
+  // currently want to get all published libraries for an application, so make ruleset/version blank
+  let urlParams = `/app-name/${ApplicationName}/app-version/${ApplicationVersion}/rulesetname/""/rulesetversion/""`;
 
-  let urlParams = `/app-name/${ApplicationName}/app-version/${ApplicationVersion}/rulesetname/${rulesetName}/rulesetversion/${rulesetVersion}`;
 
   url = url.concat(urlParams);
 

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

@@ -158,21 +158,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
           }
         ]);

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' }],