@pega/custom-dx-components 23.1.13 → 23.1.15

package/src/tasks/delete/helper.js

@@ -1,11 +1,10 @@
 import fs from 'fs';
+import path, { join } from 'path';
+
 import chalk from 'chalk';
 import inquirer from 'inquirer';
 import ora from 'ora';
 
-import path from 'path';
-import { join } from 'path';
-
 import {
   deleteLocalComponent,
   deleteInfinityServerComponent,
@@ -16,8 +15,11 @@ import {
   sanitize
 } from '../../util.js';
 import { getComponentsFromServer } from '../list/helper.js';
-
-import { TASKS_CONFIG_JSON_FILENAME, COMPONENTS_DIRECTORY_PATH, COMPONENTS_PATH } from '../../constants.js';
+import {
+  TASKS_CONFIG_JSON_FILENAME,
+  COMPONENTS_DIRECTORY_PATH,
+  COMPONENTS_PATH
+} from '../../constants.js';
 
 export const SOURCE_OF_COMPONENT_TYPES = {
   SERVER: 'Server',
@@ -27,8 +29,7 @@ export const SOURCE_OF_COMPONENT_TYPES = {
 let library;
 let organization;
 
-
-export const getDeleteComponentsQuestions = async (options) => {
+export const getDeleteComponentsQuestions = async options => {
   const defaultPegaServerConfig = await getPegaServerConfig();
 
   return [
@@ -63,34 +64,34 @@ export const getLaunchPadFilterQuestions = async () => {
 
   const componentData = data[COMPONENTS_PATH];
 
-   ({ library } = componentData);
-   ({ organization } = JSON.parse(fs.readFileSync(path.resolve('package.json'), 'utf8')));
+  ({ 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;
+    {
+      name: 'organization',
+      message: 'Enter component organization (required)',
+      default: organization,
+      validate: value => {
+        if (value) {
+          return true;
+        }
+        return 'Please provide value for organization';
       }
-      return 'Please provide value for organization';
-    }
-  },
-  {
-    name: 'library',
-    message: 'Enter library name (required)',
-    default: library,
-    validate: value => {
-      if (value) {
-        return true;
+    },
+    {
+      name: 'library',
+      message: 'Enter library name (required)',
+      default: library,
+      validate: value => {
+        if (value) {
+          return true;
+        }
+        return 'Please provide value for library';
       }
-      return 'Please provide value for library';
     }
-  }
   ];
-}
+};
 
 export const deleteLocalComponents = async (sourceOfComponents, options) => {
   const localComponents = await getComponents();
@@ -99,7 +100,8 @@ export const deleteLocalComponents = async (sourceOfComponents, options) => {
     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';
+      const confirmDeletion =
+        sDeletion === 'Y' || sDeletion === 'y' || sDeletion === true || sDeletion === 'true';
       if (confirmDeletion) {
         await deleteLocalComponent(componentKey);
       }
@@ -128,27 +130,41 @@ export const deleteLocalComponents = async (sourceOfComponents, options) => {
 };
 
 export const deleteServerComponents = async (sourceOfComponents, answers) => {
-
   const defaultPegaServerConfig = await getPegaServerConfig();
   const isLaunchpad = defaultPegaServerConfig.serverType === 'launchpad';
 
-
   if (isLaunchpad) {
     const questions = await getLaunchPadFilterQuestions();
     const lpAnswers = await inquirer.prompt(questions);
 
-    ({library, organization} = lpAnswers);
+    ({ library, organization } = lpAnswers);
   }
 
-  const spinner = ora('Fetching components from server').start();
-  const data = await getComponentsFromServer(library, organization);
-  spinner.stop();
+  let spinner;
+  let data;
+  try {
+    spinner = ora('Fetching components from server').start();
+    data = await getComponentsFromServer(library, organization);
+    spinner.stop();
+  } catch (error) {
+    spinner.stop();
+    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);
+  }
 
   let serverComponents;
   if (isLaunchpad) {
     serverComponents = data;
-
   } else {
     try {
       if (typeof data === 'object') {
@@ -161,14 +177,18 @@ export const deleteServerComponents = async (sourceOfComponents, answers) => {
     }
   }
 
-
   if (serverComponents && serverComponents?.length > 0) {
     if (isLaunchpad) {
       const choicesArr = serverComponents.map(({ name: componentName, type, version }) => {
-        const name = `${standardizeStr(componentName, 45)} ${standardizeStr(type, 20)} ${standardizeStr(version, 20)}`;
+        const name = `${standardizeStr(componentName, 45)} ${standardizeStr(
+          type,
+          20
+        )} ${standardizeStr(version, 20)}`;
 
         const value = `${componentName}~|~${type}~|~${version}`;
-        const short = `\n Selected component : ${chalk.redBright(`${componentName} ${type} : ${version}`)}`;
+        const short = `\n Selected component : ${chalk.redBright(
+          `${componentName} ${type} : ${version}`
+        )}`;
 
         return { name, value, short };
       });
@@ -177,20 +197,25 @@ export const deleteServerComponents = async (sourceOfComponents, answers) => {
         name: 'componentToDelete',
         type: 'rawlist',
         pageSize: 10,
-        message: `Select component to delete \n  ${standardizeStr('Component Name', 48)} ${standardizeStr('Type', 20)} ${standardizeStr(
-          'Version',
-          22
-        )}`,
+        message: `Select component to delete \n  ${standardizeStr(
+          'Component Name',
+          48
+        )} ${standardizeStr('Type', 20)} ${standardizeStr('Version', 22)}`,
         choices: choicesArr
       });
       await deleteLaunchpadServerComponent(launchpadAnswers.componentToDelete);
     } else {
       // logic for Infinity
       const choicesArr = serverComponents.map(({ label, pyRuleSet, pyRuleSetVersion }) => {
-        const name = `${standardizeStr(label, 45)} ${standardizeStr(pyRuleSet, 30)} ${standardizeStr(pyRuleSetVersion, 20)}`;
+        const name = `${standardizeStr(label, 45)} ${standardizeStr(
+          pyRuleSet,
+          30
+        )} ${standardizeStr(pyRuleSetVersion, 20)}`;
 
         const value = `${label}~|~${pyRuleSet}~|~${pyRuleSetVersion}`;
-        const short = `\n Selected component : ${chalk.redBright(`${label} ${pyRuleSet} : ${pyRuleSetVersion}`)}`;
+        const short = `\n Selected component : ${chalk.redBright(
+          `${label} ${pyRuleSet} : ${pyRuleSetVersion}`
+        )}`;
 
         return { name, value, short };
       });
@@ -198,10 +223,10 @@ export const deleteServerComponents = async (sourceOfComponents, answers) => {
         name: 'componentToDelete',
         type: 'rawlist',
         pageSize: 10,
-        message: `Select component to delete \n  ${standardizeStr('Rule name', 48)} ${standardizeStr('Ruleset name', 30)} ${standardizeStr(
-          'Ruleset version',
-          22
-        )}`,
+        message: `Select component to delete \n  ${standardizeStr(
+          'Rule name',
+          48
+        )} ${standardizeStr('Ruleset name', 30)} ${standardizeStr('Ruleset version', 22)}`,
         choices: choicesArr
       });
       await deleteInfinityServerComponent(infinityAnswers.componentToDelete);

package/src/tasks/init/helper.js

@@ -48,11 +48,11 @@ export const getInitProjectQuestions = () => {
       message: 'Description',
       default: ''
     },
-    {
-      name: 'gitRepositoryUrl',
-      message: 'Git repository url (optional)',
-      default: ''
-    },
+    // {
+    //   name: 'gitRepositoryUrl',
+    //   message: 'Git repository url (optional)',
+    //   default: ''
+    // },
     {
       name: 'author',
       message: 'Author',

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

@@ -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": "^4.3.1",
+    "@pega/cosmos-react-core": "^4.3.1",
+    "@pega/cosmos-react-work": "^4.3.1",
     "dayjs": "^1.11.10",
     "lodash.get": "^4.4.2",
     "polished": "^4.2.2",
@@ -69,7 +69,7 @@
   },
   "devDependencies": {
     "@pega/configs": "^0.6.0",
-    "@pega/custom-dx-components": "23.1.13",
+    "@pega/custom-dx-components": "23.1.15",
     "@pega/pcore-pconnect-typedefs": "~2.1.1",
     "@storybook/addon-actions": "^7.6.7",
     "@storybook/addon-essentials": "^7.6.7",

package/src/tasks/list/helper.js

@@ -102,7 +102,10 @@ async function fetchComponentsFromInfinity(apiUrl, headers) {
     })
       .then((response) => {
         status = response.status;
-        if (status === 404){
+        if (status === 401) {
+          throw new Error('Error occurred in authentication. Please regenerate using authenticate');
+        }
+        else if (status === 404){
           throw new Error('404: Server resource not found');
         }
         else if (status === 405){
@@ -186,7 +189,7 @@ export const getComponentsFromServer = async (library, organization) => {
       fs.readFile(TOKEN_PATH, 'utf8', (err, data) => {
         if (err) {
           // eslint-disable-next-line prefer-promise-reject-errors
-          reject(`\n${chalk.bold.red('Error occurred in authentication. Please regenerate using authenticate')}`);
+          reject(`\n${chalk.bold.red('\nError occurred in authentication. Please regenerate using authenticate')}`);
         }
         if (data) {
           const { access_token: accessToken, token_type: tokenType } = JSON.parse(data);

package/src/tasks/publish/helper.js

@@ -19,7 +19,7 @@ import {
   TOKEN_PATH
 } from '../../constants.js';
 
-export const getPublishComponentQuestions = async () => {
+export const getPublishComponentQuestions = async componentKey => {
   const components = await getComponents();
 
   if (components.length === 0) {
@@ -34,7 +34,9 @@ export const getPublishComponentQuestions = async () => {
       name: 'componentKey',
       type: 'rawlist',
       message: 'Select component to publish',
-      choices: components
+      choices: components,
+      default: componentKey,
+      when: () => !componentKey
     },
     {
       name: 'rulesetName',
@@ -157,63 +159,63 @@ export const publishComponentToServer = async (data, doFetch) => {
           // refresh_token: refreshToken
         } = JSON.parse(OauthData);
         let status = 500;
-        const headers = {
-          Authorization: `${tokenType} ${accessToken}`
-        };
+        const headers = {};
 
         if (isLaunchpad) {
           headers.cookie = `Pega-AAT=${accessToken}`;
           headers['Content-Type'] = 'application/json';
+        } else {
+          headers.Authorization = `${tokenType} ${accessToken}`;
         }
 
-        fetch(url, {
+        const response = await fetch(url, {
           method: 'POST',
           agent: getHttpsAgent(defaultPegaConfig),
           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(
-                chalk.bold.green(`Success : ${isLaunchpad ? respData : respData.message}`)
-              );
-            } 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)}`);
-            }
-          });
+        });
+
+        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 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`);
     }
   }

package/src/tasks/publish/index.js

@@ -31,9 +31,15 @@ export default async options => {
 
     content = { componentKey, rulesetName, rulesetVersion, devBuild };
   } else {
-    const questions = await getPublishComponentQuestions();
+    // VS Code pluggin would send in the component
+    let paramComponentKey;
+    if (options.params.length == 4) {
+      paramComponentKey = options.params[3];
+    }
+
+    const questions = await getPublishComponentQuestions(paramComponentKey);
     const answers = await inquirer.prompt(questions);
-    ({ componentKey, sourceMap, devBuild } = answers);
+    ({ componentKey = paramComponentKey, sourceMap, devBuild } = answers);
 
     content = {
       ...answers

package/src/tasks/rename/index.js

@@ -225,13 +225,20 @@ export default async options => {
 
   }
   else {
+    // VS Code pluggin would send in the component
+    let paramComponentKey;
+    if (options.params.length == 4) {
+      paramComponentKey = options.params[3];
+    }
+
     const questions = [
       {
         name: 'componentKey',
         type: 'rawlist',
         pageSize: 15,
         message: 'Select component to rename',
-        choices: localComponents
+        choices: localComponents,
+        when: () => !paramComponentKey
       },
       {
         name: 'componentName',
@@ -312,7 +319,7 @@ export default async options => {
 
     await inquirer.prompt(questions).then(async answers => {
       const {
-        componentKey,
+        componentKey = paramComponentKey,
         componentName,
         componentLabel,
         organization,

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

@@ -1,50 +1,32 @@
-
 import fs from 'fs';
-import path, { join } from 'path';
-import { URL, fileURLToPath } from 'url';
+import path from 'path';
 
 import chalk from 'chalk';
-import { up } from 'inquirer/lib/utils/readline.js';
-
-import {
-  convertIntoPascalCase,
-  showVersion,
-  updateUseWebPackPromotion
-} from '../../util.js';
-import {
-  WEBPACK_CONFIG_JS_FILENAME,
-  BUILDER_INDEX_FILE_PATH
-} from '../../constants.js';
-
 
+import { showVersion, updateUseWebPackPromotion } from '../../util.js';
+import { WEBPACK_CONFIG_JS_FILENAME } from '../../constants.js';
 
 export const renamePromotedWebPack = async () => {
-
   // call this function from top level
   // fs.copyFileSync("./webpack.config.js", "webpack.config.js")
 
   const promoteWebPackDir = path.resolve(WEBPACK_CONFIG_JS_FILENAME);
-  const renamedPromoteWebPackDir = path.resolve(`${WEBPACK_CONFIG_JS_FILENAME  }.notused`);
+  const renamedPromoteWebPackDir = path.resolve(`${WEBPACK_CONFIG_JS_FILENAME}.notused`);
 
   try {
     fs.renameSync(promoteWebPackDir, renamedPromoteWebPackDir);
-  }
-  catch (ex) {
+  } catch (ex) {
     console.log(chalk.bold.red(`File ${promoteWebPackDir} not found.`));
     process.exit();
   }
 
-  console.log(chalk.bold.green("Bundler reverted to using internal webpack.config.js."));
+  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 default async options => {
+export default async () => {
   showVersion();
 
   await renamePromotedWebPack();
   await updateUseWebPackPromotion(false);
-
 };

package/src/util.js

@@ -9,7 +9,7 @@ import chalk from 'chalk';
 import mustache from 'mustache';
 import pascalCase from 'pascalcase';
 import fetch from 'node-fetch';
-import checkGit from 'check-git';
+// import checkGit from 'check-git';
 
 import * as currentPath from './currentPath.cjs';
 import {
@@ -362,12 +362,12 @@ export const showVersion = () => {
     process.exit(1);
   }
 
-  const hasGit = checkGit(process.cwd());
+  // const hasGit = checkGit(process.cwd());
 
-  if (!hasGit) {
-    console.log(chalk.redBright('DX Component Builder - Git needs to be installed.'));
-    process.exit(1);
-  }
+  // if (!hasGit) {
+  //   console.log(chalk.redBright('DX Component Builder - Git needs to be installed.'));
+  //   process.exit(1);
+  // }
 };
 
 export const getOOTBComponents = async () => {

package/tests/assets/components/create/Pega_DXIL_MyTestText/create-nonce.ts

@@ -0,0 +1,6 @@
+/* eslint-disable camelcase */
+// @ts-ignore
+if (window?.__webpack_nonce__) {
+  // @ts-ignore
+  __webpack_nonce__ = window.__webpack_nonce__;
+}

package/tests/assets/components/create/Pega_DXIL_MyTestText/index.tsx

@@ -1,6 +1,7 @@
 import { Input, withConfiguration } from '@pega/cosmos-react-core';
 
 import type { PConnFieldProps } from './PConnProps';
+import './create-nonce';
 
 import StyledPegaDxilMyTestTextWrapper from './styles';
 

package/tests/assets/components/createAll/Constellation/Pega_DXIL_MyBoolean/create-nonce.ts

@@ -0,0 +1,6 @@
+/* eslint-disable camelcase */
+// @ts-ignore
+if (window?.__webpack_nonce__) {
+  // @ts-ignore
+  __webpack_nonce__ = window.__webpack_nonce__;
+}

package/tests/assets/components/createAll/Constellation/Pega_DXIL_MyBoolean/index.tsx

@@ -7,6 +7,8 @@ import {
 } from "@pega/cosmos-react-core";
 
 import type { PConnFieldProps } from './PConnProps';
+import './create-nonce';
+
 
 // includes in bundle
 import handleEvent from "./event-utils";

package/tests/assets/components/createAll/Constellation/Pega_DXIL_MyCaseWidget/create-nonce.ts

@@ -0,0 +1,6 @@
+/* eslint-disable camelcase */
+// @ts-ignore
+if (window?.__webpack_nonce__) {
+  // @ts-ignore
+  __webpack_nonce__ = window.__webpack_nonce__;
+}

package/tests/assets/components/createAll/Constellation/Pega_DXIL_MyCaseWidget/index.tsx

@@ -1,6 +1,7 @@
 import { useState, useEffect } from 'react';
 import { Table, Text, withConfiguration } from '@pega/cosmos-react-core';
 import type { PConnFieldProps } from './PConnProps';
+import './create-nonce';
 
 import StyledPegaDxilMyCaseWidgetWrapper from './styles';
 

package/tests/assets/components/createAll/Constellation/Pega_DXIL_MyCurrency/create-nonce.ts

@@ -0,0 +1,6 @@
+/* eslint-disable camelcase */
+// @ts-ignore
+if (window?.__webpack_nonce__) {
+  // @ts-ignore
+  __webpack_nonce__ = window.__webpack_nonce__;
+}

package/tests/assets/components/createAll/Constellation/Pega_DXIL_MyCurrency/index.tsx

@@ -12,6 +12,7 @@ import {
 
 
 import type { PConnFieldProps } from './PConnProps';
+import './create-nonce';
 
 // includes in bundle
 import handleEvent from './event-utils';

package/tests/assets/components/createAll/Constellation/Pega_DXIL_MyDate/create-nonce.ts

@@ -0,0 +1,6 @@
+/* eslint-disable camelcase */
+// @ts-ignore
+if (window?.__webpack_nonce__) {
+  // @ts-ignore
+  __webpack_nonce__ = window.__webpack_nonce__;
+}

package/tests/assets/components/createAll/Constellation/Pega_DXIL_MyDate/index.tsx

@@ -3,6 +3,7 @@ import { DateInput, FieldValueList, DateTimeDisplay, Text, withConfiguration } f
 import FormattedText from "./FormattedText";
 
 import type { PConnFieldProps } from './PConnProps';
+import './create-nonce';
 
 import StyledPegaDxilMyDateWrapper from './styles';
 

package/tests/assets/components/createAll/Constellation/Pega_DXIL_MyDateTime/create-nonce.ts

@@ -0,0 +1,6 @@
+/* eslint-disable camelcase */
+// @ts-ignore
+if (window?.__webpack_nonce__) {
+  // @ts-ignore
+  __webpack_nonce__ = window.__webpack_nonce__;
+}

package/tests/assets/components/createAll/Constellation/Pega_DXIL_MyDateTime/index.tsx

@@ -1,6 +1,7 @@
 import { useEffect, useState } from 'react';
 import { DateTimeInput, FieldValueList, DateTimeDisplay, Text, withConfiguration } from "@pega/cosmos-react-core";
 import type { PConnFieldProps } from './PConnProps';
+import './create-nonce';
 
 // includes in bundle
 import DateTimeFormatter from "./date-time";

package/tests/assets/components/createAll/Constellation/Pega_DXIL_MyDecimal/create-nonce.ts

@@ -0,0 +1,6 @@
+/* eslint-disable camelcase */
+// @ts-ignore
+if (window?.__webpack_nonce__) {
+  // @ts-ignore
+  __webpack_nonce__ = window.__webpack_nonce__;
+}