@pega/dx-component-builder-sdk 0.1.29 → 0.1.31

package/src/tasks/create/templates/SDK-React/widget/PAGE-CASE/index.tsx.mustache

@@ -1,3 +1,4 @@
+/* eslint-disable react/no-unused-prop-types */
 import React, {useState} from "react";
 import PropTypes from "prop-types";
 import TextField from '@material-ui/core/TextField';
@@ -31,25 +32,33 @@ const useStyles = makeStyles((theme) => ({
 // any default values in config.pros should be set in defaultProps at bottom of this file
 export default function {{COMPONENT_CLASS_NAME}}(props) {
   // const componentName = "Operator";
-  const { caseOpConfig } = props;
+  const {
+    label,
+    createLabel,
+    updateLabel,
+    createOperator,
+    updateOperator,
+    createDateTime,
+    updateDateTime
+  } = props;
   const classes = useStyles();
 
-  const fieldLabel = caseOpConfig.label.toLowerCase();
+  const fieldLabel = label.toLowerCase();
   let caseOpLabel = "---";
   let caseOpName = "---";
   let caseOpId = "";
   let caseTime = null;
 
   if (fieldLabel === "create operator") {
-    caseOpLabel = caseOpConfig.createLabel;
-    caseOpName = caseOpConfig.createOperator.userName;
-    caseTime = caseOpConfig.createDateTime;
-    caseOpId = caseOpConfig.createOperator.userId;
+    caseOpLabel = createLabel;
+    caseOpName = createOperator.userName;
+    caseTime = createDateTime;
+    caseOpId = createOperator.userId;
   } else if (fieldLabel === "update operator") {
-    caseOpLabel = caseOpConfig.updateLabel;
-    caseOpName = caseOpConfig.updateOperator.userName;
-    caseTime = caseOpConfig.updateDateTime;
-    caseOpId = caseOpConfig.updateOperator.userId;
+    caseOpLabel = updateLabel;
+    caseOpName = updateOperator.userName;
+    caseTime = updateDateTime;
+    caseOpId = updateOperator.userId;
   }
 
   // Popover-related
@@ -204,8 +213,25 @@ export default function {{COMPONENT_CLASS_NAME}}(props) {
 }
 
 {{COMPONENT_CLASS_NAME}}.defaultProps = {
+  createLabel: null,
+  updateLabel: null,
+  createOperator: null,
+  updateOperator: null,
+  createDateTime: null,
+  updateDateTime: null
 };
 
 {{COMPONENT_CLASS_NAME}}.propTypes = {
-  caseOpConfig: PropTypes.object.isRequired,
+  getPConnect: PropTypes.func.isRequired,
+  label: PropTypes.string,
+  createLabel: PropTypes.string,
+  updateLabel: PropTypes.string,
+  resolveLabel: PropTypes.string,
+  createOperator: PropTypes.objectOf(PropTypes.any),
+  updateOperator: PropTypes.objectOf(PropTypes.any),
+  resolveOperator: PropTypes.objectOf(PropTypes.any),
+  createDateTime: PropTypes.string,
+  updateDateTime: PropTypes.string,
+  resolveDateTime: PropTypes.string,
+  hideLabel: PropTypes.bool
 };

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

@@ -155,7 +155,8 @@ export const validateCompileAll = async (
     const type = "Field";
     const subtype = COMPONENT_SCHEMA.subtype.field[fieldIdx].value;
     const prefixNoSpace = prefix.replace(/\s+/g, '');
-    const componentName = "".concat(prefixNoSpace).concat(COMPONENT_SCHEMA.subtype.field[fieldIdx].name);
+    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 description = componentLabel;
 
@@ -304,7 +305,7 @@ export const validateCompile = async (
 
       let componentsConstellation = await getComponents(false, CATEGORY_CONSTELLATION);
       if (components.includes(componentKey)) {
-        console.log(chalk.red(`${componentKey} companion component already exists in ${targetDirectoryConstellation}`));
+        console.log(chalk.red(`${componentKey} associated component already exists in ${targetDirectoryConstellation}`));
       }
 
       return;
@@ -312,7 +313,7 @@ export const validateCompile = async (
     // test for constellation
     const componentsConstellation = await getComponents(false, CATEGORY_CONSTELLATION);
     if (componentsConstellation.includes(componentKey)) {
-      console.log(chalk.red(`${componentKey} companion component already exists in ${targetDirectoryConstellation}`));
+      console.log(chalk.red(`${componentKey} associated component already exists in ${targetDirectoryConstellation}`));
       return;
     }
   }
@@ -320,7 +321,7 @@ export const validateCompile = async (
     // test for constellation
     const componentsConstellation = await getComponents(false, CATEGORY_CONSTELLATION);
     if (componentsConstellation.includes(componentKey)) {
-      console.log(chalk.red(`${componentKey} companion component already exists in ${targetDirectoryConstellation}`));
+      console.log(chalk.red(`${componentKey} associated component already exists in ${targetDirectoryConstellation}`));
       return;
     }
   }
@@ -370,7 +371,7 @@ export const validateCompile = async (
     console.log(chalk.green(`created ${componentKey} component in ${targetDirectory}`));
   }
 
-  console.log(chalk.green(`created ${componentKey} companion component in ${targetDirectoryConstellation}`));
+  console.log(chalk.green(`created ${componentKey} associated component in ${targetDirectoryConstellation}`));
 
 };
 

package/src/tasks/delete/helper.js

@@ -19,6 +19,18 @@ export const SOURCE_OF_COMPONENT_TYPES = {
   LOCAL: 'Local'
 };
 
+export const visualLCCategory = (category) => {
+
+  switch (category) {
+    case CATEGORY_CONSTELLATION :
+      return "custom-".concat(category.toLowerCase());
+    case CATEGORY_CUSTOM :
+    case CATEGORY_OVERRIDE :
+      return category.toLowerCase().concat("-sdk");
+  }
+
+  return category.toLowerCase();
+}
 
 export const getDeleteComponentsQuestions = async (options, sourceOfComponentsOption) => {
   const defaultPegaServerConfig = await getPegaServerConfig();
@@ -83,7 +95,7 @@ export const deleteLocalComponents = async (sourceOfComponents, category = CATEG
       }
     }
   } else {
-    const categoryLC = category.toLowerCase();
+    const categoryLC = visualLCCategory(category);
     console.log(chalk.bold.redBright(`No ${categoryLC} components in ${sourceOfComponents}`));
   }
 };

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

@@ -20,6 +20,18 @@ export const SOURCE_OF_COMPONENT_TYPES = {
   LOCAL: 'Local'
 };
 
+export const visualLCCategory = (category) => {
+
+  switch (category) {
+    case CATEGORY_CONSTELLATION :
+      return "custom-".concat(category.toLowerCase());
+    case CATEGORY_CUSTOM :
+    case CATEGORY_OVERRIDE :
+      return category.toLowerCase().concat("-sdk");
+  }
+
+  return category.toLowerCase();
+}
 
 export const getDeleteComponentsQuestions = async (options, sourceOfComponentsOption) => {
   const defaultPegaServerConfig = await getPegaServerConfig();
@@ -93,7 +105,7 @@ export const deleteLocalComponents = async (sourceOfComponents, category = CATEG
       }
     }
   } else {
-    const categoryLC = category.toLowerCase();
+    const categoryLC = visualLCCategory(category);
     console.log(chalk.bold.redBright(`No ${categoryLC} components in ${sourceOfComponents}`));
   }
 };

package/src/tasks/index.js

@@ -14,4 +14,4 @@ export { default as authenticate } from './authenticate/index.js';
 export { default as upgrade } from './upgrade/index.js';
 export { default as buildComponent } from './build/index.js';
 export { default as buildAllComponents } from './build-all/index.js';
-export { default as generateMissingCompanions } from './generate-missing-companions/index.js';
+export { default as scanAndFix } from './scan-and-fix/index.js';

package/src/tasks/map/map.js

@@ -14,6 +14,7 @@ import {
   CATEGORY_CUSTOM,
   CATEGORY_CONSTELLATION,
   COMPONENT_DIRECTORY_PREFIX_CUSTOM,
+  COMPONENT_DIRECTORY_SUFFIX_SDK,
   DXCB_CONFIG
 } from '../../constants.js';
 
@@ -25,7 +26,7 @@ export const updateComponentMap = async (componentKey, category = CATEGORY_CUSTO
 
   const pegaConfigJsonPath = path.join(path.resolve(), SDK_CONFIG_JSON_FILENAME);
   const pegaLocalComponentMapPath = path.join(path.resolve(), SDK_LOCAL_COMPONENT_MAP_FILENAME);
-  const categoryDirectory = (category === CATEGORY_CONSTELLATION) ? join("/", COMPONENT_DIRECTORY_PREFIX_CUSTOM + category.toLowerCase()) : join("/", category.toLowerCase());
+  const categoryDirectory = (category === CATEGORY_CONSTELLATION) ? join("/", COMPONENT_DIRECTORY_PREFIX_CUSTOM + category.toLowerCase()) : join("/", category.toLowerCase() + COMPONENT_DIRECTORY_SUFFIX_SDK);
 
   const componentNameNoPrefix = removeComponentPrefix(componentKey);
   const componentName = convertIntoPascalCase(componentNameNoPrefix);
@@ -68,7 +69,7 @@ export const updateComponentMap = async (componentKey, category = CATEGORY_CUSTO
 
 export const deleteFromComponentMap = async (componentKey, category = CATEGORY_CUSTOM) =>  {
   const pegaLocalComponentMapPath = path.join(path.resolve(), SDK_LOCAL_COMPONENT_MAP_FILENAME);
-  const categoryDirectory = (category === CATEGORY_CONSTELLATION) ? join("/", COMPONENT_DIRECTORY_PREFIX_CUSTOM + category.toLowerCase()) : join("/", category.toLowerCase());
+  const categoryDirectory = (category === CATEGORY_CONSTELLATION) ? join("/", COMPONENT_DIRECTORY_PREFIX_CUSTOM + category.toLowerCase()) : join("/", category.toLowerCase() + COMPONENT_DIRECTORY_SUFFIX_SDK);
   const pegaConfigJsonPath = path.join(path.resolve(), SDK_CONFIG_JSON_FILENAME);
 
   const componentNameNoPrefix = removeComponentPrefix(componentKey);

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

@@ -131,20 +131,20 @@ export const zipComponent = async (componentKey, category = CATEGORY_CUSTOM) =>
   let configContent = "{ }";
   if (category === CATEGORY_CUSTOM || category === CATEGORY_CONSTELLATION) {
     configContent = Buffer.from(fs.readFileSync(`${srcDirectory}/config.json`)).toString();
-    fs.rm('dist', { recursive: true }, err => {
-      if (err) {
-        throw err;
-      }
-    });
+    //fs.rm('dist', { recursive: true }, err => {
+    //  if (err) {
+    //    throw err;
+     // }
+    //});
   }
   else {
     if (fs.existsSync(configExtJson)) {
       configContent = Buffer.from(fs.readFileSync(`${srcDirectory}/config-ext.json`)).toString();
-      fs.rm('dist', { recursive: true }, err => {
-        if (err) {
-          throw err;
-        }
-      });
+      //fs.rm('dist', { recursive: true }, err => {
+      //  if (err) {
+      //    throw err;
+      //  }
+      //});
     }
     else {
       const tempConfig = { "componentKey" : ""};
@@ -161,6 +161,14 @@ export const zipComponent = async (componentKey, category = CATEGORY_CUSTOM) =>
   return { zipContent, configContent };
 };
 
+export const removeDist = async () => {
+  fs.rm('dist', { recursive: true }, err => {
+    if (err) {
+      throw err;
+    }
+  });
+}
+
 export const publishComponentToServer = async data => {
   const { configContent, zipContent, rulesetName, rulesetVersion } = data;
   let { componentKey } = data;

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

@@ -15,32 +15,12 @@ import { getPublishComponentQuestions,
   zipComponent, 
   getBuildCategory, 
   mapConfigJsonToCompanion,
-  removeCompanionConfigJson } from './helper.js';
+  removeCompanionConfigJson,
+  removeDist
+ } from './helper.js';
 
 
-
-export default async options => {
-  showVersion();
-
-  const catQuestion = await getBuildCategory(options);
-  const catAnwers = await inquirer.prompt(catQuestion);
-
-  let category = catAnwers.category;
-  if (category == null) {
-    category = getOptionsCategory(options);
-  }
-
-  const components = await getComponentsObj(false, category);
-  const questions = await getPublishComponentQuestions(category);
-  const answers = await inquirer.prompt(questions);
-  const {sourceMap, devBuild } = answers;
-
-  let content = {
-    ...answers
-  };
-
-  var componentKey;
-
+export function getCustomTasks(componentKey, category, sourceMap, devBuild, content, options) {
   const customTasks = new Listr(
     [
 
@@ -65,7 +45,7 @@ export default async options => {
         }
       },
       {
-        title: 'Lint companion component',
+        title: 'Lint associated component',
         task: async () => {
           const targetDirectory = await getComponentDirectoryPath(componentKey, CATEGORY_CONSTELLATION);
           // console.log(`in buildComponent Lint component task: componentKey: ${componentKey} targetDirectory: ${targetDirectory}`);
@@ -73,31 +53,31 @@ export default async options => {
         }
       },
       {
-        title: 'Map config to companion component',
+        title: 'Map config to associated component',
         task: async () => {
-          mapConfigJsonToCompanion(componentKey);
+          await mapConfigJsonToCompanion(componentKey);
         }
       },
       {
-        title: 'Bundle companion component',
+        title: 'Bundle associated component',
         task: async () => await bundleComponent(componentKey, sourceMap, devBuild, CATEGORY_CONSTELLATION),
         skip: () => (options.skipBundle ? 'Skipped bundling component' : undefined)
       },
       {
-        title: 'Zip companion component',
+        title: 'Zip associated component',
         task: async () => {
           const output = await zipComponent(componentKey, CATEGORY_CONSTELLATION);
           content = { ...content, ...output, componentKey };
         }
       },
       {
-        title: 'Publish companion component',
+        title: 'Publish associated component',
         task: async () => {
           await publishComponentToServer(content);
         }
       },
       {
-        title: 'Clean up companion',
+        title: 'Clean up associated component',
         task: async () => {
           await removeCompanionConfigJson(componentKey);
         }
@@ -108,6 +88,11 @@ export default async options => {
     }
   );
 
+  return customTasks;
+}
+
+export function getOverrideTasks(componentKey, category, sourceMap, devBuild, content, options) {
+
   const overrideTasks = new Listr(
     [
       {
@@ -154,27 +139,65 @@ export default async options => {
     }
   );
 
+  return overrideTasks;
+}
+
+
+export default async options => {
+  showVersion();
+
+  const catQuestion = await getBuildCategory(options);
+  const catAnwers = await inquirer.prompt(catQuestion);
+
+  let category = catAnwers.category;
+  if (category == null) {
+    category = getOptionsCategory(options);
+  }
+
+  const components = await getComponentsObj(false, category);
+  const questions = await getPublishComponentQuestions(category);
+  const answers = await inquirer.prompt(questions);
+  const {sourceMap, devBuild } = answers;
+
+  let content = {
+    ...answers
+  };
+
+  var componentKey;
+
 
   if (category === CATEGORY_CUSTOM) {
-    for (var index in components) {
-      componentKey = components[index].value;
-      console.log(chalk.bold.green("Publishing: " + components[index].name));
-      await customTasks.run().catch(err => {
-         console.log(chalk.bold.red(err.toString()));
-      });
-    }
+
+      for (var index in components) {
+        componentKey = components[index].value;
+        console.log(chalk.bold.green("Publishing: " + components[index].name));
+
+        let myCustomTasks = getCustomTasks(componentKey, category, sourceMap, devBuild, content, options);
+
+        await myCustomTasks.run().catch(err => {
+          console.log(chalk.bold.red(err.toString()));
+        });
+      }
+
   }
   else {
     for (var index in components) {
       componentKey = components[index].value;
       console.log(chalk.bold.green("Publishing: " + components[index].name));
-      await overrideTasks.run().catch(err => {
-         console.log(chalk.bold.red(err.toString()));
+
+      let myOverrideTasks = getOverrideTasks(componentKey, category, sourceMap, devBuild, content, options);
+
+      await myOverrideTasks.run().catch(err => {
+        console.log(chalk.bold.red(err.toString()));
       });
     }
+
   }
 
 
+  // once done, remove leftover dist directory
+  removeDist();
+
 
   return true;
 };

package/src/util.js

@@ -33,6 +33,7 @@ import {
   CATEGORY_OVERRIDE,
   CATEGORY_CONSTELLATION,
   COMPONENT_DIRECTORY_PREFIX_CUSTOM,
+  COMPONENT_DIRECTORY_SUFFIX_SDK,
   DXCB_COMPONENT_DEFAULTS,
   SERVER_CONFIG,
   SERVER_REST_URL
@@ -55,10 +56,23 @@ export const checkPathAccess = async (path, options = {}) => {
   }
 };
 
+export const visualLCCategory = (category) => {
+
+  switch (category) {
+    case CATEGORY_CONSTELLATION :
+      return "custom-".concat(category.toLowerCase());
+    case CATEGORY_CUSTOM :
+    case CATEGORY_OVERRIDE :
+      return category.toLowerCase().concat("-sdk");
+  }
+
+  return category.toLowerCase();
+}
+
 export const deleteLocalComponent = async (componentKey, category = CATEGORY_CUSTOM) => {
   const currentDirectory = process.cwd();
   const pegaConfigJsonPath = join(currentDirectory, SDK_CONFIG_JSON_FILENAME);
-  const categoryDirectory = (category === CATEGORY_CONSTELLATION) ? join("/", COMPONENT_DIRECTORY_PREFIX_CUSTOM + category.toLowerCase()) : join("/", category.toLowerCase());
+  const categoryDirectory = (category === CATEGORY_CONSTELLATION) ? join("/", COMPONENT_DIRECTORY_PREFIX_CUSTOM + category.toLowerCase()) : join("/", category.toLowerCase() + COMPONENT_DIRECTORY_SUFFIX_SDK);
 
   await checkPathAccess(pegaConfigJsonPath);
 
@@ -76,14 +90,15 @@ export const deleteLocalComponent = async (componentKey, category = CATEGORY_CUS
         throw err;
       }
 
-      const sCat = (category === CATEGORY_CONSTELLATION) ? `custom ${category}` : category;
+      const sCat = visualLCCategory(category);
       console.log(`${chalk.red.bold(componentKey)} is deleted from Local ${sCat} `);
 
 
     });
   }
   else {
-    console.log(`${chalk.red.bold(componentKey)} is NOT FOUND from Local ${category} `);
+    const categoryLC = visualLCCategory(category);
+    console.log(`${chalk.red.bold(componentKey)} is NOT FOUND from Local ${categoryLC} `);
   }
 };
 
@@ -165,7 +180,7 @@ export const getOptionsSource = (options) => {
 export const getComponents = async (showSeparator = false, category = CATEGORY_CUSTOM) => {
   const currentDirectory = process.cwd();
   const pegaConfigJsonPath = join(currentDirectory, SDK_CONFIG_JSON_FILENAME);
-  const categoryDirectory = (category === CATEGORY_CONSTELLATION) ? join("/", COMPONENT_DIRECTORY_PREFIX_CUSTOM + category.toLowerCase()) : join("/", category.toLowerCase());
+  const categoryDirectory = (category === CATEGORY_CONSTELLATION) ? join("/", COMPONENT_DIRECTORY_PREFIX_CUSTOM + category.toLowerCase()) : join("/", category.toLowerCase() + COMPONENT_DIRECTORY_SUFFIX_SDK);
 
   await checkPathAccess(pegaConfigJsonPath);
 
@@ -262,7 +277,7 @@ export const getDirectoryFiles = async (directory) => {
 export const getComponentsObj = async (showSeparator = false, category = CATEGORY_CUSTOM) => {
   const currentDirectory = process.cwd();
   const pegaConfigJsonPath = join(currentDirectory, SDK_CONFIG_JSON_FILENAME);
-  const categoryDirectory = (category === CATEGORY_CONSTELLATION) ? join("/", COMPONENT_DIRECTORY_PREFIX_CUSTOM + category.toLowerCase()) : join("/", category.toLowerCase());
+  const categoryDirectory = (category === CATEGORY_CONSTELLATION) ? join("/", COMPONENT_DIRECTORY_PREFIX_CUSTOM + category.toLowerCase()) : join("/", category.toLowerCase() + COMPONENT_DIRECTORY_SUFFIX_SDK);
 
   await checkPathAccess(pegaConfigJsonPath);
 
@@ -415,7 +430,7 @@ export const getSubComponentsAndDir = async (directory, type) => {
 export const getComponentsAndSubDirectory = async (category = CATEGORY_CUSTOM) => {
   const currentDirectory = process.cwd();
   const pegaConfigJsonPath = join(currentDirectory, SDK_CONFIG_JSON_FILENAME);
-  const categoryDirectory = (category === CATEGORY_CONSTELLATION) ? join("/", COMPONENT_DIRECTORY_PREFIX_CUSTOM + category.toLowerCase()) : join("/", category.toLowerCase());
+  const categoryDirectory = (category === CATEGORY_CONSTELLATION) ? join("/", COMPONENT_DIRECTORY_PREFIX_CUSTOM + category.toLowerCase()) : join("/", category.toLowerCase() + COMPONENT_DIRECTORY_SUFFIX_SDK);
 
   await checkPathAccess(pegaConfigJsonPath);
 
@@ -484,7 +499,7 @@ export const getComponentDefaults = async () => {
 export const getComponentDirectoryPath = async (componentKey, category = CATEGORY_CUSTOM) => {
   const currentDirectory = process.cwd();
   const pegaConfigJsonPath = join(currentDirectory, SDK_CONFIG_JSON_FILENAME);
-  const categoryDirectory = (category === CATEGORY_CONSTELLATION) ? join("/", COMPONENT_DIRECTORY_PREFIX_CUSTOM + category.toLowerCase()) : join("/", category.toLowerCase());
+  const categoryDirectory = (category === CATEGORY_CONSTELLATION) ? join("/", COMPONENT_DIRECTORY_PREFIX_CUSTOM + category.toLowerCase()) : join("/", category.toLowerCase() + COMPONENT_DIRECTORY_SUFFIX_SDK);
 
   await checkPathAccess(pegaConfigJsonPath);