@pega/custom-dx-components 0.23.9 → 0.23.11

package/src/tasks/delete/helper.js

@@ -1,7 +1,10 @@
+import fs from 'fs';
 import chalk from 'chalk';
 import inquirer from 'inquirer';
 import ora from 'ora';
 
+import path from 'path';
+import { join } from 'path';
 
 import {
   deleteLocalComponent,
@@ -9,18 +12,23 @@ import {
   deleteLaunchpadServerComponent,
   getComponents,
   getPegaServerConfig,
-  standardizeStr
+  standardizeStr,
+  sanitize
 } from '../../util.js';
 import { getComponentsFromServer } from '../list/helper.js';
 
-
+import { TASKS_CONFIG_JSON_FILENAME, COMPONENTS_DIRECTORY_PATH, COMPONENTS_PATH } from '../../constants.js';
 
 export const SOURCE_OF_COMPONENT_TYPES = {
   SERVER: 'Server',
   LOCAL: 'Local'
 };
 
-export const getDeleteComponentsQuestions = async (options, sourceOfComponentsOption) => {
+let library;
+let organization;
+
+
+export const getDeleteComponentsQuestions = async (options) => {
   const defaultPegaServerConfig = await getPegaServerConfig();
 
   return [
@@ -37,25 +45,65 @@ export const getDeleteComponentsQuestions = async (options, sourceOfComponentsOp
   ];
 };
 
-export const deleteLocalComponents = async (sourceOfComponents, options) => {
-  const localComponents = await getComponents();
+export const getLaunchPadFilterQuestions = async () => {
+  const defaultPegaServerConfig = await getPegaServerConfig();
 
+  const currentDirectory = process.cwd();
+  const pegaConfigJsonPath = join(currentDirectory, TASKS_CONFIG_JSON_FILENAME);
 
+  let data = fs.readFileSync(pegaConfigJsonPath, { encoding: 'utf8' });
+  data = data && JSON.parse(data);
 
-  if (localComponents.length > 0) {
+  if (!data[COMPONENTS_DIRECTORY_PATH]) {
+    console.error(
+      `${chalk.red.bold('ERROR')} Could not able find components directory path in config.json`
+    );
+    process.exit(1);
+  }
+
+  const componentData = data[COMPONENTS_PATH];
+
+   ({ library } = componentData);
+   ({ organization } = JSON.parse(fs.readFileSync(path.resolve('package.json'), 'utf8')));
+
+  return [
+  {
+    name: 'organization',
+    message: 'Enter component organization (required)',
+    default: organization,
+    validate: value => {
+      if (value) {
+        return true;
+      }
+      return 'Please provide value for organization';
+    }
+  },
+  {
+    name: 'library',
+    message: 'Enter library name (required)',
+    default: library,
+    validate: value => {
+      if (value) {
+        return true;
+      }
+      return 'Please provide value for library';
+    }
+  }
+  ];
+}
 
+export const deleteLocalComponents = async (sourceOfComponents, options) => {
+  const localComponents = await getComponents();
+
+  if (localComponents.length > 0) {
     if (options.params.length >= 6) {
       const componentKey = options.params[4];
       const sDeletion = options.params[5];
-      const confirmDeletion = (sDeletion === 'Y' ||
-                               sDeletion === 'y' ||
-                               sDeletion === true ||
-                               sDeletion === 'true') ? true : false;
+      const confirmDeletion = sDeletion === 'Y' || sDeletion === 'y' || sDeletion === true || sDeletion === 'true';
       if (confirmDeletion) {
         await deleteLocalComponent(componentKey);
       }
-    }
-    else {
+    } else {
       const answers = await inquirer.prompt([
         {
           name: 'componentKey',
@@ -74,36 +122,45 @@ export const deleteLocalComponents = async (sourceOfComponents, options) => {
         await deleteLocalComponent(answers.componentKey);
       }
     }
-
   } else {
     console.log(chalk.bold.redBright(`No custom components in ${sourceOfComponents}`));
   }
 };
 
 export const deleteServerComponents = async (sourceOfComponents, answers) => {
-  const spinner = ora('Fetching components from server').start();
+
   const defaultPegaServerConfig = await getPegaServerConfig();
   const isLaunchpad = defaultPegaServerConfig.serverType === 'launchpad';
-  const data = await getComponentsFromServer(answers);
 
-  // const serverComponents = isLaunchpad ? data : JSON.parse(data).pxResults;
+
+  if (isLaunchpad) {
+    const questions = await getLaunchPadFilterQuestions();
+    const lpAnswers = await inquirer.prompt(questions);
+
+    ({library, organization} = lpAnswers);
+  }
+
+  const spinner = ora('Fetching components from server').start();
+  const data = await getComponentsFromServer(library, organization);
+  spinner.stop();
+
+
   let serverComponents;
   if (isLaunchpad) {
     serverComponents = data;
-  }
-  else {
+
+  } else {
     try {
-      if (typeof(data) == 'object') {
+      if (typeof data === 'object') {
         serverComponents = data.pxResults;
-      }
-      else {
+      } else {
         serverComponents = JSON.parse(data).pxResults;
       }
-
+    } catch (ex) {
+      /* empty */
     }
-    catch (ex) {}
   }
-  spinner.stop();
+
 
   if (serverComponents && serverComponents?.length > 0) {
     if (isLaunchpad) {
@@ -132,23 +189,21 @@ export const deleteServerComponents = async (sourceOfComponents, answers) => {
       const choicesArr = serverComponents.map(({ label, pyRuleSet, pyRuleSetVersion }) => {
         const name = `${standardizeStr(label, 45)} ${standardizeStr(pyRuleSet, 30)} ${standardizeStr(pyRuleSetVersion, 20)}`;
 
-      const value = `${label}~|~${pyRuleSet}~|~${pyRuleSetVersion}`;
-      const short = `Selected component : ${chalk.redBright(
-        `${label} ${pyRuleSet} : ${pyRuleSetVersion}`
-      )}`;
+        const value = `${label}~|~${pyRuleSet}~|~${pyRuleSetVersion}`;
+        const short = `\n Selected component : ${chalk.redBright(`${label} ${pyRuleSet} : ${pyRuleSetVersion}`)}`;
 
-      return { name, value, short };
-    });
+        return { name, value, short };
+      });
       const infinityAnswers = await inquirer.prompt({
-      name: 'componentToDelete',
-      type: 'rawlist',
-      pageSize: 10,
+        name: 'componentToDelete',
+        type: 'rawlist',
+        pageSize: 10,
         message: `Select component to delete \n  ${standardizeStr('Rule name', 48)} ${standardizeStr('Ruleset name', 30)} ${standardizeStr(
           'Ruleset version',
           22
         )}`,
-      choices: choicesArr
-    });
+        choices: choicesArr
+      });
       await deleteInfinityServerComponent(infinityAnswers.componentToDelete);
     }
   } else {

package/src/tasks/delete/index.js

@@ -1,16 +1,9 @@
 import inquirer from 'inquirer';
-import ora from 'ora';
-import chalk from 'chalk';
-
-import {
-  deleteLocalComponents,
-  SOURCE_OF_COMPONENT_TYPES,
-  deleteServerComponents,
-  getDeleteComponentsQuestions
-} from './helper.js';
 
 import { showVersion } from '../../util.js';
 
+import { deleteLocalComponents, SOURCE_OF_COMPONENT_TYPES, deleteServerComponents, getDeleteComponentsQuestions } from './helper.js';
+
 const deleteComponentsFn = async (sourceOfComponents, answers, options) => {
   switch (sourceOfComponents) {
     case SOURCE_OF_COMPONENT_TYPES.LOCAL: {
@@ -28,7 +21,7 @@ const deleteComponentsFn = async (sourceOfComponents, answers, options) => {
   }
 };
 
-export default async options => {
+export default async (options) => {
   showVersion();
 
   let sourceOfComponentsOption = SOURCE_OF_COMPONENT_TYPES.LOCAL;

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

@@ -1,3 +1,6 @@
+import fs from 'fs';
+import path, {join} from 'path';
+
 import chalk from 'chalk';
 import inquirer from 'inquirer';
 import ora from 'ora';
@@ -6,23 +9,26 @@ import {
   deleteInfinityServerComponent,
   deleteLaunchpadServerComponent,
   deleteLocalComponent,
-  deleteServerComponent,
   getComponents,
   getPegaServerConfig,
   standardizeStr,
   validateRulesetVersion
 } from '../../util.js';
 import { getComponentsFromServer } from '../list/helper.js';
+import { TASKS_CONFIG_JSON_FILENAME, COMPONENTS_DIRECTORY_PATH, COMPONENTS_PATH } from '../../constants.js';
 
 export const SOURCE_OF_COMPONENT_TYPES = {
   SERVER: 'Server',
   LOCAL: 'Local'
 };
 
-export const getDeleteComponentsQuestions = async (options, sourceOfComponentsOption) => {
-  const defaultPegaServerConfig = await getPegaServerConfig();
+let library;
+let organization;
 
 
+export const getDeleteComponentsQuestions = async (options) => {
+  const defaultPegaServerConfig = await getPegaServerConfig();
+
   return [
     {
       name: 'sourceOfComponents',
@@ -37,34 +43,74 @@ export const getDeleteComponentsQuestions = async (options, sourceOfComponentsOp
   ];
 };
 
+export const getLaunchPadFilterQuestions = async () => {
+  const currentDirectory = process.cwd();
+  const pegaConfigJsonPath = join(currentDirectory, TASKS_CONFIG_JSON_FILENAME);
+
+  let data = fs.readFileSync(pegaConfigJsonPath, { encoding: 'utf8' });
+  data = data && JSON.parse(data);
+
+  if (!data[COMPONENTS_DIRECTORY_PATH]) {
+    console.error(
+      `${chalk.red.bold('ERROR')} Could not able find components directory path in config.json`
+    );
+    process.exit(1);
+  }
+
+  const componentData = data[COMPONENTS_PATH];
 
+  ({ library } = componentData);
+  ({ organization } = JSON.parse(fs.readFileSync(path.resolve('package.json'), 'utf8')));
+
+  return [
+    {
+      name: 'organization',
+      message: 'Enter component organization (required)',
+      default: organization,
+      validate: value => {
+        if (value) {
+          return true;
+        }
+        return 'Please provide value for organization';
+      }
+    },
+    {
+      name: 'library',
+      message: 'Enter library name (required)',
+      default: library,
+      validate: value => {
+        if (value) {
+          return true;
+        }
+        return 'Please provide value for library';
+      }
+    }
+  ];
+}
 
 export const deleteLocalComponents = async (sourceOfComponents, options) => {
   const localComponents = await getComponents();
 
-  for (var index in localComponents) {
+  // eslint-disable-next-line no-restricted-syntax, guard-for-in
+  for (const index in localComponents) {
     console.log(chalk.bold.green(localComponents[index]));
   }
 
   if (localComponents.length > 0) {
-
     if (options.params.length >= 5) {
       const sDeletion = options.params[4];
-      const confirmDeletion = (sDeletion === 'Y' ||
-                               sDeletion === 'y' ||
-                               sDeletion === true ||
-                               sDeletion === 'true') ? true : false;
+      const confirmDeletion = sDeletion === 'Y' || sDeletion === 'y' || sDeletion === true || sDeletion === 'true';
       if (confirmDeletion) {
-        for (var index in localComponents) {
-          var componentToDelete = localComponents[index];
-          //console.log(chalk.bold.green("Deleting: " + componentToDelete));
+        // eslint-disable-next-line no-restricted-syntax, guard-for-in
+        for (const index in localComponents) {
+          const componentToDelete = localComponents[index];
+          // console.log(chalk.bold.green("Deleting: " + componentToDelete));
+          // eslint-disable-next-line no-await-in-loop
           await deleteLocalComponent(componentToDelete);
         }
       }
-    }
-    else{
+    } else {
       const answers = await inquirer.prompt([
-
         {
           name: 'confirmDeletion',
           type: 'confirm',
@@ -80,38 +126,45 @@ export const deleteLocalComponents = async (sourceOfComponents, options) => {
         }
       }
     }
-
-  }
-  else {
+  } else {
     console.log(chalk.bold.redBright(`No custom components in ${sourceOfComponents}`));
   }
 };
 
 export const deleteServerComponents = async (sourceOfComponents, answers) => {
-  const spinner = ora('Fetching components from server').start();
+
   const defaultPegaServerConfig = await getPegaServerConfig();
   const isLaunchpad = defaultPegaServerConfig.serverType === 'launchpad';
-  const data = await getComponentsFromServer(answers);
+
+  if (isLaunchpad) {
+    const questions = await getLaunchPadFilterQuestions();
+    const lpAnswers = await inquirer.prompt(questions);
+
+    ({library, organization} = lpAnswers);
+  }
+
+  const spinner = ora('Fetching components from server').start();
+  const data = await getComponentsFromServer(library, organization);
+  spinner.stop();
+
 
   // const serverComponents = isLaunchpad ? data : data.pxResults;
   let serverComponents;
   if (isLaunchpad) {
     serverComponents = data;
-  }
-  else {
+  } else {
     try {
-      if (typeof(data) == 'object') {
+      if (typeof data === 'object') {
         serverComponents = data.pxResults;
-      }
-      else {
+      } else {
         serverComponents = JSON.parse(data).pxResults;
       }
-
+    } catch (ex) {
+      /* empty */
     }
-    catch (ex) {}
   }
 
-  spinner.stop();
+
 
   if (serverComponents && serverComponents?.length > 0) {
     if (isLaunchpad) {
@@ -139,35 +192,35 @@ export const deleteServerComponents = async (sourceOfComponents, answers) => {
       const choicesArr = serverComponents.map(({ label, pyRuleSet, pyRuleSetVersion }) => {
         const name = `${standardizeStr(label, 45)} ${standardizeStr(pyRuleSet, 30)} ${standardizeStr(pyRuleSetVersion, 20)}`;
 
-      const value = `${label}~|~${pyRuleSet}~|~${pyRuleSetVersion}`;
+        const value = `${label}~|~${pyRuleSet}~|~${pyRuleSetVersion}`;
         const short = `\n Selected component : ${chalk.redBright(`${label} ${pyRuleSet} : ${pyRuleSetVersion}`)}`;
 
-      return { name, value, short };
-    });
+        return { name, value, short };
+      });
 
-    const selectedComp = await inquirer.prompt([
-      {
-        name: 'rulesetName',
-        message: 'Enter ruleset name',
-        default: defaultPegaServerConfig.rulesetName,
+      const selectedComp = await inquirer.prompt([
+        {
+          name: 'rulesetName',
+          message: 'Enter ruleset name',
+          default: defaultPegaServerConfig.rulesetName,
           validate: (value) => {
-          if (value.trim()) {
-            return true;
+            if (value.trim()) {
+              return true;
+            }
+            return 'Ruleset name cannot be empty';
           }
-          return 'Ruleset name cannot be empty';
-        }
-      },
-      {
-        name: 'rulesetVersion',
-        message: 'Enter ruleset version',
+        },
+        {
+          name: 'rulesetVersion',
+          message: 'Enter ruleset version',
           default: defaultPegaServerConfig.rulesetVersion,
           validate: (value) => {
-          if (validateRulesetVersion(value)) {
-            return true;
+            if (validateRulesetVersion(value)) {
+              return true;
+            }
+            return 'Please provide compatible version e.g 01-01-01';
           }
-          return 'Please provide compatible version e.g 01-01-01';
         }
-      }
       ]);
 
       let bHasAtLeastOneComponent = false;
@@ -182,17 +235,17 @@ export const deleteServerComponents = async (sourceOfComponents, answers) => {
 
       if (!bHasAtLeastOneComponent) {
         console.log(chalk.bold.redBright(`No custom components in ${sourceOfComponents} that match ruleSet:${selectedComp.rulesetName}.`));
-        process.exit(1);
+        process.exit();
       }
 
       const confirmDeletionAnswers = await inquirer.prompt([
-      {
-        name: 'confirmDeletion',
-        type: 'confirm',
-        message: 'Do you want to delete these components ?',
-        default: false
-      }
-    ]);
+        {
+          name: 'confirmDeletion',
+          type: 'confirm',
+          message: 'Do you want to delete these components ?',
+          default: false
+        }
+      ]);
       if (confirmDeletionAnswers.confirmDeletion) {
         for (const choice of choicesArr) {
           const componentToDelete = choice.value;
@@ -205,8 +258,6 @@ export const deleteServerComponents = async (sourceOfComponents, answers) => {
         }
       }
     }
-
-
   } else {
     console.log(chalk.bold.redBright(`No custom components in ${sourceOfComponents}`));
   }

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

@@ -1,16 +1,9 @@
 import inquirer from 'inquirer';
-import ora from 'ora';
-import chalk from 'chalk';
-
-import {
-  deleteLocalComponents,
-  SOURCE_OF_COMPONENT_TYPES,
-  deleteServerComponents,
-  getDeleteComponentsQuestions
-} from './helper.js';
 
 import { showVersion } from '../../util.js';
 
+import { deleteLocalComponents, SOURCE_OF_COMPONENT_TYPES, deleteServerComponents, getDeleteComponentsQuestions } from './helper.js';
+
 const deleteComponentsFn = async (sourceOfComponents, answers, options) => {
   switch (sourceOfComponents) {
     case SOURCE_OF_COMPONENT_TYPES.LOCAL: {

package/src/tasks/init/index.js

@@ -94,7 +94,7 @@ export default async (options) => {
       fs.mkdirSync(projectDirectory);
     } else {
       console.log(chalk.bold.red(`A project with name ${projectName} already exists. Exiting...`));
-      process.exit(1);
+      process.exit();
     }
 
     const targetDirectory = options.targetDirectory || process.cwd();

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

@@ -0,0 +1 @@
+{}

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

@@ -23,15 +23,16 @@
     "deleteAll": "custom-dx-components deleteAll",
     "promoteWebPack": "custom-dx-components promoteWebPack",
     "revertWebPack": "custom-dx-components revertWebPack",
-    "test": "npm run test:functional && npm run test:unit",
-    "test:functional": "jest --runInBand test/functionTest --detectOpenHandles --coverage",
-    "test-coverage": "node --input-type=module  --experimental-vm-modules node_modules/jest/bin/jest.js --runInBand node_modules/@pega/custom-dx-component --ci --testResultsProcessor='jest-junit' --coverage",
-    "test:unit": "npm run test:unit:local --prefix node_modules/@pega/custom-dx-components",
     "lint:types": "tsc --noEmit",
     "lint:es": "eslint .",
     "lint:styles": "stylelint \"./**/*.@(js|jsx|ts|tsx)\"",
     "lint:format": "prettier -c .",
-    "lint:spelling": "cspell --no-progress **/*"
+    "lint:spelling": "cspell --no-progress **/*",
+    "test": "echo 'Running functional and unit tests will DELETE existing local components, proceed (y/n)?' && read proceed && if test \"$proceed\" = \"y\"; then npm run test:full; fi ",
+    "test:full": "npm run test:functional && npm run test:unit",
+    "test:functional": "npm run test:functional:local --prefix node_modules/@pega/custom-dx-components",
+    "test-coverage": "node --input-type=module  --experimental-vm-modules node_modules/jest/bin/jest.js --runInBand node_modules/@pega/custom-dx-component --ci --testResultsProcessor='jest-junit' --coverage",
+    "test:unit": "npm run test:unit:local --prefix node_modules/@pega/custom-dx-components"
   },
     "scriptsComments": {
     "build": "tsc -b tsconfig.build.json",
@@ -50,8 +51,8 @@
   "license": "Enter License",
   "sideEffects": false,
   "dependencies": {
-    "@pega/cosmos-react-core": "^3.0.1",
-    "@pega/cosmos-react-work": "3.0.1",
+    "@pega/cosmos-react-core": "^4.0.1",
+    "@pega/cosmos-react-work": "4.0.1",
     "dayjs": "^1.11.5",
     "polished": "^4.2.2",
     "prop-types": "^15.8.1",
@@ -65,7 +66,7 @@
   },
   "devDependencies": {
     "@pega/configs": "^0.5.3",
-    "@pega/custom-dx-components": "^0.23.9",
+    "@pega/custom-dx-components": "^23.1.10",
     "@pega/eslint-config": "^0.3.2",
     "@storybook/addon-actions": "^6.5.12",
     "@storybook/addon-essentials": "^6.5.12",