@pega/custom-dx-components 0.23.3 → 0.23.5

package/src/tasks/create/index.js

@@ -109,7 +109,8 @@ const validateCompile = async (
     type,
     subtype,
     description,
-    allowedApplications
+    allowedApplications,
+    organization
   },
   options
 ) => {
@@ -127,7 +128,11 @@ const validateCompile = async (
   const templateDir = `./templates/${framework}/${type}/${sSubType}`;
   const templateDirectory = fileURLToPath(new URL(templateDir, import.meta.url));
 
-  const { organization } = JSON.parse(fs.readFileSync(path.resolve('package.json'), 'utf8'));
+  if (organization == null) {
+   ({ organization } = JSON.parse(fs.readFileSync(path.resolve('package.json'), 'utf8')));
+  }
+
+
 
   const componentKey = `${organization}_${library}_${componentName}`;
   const targetDirectory = await getComponentDirectoryPath(componentKey);
@@ -162,15 +167,18 @@ const validateCompile = async (
 export default async options => {
   showVersion();
 
-  if (options.params[9]) {
+  if (options.params.length >= 12) {
 
     const type = options.params[3];
     const subtype = options.params[4];
     const componentName = options.params[5];
     const componentLabel = options.params[6];
-    const library = options.params[7];
-    const version = options.params[9];
-    const description = options.params[9];
+    const version = options.params[7];
+    const library = options.params[8];
+    const allowedApplications = options.params[9];
+    const description = options.params[10];
+    const organization = options.params[11];
+    const framework = "Constellation";
 
     await validateCompile(
       {
@@ -181,7 +189,9 @@ export default async options => {
         framework,
         type,
         subtype,
-        description
+        description,
+        allowedApplications,
+        organization
       },
       options
     );

package/src/tasks/create/templates/Constellation/Field/Boolean/config.json.mustache

@@ -7,7 +7,6 @@
   "library": "{{LIBRARY}}",
   "allowedApplications": {{{ALLOWEDAPPS}}},
   "componentKey": "{{COMPONENT_KEY}}",
-  "compName" : "{{COMPONENT_CLASS_NAME}}",
   "type": "{{TYPE}}",
   "subtype": {{{SUB_TYPE}}},
   "icon": "images/pz-checkbox-active.svg",

package/src/tasks/create/templates/Constellation/Field/Date/DateFormatter.js.mustache

@@ -1,13 +1,13 @@
 import dayjs from 'dayjs';
-import relativeTime from 'dayjs/plugin/relativeTime';
-import localizedFormat from 'dayjs/plugin/localizedFormat';
-import utc from 'dayjs/plugin/utc';
-import tzone from 'dayjs/plugin/timezone';
+import relativeTime from 'dayjs/plugin/relativeTime.js';
+import localizedFormat from 'dayjs/plugin/localizedFormat.js';
+import utc from 'dayjs/plugin/utc.js';
+import timezone from 'dayjs/plugin/timezone.js';
 
 dayjs.extend(relativeTime);
 dayjs.extend(localizedFormat);
 dayjs.extend(utc);
-dayjs.extend(tzone);
+dayjs.extend(timezone);
 
 const types = ['fromNow', 'customFormat'];
 
@@ -16,12 +16,12 @@ const types = ['fromNow', 'customFormat'];
 // value should be in ISO 8601 format.
 function DateFormatter(
   value,
-  { type = types[1], format = "DD/MM/YYYY", timezone } = {}
+  { type = types[1], format = "DD/MM/YYYY", tzone } = {}
 ) {
   if (!value) return value;
   switch (type) {
     case types[1]:
-      if (timezone) return dayjs(value).tz(timezone).format(format);
+      if (tzone) return dayjs(value).tz(tzone).format(format);
       return dayjs(value).format(format);
     case types[0]:
       return dayjs(value).from(dayjs());

package/src/tasks/create/templates/Constellation/Field/Date/config.json.mustache

@@ -7,7 +7,6 @@
   "library": "{{LIBRARY}}",
   "allowedApplications": {{{ALLOWEDAPPS}}},
   "componentKey": "{{COMPONENT_KEY}}",
-  "compName" : "{{COMPONENT_CLASS_NAME}}",
   "type": "{{TYPE}}",
   "subtype": {{{SUB_TYPE}}},
   "icon": "images/pz-date-time-active.svg",

package/src/tasks/create/templates/Constellation/Field/Date/date.js.mustache

@@ -1,16 +1,16 @@
 /* eslint-disable no-undef */
 import dayjs from 'dayjs';
-import DateFormatter from './DateFormatter';
+import DateFormatter from './DateFormatter.js';
 
-const relativeTime = require('dayjs/plugin/relativeTime');
-const utc = require('dayjs/plugin/utc');
-const localizedFormat = require('dayjs/plugin/localizedFormat');
-const tzone = require('dayjs/plugin/timezone');
+import relativeTime from 'dayjs/plugin/relativeTime.js';
+import localizedFormat from 'dayjs/plugin/localizedFormat.js';
+import utc from 'dayjs/plugin/utc.js';
+import timezone from 'dayjs/plugin/timezone.js';
 
 dayjs.extend(relativeTime);
 dayjs.extend(localizedFormat);
 dayjs.extend(utc);
-dayjs.extend(tzone);
+dayjs.extend(timezone);
 
 function isIsoDate(str) {
   if (!/\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z/.test(str)) return false;
@@ -372,8 +372,8 @@ export const getDateTimeOptions = (withSeconds, is12h = false) => {
   };
 };
 
-export function getCurrentTimezone(timezone) {
-  if (timezone) return timezone;
+export function getCurrentTimezone(tzone) {
+  if (tzone) return tzone;
   return PCore?.getLocaleUtils?.().getTimeZoneInUse?.();
 }
 

package/src/tasks/create/templates/Constellation/Field/DateTime/config.json.mustache

@@ -7,7 +7,6 @@
   "library": "{{LIBRARY}}",
   "allowedApplications": {{{ALLOWEDAPPS}}},
   "componentKey": "{{COMPONENT_KEY}}",
-  "compName" : "{{COMPONENT_CLASS_NAME}}",
   "type": "{{TYPE}}",
   "subtype": {{{SUB_TYPE}}},
   "icon": "images/pz-text-input-active.svg",

package/src/tasks/create/templates/Constellation/Field/DateTime/date-time.js.mustache

@@ -1,25 +1,25 @@
 import dayjs from "dayjs";
-import relativeTime from "dayjs/plugin/relativeTime";
-import localizedFormat from "dayjs/plugin/localizedFormat";
-import utc from "dayjs/plugin/utc";
-import tzone from "dayjs/plugin/timezone";
+import relativeTime from 'dayjs/plugin/relativeTime.js';
+import localizedFormat from 'dayjs/plugin/localizedFormat.js';
+import utc from 'dayjs/plugin/utc.js';
+import timezone from 'dayjs/plugin/timezone.js';
 
 dayjs.extend(relativeTime);
 dayjs.extend(localizedFormat);
 dayjs.extend(utc);
-dayjs.extend(tzone);
+dayjs.extend(timezone);
 
 const types = ["fromNow", "customFormat"];
 
 // value should be in ISO 8601 format.
 function DateFormatter(
   value,
-  { type = types[1], format = "DD/MM/YYYY", timezone, fieldType } = {}
+  { type = types[1], format = "DD/MM/YYYY", tzone, fieldType } = {}
 ) {
   if (!value) return value;
   switch (type) {
     case types[1]:
-      if (timezone && fieldType !== 'Date') return dayjs(value).tz(timezone).format(format); // Date only value should be formatted without timezone
+      if (tzone && fieldType !== 'Date') return dayjs(value).tz(tzone).format(format); // Date only value should be formatted without timezone
       return dayjs(value).format(format);
     case types[0]:
       return dayjs(value).from(dayjs());
@@ -74,9 +74,9 @@ export default {
         })
       : value;
   },
-  convertFromTimezone: (value, timezone) =>
-  value && timezone
-  ? dayjs.tz(value, timezone).utc().format("YYYY-MM-DDTHH:mm:ss[Z]")
+  convertFromTimezone: (value, tzone) =>
+  value && tzone
+  ? dayjs.tz(value, tzone).utc().format("YYYY-MM-DDTHH:mm:ss[Z]")
   : value,
   Date: (value, options) =>
     DateFormatter(value, { type: "customFormat", ...options }),

package/src/tasks/create/templates/Constellation/Field/DateTime/date-utils.js.mustache

@@ -1,13 +1,14 @@
 /* eslint-disable no-undef */
 import dayjs from "dayjs";
-
-const relativeTime = require("dayjs/plugin/relativeTime");
+import relativeTime from 'dayjs/plugin/relativeTime.js';
+import localizedFormat from 'dayjs/plugin/localizedFormat.js';
+import utc from 'dayjs/plugin/utc.js';
+import timezone from 'dayjs/plugin/timezone.js';
 
 dayjs.extend(relativeTime);
-
-const utc = require("dayjs/plugin/utc");
-
+dayjs.extend(localizedFormat);
 dayjs.extend(utc);
+dayjs.extend(timezone);
 
 /**
  * Return relative time in fromNow for the given datetime

package/src/tasks/create/templates/Constellation/Field/DateTime/date.js.mustache

@@ -1,11 +1,14 @@
 /* eslint-disable no-undef */
 import dayjs from 'dayjs';
-
-const relativeTime = require('dayjs/plugin/relativeTime');
-const utc = require('dayjs/plugin/utc');
+import relativeTime from 'dayjs/plugin/relativeTime.js';
+import localizedFormat from 'dayjs/plugin/localizedFormat.js';
+import utc from 'dayjs/plugin/utc.js';
+import timezone from 'dayjs/plugin/timezone.js';
 
 dayjs.extend(relativeTime);
+dayjs.extend(localizedFormat);
 dayjs.extend(utc);
+dayjs.extend(timezone);
 
 export const datetimedisplayformatter = (formatter) => {
   const objectvalues = {};

package/src/tasks/create/templates/Constellation/Field/Decimal/config.json.mustache

@@ -7,7 +7,6 @@
   "library": "{{LIBRARY}}",
   "allowedApplications": {{{ALLOWEDAPPS}}},
   "componentKey": "{{COMPONENT_KEY}}",
-  "compName" : "{{COMPONENT_CLASS_NAME}}",
   "type": "{{TYPE}}",
   "subtype": {{{SUB_TYPE}}},
   "icon": "images/pz-decimal-active.svg",

package/src/tasks/create/templates/Constellation/Field/Decimal-Currency/config.json.mustache

@@ -7,7 +7,6 @@
   "library": "{{LIBRARY}}",
   "allowedApplications": {{{ALLOWEDAPPS}}},
   "componentKey": "{{COMPONENT_KEY}}",
-  "compName" : "{{COMPONENT_CLASS_NAME}}",
   "type": "{{TYPE}}",
   "subtype": {{{SUB_TYPE}}},
   "icon": "images/pz-currency-active.svg",

package/src/tasks/create/templates/Constellation/Field/Decimal-Percentage/config.json.mustache

@@ -7,7 +7,6 @@
   "library": "{{LIBRARY}}",
   "allowedApplications": {{{ALLOWEDAPPS}}},
   "componentKey": "{{COMPONENT_KEY}}",
-  "compName" : "{{COMPONENT_CLASS_NAME}}",
   "type": "{{TYPE}}",
   "subtype": {{{SUB_TYPE}}},
   "icon": "images/pz-text-input-active.svg",

package/src/tasks/create/templates/Constellation/Field/Integer/config.json.mustache

@@ -7,7 +7,6 @@
   "library": "{{LIBRARY}}",
   "allowedApplications": {{{ALLOWEDAPPS}}},
   "componentKey": "{{COMPONENT_KEY}}",
-  "compName" : "{{COMPONENT_CLASS_NAME}}",
   "type": "{{TYPE}}",
   "subtype": {{{SUB_TYPE}}},
   {{#IS_TEMPLATE}}

package/src/tasks/create/templates/Constellation/Field/Picklist/config.json.mustache

@@ -7,7 +7,6 @@
   "library": "{{LIBRARY}}",
   "allowedApplications": {{{ALLOWEDAPPS}}},
   "componentKey": "{{COMPONENT_KEY}}",
-  "compName" : "{{COMPONENT_CLASS_NAME}}",
   "type": "{{TYPE}}",
   "subtype": {{{SUB_TYPE}}},
   "icon": "images/pz-dropdown-active.svg",

package/src/tasks/create/templates/Constellation/Field/Text/config.json.mustache

@@ -7,7 +7,6 @@
   "library": "{{LIBRARY}}",
   "allowedApplications": {{{ALLOWEDAPPS}}},
   "componentKey": "{{COMPONENT_KEY}}",
-  "compName" : "{{COMPONENT_CLASS_NAME}}",
   "type": "{{TYPE}}",
   "subtype": {{{SUB_TYPE}}},
   {{#IS_TEMPLATE}}

package/src/tasks/create/templates/Constellation/Field/Text-Email/config.json.mustache

@@ -7,7 +7,6 @@
   "library": "{{LIBRARY}}",
   "allowedApplications": {{{ALLOWEDAPPS}}},
   "componentKey": "{{COMPONENT_KEY}}",
-  "compName" : "{{COMPONENT_CLASS_NAME}}",
   "type": "{{TYPE}}",
   "subtype": {{{SUB_TYPE}}},
   "icon": "images/pz-email-active.svg",

package/src/tasks/create/templates/Constellation/Field/Text-Input/config.json.mustache

@@ -7,7 +7,6 @@
   "library": "{{LIBRARY}}",
   "allowedApplications": {{{ALLOWEDAPPS}}},
   "componentKey": "{{COMPONENT_KEY}}",
-  "compName" : "{{COMPONENT_CLASS_NAME}}",
   "type": "{{TYPE}}",
   "subtype": "Text",
   "icon": "images/pz-text-input-active.svg",

package/src/tasks/create/templates/Constellation/Field/Text-Paragraph/config.json.mustache

@@ -7,7 +7,6 @@
   "library": "{{LIBRARY}}",
   "allowedApplications": {{{ALLOWEDAPPS}}},
   "componentKey": "{{COMPONENT_KEY}}",
-  "compName" : "{{COMPONENT_CLASS_NAME}}",
   "type": "{{TYPE}}",
   "subtype": {{{SUB_TYPE}}},
   "icon": "images/pz-text-area-active.svg",

package/src/tasks/create/templates/Constellation/Field/Text-Phone/config.json.mustache

@@ -7,7 +7,6 @@
   "library": "{{LIBRARY}}",
   "allowedApplications": {{{ALLOWEDAPPS}}},
   "componentKey": "{{COMPONENT_KEY}}",
-  "compName" : "{{COMPONENT_CLASS_NAME}}",
   "type": "{{TYPE}}",
   "subtype": {{{SUB_TYPE}}},
   "icon": "images/pz-phone-active.svg",

package/src/tasks/create/templates/Constellation/Field/Text-Phone/index.jsx.mustache

@@ -14,7 +14,6 @@ import handleEvent from "./event-utils";
 import { suggestionsHandler } from './suggestions-handler';
 
 import Styled{{COMPONENT_CLASS_NAME}}Wrapper from './styles';
-import { } from "@pega/cosmos-react-core";
 
 export const formatExists = (formatterVal) => {
     const formatterValues = [

package/src/tasks/create/templates/Constellation/Field/Text-URL/config.json.mustache

@@ -7,7 +7,6 @@
   "library": "{{LIBRARY}}",
   "allowedApplications": {{{ALLOWEDAPPS}}},
   "componentKey": "{{COMPONENT_KEY}}",
-  "compName" : "{{COMPONENT_CLASS_NAME}}",
   "type": "{{TYPE}}",
   "subtype": {{{SUB_TYPE}}},
   "icon": "images/pz-url-active.svg",

package/src/tasks/create/templates/Constellation/Field/TimeOfDay/config.json.mustache

@@ -7,7 +7,6 @@
   "library": "{{LIBRARY}}",
   "allowedApplications": {{{ALLOWEDAPPS}}},
   "componentKey": "{{COMPONENT_KEY}}",
-  "compName" : "{{COMPONENT_CLASS_NAME}}",
   "type": "{{TYPE}}",
   "subtype": {{{SUB_TYPE}}},
   "icon": "images/pz-date-time-active.svg",

package/src/tasks/create/templates/Constellation/Field/TimeOfDay/time-of-day.js.mustache

@@ -1,13 +1,14 @@
 /* eslint-disable no-undef */
 import dayjs from "dayjs";
-
-const relativeTime = require("dayjs/plugin/relativeTime");
+import relativeTime from 'dayjs/plugin/relativeTime.js';
+import localizedFormat from 'dayjs/plugin/localizedFormat.js';
+import utc from 'dayjs/plugin/utc.js';
+import timezone from 'dayjs/plugin/timezone.js';
 
 dayjs.extend(relativeTime);
-
-const utc = require("dayjs/plugin/utc");
-
+dayjs.extend(localizedFormat);
 dayjs.extend(utc);
+dayjs.extend(timezone);
 
 /**
  * Return relative time in fromNow for the given datetime

package/src/tasks/create/templates/Constellation/Template/DETAILS/config.json.mustache

@@ -7,7 +7,6 @@
   "library": "{{LIBRARY}}",
   "allowedApplications": {{{ALLOWEDAPPS}}},
   "componentKey": "{{COMPONENT_KEY}}",
-  "compName" : "{{COMPONENT_CLASS_NAME}}",
   "type": "{{TYPE}}",
   "subtype": {{{SUB_TYPE}}},
   "icon": "OneColumnDetails.svg",

package/src/tasks/create/templates/Constellation/Template/DETAILS-region/config.json.mustache

@@ -7,7 +7,6 @@
   "library": "{{LIBRARY}}",
   "allowedApplications": {{{ALLOWEDAPPS}}},
   "componentKey": "{{COMPONENT_KEY}}",
-  "compName" : "{{COMPONENT_CLASS_NAME}}",
   "type": "{{TYPE}}",
   "subtype": {{{SUB_TYPE}}},
   "icon": "TwoColumnDetails.svg",

package/src/tasks/create/templates/Constellation/Template/FORM/config.json.mustache

@@ -7,7 +7,6 @@
   "library": "{{LIBRARY}}",
   "allowedApplications": {{{ALLOWEDAPPS}}},
   "componentKey": "{{COMPONENT_KEY}}",
-  "compName" : "{{COMPONENT_CLASS_NAME}}",
   "type": "{{TYPE}}",
   "subtype": {{{SUB_TYPE}}},
   "icon": "DefaultForm.svg",

package/src/tasks/create/templates/Constellation/Template/FORM-region/config.json.mustache

@@ -7,7 +7,6 @@
   "library": "{{LIBRARY}}",
   "allowedApplications": {{{ALLOWEDAPPS}}},
   "componentKey": "{{COMPONENT_KEY}}",
-  "compName" : "{{COMPONENT_CLASS_NAME}}",
   "type": "{{TYPE}}",
   "subtype": {{{SUB_TYPE}}},
   "icon": "TwoColumn.svg",

package/src/tasks/create/templates/Constellation/Template/PAGE/config.json.mustache

@@ -7,7 +7,6 @@
   "library": "{{LIBRARY}}",
   "allowedApplications": {{{ALLOWEDAPPS}}},
   "componentKey": "{{COMPONENT_KEY}}",
-  "compName" : "{{COMPONENT_CLASS_NAME}}",
   "type": "{{TYPE}}",
   "subtype": {{{SUB_TYPE}}},
   "icon": "OneColumnPage.svg",

package/src/tasks/create/templates/Constellation/Widget/CASE/config.json.mustache

@@ -7,7 +7,6 @@
   "library": "{{LIBRARY}}",
   "allowedApplications": {{{ALLOWEDAPPS}}},
   "componentKey": "{{COMPONENT_KEY}}",
-  "compName" : "{{COMPONENT_CLASS_NAME}}",
   "type": "{{TYPE}}",
   "subtype": {{{SUB_TYPE}}},
   "icon": "OneColumnPage.svg",

package/src/tasks/create/templates/Constellation/Widget/PAGE/config.json.mustache

@@ -7,7 +7,6 @@
   "library": "{{LIBRARY}}",
   "allowedApplications": {{{ALLOWEDAPPS}}},
   "componentKey": "{{COMPONENT_KEY}}",
-  "compName" : "{{COMPONENT_CLASS_NAME}}",
   "type": "{{TYPE}}",
   "subtype": {{{SUB_TYPE}}},
   "icon": "OneColumnPage.svg",

package/src/tasks/create/templates/Constellation/Widget/PAGE-CASE/config.json.mustache

@@ -7,7 +7,6 @@
   "library": "{{LIBRARY}}",
   "allowedApplications": {{{ALLOWEDAPPS}}},
   "componentKey": "{{COMPONENT_KEY}}",
-  "compName" : "{{COMPONENT_CLASS_NAME}}",
   "type": "{{TYPE}}",
   "subtype": {{{SUB_TYPE}}},
   "icon": "OneColumnPage.svg",

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

@@ -331,58 +331,21 @@ export default async options => {
   const componentData = data[COMPONENTS_PATH];
 
   const { library } = componentData;
-  const { organization } = JSON.parse(fs.readFileSync(path.resolve('package.json'), 'utf8'));
+  let { organization } = JSON.parse(fs.readFileSync(path.resolve('package.json'), 'utf8'));
 
   let componentDefaults = await getComponentDefaults();
   componentDefaults.library = library;
 
 
-  const questions = [
-    {
-      name: 'prefix',
-      message: 'Enter prefix label'
-    },
-    {
-      name: 'version',
-      message: 'Enter component version',
-      default: componentDefaults.version,
-      validate: value => {
-        if (validateSemver(value)) {
-          return true;
-        }
-        return 'Please provide semver compatible version e.g 0.0.1';
-      }
-    },
-    {
-      name: 'library',
-      message: 'Enter library name (required)',
-      default: componentDefaults.library,
-      validate: value => {
-        /* value should not be empty
-          It should not have spaces
-          It should not start with a number
-          Only case-insensitive alphanumeric values are allowed
-        */
-        if (value && !/^\d/.test(value) && value === sanitize(value)) {
-          return true;
-        }
-        return 'Only alphanumeric values are allowed, starting with alphabets';
-      }
-    },
-    {
-      name: 'allowedApplications',
-      message: 'Please enter the application names to be supported (comma-separated). ',
-      suffix: 'Keep empty for all applications'
-    }
-  ];
-
-  await inquirer.prompt(questions).then(async answers => {
-    const {
-      prefix,
-      library,
-      version,
-      allowedApplications
-    } = answers;
+  if (options.params.length >= 8) {
+    const prefix = options.params[3];
+    const version = options.params[4];
+    const library = options.params[5];
+    const allowedApplications = options.params[6];
+
+    // overwrite
+    organization = options.params[7];
+
     await validateCompileAll(
       {
         prefix,
@@ -393,6 +356,67 @@ export default async options => {
       },
       options
     );
-  });
+  }
+  else {
+    const questions = [
+      {
+        name: 'prefix',
+        message: 'Enter prefix label'
+      },
+      {
+        name: 'version',
+        message: 'Enter component version',
+        default: componentDefaults.version,
+        validate: value => {
+          if (validateSemver(value)) {
+            return true;
+          }
+          return 'Please provide semver compatible version e.g 0.0.1';
+        }
+      },
+      {
+        name: 'library',
+        message: 'Enter library name (required)',
+        default: componentDefaults.library,
+        validate: value => {
+          /* value should not be empty
+            It should not have spaces
+            It should not start with a number
+            Only case-insensitive alphanumeric values are allowed
+          */
+          if (value && !/^\d/.test(value) && value === sanitize(value)) {
+            return true;
+          }
+          return 'Only alphanumeric values are allowed, starting with alphabets';
+        }
+      },
+      {
+        name: 'allowedApplications',
+        message: 'Please enter the application names to be supported (comma-separated). ',
+        suffix: 'Keep empty for all applications'
+      }
+    ];
+
+    await inquirer.prompt(questions).then(async answers => {
+      const {
+        prefix,
+        library,
+        version,
+        allowedApplications
+      } = answers;
+      await validateCompileAll(
+        {
+          prefix,
+          library,
+          version,
+          allowedApplications,
+          organization
+        },
+        options
+      );
+    });
+  }
+
+
 
 };