@pega/custom-dx-components 0.23.4 → 0.23.5

package/jest.config.cjs

@@ -1,18 +1,37 @@
 module.exports = {
   verbose: true,
-  moduleFileExtensions: ["js", "jsx", "ts", "tsx"],
-
+  roots: ['./test'],
+  moduleFileExtensions: ['js', 'jsx', 'ts', 'tsx'],
+  testEnvironment: 'jsdom',
   transform: {
-    '^.+\\.(ts|tsx)?$': 'ts-jest',
-    "^.+\\.(js|jsx)$": "babel-jest"
+    '^.+\\.[t|j]sx?$': 'babel-jest'
   },
   collectCoverage: true,
-    coverageThreshold: {
-      global: {
-        statements: 79,
-        branches: 74,
-        functions: 81,
-        lines: 80
-      }
+  haste: {
+    retainAllFiles: true
+  },
+  testPathIgnorePatterns: [],
+  transformIgnorePatterns: [],
+  modulePathIgnorePatterns: [],
+  coveragePathIgnorePatterns: [],
+  collectCoverageFrom: ['./src/*.js'],
+  coverageThreshold: {
+    global: {
+      statements: 79,
+      branches: 74,
+      functions: 81,
+      lines: 80
     }
-}
+  },
+  reporters: [
+    'default',
+    [
+      'jest-junit',
+      {
+        suiteName: 'unit tests',
+        outputDirectory: 'build/test-results/test',
+        outputName: 'TEST-results-unit.xml'
+      }
+    ]
+  ]
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pega/custom-dx-components",
-  "version": "0.23.4",
+  "version": "0.23.5",
   "description": "Utility for building custom UI components",
   "bin": "./bin/index.js",
   "scripts": {
@@ -49,6 +49,7 @@
     "react-dev-utils": "^12.0.1",
     "resolve": "1.22.1",
     "resolve-url-loader": "^5.0.0",
+    "sass-loader": "^13.0.2",
     "terser-webpack-plugin": "5.3.6",
     "ts-loader": "^9.3.1",
     "typescript": "^4.8.3",

package/src/tasks/create/index.js

@@ -109,7 +109,8 @@ const validateCompile = async (
     type,
     subtype,
     description,
-    allowedApplications
+    allowedApplications,
+    organization
   },
   options
 ) => {
@@ -127,7 +128,11 @@ const validateCompile = async (
   const templateDir = `./templates/${framework}/${type}/${sSubType}`;
   const templateDirectory = fileURLToPath(new URL(templateDir, import.meta.url));
 
-  const { organization } = JSON.parse(fs.readFileSync(path.resolve('package.json'), 'utf8'));
+  if (organization == null) {
+   ({ organization } = JSON.parse(fs.readFileSync(path.resolve('package.json'), 'utf8')));
+  }
+
+
 
   const componentKey = `${organization}_${library}_${componentName}`;
   const targetDirectory = await getComponentDirectoryPath(componentKey);
@@ -162,7 +167,7 @@ const validateCompile = async (
 export default async options => {
   showVersion();
 
-  if (options.params.length >= 11) {
+  if (options.params.length >= 12) {
 
     const type = options.params[3];
     const subtype = options.params[4];
@@ -172,6 +177,7 @@ export default async options => {
     const library = options.params[8];
     const allowedApplications = options.params[9];
     const description = options.params[10];
+    const organization = options.params[11];
     const framework = "Constellation";
 
     await validateCompile(
@@ -184,7 +190,8 @@ export default async options => {
         type,
         subtype,
         description,
-        allowedApplications
+        allowedApplications,
+        organization
       },
       options
     );

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

@@ -331,18 +331,21 @@ export default async options => {
   const componentData = data[COMPONENTS_PATH];
 
   const { library } = componentData;
-  const { organization } = JSON.parse(fs.readFileSync(path.resolve('package.json'), 'utf8'));
+  let { organization } = JSON.parse(fs.readFileSync(path.resolve('package.json'), 'utf8'));
 
   let componentDefaults = await getComponentDefaults();
   componentDefaults.library = library;
 
 
-  if (options.params.length >= 7) {
+  if (options.params.length >= 8) {
     const prefix = options.params[3];
     const version = options.params[4];
     const library = options.params[5];
     const allowedApplications = options.params[6];
 
+    // overwrite
+    organization = options.params[7];
+
     await validateCompileAll(
       {
         prefix,

package/src/tasks/init/template/jest.config.cjs

@@ -1,14 +1,10 @@
 module.exports = {
   verbose: true,
   moduleFileExtensions: ['js', 'jsx', 'ts', 'tsx'],
-
   transform: {
     '^.+\\.[t|j]sx?$': 'babel-jest'
   },
   collectCoverage: true,
-  haste: {
-    retainAllFiles: true
-  },
   testPathIgnorePatterns: [],
   transformIgnorePatterns: [],
   modulePathIgnorePatterns: [],

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

@@ -25,7 +25,7 @@
     "test": "npm run test:functional && npm run test:unit",
     "test:functional": "jest --runInBand test/functionTest --detectOpenHandles --coverage",
     "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",
-    "test:unit": "npm run test:unit:local --prefix node_modules/@pega/custom-dx-components",    "lint:types": "tsc --noEmit",
+    "test:unit": "npm run test:unit:local --prefix node_modules/@pega/custom-dx-components",
     "lint:types": "tsc --noEmit",
     "lint:es": "eslint .",
     "lint:styles": "stylelint \"./**/*.@(js|jsx|ts|tsx)\"",
@@ -64,7 +64,7 @@
   },
   "devDependencies": {
     "@pega/configs": "^0.5.3",
-    "@pega/custom-dx-components": "^0.23.4",
+    "@pega/custom-dx-components": "^0.23.5",
     "@pega/eslint-config": "^0.3.2",
     "@storybook/addon-actions": "^6.5.12",
     "@storybook/addon-essentials": "^6.5.12",

package/src/tasks/init/template/test/functionTest/localCreateAllListDeleteAll.test.js

@@ -4,7 +4,7 @@ const fs = require('fs');
 const util = require('node:util');
 const exec = util.promisify(require('node:child_process').exec);
 
-describe('create test and delete local', () => {
+describe('createAll list and deleteAll local', () => {
   it('initial delete/cleanup', async () => {
     const script = `npm run deleteAll Local Y`;
 
@@ -15,7 +15,7 @@ describe('create test and delete local', () => {
   });
 
   it('npm run createAll Local', async () => {
-    const script = `npm run createAll "My " 0.0.1 DXIL ""`;
+    const script = `npm run createAll "My " 0.0.1 DXIL "" Pega`;
 
     const { stdout, stderr } = await exec(script);
     // console.log(stdout);

package/src/tasks/init/template/test/functionTest/localCreateBuildAllDeleteAll.test.js

@@ -4,7 +4,7 @@ const fs = require('fs');
 const util = require('node:util');
 const exec = util.promisify(require('node:child_process').exec);
 
-describe('create build and delete local', () => {
+describe('create buildAll and deleteAll local', () => {
   it('initial delete/cleanup', async () => {
     const script = `npm run deleteAll Local Y`;
 
@@ -17,7 +17,7 @@ describe('create build and delete local', () => {
   it('npm run create Local text', async () => {
     const fileName = 'MyTestText';
     const newFileName = `Pega_DXIL_${fileName}`;
-    const script = `npm run create Field Text ${fileName} "My Test Text" 0.0.1 DXIL "" "My Test Text Description"`;
+    const script = `npm run create Field Text ${fileName} "My Test Text" 0.0.1 DXIL "" "My Test Text Description" Pega`;
 
     const { stdout, stderr } = await exec(script);
     // console.log(stdout);
@@ -46,7 +46,7 @@ describe('create build and delete local', () => {
   it('npm run create Local page', async () => {
     const fileName = 'MyTestPage';
     const newFileName = `Pega_DXIL_${fileName}`;
-    const script = `npm run create Widget PAGE ${fileName} "My Test Page" 0.0.1 DXIL "" "My Test Page Description"`;
+    const script = `npm run create Widget PAGE ${fileName} "My Test Page" 0.0.1 DXIL "" "My Test Page Description" Pega`;
 
     const { stdout, stderr } = await exec(script);
     // console.log(stdout);
@@ -75,7 +75,7 @@ describe('create build and delete local', () => {
   it('npm run create Local details', async () => {
     const fileName = 'MyTestDetails';
     const newFileName = `Pega_DXIL_${fileName}`;
-    const script = `npm run create Template DETAILS ${fileName} "My Test Details" 0.0.1 DXIL "" "My Test Details Description"`;
+    const script = `npm run create Template DETAILS ${fileName} "My Test Details" 0.0.1 DXIL "" "My Test Details Description" Pega`;
 
     const { stdout, stderr } = await exec(script);
     // console.log(stdout);
@@ -144,5 +144,5 @@ describe('create build and delete local', () => {
     // const createFile = path.resolve(path.join(`src/components/${newFileName}`, 'index.jsx'));
     // const doesExist = fs.existsSync(createFile);
     // expect(doesExist).not.toBeTruthy();
-  }, 10000);
+  }, 20000);
 });

package/src/tasks/init/template/test/functionTest/localCreateBuildDelete.test.js

@@ -17,7 +17,7 @@ describe('create build and delete local', () => {
   it('npm run create Local', async () => {
     const fileName = 'MyTestText';
     const newFileName = `Pega_DXIL_${fileName}`;
-    const script = `npm run create Field Text ${fileName} "My Test Text" 0.0.1 DXIL "" "My Test Text Description"`;
+    const script = `npm run create Field Text ${fileName} "My Test Text" 0.0.1 DXIL "" "My Test Text Description" Pega`;
 
     const { stdout, stderr } = await exec(script);
     // console.log(stdout);

package/src/tasks/init/template/test/functionTest/localCreateListDelete.test.js

@@ -4,7 +4,7 @@ const fs = require('fs');
 const util = require('node:util');
 const exec = util.promisify(require('node:child_process').exec);
 
-describe('create test and delete local', () => {
+describe('create list and delete local', () => {
   it('initial delete/cleanup', async () => {
     const script = `npm run deleteAll Local Y`;
 
@@ -17,7 +17,7 @@ describe('create test and delete local', () => {
   it('npm run create Local', async () => {
     const fileName = 'MyTestText';
     const newFileName = `Pega_DXIL_${fileName}`;
-    const script = `npm run create Field Text ${fileName} "My Test Text" 0.0.1 DXIL "" "My Test Text Description"`;
+    const script = `npm run create Field Text ${fileName} "My Test Text" 0.0.1 DXIL "" "My Test Text Description" Pega`;
 
     const { stdout, stderr } = await exec(script);
     // console.log(stdout);

package/src/tasks/init/template/test/functionTest/localCreatePublishAllDeleteAll.test.js

@@ -4,7 +4,7 @@ const fs = require('fs');
 const util = require('node:util');
 const exec = util.promisify(require('node:child_process').exec);
 
-describe('create publish and delete local', () => {
+describe('create publish and deleteAll local', () => {
   it('initial delete/cleanup', async () => {
     const script = `npm run deleteAll Local Y`;
 
@@ -17,7 +17,7 @@ describe('create publish and delete local', () => {
   it('npm run create Local text', async () => {
     const fileName = 'MyTestText';
     const newFileName = `Pega_DXIL_${fileName}`;
-    const script = `npm run create Field Text ${fileName} "My Test Text" 0.0.1 DXIL "" "My Test Text Description"`;
+    const script = `npm run create Field Text ${fileName} "My Test Text" 0.0.1 DXIL "" "My Test Text Description" Pega`;
 
     const { stdout, stderr } = await exec(script);
     // console.log(stdout);
@@ -46,7 +46,7 @@ describe('create publish and delete local', () => {
   it('npm run create Local page', async () => {
     const fileName = 'MyTestPage';
     const newFileName = `Pega_DXIL_${fileName}`;
-    const script = `npm run create Widget PAGE ${fileName} "My Test Page" 0.0.1 DXIL "" "My Test Page Description"`;
+    const script = `npm run create Widget PAGE ${fileName} "My Test Page" 0.0.1 DXIL "" "My Test Page Description" Pega`;
 
     const { stdout, stderr } = await exec(script);
     // console.log(stdout);
@@ -75,7 +75,7 @@ describe('create publish and delete local', () => {
   it('npm run create Local details', async () => {
     const fileName = 'MyTestDetails';
     const newFileName = `Pega_DXIL_${fileName}`;
-    const script = `npm run create Template DETAILS ${fileName} "My Test Details" 0.0.1 DXIL "" "My Test Details Description"`;
+    const script = `npm run create Template DETAILS ${fileName} "My Test Details" 0.0.1 DXIL "" "My Test Details Description" Pega`;
 
     const { stdout, stderr } = await exec(script);
     // console.log(stdout);

package/src/tasks/init/template/test/functionTest/localCreatePublishDelete.test.js

@@ -17,7 +17,7 @@ describe('create publish and delete local', () => {
   it('npm run create Local', async () => {
     const fileName = 'MyTestText';
     const newFileName = `Pega_DXIL_${fileName}`;
-    const script = `npm run create Field Text ${fileName} "My Test Text" 0.0.1 DXIL "" "My Test Text Description"`;
+    const script = `npm run create Field Text ${fileName} "My Test Text" 0.0.1 DXIL "" "My Test Text Description" Pega`;
 
     const { stdout, stderr } = await exec(script);
     // console.log(stdout);

package/src/tasks/init/template/test/functionTest/localCreateRenameDelete.test.js

@@ -4,7 +4,7 @@ const fs = require('fs');
 const util = require('node:util');
 const exec = util.promisify(require('node:child_process').exec);
 
-describe('create test and delete local', () => {
+describe('create rename and delete local', () => {
   it('initial delete/cleanup', async () => {
     const script = `npm run deleteAll Local Y`;
 
@@ -17,7 +17,7 @@ describe('create test and delete local', () => {
   it('npm run create Local', async () => {
     const fileName = 'MyTestText';
     const newFileName = `Pega_DXIL_${fileName}`;
-    const script = `npm run create Field Text ${fileName} "My Test Text" 0.0.1 DXIL "" "My Test Text Description"`;
+    const script = `npm run create Field Text ${fileName} "My Test Text" 0.0.1 DXIL "" "My Test Text Description" Pega`;
 
     const { stdout, stderr } = await exec(script);
     // console.log(stdout);

package/test/unitTest/util.test.js

@@ -37,6 +37,25 @@ const mockAcces = {
   TOKEN_PATH: '.access_token'
 }
 
+// should be overridden
+let libraryName = "not valid";
+let organizationName = "not valid";
+let version = "not valid";
+
+beforeAll( async () => {
+  const thePath = process.cwd().replace("node_modules/@pega/custom-dx-components","");
+  const cwdMock = jest.spyOn(process, 'cwd');
+  cwdMock.mockReturnValue(thePath);
+
+
+  const oConf = await getPegaConfig();
+  libraryName = oConf.component.library;
+  version = oConf.component.version;
+
+
+
+});
+
 // describe('utils fetch', () => {
 //   let promiseStub = null;
 
@@ -279,8 +298,8 @@ describe('utils test', () => {
 
     expect(oConf).not.toBeNull;
     expect(sPath).toMatch('src/components');
-    expect(oConf.component.library).toMatch('DXIL');
-    expect(oConf.component.version).toMatch('0.0.1');
+    expect(oConf.component.library).toMatch(libraryName);
+    expect(oConf.component.version).toMatch(version);
 
     cwdMock.mockRestore();
 
@@ -317,8 +336,8 @@ describe('utils test', () => {
     const oConf = await getComponentDefaults();
 
     expect(oConf).not.toBeNull;
-    expect(oConf.library).toMatch('DXIL');
-    expect(oConf.version).toMatch('0.0.1');
+    expect(oConf.library).toMatch(libraryName);
+    expect(oConf.version).toMatch(version);
 
     cwdMock.mockRestore();