@pega/custom-dx-components 0.25.19 → 0.25.21

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

@@ -67,6 +67,8 @@ addDebugLog("doesLibraryExist", `libraryName: ${libraryName}, libraryVersion: ${
 
 
 export const zipLibraryComponent = async (libraryName, version) => {
+addDebugLog("zipLibraryComponent", `libraryName: ${libraryName}, libraryVersion: ${version}`, "");
+
   const currentDirectory = process.cwd();
   const libraryDirName = `${libraryName}/${version}`;
   const libraryDirectory = path.join(currentDirectory, libraryDirName);
@@ -79,15 +81,20 @@ export const zipLibraryComponent = async (libraryName, version) => {
   const zipChunks = [];
   archive.on('data', chunk => zipChunks.push(chunk));
 
-  // Add src directory
-  archive.directory(libraryDirectory, 'src');
+  // No going to add full list of created by buildLib, instead
+  // below going just just *.js files and a few specific .json files
+  // // Add main directory as src directory in zip
+  // archive.directory(libraryDirectory, 'src');
+
+  // only zip *.js files, not *.js.br, *.js.map, license, text, json, etc.
+  archive.glob("*.js", { cwd: libraryDirectory });
 
-  // Add config.json file
+  // Add componentsconfig.json.json file (array of config.json)
   if (fs.existsSync(componentsConfigJson)) {
     archive.file(componentsConfigJson, { name: path.basename(componentsConfigJson) });
   }
 
-  // Add localizations file
+  // Add componentslocalization.jspon (array of component localizations) file
   if (fs.existsSync(localizationsJson)) {
     archive.file(localizationsJson, { name: path.basename(localizationsJson) });
   }
@@ -118,136 +125,138 @@ export const zipLibraryComponent = async (libraryName, version) => {
 
 
 export const publishComponentLibraryToServer = async (data, doFetch) => {
-  addDebugLog("publishComponentToServer", `data: ${data}`, "");
-    const { configContent, zipContent, localizationsContent, rulesetName, rulesetVersion, libraryName, version } = data;
-
-    const defaultPegaServerConfig = await getPegaServerConfig();
-    const { serverType, isolationId } = defaultPegaServerConfig;
-    const isLaunchpad = serverType === 'launchpad';
-    const launchpadRestEndpoint = LP_PUBLISH_COMPONENT_SERVICE_REST_ENDPOINT.replace(
-      '{isolationId}',
-      isolationId || 'undefined'
-    );
-    let apiBody;
-
-    if (isLaunchpad) {
-      // currently no launchpad records to rule resolve a library
-
-      // apiBody = {
-      //   type: 'CustomComponent',
-      //   zipContent,
-      //   componentName: JSON.parse(configContent).componentKey,
-      //   pxUpdateDateTime: '',
-      //   environmentID: defaultPegaServerConfig.isolationId
-      // };
-    } else {
-      apiBody = {
-        configContent,
-        zipContent,
-        publishFor: 'constellation',
-        rulesetName,
-        rulesetVersion,
-        libraryName,
-        version,
-        category: '',
-        localizationsContent
-      };
-    }
+addDebugLog("publishComponentToServer", `data: ${data}`, "");
+  const { configContent, zipContent, localizationsContent, rulesetName, rulesetVersion, libraryName, version } = data;
+
+  const defaultPegaServerConfig = await getPegaServerConfig();
+  const { serverType, isolationId } = defaultPegaServerConfig;
+  const isLaunchpad = serverType === 'launchpad';
+  const launchpadRestEndpoint = LP_PUBLISH_COMPONENT_SERVICE_REST_ENDPOINT.replace(
+    '{isolationId}',
+    isolationId || 'undefined'
+  );
+  let apiBody;
+
+  if (isLaunchpad) {
+    // currently no launchpad records to rule resolve a library
+
+    // apiBody = {
+    //   type: 'CustomComponent',
+    //   zipContent,
+    //   componentName: JSON.parse(configContent).componentKey,
+    //   pxUpdateDateTime: '',
+    //   environmentID: defaultPegaServerConfig.isolationId
+    // };
+  } else {
+    apiBody = {
+      configContent,
+      zipContent,
+      publishFor: 'constellation',
+      rulesetName,
+      rulesetVersion,
+      libraryName,
+      version,
+      category: '',
+      localizationsContent
+    };
+  }
 
-    const defaultPegaConfig = await getPegaServerConfig();
-    const url = constructCompleteUrl(
-      defaultPegaConfig.server,
-      isLaunchpad ? launchpadRestEndpoint : PUBLISH_COMPONENT_LIBRARY_SERVICE_REST_ENDPOINT
-    );
-
-    if (doFetch) {
-      try {
-        const OauthData = fs.readFileSync(TOKEN_PATH, 'utf8');
-        if (OauthData) {
-          const {
-            access_token: accessToken,
-            token_type: tokenType
-            // refresh_token: refreshToken
-          } = JSON.parse(OauthData);
-          let status = 500;
-          let headers = {};
-
-          if (isLaunchpad) {
-            headers.cookie = `Pega-AAT=${accessToken}`;
-            headers['Content-Type'] = 'application/json';
-          } else {
-            headers.Authorization = `${tokenType} ${accessToken}`;
-          }
+  const defaultPegaConfig = await getPegaServerConfig();
+  const url = constructCompleteUrl(
+    defaultPegaConfig.server,
+    isLaunchpad ? launchpadRestEndpoint : PUBLISH_COMPONENT_LIBRARY_SERVICE_REST_ENDPOINT
+  );
 
-          let spinner;
-
-          console.log();
-          spinner = ora(chalk.green.bold('Publishing library...')).start();
-
-          const response = await fetch(url, {
-            method: 'POST',
-            agent: getHttpsAgent(defaultPegaConfig),
-            headers,
-            body: JSON.stringify(apiBody)
-          });
-
-          spinner.stop();
-
-          status = response.status;
-          if (!response.ok) {
-            if (status === 401) {
-              throw new Error(
-                'Error occurred in authentication. Please regenerate using authenticate'
-              );
-              // console.log(accessTokenUri, refreshToken);
-              /* TODO - Handle refresh_token */
-            } else if (status === 404) {
-              throw new Error('404: Server resource not found');
-            } else if (status === 405) {
-              throw new Error('405: Server method not allowed');
-            } else if (status === 408) {
-              throw new Error('408: Server timed out');
-            } else if (response.status === 403) {
-              throw new Error('Error forbidden: User does not have privileges to Publish.');
-            }
+  if (doFetch) {
+    try {
+      const OauthData = fs.readFileSync(TOKEN_PATH, 'utf8');
+      if (OauthData) {
+        const {
+          access_token: accessToken,
+          token_type: tokenType
+          // refresh_token: refreshToken
+        } = JSON.parse(OauthData);
+        let status = 500;
+        let headers = {};
+
+        if (isLaunchpad) {
+          headers.cookie = `Pega-AAT=${accessToken}`;
+          headers['Content-Type'] = 'application/json';
+        } else {
+          headers.Authorization = `${tokenType} ${accessToken}`;
+        }
+
+        let spinner;
+
+        console.log();
+        spinner = ora(chalk.green.bold('Publishing library...')).start();
+
+        const response = await fetch(url, {
+          method: 'POST',
+          agent: getHttpsAgent(defaultPegaConfig),
+          headers,
+          body: JSON.stringify(apiBody)
+        });
+
+        spinner.stop();
+
+        status = response.status;
+        if (!response.ok) {
+          if (status === 401) {
+            throw new Error(
+              'Error occurred in authentication. Please regenerate using authenticate'
+            );
+            // console.log(accessTokenUri, refreshToken);
+            /* TODO - Handle refresh_token */
+          } else if (status === 404) {
+            throw new Error('404: Server resource not found');
+          } else if (status === 405) {
+            throw new Error('405: Server method not allowed');
+          } else if (status === 408) {
+            throw new Error('408: Server timed out');
+          } else if (response.status === 403) {
+            throw new Error('Error forbidden: User does not have privileges to Publish.');
           }
+        }
 
-          try {
-            // const respData = isLaunchpad ? await response.text() : await response.json();
-            const headerType = response.headers.get('content-type');
-            const respData = headerType.includes("json") ? await response.json() : await response.text();
-            let respMessage = headerType.includes("json") ? respData.message : respData;
+        try {
+          // const respData = isLaunchpad ? await response.text() : await response.json();
+          const headerType = response.headers.get('content-type');
+          const respData = headerType.includes("json") ? await response.json() : await response.text();
+          let respMessage = headerType.includes("json") ? respData.message : respData;
 
 
-            if (status === 500) {
-              status = 999;
-              if (respMessage === '') {
-                respMessage = `Server error, please check server logs for error.`;
-              }
-              throw new Error(respMessage);
+          if (status === 500) {
+            status = 999;
+            if (respMessage === '') {
+              respMessage = `Server error, please check server logs for error.`;
             }
+            throw new Error(respMessage);
+          }
 
-            console.log(chalk.bold.green(`Success : ${respMessage }`));
+          console.log(chalk.bold.green(`Success : ${respMessage }`));
 
-          } catch (err) {
-            if (status === 500) {
-              throw new Error(`Server error, please check server logs for error.`);
-            } else if (status === 999) {
-              throw new Error(err);
-            }
+        } catch (err) {
+          if (status === 500) {
+            throw new Error(`Server error, please check server logs for error.`);
+          } else if (status === 999) {
+            throw new Error(err);
           }
-        } else {
-          throw new Error(`Error occurred in authentication. Please regenerate using authenticate`);
         }
-      } catch (err) {
-        // throw new Error(`Error occurred in authentication. Please regenerate using authenticate`);
-        throw new Error(err);
+      } else {
+        throw new Error(`Error occurred in authentication. Please regenerate using authenticate`);
       }
+    } catch (err) {
+      // throw new Error(`Error occurred in authentication. Please regenerate using authenticate`);
+      throw new Error(err);
     }
-  };
+  }
+};
 
 
 export const publishUILibraryComponentToInfinity = async (content) => {
+addDebugLog("publishUILibraryComponentToInfinity", `content: ${content}`, "");
+
   // const compDef =  getConfigDefaults();
   // const organization = compDef.organization;
   // const library = compDef.library;
@@ -267,16 +276,15 @@ export const publishUILibraryComponentToInfinity = async (content) => {
     // console.log(chalk.green.bold(`Success: Published ${content.libraryName}/${content.version} to server as a CL.`));
   }
   catch (err) {
-    console.log(chalk.bold.red(err.toString()));
+    let sErr = err.toString();
+    // strip all Error:
+    sErr = sErr.replaceAll("Error: ", "");
+    console.log(chalk.bold.red("Error: " + sErr));
   }
 
-
-
 }
 
 
-
-
 export const publishNewLibraryAsync = async (libraryName, version, checkDeleted = false) => {
 addDebugLog("publishNewLibraryAsync", `libraryName: ${libraryName}, version: ${version}, checkDeleted: ${checkDeleted} `, "");
 
@@ -372,13 +380,6 @@ addDebugLog("publishLibrary", "", "+");
 
     version = orgLib.buildVersion;
 
-    // check to see if devBuild
-    // const devBuild = await getConfigDevBuild();
-    // const devBuild = orgLib.devBuild;
-    // if (devBuild) {
-    //   version = version.concat("-dev");
-    // }
-
   }
 
   const tokenAndStaticServer = await getC11NB2STokenAndStaticServer();
@@ -414,10 +415,8 @@ addDebugLog("publishLibrary", "", "+");
       ({version} = versionAnswers);
     }
 
-
     let okToPublish = true;
 
-
     // this check matches check below, but for JEST, we don't want to go any further, just verifying if will
     // be caught
     if (noRealPublish && !version.includes("-dev")) {
@@ -425,7 +424,6 @@ addDebugLog("publishLibrary", "", "+");
       return;
     }
 
-
     if (!version.includes("-dev") && !internalPublish && !isLibraryBasedCL) {
       okToPublish = false;
       const publishAnswers = await inquirer.prompt([
@@ -457,7 +455,6 @@ addDebugLog("publishLibrary", "", "+");
         let content = { libraryName, version, rulesetName, rulesetVersion };
         await publishUILibraryComponentToInfinity(content);
 
-
       }
       else {
         let libVersionExists = await doesLibraryExist(libraryName, version);
@@ -515,7 +512,6 @@ addDebugLog("publishLibrary", "", "+");
   }
 
 
-
 addDebugLog("publishLibrary", "END", "-");
 
   return true;

package/src/tasks/restore/index.js

@@ -10,9 +10,12 @@ import {
   getConfigDefaults,
   getLibraryBased,
   restoreFromArchive,
-  cleanUpTemp
+  cleanUpTemp,
+  forceDefaultsUpdate
  } from '../../util.js';
 
+ import { showCurrentStatus } from '../show-status/index.js';
+
 export default async options => {
   await showVersion();
   await checkLibraryAndArchives();
@@ -61,6 +64,9 @@ addDebugLog("restoreComponent", "", "+");
       process.exit(1);
     });
     console.log(chalk.greenBright('\nComponents restored'));
+
+    await forceDefaultsUpdate();
+    await showCurrentStatus();
   }
 
 

package/src/tasks/show-status/index.js

@@ -3,12 +3,13 @@ import path from 'path';
 
 import chalk from 'chalk';
 
-import { showVersion, getLibraryBased, addDebugLog, getConfigDefaults, getComponents, checkLibraryAndArchives } from '../../util.js';
+import { showVersion, getLibraryBased, addDebugLog, getConfigDefaults, getComponents, checkLibraryAndArchives, getLibraryBasedCL } from '../../util.js';
 
 export const showCurrentStatus = async () => {
 
   const configDefaults = getConfigDefaults();
   const componentList = await getComponents();
+  const isLibraryBasedCL = getLibraryBasedCL();
 
   console.log("");
   console.log("\tCurrent status");
@@ -16,12 +17,15 @@ export const showCurrentStatus = async () => {
   console.log(`\tOrganization:\t ${chalk.bold.green(`${configDefaults.organization}`)}`);
   console.log(`\tLibrary:\t ${chalk.bold.green(`${configDefaults.library}`)}`);
   console.log(`\tVersion:\t ${chalk.bold.green(`${configDefaults.buildVersion}`)}`);
-  if (!configDefaults.devBuild) {
-    console.log(`\tPermanent:\t ${chalk.bold.magentaBright(`${!configDefaults.devBuild}`)}`);
-  }
-  else {
-    console.log(`\tPermanent:\t ${chalk.bold.green(`${!configDefaults.devBuild}`)}`);
+  if (!isLibraryBasedCL) {
+    if (!configDefaults.devBuild) {
+      console.log(`\tPermanent:\t ${chalk.bold.magentaBright(`${!configDefaults.devBuild}`)}`);
+    }
+    else {
+      console.log(`\tPermanent:\t ${chalk.bold.green(`${!configDefaults.devBuild}`)}`);
+    }
   }
+
   console.log(`\tComponent count: ${chalk.bold.green(`${componentList.length}`)}`);
 
   console.log("");

package/src/util.js

@@ -155,6 +155,11 @@ export const setUpDefaults = async () => {
 
     if (data[LIBRARY_BASED_CL]) {
       retrievedConfigData.isLibraryBasedCL = data[LIBRARY_BASED_CL];
+
+      // if this is true, then force librarybased to true, so it doesn't have to be set
+      if (retrievedConfigData.isLibraryBasedCL) {
+        retrievedConfigData.isLibraryBased = retrievedConfigData.isLibraryBasedCL;
+      }
     }
 
 
@@ -470,6 +475,55 @@ if (showDebug) addDebugLog("setLibraryBased", "", "");
 
 }
 
+export const setLibraryBasedCL = async (isLibraryBasedCL) => {
+  if (showDebug) addDebugLog("setLibraryBased", "", "");
+    const currentDirectory = process.cwd();
+    const pegaConfigJsonPath = join(currentDirectory, TASKS_CONFIG_JSON_FILENAME);
+
+    try {
+      // force to throw error and not console log
+      await checkPathAccess(pegaConfigJsonPath, {}, true);
+    }
+    catch (ex) {
+      // when can't find it, always be false, assume no library based.
+      // This is IMPORTANT for init (npx install)
+      return false;
+    }
+
+    let data = fs.readFileSync(pegaConfigJsonPath, { encoding: 'utf8' });
+    data = JSON.parse(data);
+
+    if (data[LIBRARY_BASED_CL] != undefined) {
+      data[LIBRARY_BASED_CL] = isLibraryBasedCL;
+
+      // if not undefined, force this as well
+      if (data[LIBRARY_BASED] != undefined) {
+        data[LIBRARY_BASED] = isLibraryBasedCL;
+      }
+
+      // update file
+      // stringify "4", makes the json string look like JSON in the file, formated instead of a single line
+      try {
+        fs.writeFileSync(pegaConfigJsonPath, JSON.stringify(data, null, 4), { encoding: 'utf8',flag:'w' });
+      }
+      catch (err) {
+        console.error(err);
+      }
+      //await forceDefaultsUpdate();
+      defaultConfigs.isLibraryBasedCL = isLibraryBasedCL;
+
+      // force libraryBased if isLibraryBasedCL is true
+      defaultConfigs.isLibraryBased = isLibraryBasedCL;
+
+
+      // reset
+      pegaData = null;
+      pegaConfig = null;
+
+    }
+
+  }
+
 export const getShowDebug = () => {
   // const currentDirectory = process.cwd();
   // const pegaConfigJsonPath = join(currentDirectory, TASKS_CONFIG_JSON_FILENAME);
@@ -856,6 +910,26 @@ 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);
+        const isolationId = oOAuthData["isolation-ids"].write;
+        pegaConfig['server-config'].isolationId = isolationId[0];
+      }
+
+    }
+
     sPegaServerConfig = JSON.stringify(pegaConfig['server-config']);
   }
 
@@ -1390,13 +1464,18 @@ if (showDebug) addDebugLog("deleteInfinityServerComponentLibrary", `componentKey
 
       try {
         const respData = await response.json();
-        console.log(
-              chalk.bold.green(`${respData.message}`)
-        );
+        const message = respData.message;
+        status = parseInt(respData.status);
+
+        if (status === 200) {
+          console.log(
+            chalk.bold.green(`${message}`)
+          );
+        }
 
         if (status === 500) {
           status = 999;
-          throw new Error(respData.message);
+          throw new Error(message);
         }
       }
       catch (err) {

package/tests/assets/library/components/create/Pega_DXIL_MyTestText/config.json

@@ -3,7 +3,7 @@
   "label": "My Test Text",
   "description": "My Test Text Description",
   "organization": "Pega",
-  "version": "0.0.1-dev",
+  "version": "0.0.1",
   "library": "DXIL",
   "allowedApplications": [],
   "componentKey": "Pega_DXIL_MyTestText",

package/tests/assets/library/components/createAll/Constellation/Pega_DXIL_MyBoolean/config.json

@@ -3,7 +3,7 @@
   "label": "My Boolean",
   "description": "My Boolean",
   "organization": "Pega",
-  "version": "0.0.1-dev",
+  "version": "0.0.1",
   "library": "DXIL",
   "allowedApplications": [],
   "componentKey": "Pega_DXIL_MyBoolean",

package/tests/assets/library/components/createAll/Constellation/Pega_DXIL_MyCaseWidget/config.json

@@ -3,7 +3,7 @@
   "label": "My Case Widget",
   "description": "My Case Widget",
   "organization": "Pega",
-  "version": "0.0.1-dev",
+  "version": "0.0.1",
   "library": "DXIL",
   "allowedApplications": [],
   "componentKey": "Pega_DXIL_MyCaseWidget",

package/tests/assets/library/components/createAll/Constellation/Pega_DXIL_MyCaseWidget/localizations.json

@@ -0,0 +1,8 @@
+{
+  "fields": {
+    "Date": "Date",
+    "Description" : "Description",
+    "Performed by" : "Performed by",
+    "Loading case history" : "Loading case history"
+  }
+}

package/tests/assets/library/components/createAll/Constellation/Pega_DXIL_MyCurrency/config.json

@@ -3,7 +3,7 @@
   "label": "My Currency",
   "description": "My Currency",
   "organization": "Pega",
-  "version": "0.0.1-dev",
+  "version": "0.0.1",
   "library": "DXIL",
   "allowedApplications": [],
   "componentKey": "Pega_DXIL_MyCurrency",

package/tests/assets/library/components/createAll/Constellation/Pega_DXIL_MyDate/config.json

@@ -3,7 +3,7 @@
   "label": "My Date",
   "description": "My Date",
   "organization": "Pega",
-  "version": "0.0.1-dev",
+  "version": "0.0.1",
   "library": "DXIL",
   "allowedApplications": [],
   "componentKey": "Pega_DXIL_MyDate",

package/tests/assets/library/components/createAll/Constellation/Pega_DXIL_MyDateTime/config.json

@@ -3,7 +3,7 @@
   "label": "My DateTime",
   "description": "My DateTime",
   "organization": "Pega",
-  "version": "0.0.1-dev",
+  "version": "0.0.1",
   "library": "DXIL",
   "allowedApplications": [],
   "componentKey": "Pega_DXIL_MyDateTime",

package/tests/assets/library/components/createAll/Constellation/Pega_DXIL_MyDecimal/config.json

@@ -3,7 +3,7 @@
   "label": "My Decimal",
   "description": "My Decimal",
   "organization": "Pega",
-  "version": "0.0.1-dev",
+  "version": "0.0.1",
   "library": "DXIL",
   "allowedApplications": [],
   "componentKey": "Pega_DXIL_MyDecimal",

package/tests/assets/library/components/createAll/Constellation/Pega_DXIL_MyDetails/config.json

@@ -3,7 +3,7 @@
   "label": "My Details",
   "description": "My Details",
   "organization": "Pega",
-  "version": "0.0.1-dev",
+  "version": "0.0.1",
   "library": "DXIL",
   "allowedApplications": [],
   "componentKey": "Pega_DXIL_MyDetails",

package/tests/assets/library/components/createAll/Constellation/Pega_DXIL_MyEmail/config.json

@@ -3,7 +3,7 @@
   "label": "My Email",
   "description": "My Email",
   "organization": "Pega",
-  "version": "0.0.1-dev",
+  "version": "0.0.1",
   "library": "DXIL",
   "allowedApplications": [],
   "componentKey": "Pega_DXIL_MyEmail",

package/tests/assets/library/components/createAll/Constellation/Pega_DXIL_MyForm/config.json

@@ -3,7 +3,7 @@
   "label": "My Form",
   "description": "My Form",
   "organization": "Pega",
-  "version": "0.0.1-dev",
+  "version": "0.0.1",
   "library": "DXIL",
   "allowedApplications": [],
   "componentKey": "Pega_DXIL_MyForm",

package/tests/assets/library/components/createAll/Constellation/Pega_DXIL_MyIconButtonURL/config.json

@@ -3,7 +3,7 @@
   "label": "My Icon Button URL",
   "description": "My Icon Button URL",
   "organization": "Pega",
-  "version": "0.0.1-dev",
+  "version": "0.0.1",
   "library": "DXIL",
   "allowedApplications": [],
   "componentKey": "Pega_DXIL_MyIconButtonURL",

package/tests/assets/library/components/createAll/Constellation/Pega_DXIL_MyIconButtonURL/localizations.json

@@ -0,0 +1,10 @@
+{
+  "fields": {
+    "State name" : "State name",
+    "State code" : "State code",
+    "State list for": "State list for",
+    "Click to show/hide state list": "Click to show/hide state list",
+    "State list": "State list",
+    "Loading state list": "Loading state list"
+  }
+}