@pega/dx-component-builder-sdk 0.1.15 → 0.1.17

package/src/tasks/validator/index.js

@@ -30,6 +30,15 @@ const allowedSubtypes = [
   ])
 ];
 
+// additional subtypes are manually added below
+const allowedOverrideSubtypes = [
+  ...new Set([
+    ...COMPONENT_SCHEMA.subtype.field.map(({ value }) => value),
+    ...COMPONENT_SCHEMA.subtype.template,
+    ...COMPONENT_SCHEMA.subtype.widget.map(({ value }) => value)
+  ]), "ACTION", "DATA_CAPTURE", "SUMMARY", "CASEVIEW", "DATAVIEW", "LIST"
+];
+
 const schema = {
   type: 'object',
   properties: {
@@ -183,7 +192,7 @@ const overrideSchema = {
     subtype: {
       anyOf: [{ type: 'string' }, { type: 'array' }],
 
-      enum: allowedSubtypes
+      enum: allowedOverrideSubtypes
     },
     icon: { type: 'string' },
     properties: {
@@ -300,7 +309,7 @@ const overrideSchema = {
     },
     defaultConfig: { type: 'object' }
   },
-  required: ['componentKey', 'name', 'description', 'type', 'subtype', 'properties'],
+  required: ['name', 'type', 'subtype', 'properties', 'componentKey'],
   additionalProperties: true
 };
 
@@ -345,7 +354,7 @@ export default async (option, category = CATEGORY_CUSTOM) => {
     }
     else if (category === CATEGORY_OVERRIDE) {
       // for now, if now file just end
-      console.log(`${chalk.bold.yellow('config file not availabe for: ' + componentToValidate)}`);
+      console.log(`${chalk.bold.yellow('Config file not availabe for: ' + componentToValidate)}`);
       return;
     }
   }

package/src/util.js

@@ -22,22 +22,17 @@ import {
   FIELD_PATH,
   WIDGET_PATH,
   TEMPLATE_PATH,
-  FORMS_PATH,
-  TEMPLATES_PATH,
-  WIDGETS_PATH,
   DSE_PATH,
   INFRA_PATH,
   COMPONENT_PREFIX_FIELD_PATH,
   COMPONENT_PREFIX_TEMPLATE_PATH,
   COMPONENT_PREFIX_WIDGET_PATH,
-  COMPONENT_PREFIX_FORMS_PATH,
-  COMPONENT_PREFIX_TEMPLATES_PATH,
-  COMPONENT_PREFIX_WIDGETS_PATH,
   COMPONENT_PREFIX_DSE_PATH,
   COMPONENT_PREFIX_INFRA_PATH,
   CATEGORY_CUSTOM,
   CATEGORY_OVERRIDE,
-  CATEGORY_CONSTELLATION
+  CATEGORY_CONSTELLATION,
+  COMPONENT_DIRECTORY_PREFIX_CUSTOM
 } from './constants.js';
 
 
@@ -60,7 +55,7 @@ export const checkPathAccess = async (path, options = {}) => {
 export const deleteLocalComponent = async (componentKey, category = CATEGORY_CUSTOM) => {
   const currentDirectory = process.cwd();
   const pegaConfigJsonPath = join(currentDirectory, DXCB_CONFIG_JSON_FILENAME);
-  const categoryDirectory = join("/", category.toLowerCase());
+  const categoryDirectory = (category === CATEGORY_CONSTELLATION) ? join("/", COMPONENT_DIRECTORY_PREFIX_CUSTOM + category.toLowerCase()) : join("/", category.toLowerCase());
 
   await checkPathAccess(pegaConfigJsonPath);
 
@@ -172,7 +167,7 @@ export const getOptionsSource = (options) => {
 export const getComponents = async (showSeparator = false, category = CATEGORY_CUSTOM) => {
   const currentDirectory = process.cwd();
   const pegaConfigJsonPath = join(currentDirectory, DXCB_CONFIG_JSON_FILENAME);
-  const categoryDirectory = join("/", category.toLowerCase());
+  const categoryDirectory = (category === CATEGORY_CONSTELLATION) ? join("/", COMPONENT_DIRECTORY_PREFIX_CUSTOM + category.toLowerCase()) : join("/", category.toLowerCase());
 
   await checkPathAccess(pegaConfigJsonPath);
 
@@ -215,14 +210,14 @@ export const getComponents = async (showSeparator = false, category = CATEGORY_C
       }
       break;
     case CATEGORY_OVERRIDE:
-      const formsComps = await getSubComponents(directory, FORMS_PATH);
-      const templatesComps = await getSubComponents(directory, TEMPLATES_PATH);
-      const widgetsComps = await getSubComponents(directory, WIDGETS_PATH);
+      const formsComps = await getSubComponents(directory, FIELD_PATH);
+      const templatesComps = await getSubComponents(directory, TEMPLATE_PATH);
+      const widgetsComps = await getSubComponents(directory, WIDGET_PATH);
       const dseComps = await getSubComponents(directory, DSE_PATH);
       const infraComps = await getSubComponents(directory, INFRA_PATH);
 
       if (formsComps.length > 0) {
-        if (showSeparator) compList.push(new inquirer.Separator("---- forms (fields) ----"));
+        if (showSeparator) compList.push(new inquirer.Separator("---- fields  ----"));
         compList.push(...formsComps);
       }
 
@@ -291,7 +286,7 @@ export const createBlankConfigExt = async (directory, name) => {
 export const getComponentsObj = async (showSeparator = false, category = CATEGORY_CUSTOM) => {
   const currentDirectory = process.cwd();
   const pegaConfigJsonPath = join(currentDirectory, DXCB_CONFIG_JSON_FILENAME);
-  const categoryDirectory = join("/", category.toLowerCase());
+  const categoryDirectory = (category === CATEGORY_CONSTELLATION) ? join("/", COMPONENT_DIRECTORY_PREFIX_CUSTOM + category.toLowerCase()) : join("/", category.toLowerCase());
 
   await checkPathAccess(pegaConfigJsonPath);
 
@@ -355,20 +350,20 @@ export const getComponentsObj = async (showSeparator = false, category = CATEGOR
       }
       break;
     case CATEGORY_OVERRIDE:
-      const formsComps = await getSubComponents(directory, FORMS_PATH);
-      const templatesComps = await getSubComponents(directory, TEMPLATES_PATH);
-      const widgetsComps = await getSubComponents(directory, WIDGETS_PATH);
+      const formsComps = await getSubComponents(directory, FIELD_PATH);
+      const templatesComps = await getSubComponents(directory, TEMPLATE_PATH);
+      const widgetsComps = await getSubComponents(directory, WIDGET_PATH);
       const dseComps = await getSubComponents(directory, DSE_PATH);
       const infraComps = await getSubComponents(directory, INFRA_PATH);
 
       if (formsComps.length > 0) {
-        if (showSeparator) compList.push(new inquirer.Separator("---- forms (fields) ----"));
+        if (showSeparator) compList.push(new inquirer.Separator("---- fields ----"));
 
         compList.push(...formsComps.map(
           name => {
             const container = {};
             container.name = name;
-            container.value = COMPONENT_PREFIX_FORMS_PATH + name;
+            container.value = COMPONENT_PREFIX_FIELD_PATH + name;
 
             return container;
           }
@@ -381,7 +376,7 @@ export const getComponentsObj = async (showSeparator = false, category = CATEGOR
           name => {
             const container = {};
             container.name = name;
-            container.value = COMPONENT_PREFIX_TEMPLATES_PATH + name;
+            container.value = COMPONENT_PREFIX_TEMPLATE_PATH + name;
 
             return container;
           }
@@ -394,7 +389,7 @@ export const getComponentsObj = async (showSeparator = false, category = CATEGOR
           name => {
             const container = {};
             container.name = name;
-            container.value = COMPONENT_PREFIX_WIDGETS_PATH + name;
+            container.value = COMPONENT_PREFIX_WIDGET_PATH + name;
 
             return container;
           }
@@ -451,7 +446,7 @@ export const getSubComponentsAndDir = async (directory, type) => {
 export const getComponentsAndSubDirectory = async (category = CATEGORY_CUSTOM) => {
   const currentDirectory = process.cwd();
   const pegaConfigJsonPath = join(currentDirectory, DXCB_CONFIG_JSON_FILENAME);
-  const categoryDirectory = join("/", category.toLowerCase());
+  const categoryDirectory = (category === CATEGORY_CONSTELLATION) ? join("/", COMPONENT_DIRECTORY_PREFIX_CUSTOM + category.toLowerCase()) : join("/", category.toLowerCase());
 
   await checkPathAccess(pegaConfigJsonPath);
 
@@ -490,15 +485,6 @@ export const removeComponentPrefix = (componentName) => {
   else if (componentName.indexOf(COMPONENT_PREFIX_WIDGET_PATH) == 0) {
     componentName = componentName.substring(COMPONENT_PREFIX_WIDGET_PATH.length);
   }
-  else if (componentName.indexOf(COMPONENT_PREFIX_FORMS_PATH) == 0) {
-    componentName = componentName.substring(COMPONENT_PREFIX_FORMS_PATH.length);
-  }
-  else if (componentName.indexOf(COMPONENT_PREFIX_TEMPLATES_PATH) == 0) {
-    componentName = componentName.substring(COMPONENT_PREFIX_TEMPLATES_PATH.length);
-  }
-  else if (componentName.indexOf(COMPONENT_PREFIX_WIDGETS_PATH) == 0) {
-    componentName = componentName.substring(COMPONENT_PREFIX_WIDGETS_PATH.length);
-  }
   else if (componentName.indexOf(COMPONENT_PREFIX_DSE_PATH) == 0) {
     componentName = componentName.substring(COMPONENT_PREFIX_DSE_PATH.length);
   }
@@ -535,7 +521,7 @@ export const getComponentDefaults = async () => {
 export const getComponentDirectoryPath = async (componentKey, category = CATEGORY_CUSTOM) => {
   const currentDirectory = process.cwd();
   const pegaConfigJsonPath = join(currentDirectory, DXCB_CONFIG_JSON_FILENAME);
-  const categoryDirectory = join("/", category.toLowerCase());
+  const categoryDirectory = (category === CATEGORY_CONSTELLATION) ? join("/", COMPONENT_DIRECTORY_PREFIX_CUSTOM + category.toLowerCase()) : join("/", category.toLowerCase());
 
   await checkPathAccess(pegaConfigJsonPath);