@pega/custom-dx-components 8.8.11 → 8.8.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pega/custom-dx-components",
-  "version": "8.8.11",
+  "version": "8.8.12",
   "description": "Utility for building custom UI components",
   "bin": "./bin/index.js",
   "scripts": {

package/src/tasks/authenticate/helper.js

@@ -1,38 +1,38 @@
 /* eslint-disable import/prefer-default-export */
-import { getPegaServerConfig } from '../../util.js';
-
 import { AUTHENTICATE_SCHEMA, AUTHENTICATE_DEFAULTS } from '../../constants.js';
 
 export const getAuthQuestions = async (dxcbConfig) => {
   const defaultPegaConfig = dxcbConfig;
-  const aAlwaysAsk = dxcbConfig['questions_askAlways'] ? dxcbConfig['questions_askAlways'].split(',') : [];
-  const aNeverAsk = dxcbConfig['questions_askNever'] ? dxcbConfig['questions_askNever'].split(',') : [];
-  const aAskOnce = dxcbConfig['questions_askOnce'] ? dxcbConfig['questions_askOnce'].split(',') : [];
-  const aAskedOnce = dxcbConfig['questions_askedOnce'] ? dxcbConfig['questions_askedOnce'].split(',') : [];
+  const aAlwaysAsk = dxcbConfig.questions_askAlways ? dxcbConfig.questions_askAlways.split(',') : [];
+  const aNeverAsk = dxcbConfig.questions_askNever ? dxcbConfig.questions_askNever.split(',') : [];
+  const aAskOnce = dxcbConfig.questions_askOnce ? dxcbConfig.questions_askOnce.split(',') : [];
+  const aAskedOnce = dxcbConfig.questions_askedOnce ? dxcbConfig.questions_askedOnce.split(',') : [];
 
   // Ask if various must, never, once criteria are met
   const askThisTime = (prop) => {
-    const bAsk = aAlwaysAsk.includes(prop) ||
+    return aAlwaysAsk.includes(prop) ||
       (!aNeverAsk.includes(prop) && (aAskOnce.includes(prop) && !aAskedOnce.includes(prop)));
-    return bAsk;
   };
 
-  const initAnswer = (prop, answers, defValue) => {
-    return askThisTime(prop, answers) ? undefined : (defaultPegaConfig[prop] ? defaultPegaConfig[prop] : defValue);
+  const initAnswer = (prop, defValue) => {
+    if (askThisTime(prop)) {
+      return undefined;
+    }
+    return defaultPegaConfig[prop] ? defaultPegaConfig[prop] : defValue;
   };
 
   const initAnswers = (answers) => {
     // Setup default answers (if they are present and non-empty)
-    answers.serverType = initAnswer('serverType', answers, AUTHENTICATE_DEFAULTS.serverType);
-    answers.server = initAnswer('server', answers, AUTHENTICATE_DEFAULTS.server);
-    answers.isolationId = initAnswer('isolationId', answers);
-    answers.clientId = initAnswer('clientId', answers, AUTHENTICATE_DEFAULTS.clientId);
-    answers.grantType = initAnswer('grantType', answers, AUTHENTICATE_DEFAULTS.grantType);
-    answers.authService = initAnswer('authService', answers, AUTHENTICATE_DEFAULTS.authService);
+    answers.serverType = initAnswer('serverType', AUTHENTICATE_DEFAULTS.serverType);
+    answers.server = initAnswer('server', AUTHENTICATE_DEFAULTS.server);
+    answers.isolationId = initAnswer('isolationId');
+    answers.clientId = initAnswer('clientId', AUTHENTICATE_DEFAULTS.clientId);
+    answers.grantType = initAnswer('grantType', AUTHENTICATE_DEFAULTS.grantType);
+    answers.authService = initAnswer('authService', AUTHENTICATE_DEFAULTS.authService);
     answers.redirectUri = initAnswer('redirectUri', AUTHENTICATE_DEFAULTS.redirectUri);
-    answers.clientSecret = initAnswer('clientSecret', answers);
-    answers.user = initAnswer('user', answers);
-    answers.password = initAnswer('password', answers);
+    answers.clientSecret = initAnswer('clientSecret');
+    answers.user = initAnswer('user');
+    answers.password = initAnswer('password');
     answers.aAsked = [];
   };
 
@@ -192,14 +192,15 @@ export const getAuthQuestions = async (dxcbConfig) => {
       type: 'password',
       message: 'Enter clientSecret',
       default: defaultPegaConfig.clientSecret,
-      validate: (value, answers) => {
+      validate: value => {
         if (value.trim()) {
           return true;
         }
         return 'clientSecret cannot be empty';
       },
       when: answers => {
-        return (answers.grantType !== "authCode" && fnStandardWhen('clientSecret', answers));
+        return (((answers.serverType === "infinity" && answers.grantType !== "authCode") ||
+          answers.serverType === "launchpad") && fnStandardWhen('clientSecret', answers));
       }
     }
   ];

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

@@ -3,18 +3,16 @@ import Listr from 'listr';
 import chalk from 'chalk';
 
 import validate from '../validator/index.js';
-
 import bundleComponent from '../bundle/index.js';
-import lintComponent from '../linter/index.js';
-import { getBuildComponentQuestions, cleanUp } from './helper.js';
-import { getComponentDirectoryPath, showVersion, getComponentsObj } from '../../util.js';
+import { lintComponent } from '../linter/index.js';
+import { getComponentDirectoryPath, showVersion, getComponents } from '../../util.js';
 
-import { CATEGORY_CONSTELLATION } from '../../constants.js';
+import { getBuildComponentQuestions, cleanUp } from './helper.js';
 
 
 export function getCustomTasks(componentKey, sourceMap, devBuild) {
 
-  const customTasks = new Listr(
+  return new Listr(
     [
       {
         title: 'Validate config schema',
@@ -32,7 +30,7 @@ export function getCustomTasks(componentKey, sourceMap, devBuild) {
       },
       {
         title: 'Bundle component',
-        task: async () => await bundleComponent(componentKey, sourceMap, devBuild),
+        task: async () => bundleComponent(componentKey, sourceMap, devBuild),
       }
     ],
     {
@@ -40,40 +38,35 @@ export function getCustomTasks(componentKey, sourceMap, devBuild) {
     }
   );
 
-  return customTasks;
+
 }
 
 
 
 
-export default async options => {
+export default async () => {
   showVersion();
 
-  let category = CATEGORY_CONSTELLATION;
 
-  const components = await getComponentsObj();
+  const components = await getComponents();
   const questions = await getBuildComponentQuestions();
   const answers = await inquirer.prompt(questions);
   const { sourceMap, devBuild } = answers;
 
 
+  for (const componentKey of components) {
+    console.log(chalk.bold.green(`Building ${componentKey}`));
 
-  var componentKey;
-
-
-  for (var index in components) {
-    componentKey = components[index].value;
-    console.log(chalk.bold.green("Building: " + components[index].name));
-
-    let myCustomTasks = getCustomTasks(componentKey, sourceMap, devBuild );
+    const myCustomTasks = getCustomTasks(componentKey, sourceMap, devBuild );
 
+    // eslint-disable-next-line no-await-in-loop
     await myCustomTasks.run().catch(err => {
         console.log(chalk.bold.red(err.toString()));
     });
   }
 
-
-  cleanUp();
+  // once done, remove leftover directories
+  await cleanUp();
 
   return true;
 };

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

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

package/src/tasks/publish/helper.js

@@ -40,8 +40,8 @@ export const getPublishComponentQuestions = async () => {
         }
         return 'Ruleset name cannot be empty';
       },
-      when: answers => {
-        return answers.serverType === 'infinity';
+      when: () => {
+        return defaultPegaConfig.serverType === 'infinity';
       }
     },
     {
@@ -54,8 +54,8 @@ export const getPublishComponentQuestions = async () => {
         }
         return 'Please provide compatible version e.g 01-01-01';
       },
-      when: answers => {
-        return answers.serverType === 'infinity';
+      when: () => {
+        return defaultPegaConfig.serverType === 'infinity';
       }
     },
     {

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

@@ -9,14 +9,16 @@ import chalk from 'chalk';
 import {
   constructCompleteUrl,
   getComponentDirectoryPath,
-  getComponents,
   getPegaServerConfig,
   validateRulesetVersion
 } from '../../util.js';
-import { 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();
   const defaultPegaConfig = await getPegaServerConfig();
 
   return [
@@ -29,6 +31,9 @@ export const getPublishComponentQuestions = async () => {
           return true;
         }
         return 'Ruleset name cannot be empty';
+      },
+      when: () => {
+        return defaultPegaConfig.serverType === 'infinity';
       }
     },
     {
@@ -40,12 +45,16 @@ export const getPublishComponentQuestions = async () => {
           return true;
         }
         return 'Please provide compatible version e.g 01-01-01';
+      },
+      when: () => {
+        return defaultPegaConfig.serverType === 'infinity';
       }
     },
     {
       name: 'sourceMap',
       message: 'Generate source map ?',
       default: defaultPegaConfig.sourceMap,
+      // eslint-disable-next-line sonarjs/no-redundant-boolean
       when: () => false && !process.env.SOURCE_MAP
     },
     {
@@ -70,11 +79,11 @@ export const zipComponent = async componentKey => {
 
   const configContent = Buffer.from(fs.readFileSync(`${srcDirectory}/config.json`)).toString();
   // clean up now happens in function cleanUp
-  //fs.rmdir('dist', { recursive: true }, err => {
+  // fs.rmdir('dist', { recursive: true }, err => {
   //  if (err) {
   //    throw err;
   //  }
-  //});
+  // });
   return { zipContent, configContent };
 };
 
@@ -90,40 +99,68 @@ export const cleanUp = async () => {
       throw err;
     }
   });
-}
+};
 
 export const publishComponentToServer = async data => {
-  const { configContent, zipContent, componentKey, rulesetName, rulesetVersion } = data;
-
-  const apiBody = {
-    configContent,
-    zipContent,
-    componentKey: JSON.parse(configContent).componentKey,
-    publishFor: 'constellation',
-    rulesetName,
-    rulesetVersion,
-    category: ''
-  };
+  const { configContent, zipContent, rulesetName, rulesetVersion } = data;
+
+  const defaultPegaServerConfig = await getPegaServerConfig();
+  const { serverType, isolationId } = defaultPegaServerConfig;
+  const isLaunchpad = serverType === 'launchpad';
+  const launchpadRestEndpoint = LP_PUBLISH_COMPONENT_SERVICE_REST_ENDPOINT.replace(
+    '{isolationId}',
+    isolationId
+  );
+  let apiBody;
+
+  if (isLaunchpad) {
+    apiBody = {
+      type: 'CustomComponent',
+      zipContent,
+      componentName: JSON.parse(configContent).componentKey,
+      pxUpdateDateTime: '',
+      environmentID: defaultPegaServerConfig.isolationId
+    };
+  } else {
+    apiBody = {
+      configContent,
+      zipContent,
+      componentKey: JSON.parse(configContent).componentKey,
+      publishFor: 'constellation',
+      rulesetName,
+      rulesetVersion,
+      category: ''
+    };
+  }
+
   const defaultPegaConfig = await getPegaServerConfig();
   const url = constructCompleteUrl(
     defaultPegaConfig.server,
-    PUBLISH_COMPONENT_SERVICE_REST_ENDPOINT
+    isLaunchpad ? launchpadRestEndpoint : PUBLISH_COMPONENT_SERVICE_REST_ENDPOINT
   );
+
   try {
     const OauthData = fs.readFileSync(TOKEN_PATH, 'utf8');
     if (OauthData) {
       const {
         access_token: accessToken,
-        token_type: tokenType,
-        refresh_token: refreshToken
+        token_type: tokenType
+        // refresh_token: refreshToken
       } = JSON.parse(OauthData);
       let status = 500;
+      const headers = {};
+
+      if (isLaunchpad) {
+        headers.cookie = `Pega-AAT=${accessToken}`;
+        headers['Content-Type'] = 'application/json';
+      } else {
+        headers.Authorization = `${tokenType} ${accessToken}`;
+      }
+
       fetch(url, {
         method: 'POST',
         agent: new https.Agent({ rejectUnauthorized: false }),
-        headers: {
-          Authorization: `${tokenType} ${accessToken}`
-        },
+        headers,
         body: JSON.stringify(apiBody)
       })
         .then(response => {
@@ -131,20 +168,32 @@ export const publishComponentToServer = async data => {
           return response.text();
         })
         .then(resp => {
-          const respData = JSON.parse(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) {
-            console.log(chalk.bold.green(`Success : ${respData.message}`));
+          } else if (status === 200 || status === 201) {
+            console.log(chalk.bold.green(`Success : ${isLaunchpad ? respData : respData.message}`));
           } else {
             throw new Error(`${respData.message}`);
           }
         })
-        .catch(e => Promise.reject(`${chalk.bold.red(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'
+              )}`
+            );
+          } else {
+            // eslint-disable-next-line prefer-promise-reject-errors
+            Promise.reject(`${chalk.bold.red(e)}`);
+          }
+        });
     } else {
       throw new Error(`Error occurred in authentication. Please regenerate using authenticate`);
     }

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

@@ -3,22 +3,19 @@ import Listr from 'listr';
 import chalk from 'chalk';
 
 import validate from '../validator/index.js';
-
 import bundleComponent from '../bundle/index.js';
 import { lintComponent } from '../linter/index.js';
+import { getComponents, getComponentDirectoryPath, showVersion } from '../../util.js';
 
-
-import { getPublishComponentQuestions, publishComponentToServer, zipComponent, cleanUp } from './helper.js';
 import {
-  getComponents,
-  getComponentDirectoryPath,
-  showVersion
-} from '../../util.js';
-
-
+  getPublishComponentQuestions,
+  publishComponentToServer,
+  zipComponent,
+  cleanUp
+} from './helper.js';
 
 export function getCustomTasks(componentKey, sourceMap, devBuild, content, options) {
-  const customTasks = new Listr(
+  return new Listr(
     [
       {
         title: 'Validate config schema',
@@ -28,7 +25,9 @@ export function getCustomTasks(componentKey, sourceMap, devBuild, content, optio
       },
       {
         title: 'Bundle Component',
-        task: async () => await bundleComponent(componentKey, sourceMap, devBuild),
+        task: async () => {
+          await bundleComponent(componentKey, sourceMap, devBuild);
+        },
         skip: () => (options.skipBundle ? 'Skipped bundling component' : undefined)
       },
       {
@@ -57,8 +56,6 @@ export function getCustomTasks(componentKey, sourceMap, devBuild, content, optio
       exitOnError: true
     }
   );
-
-  return customTasks;
 }
 
 export default async options => {
@@ -67,29 +64,25 @@ export default async options => {
   const components = await getComponents();
   const questions = await getPublishComponentQuestions();
   const answers = await inquirer.prompt(questions);
-  const {sourceMap, devBuild } = answers;
+  const { sourceMap, devBuild } = answers;
 
-  let content = {
+  const content = {
     ...answers
   };
 
-  var componentKey;
-
+  for (const componentKey of components) {
+    console.log(chalk.bold.green(`Publishing: ${componentKey}`));
 
-  for (var index in components) {
-    componentKey = components[index];
-    console.log(chalk.bold.green("Publishing: " + componentKey));
-
-    let myCustomTasks = getCustomTasks(componentKey, sourceMap, devBuild, content, options);
+    const myCustomTasks = getCustomTasks(componentKey, sourceMap, devBuild, content, options);
 
+    // eslint-disable-next-line no-await-in-loop
     await myCustomTasks.run().catch(err => {
-       console.log(chalk.bold.red(err.toString()));
+      console.log(chalk.bold.red(err.toString()));
     });
   }
 
-   // once done, remove leftover directories
-   cleanUp();
-
+  // once done, remove leftover directories
+  await cleanUp();
 
   return true;
 };