@pega/custom-dx-components 0.242.50 → 0.242.52

package/package.json

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

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

@@ -11,6 +11,7 @@ import {
   deleteLocalArchiveLibrary,
   deleteLocalArchiveLibraryVersion,
   deleteLocalComponent,
+  getHaveDependencyDifference,
   getComponents,
   getLibraryArchiveDirectories,
   deleteArchives,
@@ -174,6 +175,15 @@ addDebugLog("deleteLibraryVersion", "END", "-");
         console.log(`\nSwitched to ${chalk.green(`${configDef.displayLibVersion}`)}`);
         await showCurrentStatus();
 
+        if (getHaveDependencyDifference()) {
+
+          console.log('\n***************************************************************');
+          console.log(chalk.bold.yellow('Dependencies have changed between versions, recommend updating.'));
+          console.log(`>>> PLEASE run ${chalk.bold.yellow("'npm update'")}.`);
+          console.log('***************************************************************\n');
+
+        }
+
       }
     }
     else {
@@ -182,6 +192,16 @@ addDebugLog("deleteLibraryVersion", "END", "-");
     }
 
   }
+  else {
+    // switch to another version, if no versions to switch to then delete /store so will be back to state of nothing
+    const archiveLibraries = await getLibraryArchiveDirectories("");
+    if (!archiveLibraries || archiveLibraries.length === 0) {
+      // no libraries, so remove "/store"
+      await deleteArchives();
+    }
+
+  }
+
 
 addDebugLog("deleteLibraryVersion", "END", "-");
 

package/src/tasks/import-archive/index.js

@@ -247,7 +247,8 @@ addDebugLog("importArch", `filePath: ${filePath}, fileName: ${fileName}`, "");
   let organization = await getPackgeOrg(tempPackage);
   let localConfig = await getLocalConfigData(tempTasksConfig);
 
-  let orgLibName = `${organization}_${localConfig.library}`;
+  let libName = localConfig.library;
+  let orgLibName = `${organization}_${libName}`;
   const version = localConfig.buildVersion;
   const devBuild = localConfig.devBuild;
 
@@ -365,8 +366,8 @@ addDebugLog("importArch", `filePath: ${filePath}, fileName: ${fileName}`, "");
 
     console.log('\n***************************************************************');
     console.log(chalk.bold.yellow('Dependencies have changed between versions, recommend updating.'));
-    console.log(`PLEASE run ${chalk.bold.yellow("'npm update'")}.`);
-    console.log('****************************************************************\n');
+    console.log(`>>> PLEASE run ${chalk.bold.yellow("'npm update'")}.`);
+    console.log('***************************************************************\n');
   }
 
 

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

@@ -100,7 +100,7 @@
   },
   "devDependencies": {
     "@pega/configs": "^0.15.1",
-    "@pega/custom-dx-components": "~0.242.50",
+    "@pega/custom-dx-components": "~0.242.52",
     "@pega/pcore-pconnect-typedefs": "~3.2.0-alpha.1",
     "@storybook/addon-actions": "^7.6.19",
     "@storybook/addon-essentials": "^7.6.19",

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

@@ -139,8 +139,8 @@ addDebugLog("switchLibrary", "", "+");
 
     console.log('\n***************************************************************');
     console.log(chalk.bold.yellow('Dependencies have changed between versions, recommend updating.'));
-    console.log(`PLEASE run ${chalk.bold.yellow("'npm update'")}.`);
-    console.log('****************************************************************\n');
+    console.log(`>>> PLEASE run ${chalk.bold.yellow("'npm update'")}.`);
+    console.log('***************************************************************\n');
 
   }
 

package/src/tasks/switch-version/index.js

@@ -103,25 +103,6 @@ addDebugLog("switchVersion", "", "+");
     });
 
 
-    // const anotherTask = new Listr(
-    //   [
-    //     {
-    //       title: `npm update (may take a few minutes)`,
-    //       task: async () => {
-    //         await runNpmUpdate();
-    //       }
-    //     }
-    //   ],
-    //   { concurrent: false, exitOnError: true }
-    // );
-
-
-    // archive existing
-    // await zipVersionAndArchive(existingOrgLib, oldVersion);
-
-    // restore from archive
-    //
-
     console.log(`${chalk.bold.green(`\nSwitched to ${orgLib.currentOrgLib}/${newVersion}!\n`)}`);
 
     await forceDefaultsUpdate();
@@ -131,19 +112,9 @@ addDebugLog("switchVersion", "", "+");
 
       console.log('\n***************************************************************');
       console.log(chalk.bold.yellow('Dependencies have changed between versions, recommend updating.'));
-      console.log(`PLEASE run ${chalk.bold.yellow("'npm update'")}.`);
-      console.log('****************************************************************\n');
-
-      // const upateQuestions = await getRunNpmQuestions();
-      // const answers = await inquirer.prompt(upateQuestions);
-      // const { updateNpm } = answers;
-
-      // if (updateNpm) {
-      //   await anotherTask.run().catch(err => {
-      //     console.log(chalk.bold.red(err.toString()));
-      //     process.exit(1);
-      //   });
-      // }
+      console.log(`>>> PLEASE run ${chalk.bold.yellow("'npm update'")}.`);
+      console.log('***************************************************************\n');
+
     }
 
 

package/src/util.js

@@ -285,12 +285,19 @@ export const checkJWTExpiration = async () => {
   }
 
   const jwt = jwtDecode(tokenAndStaticServer.C11NB2S);
-  const  { exp } = jwt;
+  const  { exp, customer_org } = jwt;
   if (exp < (new Date().getTime() + 1) / 1000) {
     console.log(chalk.redBright("JWT token has expired, please reauthenticate."));
     process.exit(1);
   }
 
+  // check that there is customer_org
+  if (!customer_org || customer_org === "") {
+    console.log(chalk.red(`PegaInfinity server DSS setting ${chalk.redBright.bold(`C11nCCv2CustomerOrg`)} is NOT set.`));
+    console.log(chalk.red("Please update DSS setting, save and then reauthenticate."));
+    process.exit(1);
+  }
+
 }
 
 export const getLibraryBased = () => {
@@ -1258,17 +1265,18 @@ if (showDebug) addDebugLog("getLocalLibraryVersions", `libraryName: ${libraryNam
 };
 
 export const getLocalArchivedLibraryVersions = async (libraryName, currentVersion = "0.0.0") => {
-  if (showDebug) addDebugLog("getLocalArchivedLibraryVersions", `libraryName: ${libraryName}` , "");
-    const currentDirectory = process.cwd();
-    const archiveDirectory = join (currentDirectory, ARCHIVES_PATH, `${libraryName}`);
+if (showDebug) addDebugLog("getLocalArchivedLibraryVersions", `libraryName: ${libraryName}` , "");
+  const currentDirectory = process.cwd();
+  const archiveDirectory = join (currentDirectory, ARCHIVES_PATH, `${libraryName}`);
 
-    return fs
-      .readdirSync(archiveDirectory, { withFileTypes: true })
-      .filter(dirent => dirent.isDirectory() && dirent.name != currentVersion)
-      .map(dirent => dirent.name);
-  };
+  return fs
+    .readdirSync(archiveDirectory, { withFileTypes: true })
+    .filter(dirent => dirent.isDirectory() && dirent.name != currentVersion)
+    .map(dirent => dirent.name);
+};
 
 export const getLocalArchivedLibrraryVersionData = async(libraryName, libraryVersion) => {
+if (showDebug) addDebugLog("getLocalArchivedLibrraryVersionData", `libraryName: ${libraryName}, libraryVersion: ${libraryVersion}`, "");
   const currentDirectory = process.cwd();
   const archiveDirectory = join (currentDirectory, ARCHIVES_PATH, `${libraryName}`, `${libraryVersion}`);
 
@@ -1504,11 +1512,13 @@ if (showDebug) addDebugLog("zipVersionAndArchive", `orgLibName: ${orgLibName}, v
 };
 
 export const unZipFromArchive = async (fileName) => {
+if (showDebug) addDebugLog("unZipFromArchive", `fileName: ${fileName}`, "");
   await unarchive(fileName, TEMP_PATH);
 };
 
 
 export const updateComponentTaskConfig = async () => {
+if (showDebug) addDebugLog("updateComponentTaskConfig", "", "");
   const currentDirectory = process.cwd();
   const tempDirectory = join(currentDirectory, TEMP_PATH);
 
@@ -1531,6 +1541,7 @@ export const updateComponentTaskConfig = async () => {
 }
 
 export const restoreDependenciesFromPackage = async () => {
+if (showDebug) addDebugLog("restoreDependenciesFromPackage", "", "");
   const currentDirectory = process.cwd();
   const tempDirectory = join(currentDirectory, TEMP_PATH);
   const tempPackagePath = join (tempDirectory, PACKAGE_JSON_FILENAME);
@@ -1609,10 +1620,12 @@ export const restoreDependenciesFromPackage = async () => {
 }
 
 export const getHaveDependencyDifference = () => {
+if (showDebug) addDebugLog("getHaveDependencyDifference", ``, "");
   return haveDependencyDifference;
 }
 
 export const restoreFromArchive = async (fileName, orgLibName, version) => {
+if (showDebug) addDebugLog("restoreFromArchive", `fileName: ${fileName}, orgLibName: ${orgLibName}, version: ${version}`, "");
   const currentDirectory = process.cwd();
   const tempDirectory = join(currentDirectory, TEMP_PATH);
   const archiveDirectory = join (currentDirectory, ARCHIVES_PATH, `${orgLibName}`, `${version}`);
@@ -1668,6 +1681,7 @@ export const restoreFromArchive = async (fileName, orgLibName, version) => {
 };
 
 export const clearSrcComponentsDirectory = async () => {
+if (showDebug) addDebugLog("clearSrcComponentsDirectory", ``, "");
   const currentDirectory = process.cwd();
   const currentComponentsPath = join(currentDirectory, "src", "components");
 
@@ -1700,6 +1714,7 @@ if (showDebug) addDebugLog("hasArchives", `${hasArc}`, "");
 };
 
 export const deleteArchives = async () => {
+if (showDebug) addDebugLog("deleteArchives", ``, "");
   const currentDirectory = process.cwd();
   const archiveDirectory = join (currentDirectory, ARCHIVES_PATH);
   const hasArc = fs.existsSync(archiveDirectory);
@@ -1713,7 +1728,7 @@ export const deleteArchives = async () => {
 }
 
 export const checkLibraryAndArchives = async () => {
-
+if (showDebug) addDebugLog("checkLibraryAndArchives", ``, "");
   const isLibraryBased =  getLibraryBased();
   const hasArch = await hasArchives();
 
@@ -1774,59 +1789,14 @@ if (showDebug) addDebugLog("getLibraryArchiveDirectories", "", "");
   .map(dirent => dirent.name);
 };
 
-// export const getLibraryArchivesFiles = async (orgLibName, version) => {
-// if (showDebug) addDebugLog("getLibraryArchives", `orgLibName: ${orgLibName}`, "");
-//   const currentDirectory = process.cwd();
-//   const archiveDirectory = join (currentDirectory, ARCHIVES_PATH, `${orgLibName}`, `${version}`);
 
-//   if (!fs.existsSync(archiveDirectory)) {
-//     return [];
-//   }
-
-//   return fs
-//     .readdirSync(archiveDirectory, { withFileTypes: true })
-//     .filter(dirent => !dirent.isDirectory() && !isHiddenFile(dirent.name)  )
-//     .map(dirent => dirent.name);
-
-// };
 
 export const getLibraryArchivesVersions = async (orgLibName, currentVersion) => {
 if (showDebug) addDebugLog("getLibraryArchivesVersions", `orgLibName: ${orgLibName}`, "");
-  // const archFileList = await getLibraryArchivesFiles(orgLibName, currentVersion);
-  // let archiveVersionList = [];
-
-  // if (archFileList && archFileList.length > 0) {
-  //   for (let index in archFileList) {
-  //     let fileName = archFileList[index];
-  //     let fVersion = fileName.replace(orgLibName.concat("_"), "");
-  //     fVersion = fVersion.replace(".zip", "");
-  //     if (currentVersion != fVersion) {
-  //       archiveVersionList.push(fVersion);
-  //     }
-
-  //   }
-  // }
-  // else {
-  //   console.error(
-  //     `${chalk.red.bold(`No archives found for ${orgLibName}.`)}`
-  //   );
-  //   process.exit(1);
-  // }
-
-  // if (archiveVersionList.length == 0) {
-  //   console.error(
-  //     `${chalk.red.bold(`No archives found for ${orgLibName} beyond current version.`)}`
-  //   );
-  //   process.exit(1);
-  // }
-
-  //   return archiveVersionList;
 
   const currentDirectory = process.cwd();
   const archiveDirectory = join (currentDirectory, ARCHIVES_PATH, `${orgLibName}`);
 
-  // const currentVersion = getConfigDefaults().buildVersion;
-
   if (!fs.existsSync(archiveDirectory)) {
     return [];
   }
@@ -1841,6 +1811,7 @@ if (showDebug) addDebugLog("getLibraryArchivesVersions", `orgLibName: ${orgLibNa
 };
 
 export const deleteLocalArchiveLibrary = async(libraryName) => {
+if (showDebug) addDebugLog("deleteLocalArchiveLibrary", `libraryName: ${libraryName}`, "");
   const currentDirectory = process.cwd();
   const archiveDirectory = join (currentDirectory, ARCHIVES_PATH, libraryName);
 
@@ -1863,6 +1834,7 @@ export const deleteLocalArchiveLibrary = async(libraryName) => {
 }
 
 export const deleteLocalArchiveLibraryVersion = async(libraryName, version) => {
+if (showDebug) addDebugLog("deleteLocalArchiveLibraryVersion", `libraryName: ${libraryName}, version: ${version}`, "");
   const currentDirectory = process.cwd();
   const archiveDirectory = join (currentDirectory, ARCHIVES_PATH, libraryName, version);
 
@@ -1880,6 +1852,7 @@ export const deleteLocalArchiveLibraryVersion = async(libraryName, version) => {
 }
 
 export const cleanUpTemp = async() => {
+if (showDebug) addDebugLog("cleanUpTemp", ``, "");
   const currentDirectory = process.cwd();
   const tempDirectory = join (currentDirectory, TEMP_PATH);
 
@@ -1891,6 +1864,7 @@ export const cleanUpTemp = async() => {
 
 
 export const getJestFunctionalTestList = async(whichTests) => {
+if (showDebug) addDebugLog("getJestFunctionalTestList", ``, "");
   const functionalDir = path.join(path.resolve(), JEST_TESTS_FUNCTIONAL_PATH);
   const libFilter = "localLib";
 

package/tests/functional/localCreateBuildDelete.test.js

@@ -111,7 +111,7 @@ describe(`create library delete Library: ${serverDir} - ${compType}`, () => {
     expect(stdout).toContain(`${newFileName} schema is valid`);
     // expect(stdout).toContain('Compiled successfully.');
     // done();
-  }, 30000);
+  }, 50000);
 
   it('npm run delete Local', async () => {
     const fileName = 'MyTestText';

package/tests/functional/localLibCreateLibExportImportLib.test.js

@@ -125,7 +125,7 @@ describe(`createLib createAll exportStore importStore deleteLib: ${serverDir} -
     //   // remove it
     //   fs.rmdirSync(fileDir, { recursive: true });
     // }
-  }, 10000);
+  }, 30000);
 
   it('npm run list', async () => {
     const script = 'npm run list --prefix ../../..';