@pega/custom-dx-components 0.242.43 → 0.242.45

package/package.json

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

package/src/constants.js

@@ -6,6 +6,8 @@ export const WEBPACK_CONFIG_JS_FILENAME = 'webpack.config.js';
 export const WEBPACK_PATHS_JS_FILENAME = 'paths.js';
 export const USE_PROMOTED_WEB_PACK = 'usePromotedWebPack';
 export const COMPONENTS_DIRECTORY_PATH = 'components-directory-path';
+export const IMPORT_RELATIVE_PATH = 'import-relative-path';
+export const EXPORT_RELATIVE_PATH = 'export-relative-path';
 export const COMPONENTS_PATH = 'component';
 export const TOKEN_PATH = 'node_modules/@pega/custom-dx-components/.access_token';
 export const OOTB_COMPONENTS = 'node_modules/@pega/custom-dx-components/.ootb_components';

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

@@ -1,7 +1,7 @@
 import chalk from 'chalk';
 import path from 'path';
 import { join } from 'path';
-import { addDebugLog, getConfigDefaults, getLibraryArchiveDirectories, getLibraryArchivesVersions } from '../../util.js';
+import { addDebugLog, getConfigDefaults, getLibraryArchiveDirectories, getLibraryArchivesVersions, setConfigExportRelativePath, forceDefaultsUpdate } from '../../util.js';
 
 export const SOURCE_OF_COMPONENT_TYPES = {
   SERVER: 'Server',
@@ -20,9 +20,11 @@ addDebugLog("getFilePathQuestions", "", "");
     console.log("\tWindows:\tC:\\Users\\name\\...\n");
   }
 
+  const configDef = getConfigDefaults();
+
   const currentDirectory = process.cwd();
   const arPathParts = currentDirectory.split(path.sep);
-  let defaultPath = join(arPathParts[0], arPathParts[1], arPathParts[2], "Downloads");
+  let defaultPath = join(arPathParts[0], arPathParts[1], arPathParts[2], configDef.exportRelativePath);
   if (path.sep === "/") {
     defaultPath = "/".concat(defaultPath);
   }
@@ -83,3 +85,23 @@ addDebugLog("getLibraryVersionQuestion", "", "");
     }
   ];
 };
+
+export const updateSavedExportFilePath = async(filePath) => {
+  const currentDirectory = process.cwd();
+  const arPathParts = currentDirectory.split(path.sep);
+  const configDef = getConfigDefaults();
+
+  let defaultPath = join(path.sep, arPathParts[0], arPathParts[1], arPathParts[2]);
+
+  if (filePath.indexOf(defaultPath) === 0) {
+    // same starting path, so we can save the relative
+    const relativePath = filePath.replace(defaultPath.concat("/"), "");
+
+    if (relativePath != configDef.importRelativePath) {
+      await setConfigExportRelativePath(relativePath);
+      await forceDefaultsUpdate();
+    }
+
+
+  }
+}

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

@@ -18,7 +18,7 @@ import {
   cleanUpTemp
  } from '../../util.js';
 import { TASKS_CONFIG_JSON_FILENAME, ARCHIVES_PATH } from '../../constants.js';
-import { getFilePathQuestions, getLibraryQuestion, getLibraryVersionQuestion  } from './helper.js';
+import { getFilePathQuestions, getLibraryQuestion, getLibraryVersionQuestion, updateSavedExportFilePath  } from './helper.js';
 
 export const DXCB_CONFIG_INTERNAL_JSON_FILENAME = 'src/dxcb.config.json';
 const currentDirectory = process.cwd();
@@ -129,6 +129,8 @@ addDebugLog("exportArch", `exportPath: ${exportPath}, orgLibName: ${orgLibName},
     const createNewPath = newPathAnswer.createNewPath;
     if (createNewPath) {
       fs.mkdirSync(exportPath, { recursive: true });
+
+      await updateSavedExportFilePath(exportPath);
     }
     else {
       console.log(chalk.green("Store not exported."));
@@ -211,6 +213,8 @@ export default async options => {
     const filePathAnswers = await inquirer.prompt(filePathQuestions);
     let { filePath } = filePathAnswers;
 
+    await updateSavedExportFilePath(filePath);
+
 
     // if (path.sep === "/") {
     //   if (filePath.lastIndexOf(path.sep) != filePath.length - 1) {

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

@@ -3,7 +3,7 @@ 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 { addDebugLog, getConfigDefaults, convertIntoPascalCase, getComponents, getComponentDirectoryPath, getDirectoryFiles, setConfigImportRelativePath, forceDefaultsUpdate } from '../../util.js';
 import { TASKS_CONFIG_JSON_FILENAME, TEMP_PATH, PACKAGE_JSON_FILENAME } from '../../constants.js';
 
 
@@ -251,9 +251,11 @@ addDebugLog("getFilePathQuestions", "", "");
     console.log("\tWindows:\tC:\\Users\\name\\...\n");
   }
 
+  const configDef = getConfigDefaults();
+
   const currentDirectory = process.cwd();
   const arPathParts = currentDirectory.split(path.sep);
-  let defaultPath = join(arPathParts[0], arPathParts[1], arPathParts[2], "Downloads");
+  let defaultPath = join(arPathParts[0], arPathParts[1], arPathParts[2], configDef.importRelativePath);
   if (path.sep === "/") {
     defaultPath = "/".concat(defaultPath);
   }
@@ -280,3 +282,23 @@ addDebugLog("getFileNameQuestions", "", "");
     },
   ];
 };
+
+export const updateSavedFilePath = async(filePath) => {
+  const currentDirectory = process.cwd();
+  const arPathParts = currentDirectory.split(path.sep);
+  const configDef = getConfigDefaults();
+
+  let defaultPath = join(path.sep, arPathParts[0], arPathParts[1], arPathParts[2]);
+
+  if (filePath.indexOf(defaultPath) === 0) {
+    // same starting path, so we can save the relative
+    const relativePath = filePath.replace(defaultPath.concat("/"), "");
+
+    if (relativePath != configDef.importRelativePath) {
+      await setConfigImportRelativePath(relativePath);
+      await forceDefaultsUpdate();
+    }
+
+
+  }
+}

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

@@ -22,7 +22,7 @@ import {
   cleanUpTemp
  } from '../../util.js';
 import { TASKS_CONFIG_JSON_FILENAME, ARCHIVES_PATH, TEMP_PATH } from '../../constants.js';
-import { getFilePathQuestions, getFileNameQuestions, updateTempArchive  } from './helper.js';
+import { getFilePathQuestions, getFileNameQuestions, updateTempArchive, updateSavedFilePath  } from './helper.js';
 
 export const DXCB_CONFIG_INTERNAL_JSON_FILENAME = 'src/dxcb.config.json';
 const currentDirectory = process.cwd();
@@ -381,6 +381,8 @@ export default async options => {
       process.exit();
     }
 
+    await updateSavedFilePath(filePath);
+
     const fileNameQuestions = await getFileNameQuestions(zipFileList);
     const fileNameAnswers = await inquirer.prompt(fileNameQuestions);
     const {fileName} = fileNameAnswers;

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

@@ -2,8 +2,7 @@ import chalk from 'chalk';
 import fs from 'fs';
 import path from 'path';
 import { join } from 'path';
-import { addDebugLog } from '../../util.js';
-
+import { addDebugLog, getConfigDefaults, setConfigImportRelativePath, forceDefaultsUpdate } from '../../util.js';
 
 export const getFilePathQuestions = async () => {
 addDebugLog("getFilePathQuestions", "", "");
@@ -16,9 +15,11 @@ addDebugLog("getFilePathQuestions", "", "");
     console.log("\tWindows:\tC:\\Users\\name\\...\n");
   }
 
+  const configDef = getConfigDefaults();
+
   const currentDirectory = process.cwd();
   const arPathParts = currentDirectory.split(path.sep);
-  let defaultPath = join(arPathParts[0], arPathParts[1], arPathParts[2], "Downloads");
+  let defaultPath = join(arPathParts[0], arPathParts[1], arPathParts[2], configDef.importRelativePath);
   if (path.sep === "/") {
     defaultPath = "/".concat(defaultPath);
   }
@@ -45,3 +46,23 @@ addDebugLog("getFileNameQuestions", "", "");
     },
   ];
 };
+
+export const updateSavedFilePath = async(filePath) => {
+  const currentDirectory = process.cwd();
+  const arPathParts = currentDirectory.split(path.sep);
+  const configDef = getConfigDefaults();
+
+  let defaultPath = join(path.sep, arPathParts[0], arPathParts[1], arPathParts[2]);
+
+  if (filePath.indexOf(defaultPath) === 0) {
+    // same starting path, so we can save the relative
+    const relativePath = filePath.replace(defaultPath.concat("/"), "");
+
+    if (relativePath != configDef.importRelativePath) {
+      await setConfigImportRelativePath(relativePath);
+      await forceDefaultsUpdate();
+    }
+
+
+  }
+}

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

@@ -17,7 +17,9 @@ import {
   getComponents
  } from '../../util.js';
 import { TASKS_CONFIG_JSON_FILENAME } from '../../constants.js';
-import { getFilePathQuestions, getFileNameQuestions  } from './helper.js';
+import { getFilePathQuestions, getFileNameQuestions, updateSavedFilePath  } from './helper.js';
+
+import buildComponent from '../build-comp/index.js';
 
 export const DXCB_CONFIG_INTERNAL_JSON_FILENAME = 'src/dxcb.config.json';
 const currentDirectory = process.cwd();
@@ -155,90 +157,120 @@ export const importComp = async(filePath, fileName) => {
 addDebugLog("importComp", `filePath: ${filePath}, fileName: ${fileName}`, "");
 
   const currentDirectory = process.cwd();
-  const compDirectory = join(currentDirectory, "src", "components");
+  // const compDirectory = join(currentDirectory, "src", "components");
+
   const copyFilePath = join(filePath, fileName);
 
   const configDef = getConfigDefaults();
-  const copyDir = join(compDirectory, fileName);
+  const copyDir = await getComponentDirectoryPath(fileName);
+  let configData;
+  let newName = "";
+  let newLabel = "";
 
-  if (fs.existsSync(copyFilePath)) {
-    fs.cpSync(copyFilePath, copyDir, { recursive: true, force: true  });
-  }
+  if (fs.existsSync(copyDir)) {
+    configData = fs.readFileSync(join(copyDir, "/config.json"), { encoding: 'utf8' });
+    configData = configData && JSON.parse(configData);
 
-  let configData = fs.readFileSync(join(copyDir, "/config.json"), { encoding: 'utf8' });
-  configData = configData && JSON.parse(configData);
+    const compName = configData.componentKey.split("_")[2];
+    const potentialCompKey = `${configDef.currentOrgLib}_${compName}`;
+    const currentCompList = await getComponents();
 
-  const compName = configData.componentKey.split("_")[2];
-  const potentialCompKey = `${configDef.currentOrgLib}_${compName}`;
-  const currentCompList = await getComponents();
-  let newName = "";
-  let newLabel = "";
 
-  if (currentCompList && currentCompList.includes(potentialCompKey)) {
-    console.log(`\nComponent ${chalk.yellow(`${potentialCompKey}`)} already exists.`);
-    const proceedAnswers = await inquirer.prompt([
+    if (currentCompList && currentCompList.includes(potentialCompKey)) {
+      console.log(`\nComponent ${chalk.yellow(`${potentialCompKey}`)} already exists.`);
+      const proceedAnswers = await inquirer.prompt([
 
-      {
-        name: 'proceedAs',
-        type: 'rawlist',
-        message: `Proceed as ?`,
-        default: 'No import',
-        choices: ['No import', 'Overwrite', 'New name']
-      },
-      {
-        name: 'componentName',
-        message: 'Enter component name (required)',
-        when(answers) {
-          return answers.proceedAs === 'New name';
+        {
+          name: 'proceedAs',
+          type: 'rawlist',
+          message: `Proceed as ?`,
+          default: 'No import',
+          choices: ['No import', 'Overwrite', 'New name']
         },
-        validate: value => {
-          /* value should not be empty
-          It should not have spaces
-          It should not start with a number
-          Only case-insensitive alphanumeric values are allowed
-        */
-          if (value && !/^\d/.test(value) && value === sanitize(value)) {
-            return true;
+        {
+          name: 'componentName',
+          message: 'Enter component name (required)',
+          when(answers) {
+            return answers.proceedAs === 'New name';
+          },
+          validate: value => {
+            /* value should not be empty
+            It should not have spaces
+            It should not start with a number
+            Only case-insensitive alphanumeric values are allowed
+          */
+            if (value && !/^\d/.test(value) && value === sanitize(value)) {
+              return true;
+            }
+            return 'Only alphanumeric values are allowed, starting with alphabets, no spaces.';
           }
-          return 'Only alphanumeric values are allowed, starting with alphabets, no spaces.';
-        }
-      },
-      {
-        name: 'componentLabel',
-        message: 'Enter component label for display (required)',
-        when(answers) {
-          return answers.proceedAs === 'New name';
         },
-        validate: value => {
-          if (value) {
-            return true;
+        {
+          name: 'componentLabel',
+          message: 'Enter component label for display (required)',
+          when(answers) {
+            return answers.proceedAs === 'New name';
+          },
+          validate: value => {
+            if (value) {
+              return true;
+            }
+            return 'Please provide value for label';
           }
-          return 'Please provide value for label';
         }
+      ]);
+
+
+      switch (proceedAnswers.proceedAs) {
+        case 'No import':
+          // removed copied
+          // fs.rmSync(copyDir, { recursive: true, force: true, maxRetries: 2 });
+          process.exit();
+          break;
+        case 'Overwrite':
+          // remove existing
+          const existingComp = await getComponentDirectoryPath(potentialCompKey);
+          fs.rmSync(existingComp, { recursive: true, force: true, maxRetries: 2 });
+          break;
+        case 'New name':
+          newName = proceedAnswers.componentName;
+          newLabel = proceedAnswers.componentLabel;
+          break;
       }
-    ]);
-
-    switch (proceedAnswers.proceedAs) {
-      case 'No import':
-        // removed copied
-        fs.rmSync(copyDir, { recursive: true, force: true, maxRetries: 2 });
-        process.exit();
-        break;
-      case 'Overwrite':
-        // remove existing
-        const exitingComp = join(compDirectory, potentialCompKey);
-        fs.rmSync(exitingComp, { recursive: true, force: true, maxRetries: 2 });
-        break;
-      case 'New name':
-        newName = proceedAnswers.componentName;
-        newLabel = proceedAnswers.componentLabel;
-        break;
+
     }
+  }
+
+  if (fs.existsSync(copyFilePath)) {
+    fs.cpSync(copyFilePath, copyDir, { recursive: true, force: true  });
+    configData = fs.readFileSync(join(copyDir, "/config.json"), { encoding: 'utf8' });
+
+    configData = configData && JSON.parse(configData);
+
+    const newCompKey = await renameComponent(configData.componentKey, configDef.currentOrgLib, configDef.buildVersion, newName, newLabel, null);
+    console.log(`\n${chalk.green(`${fileName}`)} has been imported as ${chalk.green(`${newCompKey}`)}\n`);
+
+    const validateAnswers = await inquirer.prompt([
+      {
+        name: 'doValidate',
+        type: 'confirm',
+        message: `Validate ${chalk.yellow(`${newCompKey}`)}`,
+        default: true
+      }]);
+
+    if (validateAnswers.doValidate) {
+      const args  = [ '','', '', `${newCompKey}`];
+      let myOptions = {};
+      myOptions["params"] = args;
+
+      await buildComponent(myOptions);
+    }
+
+
 
   }
 
-  const newCompKey = await renameComponent(configData.componentKey, configDef.currentOrgLib, configDef.buildVersion, newName, newLabel, null);
-  console.log(`\n${chalk.green(`${fileName}`)} has been imported as ${chalk.green(`${newCompKey}`)}`);
+
 
 
 }
@@ -307,6 +339,8 @@ addDebugLog("importComponent", "", "+");
       process.exit();
     }
 
+    await updateSavedFilePath(filePath);
+
     const fileNameQuestions = await getFileNameQuestions(compFileList);
     const fileNameAnswers = await inquirer.prompt(fileNameQuestions);
     const {fileName} = fileNameAnswers;

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

@@ -100,7 +100,7 @@
   },
   "devDependencies": {
     "@pega/configs": "^0.6.0",
-    "@pega/custom-dx-components": "0.242.43",
+    "@pega/custom-dx-components": "~0.242.45",
     "@pega/pcore-pconnect-typedefs": "~3.0.0",
     "@storybook/addon-actions": "^7.6.7",
     "@storybook/addon-essentials": "^7.6.19",

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

@@ -1,5 +1,7 @@
 {
   "components-directory-path": "src/components",
+  "import-relative-path": "Downloads",
+  "export-relative-path": "Downloads",
   "server-config": {
     "rulesetName": "CustomDXComponents",
     "rulesetVersion": "01-01-01",

package/src/util.js

@@ -34,7 +34,9 @@ import {
   COMPONENTS_PATH,
   ARCHIVES_PATH,
   TEMP_PATH,
-  JEST_TESTS_FUNCTIONAL_PATH
+  JEST_TESTS_FUNCTIONAL_PATH,
+  IMPORT_RELATIVE_PATH,
+  EXPORT_RELATIVE_PATH
 } from './constants.js';
 
 
@@ -57,7 +59,9 @@ let defaultConfigs = {
   version: "",
   buildVersion: "",
   displayLibVersion: "",
-  showDebug: false
+  showDebug: false,
+  importRelativePath: "",
+  exportRelativePath: ""
 };
 
 let pegaConfig = null;
@@ -110,7 +114,9 @@ export const setUpDefaults = async () => {
     version: "",
     buildVersion: "",
     displayLibVersion: "",
-    showDebug: false
+    showDebug: false,
+    importRelativePath: "",
+    exportRelativePath: ""
   };
 
   // retrievedConfigData
@@ -124,6 +130,14 @@ export const setUpDefaults = async () => {
     let data = fs.readFileSync(pegaConfigJsonPath, { encoding: 'utf8' });
     data = JSON.parse(data);
 
+    if (data[IMPORT_RELATIVE_PATH]) {
+      retrievedConfigData.importRelativePath = data[IMPORT_RELATIVE_PATH];
+    }
+
+    if (data[EXPORT_RELATIVE_PATH]) {
+      retrievedConfigData.exportRelativePath = data[EXPORT_RELATIVE_PATH];
+    }
+
     if (data[LIBRARY_BASED]) {
       retrievedConfigData.isLibraryBased = data[LIBRARY_BASED];
     }
@@ -674,6 +688,30 @@ if (showDebug) addDebugLog("setConfigDevBuild", `devBuild: ${devBuild}`, "");
   fs.writeFileSync(pegaConfigJsonPath, JSON.stringify(configData, null, 4), { encoding: 'utf8' });
 }
 
+export const setConfigImportRelativePath = async (importRelativePath) => {
+if (showDebug) addDebugLog("setConfigImportRelativePath", `importRelativePath: ${importRelativePath}`, "");
+  const currentDirectory = process.cwd();
+  const pegaConfigJsonPath = join(currentDirectory, TASKS_CONFIG_JSON_FILENAME);
+  let configData = await getPegaConfig();
+  configData[IMPORT_RELATIVE_PATH] = importRelativePath;
+
+  // update file
+  // stringify "4", makes the json string look like JSON in the file, formated instead of a single line
+  fs.writeFileSync(pegaConfigJsonPath, JSON.stringify(configData, null, 4), { encoding: 'utf8' });
+}
+
+export const setConfigExportRelativePath = async (exportRelativePath) => {
+if (showDebug) addDebugLog("setConfigImportRelativePath", `exportRelativePath: ${exportRelativePath}`, "");
+  const currentDirectory = process.cwd();
+  const pegaConfigJsonPath = join(currentDirectory, TASKS_CONFIG_JSON_FILENAME);
+  let configData = await getPegaConfig();
+  configData[EXPORT_RELATIVE_PATH] = exportRelativePath;
+
+  // update file
+  // stringify "4", makes the json string look like JSON in the file, formated instead of a single line
+  fs.writeFileSync(pegaConfigJsonPath, JSON.stringify(configData, null, 4), { encoding: 'utf8' });
+}
+
 export const updateDefaultOrganization = async (organization) => {
 if (showDebug) addDebugLog("updateDefaultOrganization", `organization: ${organization}`, "");
   let packageData = JSON.parse(fs.readFileSync(path.resolve('package.json'), 'utf-8'));
@@ -817,6 +855,7 @@ if (showDebug) addDebugLog("getComponentDirectoryPath", "END", "-");
   return overrideDir ? join(overrideDir, componentKey) : join(currentDirectory, data[COMPONENTS_DIRECTORY_PATH], componentKey);
 };
 
+
 export const compileMustacheTemplate = (file, data) => {
 if (showDebug) addDebugLog("compileMustacheTemplate", `file: ${file}`, "");
   const content = fs.readFileSync(file, 'utf8');