@pega/custom-dx-components 0.242.68 → 0.242.70

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pega/custom-dx-components",
-  "version": "0.242.68",
+  "version": "0.242.70",
   "description": "Utility for building custom UI components",
   "bin": "./bin/index.js",
   "scripts": {
@@ -19,7 +19,7 @@
     "@babel/plugin-transform-class-properties": "^7.23.3",
     "@babel/preset-react": "^7.23.3",
     "@pega/auth": "^0.2.19",
-    "@pega/constellation-dx-components-build-utils": "^1.0.1",
+    "@pega/constellation-dx-components-build-utils": "^2.0.10",
     "ajv": "^8.12.0",
     "ajv-keywords": "^5.1.0",
     "archiver": "^7.0.1",

package/src/tasks/create/index.js

@@ -114,7 +114,7 @@ const compileMustacheTemplates = async (
       ALLOWEDAPPS: JSON.stringify(allowedApplications),
       TYPE: type,
       SUB_TYPE: JSON.stringify(mustacheSubType),
-      DESCRIPTION: description,
+      DESCRIPTION: description || componentLabel,
       IS_TEMPLATE: isTemplate,
       IS_PICKLIST: isPicklist,
       IS_BOOLEAN: isBool,
@@ -430,6 +430,8 @@ addDebugLog("create", "", "+");
         description,
         allowedApplications
       } = answers;
+
+
       await validateCompile(
         {
           componentName,

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

@@ -101,7 +101,7 @@
   },
   "devDependencies": {
     "@pega/configs": "^0.15.1",
-    "@pega/custom-dx-components": "~0.242.68",
+    "@pega/custom-dx-components": "~0.242.70",
     "@pega/pcore-pconnect-typedefs": "3.2.1",
     "@storybook/addon-actions": "^7.6.19",
     "@storybook/addon-essentials": "^7.6.19",

package/src/tasks/publish/index.js

@@ -87,8 +87,15 @@ addDebugLog("publish", "", "+");
       // marking as internal, so no questions will be ask
       options.params.push("internal");
 
-      await buildLibrary(options);
-      await publishLibrary(options);
+      try {
+        await buildLibrary(options);
+        await publishLibrary(options);
+      }
+      catch (err) {
+        console.log(chalk.redBright(err));
+        process.exit(1);
+      }
+
     }
 
     return true;

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

@@ -242,7 +242,7 @@ addDebugLog("publishLibrary", "", "+");
             {
               name: 'override',
               type: 'confirm',
-              message: `Do you wish to overrite it`,
+              message: `Do you wish to overwrite it`,
               default: false
             }
           ];
@@ -277,6 +277,7 @@ addDebugLog("publishLibrary", "END", "-");
   else {
     console.log(chalk.bold.redBright(`No library versions named ${libraryName}.`));
     console.log(chalk.bold.redBright(`You need to build library ${libraryName} first.`));
+    process.exit(1);
   }
 
 

package/src/tasks/validator/index.js

@@ -315,11 +315,13 @@ const validateOverideSchema = ajv.compile(overrideSchema);
 
 
 export default async (option) => {
-// addDebugLog("validate","", "");
+  // addDebugLog("validate","", "");
 
   let componentToValidate = null;
+  let throwTheError = false;
   if (option.params && option.params[3]) {
     componentToValidate = option.params[3];
+    throwTheError = true;
   } else if (option && option.task === 'validateSchema') {
     const localComponents = await getComponents();
     const answer = await inquirer.prompt({
@@ -332,8 +334,10 @@ export default async (option) => {
     componentToValidate = answer.component;
   } else if (option.name) {
     componentToValidate = option.value;
+    throwTheError = true;
   } else {
     componentToValidate = option;
+    throwTheError = true;
   }
 
   const componentDirectory = await getComponentDirectoryPath(componentToValidate);
@@ -365,17 +369,23 @@ export default async (option) => {
 
   if (valid) {
 
+    if (data.description === "") {
+      throw new Error(`Invalid schema json in config.json: 'description' cannot be blank.`);
+      process.exit(1);
+    }
+
     if (
       componentToValidate &&
       !/^[A-Za-z0-9]+_[A-Za-z0-9]+_[A-Za-z0-9]+$/.test(componentToValidate)
     ) {
-      const ootbComponents = await getOOTBComponents();
-      if (ootbComponents.includes(componentToValidate)) {
-        throw new Error(`Invalid: Error occurred in validating ${componentToValidate}`);
-      }
-    }
 
+      if (throwTheError) {
+        throw new Error (`${chalk.redBright(`Error: Invalid name of component '${componentToValidate}' .\n Component name (and component folder) MUST be of the form: 'Org_Lib_ComponentName'.`)}`);
 
+      }
+      console.log(`${chalk.redBright(`Error: Invalid name of component '${componentToValidate}' .\n Component name (and component folder) MUST be of the form: 'Org_Lib_ComponentName'.`)}`);
+      process.exit(1);
+    }
 
     console.log(`${chalk.bold.green(componentToValidate)} schema is valid`);
   } else {

package/src/util.js

@@ -836,6 +836,28 @@ export const getPegaServerConfig = async () => {
 if (showDebug) addDebugLog("getPegaServerConfig", "", "+");
   if (!pegaConfig) {
     pegaConfig = await getPegaConfig();
+
+    if (getServerType() === "launchpad") {
+
+      // need to append isolation id for now
+      let OAuthData;
+      try {
+        OAuthData = fs.readFileSync(TOKEN_PATH, 'utf8');
+      }
+      catch (ex) {
+        return ({});
+      }
+
+      if (OAuthData) {
+        const oOAuthData = JSON.parse(OAuthData);
+        if (oOAuthData["isolation-ids"]) {
+          const isolationId = oOAuthData["isolation-ids"].write;
+          pegaConfig['server-config'].isolationId = isolationId[0];
+        }
+
+      }
+
+    }
     sPegaServerConfig = JSON.stringify(pegaConfig['server-config']);
   }
 
@@ -1434,7 +1456,8 @@ if (showDebug) addDebugLog("updateC11NB2SForInfinity", "", "");
 
       const objOauthData = JSON.parse(OAuthData);
       objOauthData["C11NB2S"] = bootstrap.tokens.C11NB2S;
-      objOauthData["appStaticContentServer"] = bootstrap.serviceConfig.appStaticContentServer;
+      // objOauthData["appStaticContentServer"] = bootstrap.serviceConfig.appStaticContentServer;
+      objOauthData["appStaticContentServer"] = (bootstrap.serviceConfig.appStaticContentServer != "no-cdn" && bootstrap.serviceConfig.appStaticContentServer != "") ? bootstrap.serviceConfig.appStaticContentServer : bootstrap.serviceConfig.staticContentServer;
 
       // write out file
       fs.writeFileSync(TOKEN_PATH, JSON.stringify(objOauthData), { encoding: 'utf8',flag:'w' });