@pega/custom-dx-components 0.242.35 → 0.242.36

package/package.json

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

package/src/cli.js

@@ -27,6 +27,7 @@ import {
   publishComponent,
   publishAllComponents,
   publishLibrary,
+  quarantine,
   renameComponent,
   moveComponent,
   renameLibrary,
@@ -60,6 +61,7 @@ const TASKS = {
   PUBLISH_LIB: 'publishLibrary',
   RENAME: 'rename',
   RENAME_LIB: 'renameLibrary',
+  QUARANTINE: 'quarantine',
   MOVE: 'moveComponent',
   LIST: 'list',
   LIST_LIB: 'listLibrary',
@@ -162,6 +164,10 @@ export default async (args = []) => {
       renameLibrary(options);
       break;
     }
+    case TASKS.QUARANTINE: {
+      quarantine(options);
+      break;
+    }
     case TASKS.MOVE: {
       moveComponent(options);
       break;

package/src/constants.js

@@ -49,6 +49,7 @@ export const BOOTSTRAP_CONFIG = 'PRRestService/api/application/v2/data_views/D_p
 
 export const JEST_ASSETS_ORIGINAL_PATH = 'node_modules/@pega/custom-dx-components/tests/assets/original/components/';
 export const JEST_ASSETS_LIBRARY_PATH = 'node_modules/@pega/custom-dx-components/tests/assets/library/components/';
+export const JEST_TESTS_FUNCTIONAL_PATH = 'node_modules/@pega/custom-dx-components/tests/functional/';
 export const JEST_CREATE_PATH = 'create/';
 export const JEST_CREATE_ALL_CONSTELLATION_PATH = 'createAll/Constellation/';
 export const JEST_CREATE_ALL_LAUNCHPAD_PATH = 'createAll/Launchpad';

package/src/tasks/build-lib/helper.js

@@ -9,7 +9,6 @@ import {
   addDebugLog,
   getLibraryBased
 } from '../../util.js';
-import { TASKS_CONFIG_JSON_FILENAME } from '../../constants.js';
 
 
 export const getBuildComponentQuestions = async (defaultVersion)  => {

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

@@ -14,7 +14,8 @@ import {
   clearSrcComponentsDirectory,
   hasLibraryAndVersion,
   getConfigDefaults,
-  forceDefaultsUpdate
+  forceDefaultsUpdate,
+  cleanUpTemp
 } from '../../util.js';
 
 import { getCreateLibComponentQuestions, getOkToProceedQuestion } from './helper.js';
@@ -28,6 +29,7 @@ export default async options => {
   }
 
   await showVersion();
+  await cleanUpTemp();
 
 addDebugLog("createLibrary", "", "+");
   let libraryName;
@@ -37,7 +39,7 @@ addDebugLog("createLibrary", "", "+");
   const orgLib = getConfigDefaults();
   const hasArch = await hasArchives();
 
-  if (hasArch) {
+  if (hasArch && options.params.length < 6) {
     console.log(chalk.bold.yellow('\nBe sure to SAVE all changes before creating a new library, unsaved changes will be LOST.'))
     console.log(chalk.bold.yellow('Current library/version will be stored and the newly created library/version will be your default.'))
 
@@ -70,7 +72,7 @@ addDebugLog("createLibrary", "", "+");
     const hasLib = await hasLibraryAndVersion(libraryName, version, !permBuild);
     if (hasLib) {
       console.log(`${chalk.bold.red(`Library ${orgLib.organization}_${libraryName} already exists.`)}`);
-      console.log("You can switch to that version by entering 'npm run switchVersion'.\n")
+      console.log("You can switch to that library by entering 'npm run switchLib'.\n")
       process.exit();
     }
 

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

@@ -16,7 +16,8 @@ import {
   checkLibraryAndArchives,
   getConfigDefaults,
   forceDefaultsUpdate,
-  modAddAboutData
+  modAddAboutData,
+  cleanUpTemp
 } from '../../util.js';
 
 import { getCreateVersionComponentQuestions, updateAllComponentsConfig } from './helper.js';
@@ -31,6 +32,7 @@ export default async options => {
 
   await showVersion();
   await checkLibraryAndArchives();
+  await cleanUpTemp();
 
 addDebugLog("createVersion", "", "+");
   let libraryName;

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

@@ -15,7 +15,9 @@ import {
   getLibraryArchiveDirectories,
   deleteArchives,
   forceDefaultsUpdate,
-  restoreFromArchive } from '../../util.js';
+  restoreFromArchive,
+  cleanUpTemp
+} from '../../util.js';
 
 import { getDeleteLibraryQuestions, getLibraryVersionQuestion } from './helper.js';
 import { showCurrentStatus } from '../show-status/index.js';
@@ -157,6 +159,7 @@ export default async (options) => {
 
   await showVersion();
   await checkLibraryAndArchives();
+  await cleanUpTemp();
 
 addDebugLog("deleteLibrary", "", "+");
 

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

@@ -6,7 +6,8 @@ import {
   getLibraryBased,
   checkLibraryAndArchives,
   getConfigDefaults,
-  addDebugLog
+  addDebugLog,
+  cleanUpTemp
 } from '../../util.js';
 
 import { deleteLibraryVersion } from '../delete-lib/index.js';
@@ -21,6 +22,7 @@ export default async (options) => {
 
   await showVersion();
   await checkLibraryAndArchives();
+  await cleanUpTemp();
 
 addDebugLog("deleteVersion", "", "+");
 

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

@@ -1,6 +1,7 @@
 import fs from 'fs';
 import { promisify } from 'util';
 import { join } from 'path';
+import path from 'path';
 
 import inquirer from 'inquirer';
 import ncp from 'ncp';
@@ -13,10 +14,11 @@ import {
   checkLibraryAndArchives,
   getConfigDefaults,
   getLibraryBased,
-  zipVersionAndArchive
+  zipVersionAndArchive,
+  cleanUpTemp
  } from '../../util.js';
-import { TASKS_CONFIG_JSON_FILENAME, COMPONENTS_DIRECTORY_PATH, COMPONENTS_PATH, ARCHIVES_PATH, TEMP_PATH } from '../../constants.js';
-import { getFilePathQuestions, getFileNameQuestions, getLibraryQuestion, getLibraryVersionQuestion  } from './helper.js';
+import { TASKS_CONFIG_JSON_FILENAME, ARCHIVES_PATH } from '../../constants.js';
+import { getFilePathQuestions, getLibraryQuestion, getLibraryVersionQuestion  } from './helper.js';
 
 export const DXCB_CONFIG_INTERNAL_JSON_FILENAME = 'src/dxcb.config.json';
 const currentDirectory = process.cwd();
@@ -74,7 +76,7 @@ addDebugLog("updateFile", `fileName: ${fileName}, oldComponentKeyPC: ${oldCompon
 
 
 
-export const exportArch = async(exportPath, orgLibName, selectedVersion) => {
+export const exportArch = async(exportPath, orgLibName, selectedVersion, currentOrArchive = "") => {
 addDebugLog("exportArch", `exportPath: ${exportPath}, orgLibName: ${orgLibName}, selectedVersion: ${selectedVersion}`, "");
   const currentDirectory = process.cwd();
   const archiveDirectory = join (currentDirectory, ARCHIVES_PATH, `${orgLibName}`, `${selectedVersion}`);
@@ -84,25 +86,33 @@ addDebugLog("exportArch", `exportPath: ${exportPath}, orgLibName: ${orgLibName},
 
   const exportFile = join(exportPath, fileName);
 
+  let output;
+
+  let archiveBeforeStore = false;
+
 
   if (orgLibName === configDef.currentOrgLib && selectedVersion === configDef.buildVersion) {
 
-    console.log("\nYou've selected the current working library/version.");
-    console.log("You export store or the current.");
-    const archAnswers = await inquirer.prompt([
-      {
-        name: 'currentOrStore',
-        type: 'rawlist',
-        message: 'Select current or store',
-        default: "Current",
-        choices: ["Current", "Store"]
-      },
-    ]);
+    let currentOrStore = currentOrArchive;
+    if (currentOrArchive === "") {
+      console.log("\nYou've selected the current working library/version.");
+      console.log("Export store or the current.");
+      const archAnswers = await inquirer.prompt([
+        {
+          name: 'currentOrStore',
+          type: 'rawlist',
+          message: 'Select current or store',
+          default: "Current",
+          choices: ["Current", "Store"]
+        },
+      ]);
+
+      currentOrStore = archAnswers.currentOrStore;
+
+    }
 
-    const currentOrStore = archAnswers.currentOrStore;
     if (currentOrStore === "Current") {
-      // archive it
-      await zipVersionAndArchive(configDef.currentOrgLib, configDef.buildVersion);
+      archiveBeforeStore = true;
     }
   }
 
@@ -126,28 +136,24 @@ addDebugLog("exportArch", `exportPath: ${exportPath}, orgLibName: ${orgLibName},
     }
   }
 
-  if (fs.existsSync(exportFile)) {
-    console.log(`\nFile: ${chalk.green(`${exportFile}`)} already exists.`);
-    const overrideAnswer = await inquirer.prompt([
-      {
-        name: 'overrideExisting',
-        type: 'confirm',
-        message: 'Override existing',
-        default: false
-      },
-    ]);
+  if (archiveBeforeStore) {
+    // archive it
+    output = await zipVersionAndArchive(configDef.currentOrgLib, configDef.buildVersion);
 
-    const overrideExisting = overrideAnswer.overrideExisting;
-    if (!overrideExisting) {
-      console.log(chalk.green("Store not exported."));
-      process.exit();
-    }
-  }
+    // if archiving, need to wait before copying
+    output.on('close', function() {
+      fs.copyFileSync(archFileName, exportFile );
 
+      console.log(`\n${chalk.green(`${fileName}`)} has been exported to ${chalk.green(`${exportPath}`)}`);
 
-  fs.copyFileSync(archFileName, exportFile );
+    });
+  }
+  else {
+    fs.copyFileSync(archFileName, exportFile );
+
+    console.log(`\n${chalk.green(`${fileName}`)} has been exported to ${chalk.green(`${exportPath}`)}`);
+  }
 
-  console.log(`\n${chalk.green(`${fileName}`)} has been exported to ${chalk.green(`${exportPath}`)}`);
 
 }
 
@@ -177,14 +183,18 @@ export default async options => {
     process.exit();
   }
 
+  await cleanUpTemp();
+
   addDebugLog("exportArchive", "", "+");
 
 
-  if (options.params.length >= 6) {
-    const libraryName = options.params[4];
-    const libraryVersion = options.params[5];
+  if (options.params.length >= 7) {
+    const libraryName = options.params[3];
+    const libraryVersion = options.params[4];
+    const filePath = options.params[5];
+    const currentOrArchive = options.params[6];
 
-    await exportArch(filePath, libraryName, libraryVersion );
+    await exportArch(filePath, libraryName, libraryVersion, currentOrArchive );
 
   }
   else {
@@ -199,7 +209,14 @@ export default async options => {
 
     const filePathQuestions = await getFilePathQuestions();
     const filePathAnswers = await inquirer.prompt(filePathQuestions);
-    const { filePath } = filePathAnswers;
+    let { filePath } = filePathAnswers;
+
+
+    // if (path.sep === "/") {
+    //   if (filePath.lastIndexOf(path.sep) != filePath.length - 1) {
+    //     filePath = filePath.concat(path.sep);
+    //   }
+    // }
 
     await exportArch( filePath, orgLibName, selectedVersion);
 

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

@@ -18,7 +18,8 @@ import {
   unZipFromArchive,
   zipVersionAndArchive,
   getLibraryArchiveDirectories,
-  hasLibraryAndVersion
+  hasLibraryAndVersion,
+  cleanUpTemp
  } from '../../util.js';
 import { TASKS_CONFIG_JSON_FILENAME, ARCHIVES_PATH, TEMP_PATH } from '../../constants.js';
 import { getFilePathQuestions, getFileNameQuestions, updateTempArchive  } from './helper.js';
@@ -357,10 +358,13 @@ export default async options => {
     process.exit();
   }
 
+  await cleanUpTemp();
+
   addDebugLog("importArchive", "", "+");
 
 
   if (options.params.length >= 5) {
+    const filePath = options.params[3];
     const fileName = options.params[4];
     await importArch( filePath, fileName);
 

package/src/tasks/import-comp/helper.js

@@ -2,9 +2,7 @@ import chalk from 'chalk';
 import fs from 'fs';
 import path from 'path';
 import { join } from 'path';
-import { Listr } from 'listr2';
-import { addDebugLog, getConfigDefaults, convertIntoPascalCase, getComponents, getComponentDirectoryPath, getDirectoryFiles } from '../../util.js';
-import { TASKS_CONFIG_JSON_FILENAME, TEMP_PATH, PACKAGE_JSON_FILENAME } from '../../constants.js';
+import { addDebugLog } from '../../util.js';
 
 
 export const getFilePathQuestions = async () => {
@@ -42,7 +40,7 @@ addDebugLog("getFileNameQuestions", "", "");
     {
       name: 'fileName',
       type: 'rawlist',
-      message: `Select zip file`,
+      message: `Select component`,
       choices: zipFileList
     },
   ];

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

@@ -27,7 +27,6 @@ import {
   convertIntoPascalCase,
   getComponentDirectoryPath
 } from '../../util.js';
-import Choice from 'inquirer/lib/objects/choice.js';
 
 
 const copy = promisify(ncp);
@@ -290,7 +289,7 @@ export default async options => {
 addDebugLog("importComponent", "", "+");
 
   if (options.params.length >= 5) {
-    const filePath = options.param[3];
+    const filePath = options.params[3];
     const fileName = options.params[4];
     await importComp( filePath, fileName);
 

package/src/tasks/index.js

@@ -18,6 +18,7 @@ export { default as moveComponent } from './move/index.js';
 export { default as renameComponent } from './rename/index.js';
 export { default as renameLibrary } from './rename-lib/index.js';
 export { default as revertWebPack } from './revert-webpack/index.js';
+export { default as quarantine } from './quarantine/index.js';
 export { default as listComponents } from './list/index.js';
 export { default as listLibrary } from './list-lib/index.js';
 export { default as listPublished } from './list-pub/index.js';

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

@@ -48,11 +48,12 @@
     "_internal-test-coverage": "node --input-type=module  --experimental-vm-modules node_modules/jest/bin/jest.js --runInBand node_modules/@pega/custom-dx-component --ci --testResultsProcessor='jest-junit' --coverage",
     "_internal-test": "echo 'Running functional and unit tests will DELETE existing local components, proceed (y/n)?' && read proceed && if test \"$proceed\" = \"y\"; then npm run _internal-test-full; fi ",
     "_internal-test-full": "npm run _internal-test-functional && npm run _internal-test-unit",
-    "_internal-test-functional": "npm run test:functional:local --prefix node_modules/@pega/custom-dx-components",
+    "_internal-test-functional": "echo '\nMake sure you authenticate!!\n' && npm run test:functional:local --prefix node_modules/@pega/custom-dx-components",
     "_internal-test-unit": "npm run test:unit:local --prefix node_modules/@pega/custom-dx-components",
     "_internal-build-jest-assets": "custom-dx-components buildJestAssets",
     "_internal-buildLibrary": "custom-dx-components buildLibrary",
     "_internal-publishLibrary": "custom-dx-components publishLibrary",
+    "_internal-test-quarantine": "custom-dx-components quarantine",
     "_lint:styles": "stylelint \"./**/*.@(js|jsx|ts|tsx)\"",
     "_lint:format": "prettier -c .",
     "_lint:spelling": "cspell --no-progress **/*",
@@ -99,7 +100,7 @@
   },
   "devDependencies": {
     "@pega/configs": "^0.6.0",
-    "@pega/custom-dx-components": "0.242.35",
+    "@pega/custom-dx-components": "0.242.36",
     "@pega/pcore-pconnect-typedefs": "~3.0.0",
     "@storybook/addon-actions": "^7.6.7",
     "@storybook/addon-essentials": "^7.6.19",

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

@@ -1,7 +1,7 @@
 import inquirer from 'inquirer';
 import chalk from 'chalk';
 
-import {showVersion, getLibraryBased, addDebugLog, checkLibraryAndArchives, getLibraryArchivesVersions, getConfigDefaults, getLocalArchivedLibrraryVersionData, getComponentsConfigs } from '../../util.js';
+import {showVersion, getLibraryBased, addDebugLog, checkLibraryAndArchives, getLibraryArchivesVersions, getConfigDefaults, getLocalArchivedLibrraryVersionData, getComponentsConfigs, cleanUpTemp } from '../../util.js';
 import { getArchiveLibraryQuestions } from './helper.js';
 
 export default async (options) => {
@@ -16,6 +16,8 @@ export default async (options) => {
   await checkLibraryAndArchives();
 addDebugLog("listLibrary", "", "+");
 
+  await cleanUpTemp();
+
   let organization;
   let library;
 

package/src/tasks/list-pub/index.js

@@ -1,7 +1,7 @@
 import inquirer from 'inquirer';
 import chalk from 'chalk';
 
-import {showVersion, getC11NB2STokenAndStaticServer, getLocalLibraries, getLocalLibraryVersions, getLocalLibraryVersionData, getLibraryBased, addDebugLog, checkLibraryAndArchives, getConfigDefaults } from '../../util.js';
+import {showVersion, getC11NB2STokenAndStaticServer, getLocalLibraries, getLocalLibraryVersions, getLocalLibraryVersionData, getLibraryBased, addDebugLog, checkLibraryAndArchives, getConfigDefaults, cleanUpTemp } from '../../util.js';
 
 import { listLibJSONResponse } from '@pega/constellation-dx-components-build-utils/index.js';
 
@@ -43,6 +43,7 @@ export default async (options) => {
   await showVersion();
   await checkLibraryAndArchives();
 addDebugLog("listPublished", "", "+");
+  await cleanUpTemp();
 
   let sourceOfLibrary;
   let organization;
@@ -51,13 +52,14 @@ addDebugLog("listPublished", "", "+");
   const compDef = getConfigDefaults();
   organization = compDef.organization;
   library = compDef.library;
-  let libraryName;
-  let selectedVersion;
+  let libraryName = "";
+  let selectedVersion = "";
   let libVersions = [];
 
   if (options.params.length >= 5) {
     sourceOfLibrary = options.params[3];
-    selectedVersion = options.params[4];
+    libraryName = options.params[4];
+    selectedVersion = options.params[5];
 
     libVersions.push(selectedVersion);
 
@@ -74,16 +76,18 @@ addDebugLog("listPublished", "", "+");
     // local
     const arLibs = await getLocalLibraries();
 
-    const libAnswers = await inquirer.prompt([
-      {
-        name: 'library',
-        type: 'rawlist',
-        message: 'Pick library',
-        choices: arLibs
-      }
-    ]);
+    if (libraryName === "") {
+      const libAnswers = await inquirer.prompt([
+        {
+          name: 'library',
+          type: 'rawlist',
+          message: 'Pick library',
+          choices: arLibs
+        }
+      ]);
 
-    libraryName = libAnswers.library;
+      libraryName = libAnswers.library;
+    }
 
     if (libVersions.length == 0) {
       try {
@@ -96,7 +100,7 @@ addDebugLog("listPublished", "", "+");
 
     if (libVersions.length > 0) {
 
-        if (selectedVersion === undefined) {
+        if (selectedVersion === "") {
           const libAnswers = await inquirer.prompt([
             {
               name: 'libVersion',

package/src/tasks/move/helper.js

@@ -36,21 +36,24 @@ addDebugLog("getLibraryQuestions", "", "");
   ];
 };
 
-export const getLibraryVersionQuestion = async (libraryName, libVersions) => {
+export const getLibraryVersionQuestion = async (libraryName, libVersions, copyOrMove) => {
 addDebugLog("getLibraryVersionQuestion", `libraryName: ${libraryName}`, "");
+  const configDef = getConfigDefaults();
 
   return [
     {
       name: 'version',
       type: 'rawlist',
-      message: `Select ${chalk.green.bold(`${libraryName}`)} library version to move to`,
+      message: `Select ${chalk.green.bold(`${libraryName}`)} library version to ${copyOrMove} to`,
       choices: libVersions
     },
     {
       name: 'copyShared',
       type: 'confirm',
       message: `Copy ${chalk.yellow.bold("/shared")} directory (same named files will be overridden) ?`,
-      default: true
+      default: true,
+      when: (answers) => (answers.version != configDef.buildVersion && libraryName != configDef.library)
+
     },
   ];
 };