@pega/custom-dx-components 0.23.6 → 0.23.7

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

@@ -22,51 +22,32 @@ import {
   sanitize,
   validateSemver
 } from '../../util.js';
-import {
-  COMPONENT_SCHEMA,
-  COMPONENTS_DIRECTORY_PATH,
-  TASKS_CONFIG_JSON_FILENAME,
-  COMPONENTS_PATH,
-  CATEGORY_CONSTELLATION
- } from '../../constants.js';
+import { COMPONENT_SCHEMA, COMPONENTS_DIRECTORY_PATH, TASKS_CONFIG_JSON_FILENAME, COMPONENTS_PATH, CATEGORY_CONSTELLATION } from '../../constants.js';
 
 const pegaConfigJsonPath = path.join(path.resolve(), TASKS_CONFIG_JSON_FILENAME);
 
 const copy = promisify(ncp);
 
-const copyComponentTemplate = async options => {
+const copyComponentTemplate = async (options) => {
   if (options.targetDirectory) {
     return copy(options.templateDirectory, options.targetDirectory, {
       clobber: false
     });
-  }
-  else {
+  } else {
     return copy(options.templateDirectoryConstellation, options.targetDirectoryConstellation, {
       clobber: false,
       filter: (fileName) => {
         // filter out the file config.json or config.json.mustache
-        if (fileName.indexOf("config.json") >= 0) return false;
+        if (fileName.indexOf('config.json') >= 0) return false;
         else return true;
       }
     });
   }
-
 };
 
 export const compileMustacheTemplates = async (
   componentDirectory,
-  {
-    componentKey,
-    componentName,
-    componentLabel,
-    library,
-    version,
-    type,
-    subtype,
-    description,
-    organization,
-    allowedApplications
-  }
+  { componentKey, componentName, componentLabel, library, version, type, subtype, description, organization, allowedApplications }
 ) => {
   const files = fs.readdirSync(componentDirectory);
   const componentClassName = convertIntoPascalCase(componentKey);
@@ -83,19 +64,18 @@ export const compileMustacheTemplates = async (
   let mustacheSubType = subtype;
 
   // overrides
-  if (typeof(mustacheSubType) == "string") {
+  if (typeof mustacheSubType == 'string') {
     switch (mustacheSubType) {
-      case "FORM-region" :
-        mustacheSubType = "FORM";
+      case 'FORM-region':
+        mustacheSubType = 'FORM';
         break;
-      case "DETAILS-region" :
-        mustacheSubType = "DETAILS";
+      case 'DETAILS-region':
+        mustacheSubType = 'DETAILS';
         break;
-      case "Text-Input" :
-        mustacheSubType = "Text";
+      case 'Text-Input':
+        mustacheSubType = 'Text';
         break;
     }
-
   }
 
   if (allowedApplications.trim() === '') {
@@ -107,8 +87,8 @@ export const compileMustacheTemplates = async (
     allowedApplications = [].concat(allowedApplications);
   }
 
-  allowedApplications = allowedApplications.filter(el => !!el.trim()).map(el => el.trim());
-  files.forEach(file => {
+  allowedApplications = allowedApplications.filter((el) => !!el.trim()).map((el) => el.trim());
+  files.forEach((file) => {
     const filePath = path.join(componentDirectory, file);
 
     const output = compileMustacheTemplate(filePath, {
@@ -133,27 +113,14 @@ export const compileMustacheTemplates = async (
   });
 };
 
-
-export const validateCompileAll = async (
-  {
-    prefix,
-    library,
-    version,
-    allowedApplications,
-    organization
-  },
-  options,
-
-) => {
-
-
+export const validateCompileAll = async ({ prefix, library, version, allowedApplications, organization }, options) => {
   for (let fieldIdx in COMPONENT_SCHEMA.subtype.field) {
-    const type = "Field";
+    const type = 'Field';
     const subtype = COMPONENT_SCHEMA.subtype.field[fieldIdx].value;
     const prefixNoSpace = prefix.replace(/\s+/g, '');
     const componentNameNoSpace = COMPONENT_SCHEMA.subtype.field[fieldIdx].name.replace(/\s+/g, '');
-    const componentName = "".concat(prefixNoSpace).concat(componentNameNoSpace);
-    const componentLabel = "".concat(prefix).concat(" ").concat(COMPONENT_SCHEMA.subtype.field[fieldIdx].name);
+    const componentName = ''.concat(prefixNoSpace).concat(componentNameNoSpace);
+    const componentLabel = ''.concat(prefix).concat(' ').concat(COMPONENT_SCHEMA.subtype.field[fieldIdx].name);
     const description = componentLabel;
 
     await validateCompile(
@@ -169,23 +136,23 @@ export const validateCompileAll = async (
         allowedApplications
       },
       options
-    )
+    );
   }
 
   for (let templateIdx in COMPONENT_SCHEMA.subtype.template) {
-    const type = "Template";
+    const type = 'Template';
     const subtype = COMPONENT_SCHEMA.subtype.template[templateIdx].value;
     const prefixNoSpace = prefix.replace(/\s+/g, '');
-    let templateNameOriginal  = COMPONENT_SCHEMA.subtype.template[templateIdx].name;
-    let templateName =  convertIntoPascalCase(COMPONENT_SCHEMA.subtype.template[templateIdx].name);
+    let templateNameOriginal = COMPONENT_SCHEMA.subtype.template[templateIdx].name;
+    let templateName = convertIntoPascalCase(COMPONENT_SCHEMA.subtype.template[templateIdx].name);
     let templateLabel = convertIntoPascalCase(COMPONENT_SCHEMA.subtype.template[templateIdx].name);
-    if (templateNameOriginal.indexOf("region") >= 0) {
-      let templateNameBase = convertIntoPascalCase(templateNameOriginal.replace(" region", ""));
-      templateName = "TwoColumn".concat(templateNameBase);
-      templateLabel = "Two Column ".concat(templateNameBase);
+    if (templateNameOriginal.indexOf('region') >= 0) {
+      let templateNameBase = convertIntoPascalCase(templateNameOriginal.replace(' region', ''));
+      templateName = 'TwoColumn'.concat(templateNameBase);
+      templateLabel = 'Two Column '.concat(templateNameBase);
     }
-    const componentName = "".concat(prefixNoSpace).concat(templateName);
-    const componentLabel = "".concat(prefix).concat(" ").concat(templateLabel);
+    const componentName = ''.concat(prefixNoSpace).concat(templateName);
+    const componentLabel = ''.concat(prefix).concat(' ').concat(templateLabel);
     const description = componentLabel;
 
     await validateCompile(
@@ -201,22 +168,21 @@ export const validateCompileAll = async (
         allowedApplications
       },
       options
-    )
+    );
   }
 
-
   for (let widgetIdx in COMPONENT_SCHEMA.subtype.widget) {
-    const type = "Widget";
+    const type = 'Widget';
     const subtype = COMPONENT_SCHEMA.subtype.widget[widgetIdx].value;
     const prefixNoSpace = prefix.replace(/\s+/g, '');
-    let widgetNameOriginal  = COMPONENT_SCHEMA.subtype.widget[widgetIdx].name;
-    let widgetName = convertIntoPascalCase(COMPONENT_SCHEMA.subtype.widget[widgetIdx].name).concat("Widget");
-    let widgetLabel = convertIntoPascalCase(COMPONENT_SCHEMA.subtype.widget[widgetIdx].name).concat(" Widget");
-    if (widgetName.indexOf("&") >= 0) {
-      widgetName = convertIntoPascalCase(widgetNameOriginal.replace(" & ", ""));
+    let widgetNameOriginal = COMPONENT_SCHEMA.subtype.widget[widgetIdx].name;
+    let widgetName = convertIntoPascalCase(COMPONENT_SCHEMA.subtype.widget[widgetIdx].name).concat('Widget');
+    let widgetLabel = convertIntoPascalCase(COMPONENT_SCHEMA.subtype.widget[widgetIdx].name).concat(' Widget');
+    if (widgetName.indexOf('&') >= 0) {
+      widgetName = convertIntoPascalCase(widgetNameOriginal.replace(' & ', ''));
     }
-    const componentName = "".concat(prefixNoSpace).concat(widgetName);
-    const componentLabel = "".concat(prefix).concat(" ").concat(widgetLabel);
+    const componentName = ''.concat(prefixNoSpace).concat(widgetName);
+    const componentLabel = ''.concat(prefix).concat(' ').concat(widgetLabel);
     const description = componentLabel;
 
     await validateCompile(
@@ -232,32 +198,17 @@ export const validateCompileAll = async (
         allowedApplications
       },
       options
-    )
+    );
   }
-
-
-}
-
+};
 
 export const validateCompile = async (
-  {
-    library,
-    organization,
-    componentName,
-    componentLabel,
-    version,
-    framework,
-    type,
-    subtype,
-    description,
-    allowedApplications
-  },
+  { library, organization, componentName, componentLabel, version, framework, type, subtype, description, allowedApplications },
   options
 ) => {
-
   let sSubType = subtype;
   if (Array.isArray(subtype)) {
-    sSubType = subtype.join("-");
+    sSubType = subtype.join('-');
   }
 
   const typeLC = type.toLowerCase();
@@ -269,10 +220,9 @@ export const validateCompile = async (
   let pegaConfig = await getPegaConfig();
   let templateParentDir = `./templates/${framework}`;
 
-
   const templateDir = `${templateParentDir}/${type}/${sSubType}`;
   let templateDirectory = fileURLToPath(new URL(templateDir, import.meta.url));
-  templateDirectory = templateDirectory.replace( path.sep + "create-all", path.sep + "create");
+  templateDirectory = templateDirectory.replace(path.sep + 'create-all', path.sep + 'create');
 
   const componentKey = `${organization}_${library}_${componentName}`;
 
@@ -280,7 +230,6 @@ export const validateCompile = async (
 
   const components = await getComponents(false);
 
-
   if (components.includes(componentKey)) {
     console.log(chalk.red(`${componentKey} component already exists in ${targetDirectory}`));
 
@@ -306,14 +255,10 @@ export const validateCompile = async (
     allowedApplications
   });
 
-
   console.log(chalk.green(`created ${componentKey} component in ${targetDirectory}`));
-
-
-
 };
 
-export default async options => {
+export default async (options) => {
   showVersion();
 
   await checkPathAccess(pegaConfigJsonPath);
@@ -322,9 +267,7 @@ export default async options => {
   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`
-    );
+    console.error(`${chalk.red.bold('ERROR')} Could not able find components directory path in config.json`);
     process.exit(1);
   }
 
@@ -336,7 +279,6 @@ export default async options => {
   let componentDefaults = await getComponentDefaults();
   componentDefaults.library = library;
 
-
   if (options.params.length >= 8) {
     const prefix = options.params[3];
     const version = options.params[4];
@@ -356,8 +298,7 @@ export default async options => {
       },
       options
     );
-  }
-  else {
+  } else {
     const questions = [
       {
         name: 'prefix',
@@ -367,7 +308,7 @@ export default async options => {
         name: 'version',
         message: 'Enter component version',
         default: componentDefaults.version,
-        validate: value => {
+        validate: (value) => {
           if (validateSemver(value)) {
             return true;
           }
@@ -378,7 +319,7 @@ export default async options => {
         name: 'library',
         message: 'Enter library name (required)',
         default: componentDefaults.library,
-        validate: value => {
+        validate: (value) => {
           /* value should not be empty
             It should not have spaces
             It should not start with a number
@@ -397,13 +338,10 @@ export default async options => {
       }
     ];
 
-    await inquirer.prompt(questions).then(async answers => {
-      const {
-        prefix,
-        library,
-        version,
-        allowedApplications
-      } = answers;
+    await inquirer.prompt(questions).then(async (answers) => {
+      const { library, version, allowedApplications } = answers;
+      let { prefix } = answers;
+      prefix = prefix.replace(/\W+/g, '');
       await validateCompileAll(
         {
           prefix,
@@ -416,7 +354,4 @@ export default async options => {
       );
     });
   }
-
-
-
 };

package/src/tasks/init/index.js

@@ -124,7 +124,7 @@ export default async (options) => {
         task: () => execPromise('npm i --force --production=false', { cwd: options.targetDirectory })
       },
       {
-        title: 'Installing components dependencies',
+        title: 'Installing tasks dependencies',
         task: () => execPromise('npm i --force --production=false', { cwd: options.componentDirectory })
       }
     ],

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

@@ -64,7 +64,7 @@
   },
   "devDependencies": {
     "@pega/configs": "^0.5.3",
-    "@pega/custom-dx-components": "^0.23.6",
+    "@pega/custom-dx-components": "^0.23.7",
     "@pega/eslint-config": "^0.3.2",
     "@storybook/addon-actions": "^6.5.12",
     "@storybook/addon-essentials": "^6.5.12",

package/src/tasks/list/helper.js

@@ -5,7 +5,7 @@ import chalk from 'chalk';
 import fetch from 'node-fetch';
 
 import { LIST_COMPONENT_SERVICE_REST_ENDPOINT, LP_LIST_COMPONENT_SERVICE_REST_ENDPOINT, TOKEN_PATH } from '../../constants.js';
-import { constructCompleteUrl, getComponents, getPegaServerConfig } from '../../util.js';
+import { constructCompleteUrl, getComponents, getPegaServerConfig, getHttpsAgent } from '../../util.js';
 
 export const SOURCE_OF_COMPONENT_TYPES = {
   SERVER: 'Server',
@@ -40,12 +40,13 @@ export const listLocalComponents = async (sourceOfComponents) => {
   }
 };
 
-function fetchComponentsFromInfinity(apiUrl, headers) {
+async function fetchComponentsFromInfinity(apiUrl, headers) {
+  const serverConfig = await getPegaServerConfig();
   return new Promise((resolve, reject) => {
     let status = 500;
     fetch(apiUrl, {
       method: 'GET',
-      agent: new https.Agent({ rejectUnauthorized: false }),
+      agent: getHttpsAgent(serverConfig),
       headers
     })
       .then((response) => {
@@ -69,7 +70,8 @@ function fetchComponentsFromInfinity(apiUrl, headers) {
   });
 }
 
-function fetchComponentsFromLaunchpad(apiUrl, headers) {
+async function fetchComponentsFromLaunchpad(apiUrl, headers) {
+  const serverConfig = await getPegaServerConfig();
   // constucting urls for all type of components
   const urls = COMPONENT_SCHEMA.type.map((type) => apiUrl.replace('{type}', type.value));
   const statuses = [];
@@ -79,7 +81,7 @@ function fetchComponentsFromLaunchpad(apiUrl, headers) {
       urls.map(async (url) => {
         return fetch(url, {
           method: 'GET',
-          agent: new https.Agent({ rejectUnauthorized: false }),
+          agent: getHttpsAgent(serverConfig),
           headers
         });
       })
@@ -150,7 +152,7 @@ export const getComponentsFromServer = async () => {
 
           fetch(url, {
             method: 'GET',
-            agent: new https.Agent({ rejectUnauthorized: false }),
+            agent: getHttpsAgent(defaultPegaServerConfig),
             headers
           })
             .then(response => {

package/src/tasks/publish/helper.js

@@ -11,19 +11,16 @@ import {
   getComponentDirectoryPath,
   getComponents,
   getPegaServerConfig,
-  validateRulesetVersion
+  validateRulesetVersion,
+  getHttpsAgent
 } from '../../util.js';
-import {
-  PUBLISH_COMPONENT_SERVICE_REST_ENDPOINT,
-  LP_PUBLISH_COMPONENT_SERVICE_REST_ENDPOINT,
-  TOKEN_PATH
-} from '../../constants.js';
+import { PUBLISH_COMPONENT_SERVICE_REST_ENDPOINT, LP_PUBLISH_COMPONENT_SERVICE_REST_ENDPOINT, TOKEN_PATH } from '../../constants.js';
 
 export const getPublishComponentQuestions = async () => {
   const components = await getComponents();
 
   if (components.length == 0) {
-    console.log(chalk.redBright("No components to publish"));
+    console.log(chalk.redBright('No components to publish'));
     process.exit(1);
   }
 
@@ -40,7 +37,7 @@ export const getPublishComponentQuestions = async () => {
       name: 'rulesetName',
       message: 'Enter ruleset name',
       default: defaultPegaConfig.rulesetName,
-      validate: value => {
+      validate: (value) => {
         if (value.trim()) {
           return true;
         }
@@ -54,7 +51,7 @@ export const getPublishComponentQuestions = async () => {
       name: 'rulesetVersion',
       message: 'Enter ruleset version',
       default: defaultPegaConfig.rulesetVersion,
-      validate: value => {
+      validate: (value) => {
         if (validateRulesetVersion(value)) {
           return true;
         }
@@ -109,10 +106,7 @@ export const publishComponentToServer = async (data, doFetch) => {
   const defaultPegaServerConfig = await getPegaServerConfig();
   const { serverType, isolationId } = defaultPegaServerConfig;
   const isLaunchpad = serverType === 'launchpad';
-  const launchpadRestEndpoint = LP_PUBLISH_COMPONENT_SERVICE_REST_ENDPOINT.replace(
-    '{isolationId}',
-    isolationId
-  );
+  const launchpadRestEndpoint = LP_PUBLISH_COMPONENT_SERVICE_REST_ENDPOINT.replace('{isolationId}', isolationId);
   let apiBody;
 
   if (isLaunchpad) {
@@ -136,10 +130,7 @@ export const publishComponentToServer = async (data, doFetch) => {
   }
 
   const defaultPegaConfig = await getPegaServerConfig();
-  const url = constructCompleteUrl(
-    defaultPegaConfig.server,
-    isLaunchpad ? launchpadRestEndpoint : PUBLISH_COMPONENT_SERVICE_REST_ENDPOINT
-  );
+  const url = constructCompleteUrl(defaultPegaConfig.server, isLaunchpad ? launchpadRestEndpoint : PUBLISH_COMPONENT_SERVICE_REST_ENDPOINT);
 
   if (doFetch) {
     try {
@@ -151,9 +142,9 @@ export const publishComponentToServer = async (data, doFetch) => {
           // refresh_token: refreshToken
         } = JSON.parse(OauthData);
         let status = 500;
-      const headers = {
-        Authorization: `${tokenType} ${accessToken}`
-      };
+        const headers = {
+          Authorization: `${tokenType} ${accessToken}`
+        };
 
         if (isLaunchpad) {
           headers.cookie = `Pega-AAT=${accessToken}`;
@@ -162,20 +153,18 @@ export const publishComponentToServer = async (data, doFetch) => {
 
         fetch(url, {
           method: 'POST',
-          agent: new https.Agent({ rejectUnauthorized: false }),
+          agent: getHttpsAgent(defaultPegaConfig),
           headers,
           body: JSON.stringify(apiBody)
         })
-        .then((response) => {
+          .then((response) => {
             status = response.status;
             return response.text();
           })
-        .then((resp) => {
+          .then((resp) => {
             const respData = isLaunchpad ? resp : JSON.parse(resp);
             if (status === 401) {
-              throw new Error(
-                'Error occurred in authentication. Please regenerate using authenticate'
-              );
+              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) {
@@ -184,7 +173,7 @@ export const publishComponentToServer = async (data, doFetch) => {
               throw new Error(`${respData.message}`);
             }
           })
-        .catch((e) => {
+          .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')}`);
@@ -202,8 +191,5 @@ export const publishComponentToServer = async (data, doFetch) => {
     } catch (err) {
       throw new Error(`Error occurred in authentication. Please regenerate using authenticate`);
     }
-
   }
-
-
 };

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

@@ -6,17 +6,8 @@ import fetch from 'node-fetch';
 import AdmZip from 'adm-zip';
 import chalk from 'chalk';
 
-import {
-  constructCompleteUrl,
-  getComponentDirectoryPath,
-  getPegaServerConfig,
-  validateRulesetVersion
-} from '../../util.js';
-import {
-  PUBLISH_COMPONENT_SERVICE_REST_ENDPOINT,
-  LP_PUBLISH_COMPONENT_SERVICE_REST_ENDPOINT,
-  TOKEN_PATH
-} from '../../constants.js';
+import { constructCompleteUrl, getComponentDirectoryPath, getPegaServerConfig, validateRulesetVersion, getHttpsAgent } from '../../util.js';
+import { PUBLISH_COMPONENT_SERVICE_REST_ENDPOINT, LP_PUBLISH_COMPONENT_SERVICE_REST_ENDPOINT, TOKEN_PATH } from '../../constants.js';
 
 export const getPublishComponentQuestions = async () => {
   const defaultPegaConfig = await getPegaServerConfig();
@@ -108,10 +99,7 @@ export const publishComponentToServer = async (data, doFetch) => {
   const defaultPegaServerConfig = await getPegaServerConfig();
   const { serverType, isolationId } = defaultPegaServerConfig;
   const isLaunchpad = serverType === 'launchpad';
-  const launchpadRestEndpoint = LP_PUBLISH_COMPONENT_SERVICE_REST_ENDPOINT.replace(
-    '{isolationId}',
-    isolationId
-  );
+  const launchpadRestEndpoint = LP_PUBLISH_COMPONENT_SERVICE_REST_ENDPOINT.replace('{isolationId}', isolationId);
   let apiBody;
 
   if (isLaunchpad) {
@@ -135,10 +123,7 @@ export const publishComponentToServer = async (data, doFetch) => {
   }
 
   const defaultPegaConfig = await getPegaServerConfig();
-  const url = constructCompleteUrl(
-    defaultPegaConfig.server,
-    isLaunchpad ? launchpadRestEndpoint : PUBLISH_COMPONENT_SERVICE_REST_ENDPOINT
-  );
+  const url = constructCompleteUrl(defaultPegaConfig.server, isLaunchpad ? launchpadRestEndpoint : PUBLISH_COMPONENT_SERVICE_REST_ENDPOINT);
 
   if (doFetch) {
     try {
@@ -161,20 +146,18 @@ export const publishComponentToServer = async (data, doFetch) => {
 
         fetch(url, {
           method: 'POST',
-          agent: new https.Agent({ rejectUnauthorized: false }),
+          agent: getHttpsAgent(defaultPegaConfig),
           headers,
           body: JSON.stringify(apiBody)
         })
-        .then((response) => {
+          .then((response) => {
             status = response.status;
             return response.text();
           })
-        .then((resp) => {
+          .then((resp) => {
             const respData = isLaunchpad ? resp : JSON.parse(resp);
             if (status === 401) {
-              throw new Error(
-                'Error occurred in authentication. Please regenerate using authenticate'
-              );
+              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) {
@@ -183,7 +166,7 @@ export const publishComponentToServer = async (data, doFetch) => {
               throw new Error(`${respData.message}`);
             }
           })
-        .catch((e) => {
+          .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')}`);
@@ -202,5 +185,4 @@ export const publishComponentToServer = async (data, doFetch) => {
       throw new Error(`Error occurred in authentication. Please regenerate using authenticate`);
     }
   }
-
 };