@pega/custom-dx-components 24.2.13 → 24.2.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pega/custom-dx-components",
-  "version": "24.2.13",
+  "version": "24.2.15",
   "description": "Utility for building custom UI components",
   "bin": "./bin/index.js",
   "scripts": {

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

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

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);
@@ -369,13 +373,14 @@ export default async (option) => {
       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

@@ -1453,7 +1453,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' });