@pega/dx-component-builder-sdk 0.1.47 → 0.1.48

package/src/tasks/override/index.js

@@ -8,8 +8,12 @@ import ncp from 'ncp';
 import chalk from 'chalk';
 import { updateComponentMap  } from '../map/map.js';
 
-import { checkPathAccess, showVersion, getPegaConfig } from '../../util.js';
 import {
+  checkPathAccess, 
+  showVersion, 
+  getPegaConfig, 
+  convertIntoKebabCase, 
+  getFramework,
   getComponentDirectoryPath,
   getComponents,
   getComponentDefaults
@@ -22,7 +26,8 @@ import { COMPONENT_SCHEMA,
   DXCB_COMPONENT_DEFAULTS,
   CUSTOM_TEMPLATES,
   OVERRIDE_TEMPLATE_PATH,
-  OVERRIDE_REACT_LIB_PATH } from '../../constants.js';
+  OVERRIDE_REACT_LIB_PATH,
+  OVERRIDE_ANGULAR_LIB_PATH } from '../../constants.js';
 
 const pegaConfigJsonPath = path.join(path.resolve(), SDK_CONFIG_JSON_FILENAME);
 
@@ -76,7 +81,20 @@ const checkAndCreateConfigComponentKey = async (targetDirectory) => {
 
 const getListAvailableComponents = async (type) => {
   const components = await getComponents(false, CATEGORY_OVERRIDE);
-  const fullList = COMPONENT_SCHEMA.overrideComponent[type];
+  let fullList;
+  const framework = await getFramework();
+  switch (framework) {
+    case "SDK-Angular":
+      fullList = COMPONENT_SCHEMA.overrideAngularComponent[type];
+      break;
+    case "SDK-React":
+      fullList = COMPONENT_SCHEMA.overrideReactComponent[type];
+      break;
+    case "SDK-WebComponents":
+      fullList = COMPONENT_SCHEMA.overrideWCComponent[type];
+      break;
+  }
+  
   let availList = [];
   for (var el in fullList) {
 
@@ -99,6 +117,15 @@ const getListAvailableComponents = async (type) => {
   return availList;
 }
 
+const adjustAngularComponentName = (componentName) => {
+  if (componentName.indexOf("/") >= 0) {
+    componentName = componentName.split("/")[1];
+  }
+ 
+
+  return componentName;
+}
+
 
 const validateCompile = async (
   {
@@ -113,11 +140,26 @@ const validateCompile = async (
     process.exit(1);
   }
 
-  let pegaConfig =
-  await getPegaConfig();
+  const originalComponentName = componentName;
+
+  let pegaConfig = await getPegaConfig();
 
   // will need to put a case statement here checking framework
-  let templateParentDir = OVERRIDE_REACT_LIB_PATH;
+  const framework = await getFramework();
+  let templateParentDir = "";
+
+  switch (framework) {
+    case "SDK-Angular":
+      templateParentDir = OVERRIDE_ANGULAR_LIB_PATH;
+      componentName = adjustAngularComponentName(componentName);
+      componentName = convertIntoKebabCase(componentName);
+      break;
+    case "SDK-React":
+      templateParentDir = OVERRIDE_REACT_LIB_PATH;
+      break;
+    case "SDK-WebComponents":
+      break;
+  }
 
   if (pegaConfig[DXCB_CONFIG] &&
     pegaConfig[DXCB_CONFIG][CUSTOM_TEMPLATES] &&
@@ -221,76 +263,12 @@ export default async options => {
   const widgetList = await getListAvailableComponents("widget");
   const infraList = await getListAvailableComponents("infra");
 
-  const questions = [
-    {
-      name: 'type',
-      type: 'rawlist',
-      message: 'Enter type of component',
-      choices: COMPONENT_SCHEMA.overrideType,
-      when (propmtType) {
-        return promptType === null;
-      }
-    },
-    {
-      name: 'componentName',
-      type: 'rawlist',
-      message: 'Enter component to be overridden',
-      choices: formsList,
-      pageSize: 15,
-      when(answers) {
-        return formsList.length > 0 && (answers.type === 'field' || promptType === 'field');
-      }
-    },
-    {
-      name: 'componentName',
-      type: 'rawlist',
-      message: 'Enter component to be overridden',
-      choices: desList,
-      pageSize: 15,
-      when(answers) {
-        return desList.length > 0 && (answers.type === 'designSystemExtension' || promptType === 'designSystemExtension');
-      }
-    },
-    {
-      name: 'componentName',
-      type: 'rawlist',
-      message: 'Enter component to be overridden',
-      choices: infraList,
-      pageSize: 15,
-      when(answers) {
-        return infraList.length > 0 && (answers.type === 'infra'  || promptType === 'infra');
-      }
-    },
-    {
-      name: 'componentName',
-      type: 'rawlist',
-      message: 'Enter component to be overridden',
-      choices: templateList,
-      pageSize: 15,
-      when(answers) {
-        return templateList.length > 0 && (answers.type === 'template' || promptType === 'template');
-      }
-    },
-    {
-      name: 'componentName',
-      type: 'rawlist',
-      message: 'Enter component to be overridden',
-      choices: widgetList,
-      pageSize: 15,
-      when(answers) {
-        return widgetList.length > 0 && (answers.type === 'widget'  || promptType === 'widget');
-      }
-    },
-
-  ];
-
-  await inquirer.prompt(questions).then(async answers => {
-    let {
-      componentName,
-      type
-    } = answers;
+  if (options.params.length >= 5) {
+    let componentName = options.params[4];
+    let type;
+    
     if (promptType) type = promptType;
-
+  
     await validateCompile(
       {
         componentName,
@@ -298,6 +276,89 @@ export default async options => {
       },
       options
     );
-  });
+  }
+  else {
+    const questions = [
+      {
+        name: 'type',
+        type: 'rawlist',
+        message: 'Enter type of component',
+        choices: COMPONENT_SCHEMA.overrideType,
+        when (propmtType) {
+          return promptType === null;
+        }
+      },
+      {
+        name: 'componentName',
+        type: 'rawlist',
+        message: 'Enter component to be overridden',
+        choices: formsList,
+        pageSize: 15,
+        when(answers) {
+          return formsList.length > 0 && (answers.type === 'field' || promptType === 'field');
+        }
+      },
+      {
+        name: 'componentName',
+        type: 'rawlist',
+        message: 'Enter component to be overridden',
+        choices: desList,
+        pageSize: 15,
+        when(answers) {
+          return desList.length > 0 && (answers.type === 'designSystemExtension' || promptType === 'designSystemExtension');
+        }
+      },
+      {
+        name: 'componentName',
+        type: 'rawlist',
+        message: 'Enter component to be overridden',
+        choices: infraList,
+        pageSize: 15,
+        when(answers) {
+          return infraList.length > 0 && (answers.type === 'infra'  || promptType === 'infra');
+        }
+      },
+      {
+        name: 'componentName',
+        type: 'rawlist',
+        message: 'Enter component to be overridden',
+        choices: templateList,
+        pageSize: 15,
+        when(answers) {
+          return templateList.length > 0 && (answers.type === 'template' || promptType === 'template');
+        }
+      },
+      {
+        name: 'componentName',
+        type: 'rawlist',
+        message: 'Enter component to be overridden',
+        choices: widgetList,
+        pageSize: 15,
+        when(answers) {
+          return widgetList.length > 0 && (answers.type === 'widget'  || promptType === 'widget');
+        }
+      },
+  
+    ];
+  
+    await inquirer.prompt(questions).then(async answers => {
+      let {
+        componentName,
+        type
+      } = answers;
+      if (promptType) type = promptType;
+  
+      await validateCompile(
+        {
+          componentName,
+          type
+        },
+        options
+      );
+    });
+  
+  }
+
+
 
 };

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

@@ -8,11 +8,15 @@ import ncp from 'ncp';
 import chalk from 'chalk';
 import { updateComponentMap  } from '../map/map.js';
 
-import { checkPathAccess, showVersion, getPegaConfig } from '../../util.js';
 import {
+  checkPathAccess, 
+  showVersion, 
+  getFramework,
+  getPegaConfig,
   getComponentDirectoryPath,
   getComponents,
-  getComponentDefaults
+  getComponentDefaults,
+  convertIntoKebabCase
 } from '../../util.js';
 
 import { COMPONENT_SCHEMA, 
@@ -22,7 +26,8 @@ import { COMPONENT_SCHEMA,
   DXCB_COMPONENT_DEFAULTS,
   CUSTOM_TEMPLATES,
   OVERRIDE_TEMPLATE_PATH,
-  OVERRIDE_REACT_LIB_PATH } from '../../constants.js';
+  OVERRIDE_REACT_LIB_PATH,
+  OVERRIDE_ANGULAR_LIB_PATH } from '../../constants.js';
 import { compileMustacheTemplates } from '@pega/dx-component-builder-sdk/src/tasks/create/index.js';
 
 const pegaConfigJsonPath = path.join(path.resolve(), SDK_CONFIG_JSON_FILENAME);
@@ -77,7 +82,19 @@ const checkAndCreateConfigComponentKey = async (targetDirectory) => {
 
 const getListAvailableComponents = async (type) => {
   const components = await getComponents(false, CATEGORY_OVERRIDE);
-  const fullList = COMPONENT_SCHEMA.overrideComponent[type];
+  let fullList;
+  const framework = await getFramework();
+  switch (framework) {
+    case "SDK-Angular":
+      fullList = COMPONENT_SCHEMA.overrideAngularComponent[type];
+      break;
+    case "SDK-React":
+      fullList = COMPONENT_SCHEMA.overrideReactComponent[type];
+      break;
+    case "SDK-WebComponents":
+      fullList = COMPONENT_SCHEMA.overrideWCComponent[type];
+      break;
+  }
   let availList = [];
   for (var el in fullList) {
 
@@ -100,10 +117,20 @@ const getListAvailableComponents = async (type) => {
   return availList;
 }
 
+const adjustAngularComponentName = (componentName) => {
+  if (componentName.indexOf("/") >= 0) {
+    componentName = componentName.split("/")[1];
+  }
+
+ 
+
+  return componentName;
+}
+
 
 const validateCompile = async (
   {
-    componentName,
+    componentName, 
     type
   },
   options
@@ -113,7 +140,28 @@ const validateCompile = async (
   await getPegaConfig();
 
   // will need to put a case statement here checking framework
-  let templateParentDir = OVERRIDE_REACT_LIB_PATH;
+  const framework = await getFramework();
+  let templateParentDir = "";
+
+  let originalComponentName = componentName;
+
+  switch (framework) {
+    case "SDK-Angular":
+      templateParentDir = OVERRIDE_ANGULAR_LIB_PATH;
+      componentName = adjustAngularComponentName(componentName);
+      componentName = convertIntoKebabCase(componentName);
+      break;
+    case "SDK-React":
+      templateParentDir = OVERRIDE_REACT_LIB_PATH;
+      break;
+    case "SDK-WebComponents":
+      break;
+  }
+
+  if (componentName === "") {
+    console.log(chalk.red(`${originalComponentName} component doesn't exist`));
+    return;
+  }
 
   if (pegaConfig[DXCB_CONFIG] &&
     pegaConfig[DXCB_CONFIG][CUSTOM_TEMPLATES] &&

package/src/tasks/publish/helper.js

@@ -12,20 +12,40 @@ import {
   getComponentsObj,
   getPegaServerConfig,
   validateRulesetVersion,
-  getOptionsCategory
+  getOptionsCategory,
+  getLocalComponentKeyFromConfig,
+  getFramework
 } from '../../util.js';
 
-import { PUBLISH_COMPONENT_SERVICE_REST_ENDPOINT, 
-  TOKEN_PATH, 
-  COMPONENT_SCHEMA, 
-  CATEGORY_CONSTELLATION, 
+import { PUBLISH_COMPONENT_SERVICE_REST_ENDPOINT,
+  TOKEN_PATH,
+  COMPONENT_SCHEMA,
+  CATEGORY_CONSTELLATION,
   CATEGORY_CUSTOM } from '../../constants.js';
 
 
 export const mapConfigJsonToCompanion = async ( componentKey ) => {
   const srcDirectory = await getComponentDirectoryPath(componentKey, CATEGORY_CUSTOM);
-  const companionDirectory = await getComponentDirectoryPath(componentKey, CATEGORY_CONSTELLATION);
+  
   let configContent = fs.readFileSync(`${srcDirectory}/config.json`, { encoding: 'utf8' });
+  const framework = await getFramework();
+
+  let associatedComponentKey = componentKey;
+
+  switch (framework) {
+    case "SDK-Angular":
+      let arComp = associatedComponentKey.split("/");
+      const componentKeyPascal = await getLocalComponentKeyFromConfig(associatedComponentKey);
+      arComp[1] = componentKeyPascal;
+      associatedComponentKey = arComp.join("/")
+      break;
+    case "SDK-React":
+      break;
+    case "SDK-WebComponents":
+      break;
+  }
+
+  const companionDirectory = await getComponentDirectoryPath(associatedComponentKey, CATEGORY_CONSTELLATION);
 
   fs.writeFileSync(`${companionDirectory}/config.json`, configContent, { encoding: 'utf8' });
 
@@ -55,6 +75,12 @@ export const getBuildCategory = async (options) => {
 
 export const getPublishComponentQuestions = async (category) => {
   const components = await getComponentsObj(true, category);
+
+  if (components.length == 0) {
+    console.log(chalk.redBright("No components to publish"));
+    process.exit(1);
+  }
+
   const defaultPegaConfig = await getPegaServerConfig();
 
   return [
@@ -95,6 +121,7 @@ export const getPublishComponentQuestions = async (category) => {
     },
     {
       name: 'devBuild',
+      type: 'confirm',
       message: 'Generate development build ?',
       default: defaultPegaConfig.devBuild
     }
@@ -143,11 +170,13 @@ export const zipComponent = async (componentKey, category = CATEGORY_CUSTOM) =>
         throw err;
       }
     });
-    fs.rmdir('lib', { recursive: true }, err => {
-      if (err) {
-        throw err;
-      }
-    });
+    if (fs.existsSync('lib')) {
+      fs.rm('lib', { recursive: true }, err => {
+        if (err) {
+          throw err;
+        }
+      });
+    }
   }
   else {
     if (fs.existsSync(configExtJson)) {
@@ -178,7 +207,7 @@ export const zipComponent = async (componentKey, category = CATEGORY_CUSTOM) =>
   return { zipContent, configContent };
 };
 
-export const publishComponentToServer = async data => {
+export const publishComponentToServer = async (data, doFetch = true) => {
   const { configContent, zipContent, rulesetName, rulesetVersion } = data;
   let { componentKey } = data;
 
@@ -209,46 +238,60 @@ export const publishComponentToServer = async data => {
     defaultPegaConfig.server,
     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
-      } = JSON.parse(OauthData);
-      let status = 500;
-      fetch(url, {
-        method: 'POST',
-        agent: new https.Agent({ rejectUnauthorized: false }),
-        headers: {
-          Authorization: `${tokenType} ${accessToken}`
-        },
-        body: JSON.stringify(apiBody)
-      })
-        .then(response => {
-          status = response.status;
-          return response.text();
-        })
-        .then(resp => {
-          const respData = 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 {
-            throw new Error(`${respData.message}`);
-          }
+
+  // will be false for functional testing
+  if (doFetch) {
+    try {
+      const OauthData = fs.readFileSync(TOKEN_PATH, 'utf8');
+      if (OauthData) {
+        const {
+          access_token: accessToken,
+          token_type: tokenType,
+          refresh_token: refreshToken
+        } = JSON.parse(OauthData);
+        let status = 500;
+        fetch(url, {
+          method: 'POST',
+          agent: new https.Agent({ rejectUnauthorized: false }),
+          headers: {
+            Authorization: `${tokenType} ${accessToken}`
+          },
+          body: JSON.stringify(apiBody)
         })
-        .catch(e => Promise.reject(`${chalk.bold.red(e)}`));
-    } else {
+          .then(response => {
+            status = response.status;
+            return response.text();
+          })
+          .then(resp => {
+            const respData = 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 === 403) {
+              // eslint-disable-next-line prefer-promise-reject-errors
+              Promise.reject(
+                `${chalk.bold.red(
+                  'Error forbidden: User does not have privileges to Publish.'
+                )}`
+              );
+            }
+            else {
+              throw new Error(`${respData.message}`);
+            }
+          })
+          .catch(e => Promise.reject(`${chalk.bold.red(e)}`));
+      } 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`);
     }
-  } catch (err) {
-    throw new Error(`Error occurred in authentication. Please regenerate using authenticate`);
   }
+ 
 };