@pega/custom-dx-components 23.1.11 → 24.1.10

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

@@ -7,7 +7,7 @@
   "type": "module",
   "scripts": {
     "startStorybook": "storybook dev --port 6040 --quiet",
-    "lint": "run-p -cl lint:*",
+    "lint": "eslint .",
     "authenticate": "custom-dx-components authenticate",
     "buildComponent": "custom-dx-components buildComponent",
     "buildAllComponents": "custom-dx-components buildAllComponents",
@@ -23,16 +23,16 @@
     "deleteAll": "custom-dx-components deleteAll",
     "promoteWebPack": "custom-dx-components promoteWebPack",
     "revertWebPack": "custom-dx-components revertWebPack",
-    "lint:types": "tsc --noEmit",
-    "lint:es": "eslint .",
-    "lint:styles": "stylelint \"./**/*.@(js|jsx|ts|tsx)\"",
-    "lint:format": "prettier -c .",
-    "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"
+    "_internal-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",
+    "_internal-test": "echo 'Running functional and unit tests will DELETE existing local components, proceed (y/n)?' && read proceed && if test \"$proceed\" = \"y\"; then npm run _internal-test-full; fi ",
+    "_internal-test-full": "npm run _internal-test-functional && npm run _internal-test-unit",
+    "_internal-test-functional": "npm run test:functional:local --prefix node_modules/@pega/custom-dx-components",
+    "_internal-test-unit": "npm run test:unit:local --prefix node_modules/@pega/custom-dx-components",
+    "_internal-build-jest-assets": "custom-dx-components buildJestAssets",
+    "_lint:styles": "stylelint \"./**/*.@(js|jsx|ts|tsx)\"",
+    "_lint:format": "prettier -c .",
+    "_lint:spelling": "cspell --no-progress **/*",
+    "_lint:types": "tsc --noEmit"
   },
     "scriptsComments": {
     "build": "tsc -b tsconfig.build.json",
@@ -51,9 +51,9 @@
   "license": "Enter License",
   "sideEffects": false,
  "dependencies": {
-    "@pega/cosmos-react-condition-builder": "^4.2.0",
-    "@pega/cosmos-react-core": "^4.2.0",
-    "@pega/cosmos-react-work": "^4.2.0",
+    "@pega/cosmos-react-condition-builder": "^6.0.3",
+    "@pega/cosmos-react-core": "^6.0.3",
+    "@pega/cosmos-react-work": "^6.0.3",
     "dayjs": "^1.11.10",
     "lodash.get": "^4.4.2",
     "polished": "^4.2.2",
@@ -61,7 +61,7 @@
     "react": "^17.0.2",
     "react-autosuggest": "^10.1.0",
     "react-dom": "^17.0.2",
-    "react-is": "^18.2.0",
+    "react-is": "^17.0.2",
     "react-player": "^2.10.1",
     "react-redux": "^7.2.6",
     "styled-components": "^5.3.5",
@@ -69,11 +69,10 @@
   },
   "devDependencies": {
     "@pega/configs": "^0.6.0",
-    "@pega/custom-dx-components": "23.1.11",
-    "@pega/pcore-pconnect-typedefs": "2.0.0",
+    "@pega/custom-dx-components": "24.1.10",
+    "@pega/pcore-pconnect-typedefs": "~3.0.0",
     "@storybook/addon-actions": "^7.6.7",
     "@storybook/addon-essentials": "^7.6.7",
-    "@storybook/addon-knobs": "^7.0.2",
     "@storybook/addon-links": "^7.6.7",
     "@storybook/addon-storysource": "^7.6.7",
     "@storybook/react": "^7.6.7",

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

@@ -34,5 +34,6 @@
     "subtype": "",
     "description": "",
     "icon": ""
-  }
+  },
+  "usePromotedWebPack": false
 }

package/src/tasks/init/template/tsconfig.build.json

@@ -5,7 +5,9 @@
     "./src/**/*.stories.ts",
     "./src/**/*.stories.tsx",
     "./src/**/*.stories.js",
-    "./src/**/*.stories.jsx"
+    "./src/**/*.stories.jsx",
+    "./src/**/*.test.jsx",
+    "./src/**/*.test.tsx"
   ],
   "compilerOptions": {
     "noEmit": false,

package/src/tasks/linter/index.js

@@ -15,12 +15,15 @@ export const lintComponent = async (dirToLint) => {
   const formatter = await eslint.loadFormatter("stylish");
   const resultText = formatter.format(results);
 
-  // 4. Output it.
-  // console.log(`lint resultText: ${resultText}`);
-  console.log(resultText);
-
   // Indicate linting is complete
   console.log(chalk.green(` linting complete...`));
+
+  if (resultText.length > 0 && resultText.indexOf("error") >= 0) {
+    throw new Error( "Lint:\n" + resultText );
+  }
+  else {
+    console.log(resultText);
+  }
 };
 
 // inpsired by https://eslint.org/docs/latest/developer-guide/nodejs-api

package/src/tasks/list/helper.js

@@ -102,6 +102,15 @@ async function fetchComponentsFromInfinity(apiUrl, headers) {
     })
       .then((response) => {
         status = response.status;
+        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');
+        }
         return response.json();
       })
       .then((resp) => {
@@ -122,6 +131,7 @@ async function fetchComponentsFromInfinity(apiUrl, headers) {
 }
 
 async function fetchComponentsFromLaunchpad(apiUrl, headers) {
+
   const serverConfig = await getPegaServerConfig();
   // constructing urls for all type of components
   const urls = COMPONENT_SCHEMA.type.map((type) => apiUrl.replace('{type}', type.value));

package/src/tasks/list/index.js

@@ -1,5 +1,6 @@
 import inquirer from 'inquirer';
 import ora from 'ora';
+import chalk from 'chalk';
 
 import { showVersion, getPegaServerConfig } from '../../util.js';
 
@@ -35,9 +36,25 @@ const getList = async (sourceOfComponents, answers) => {
 
 
       const spinner = ora('Fetching components from server\n').start();
-      const data = await getComponentsFromServer(library, organization);
-      spinner.stop();
-      await displayServerComponents(data, answers);
+
+      try {
+        const data = await getComponentsFromServer(library, organization);
+        spinner.stop();
+        await displayServerComponents(data, answers);
+      }
+      catch (error) {
+
+        if (error.indexOf("ECONNREFUSED") >= 0) {
+          console.log(`\n${chalk.bold.red('Error occurred in authentication. Please regenerate using authenticate')}`);
+        }
+        else {
+          console.log(`${chalk.bold.red(error)}`);
+        }
+
+        // spinner.stop();
+        process.exit(1);
+      }
+
 
       break;
     }

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

@@ -9,7 +9,8 @@ import inquirer from 'inquirer';
 import {
   convertIntoPascalCase,
   checkPathAccess,
-  showVersion
+  showVersion,
+  updateUseWebPackPromotion
 } from '../../util.js';
 
 import {
@@ -22,8 +23,6 @@ import {
 
 
 
-let redirectFile = "";
-
 export const copyWebPack = async () => {
 
    // first check to see if already have the file
@@ -79,48 +78,23 @@ export const copyWebPack = async () => {
     }
 
 
-
-
-
+    console.log(chalk.bold.green(`Bundler now using ${newWebPackConfigDir}.`));
+    console.log(chalk.bold.green(`Utilize this file for webpack modifications.`));
 
   }
 
-  redirectFile = newWebPackConfigDir;
-
-
-
-}
-
-export const updateBuilder = async () => {
-
-  const builderIndexDir = fileURLToPath(new URL(BUILDER_INDEX_FILE_PATH, import.meta.url));
-
-  let indexFileJS = fs.readFileSync(builderIndexDir, { encoding: 'utf8' });
 
-  if (indexFileJS.length > 0) {
-    // comment out original webpack reference
-
-    // if not commented out, comment out
-    if (indexFileJS.indexOf("// import configFactory from './webpack.config.js';") < 0) {
-      indexFileJS = indexFileJS.replaceAll("import configFactory from './webpack.config.js';", "// import configFactory from './webpack.config.js';");
-    }
 
-    // uncomment out promoted webpack reference
-    indexFileJS = indexFileJS.replaceAll("// import configFactory from '../../../../../../../webpack.config.js';", "import configFactory from '../../../../../../../webpack.config.js';");
 
-    fs.writeFileSync(builderIndexDir, indexFileJS, { encoding: 'utf8' });
 
-    console.log(chalk.bold.green(`Bundler now using ${redirectFile}.`));
-    console.log(chalk.bold.green(`Utilize this file for webpack modifications.`));
-  }
+}
 
 
-}
 
 export default async options => {
   showVersion();
 
   await copyWebPack();
-  await updateBuilder();
+  await updateUseWebPackPromotion(true);
 
 };

package/src/tasks/publish/helper.js

@@ -84,17 +84,23 @@ export const zipComponent = async componentKey => {
   const srcDirectory = await getComponentDirectoryPath(componentKey);
   const buildDirectory = await path.join(path.resolve(), 'dist/components', componentKey);
   const configJson = `${srcDirectory}/config.json`;
+  const localizationJson = `${srcDirectory}/localizations.json`;
 
   const zip = new AdmZip();
 
   zip.addLocalFolder(srcDirectory, 'src/');
   zip.addLocalFile(configJson);
+
+  if (fs.existsSync(localizationJson)) {
+    zip.addLocalFile(localizationJson);
+  }
+
   zip.addLocalFolder(buildDirectory);
   const zipContent = zip.toBuffer().toString('base64');
 
   const configContent = Buffer.from(fs.readFileSync(`${srcDirectory}/config.json`)).toString();
 
-  fs.rmdir('dist', { recursive: true }, err => {
+  fs.rm('dist', { recursive: true }, err => {
     if (err) {
       throw err;
     }

package/src/tasks/publish/index.js

@@ -9,7 +9,7 @@ import { getComponentDirectoryPath, showVersion } from '../../util.js';
 
 import { getPublishComponentQuestions, publishComponentToServer, zipComponent } from './helper.js';
 
-export default async (options) => {
+export default async options => {
   showVersion();
 
   let componentKey;
@@ -19,13 +19,15 @@ export default async (options) => {
 
   let doFetch = true;
 
-  if (options.params.length >= 8) {
+  if (options.params.length >= 7) {
     componentKey = options.params[3];
     const rulesetName = options.params[4];
     const rulesetVersion = options.params[5];
     const dBuild = options.params[6];
     devBuild = dBuild === 'Y' || dBuild === 'y' || dBuild === true || dBuild === 'true';
-    doFetch = false;
+
+    // eslint-disable-next-line no-unneeded-ternary,no-nested-ternary
+    doFetch = options.params.length >= 7 ? (options.params[7] === 'noFetch' ? false : true) : true;
 
     content = { componentKey, rulesetName, rulesetVersion, devBuild };
   } else {
@@ -79,7 +81,7 @@ export default async (options) => {
     }
   );
 
-  await tasks.run().catch((err) => {
+  await tasks.run().catch(err => {
     console.log(chalk.bold.red(err.toString()));
   });
   return true;

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

@@ -70,11 +70,17 @@ export const zipComponent = async componentKey => {
   const srcDirectory = await getComponentDirectoryPath(componentKey);
   const buildDirectory = await path.join(path.resolve(), 'dist/components', componentKey);
   const configJson = `${srcDirectory}/config.json`;
+  const localizationJson = `${srcDirectory}/localizations.json`;
 
   const zip = new AdmZip();
 
   zip.addLocalFolder(srcDirectory, 'src/');
   zip.addLocalFile(configJson);
+
+  if (fs.existsSync(localizationJson)) {
+    zip.addLocalFile(localizationJson);
+  }
+
   zip.addLocalFolder(buildDirectory);
   const zipContent = zip.toBuffer().toString('base64');
 
@@ -159,55 +165,67 @@ export const publishComponentToServer = async (data, doFetch) => {
           headers.Authorization = `${tokenType} ${accessToken}`;
         }
 
-        fetch(url, {
+
+        const response = await fetch(url, {
           method: 'POST',
           agent: getHttpsAgent(defaultPegaConfig),
-          headers,
+          headers: 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(
+        });
+
+        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 {
-              throw new Error(`${respData.message}`);
-            }
-          })
-          .catch(e => {
-            if (e.code === 'ECONNREFUSED') {
-              // 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)}`);
-            }
-          });
+          }
+          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-all/index.js

@@ -16,8 +16,8 @@ import {
 
 export function getCustomTasks(componentKey, sourceMap, devBuild, content, options) {
   const sDevBuild = devBuild ? '(dev build)' : '';
-  // eslint-disable-next-line no-unneeded-ternary
-  const doFetch = options.params.length >= 7 ? false : true;
+  // eslint-disable no-unneeded-ternary,no-nested-ternary
+  const doFetch = options.params.length >= 7 ? (options.params[6] === 'noFetch' ? false : true) : true;
   return new Listr(
     [
       {
@@ -26,13 +26,6 @@ export function getCustomTasks(componentKey, sourceMap, devBuild, content, optio
           await validate(componentKey);
         }
       },
-      {
-        title: `Bundle Component ${sDevBuild}`,
-        task: async () => {
-          await bundleComponent(componentKey, sourceMap, devBuild);
-        },
-        skip: () => (options.skipBundle ? 'Skipped bundling component' : undefined)
-      },
       {
         title: 'Lint component',
         task: async () => {
@@ -41,6 +34,13 @@ export function getCustomTasks(componentKey, sourceMap, devBuild, content, optio
           await lintComponent(targetDirectory);
         }
       },
+      {
+        title: `Bundle Component ${sDevBuild}`,
+        task: async () => {
+          await bundleComponent(componentKey, sourceMap, devBuild);
+        },
+        skip: () => (options.skipBundle ? 'Skipped bundling component' : undefined)
+      },
       {
         title: 'Zip Component',
         task: async () => {
@@ -55,9 +55,7 @@ export function getCustomTasks(componentKey, sourceMap, devBuild, content, optio
         }
       }
     ],
-    {
-      exitOnError: true
-    }
+    { concurrent: false, exitOnError: true }
   );
 }
 
@@ -76,7 +74,7 @@ export default async options => {
   let devBuild;
   let content;
 
-  if (options.params.length >= 7) {
+  if (options.params.length >= 6) {
     const rulesetName = options.params[3];
     const rulesetVersion = options.params[4];
     const dBuild = options.params[5];
@@ -94,16 +92,17 @@ export default async options => {
   }
 
   // eslint-disable-next-line no-shadow
-  for (const componentKey of components) {
+  for await (const componentKey of components) {
     console.log(chalk.bold.green(`Publishing: ${componentKey}`));
 
     const myCustomTasks = getCustomTasks(componentKey, sourceMap, devBuild, content, options);
 
-    // eslint-disable-next-line no-await-in-loop
-    await myCustomTasks.run().catch(err => {
+    try {
+      await myCustomTasks.run();
+    } catch (err) {
       console.log(chalk.bold.red(err.toString()));
       process.exit(1);
-    });
+    }
   }
 
   // once done, remove leftover directories

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

@@ -8,7 +8,8 @@ import { up } from 'inquirer/lib/utils/readline.js';
 
 import {
   convertIntoPascalCase,
-  showVersion
+  showVersion,
+  updateUseWebPackPromotion
 } from '../../util.js';
 import {
   WEBPACK_CONFIG_JS_FILENAME,
@@ -33,37 +34,17 @@ export const renamePromotedWebPack = async () => {
     process.exit();
   }
 
+  console.log(chalk.bold.green("Bundler reverted to using internal webpack.config.js."));
   console.log(chalk.bold.green(`File ${promoteWebPackDir} marked as not used.`));
 
 }
 
-export const revertBuilder = async () => {
 
-  const builderIndexDir = fileURLToPath(new URL(BUILDER_INDEX_FILE_PATH, import.meta.url));
-
-  let indexFileJS = fs.readFileSync(builderIndexDir, { encoding: 'utf8' });
-
-  if (indexFileJS.length > 0) {
-    // uncomment out original webpack reference
-    indexFileJS = indexFileJS.replaceAll("// import configFactory from './webpack.config.js';", "import configFactory from './webpack.config.js';");
-
-    // comment out promoted webpack reference
-    if (indexFileJS.indexOf("// import configFactory from '../../../../../../../webpack.config.js';") < 0) {
-      indexFileJS = indexFileJS.replaceAll("import configFactory from '../../../../../../../webpack.config.js';", "// import configFactory from '../../../../../../../webpack.config.js';");
-    }
-
-    fs.writeFileSync(builderIndexDir, indexFileJS, { encoding: 'utf8' });
-
-    console.log(chalk.bold.green(`Bundler reverted to using internal webpack.config.js.`));
-  }
-
-
-}
 
 export default async options => {
   showVersion();
 
   await renamePromotedWebPack();
-  await revertBuilder();
+  await updateUseWebPackPromotion(false);
 
 };

package/src/tasks/validator/index.js

@@ -350,7 +350,13 @@ export default async (option) => {
   }
 
   //const data = JSON.parse(fs.readFileSync(path.resolve(configFile), 'utf8'));
-  const data = JSON.parse(configData);
+  let data;
+  try {
+    data = JSON.parse(configData);
+  }
+  catch (er) {
+    throw new Error(`Invalid schema json in config.json: ${er}`);
+  }
 
   const valid = validateSchema(data);