@genesislcap/blank-app-seed 3.30.0-prerelease.2 → 3.30.0-prerelease.4

package/.genx/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@genesislcap/blank-app-seed-config",
   "description": "Genesis Blank App Seed Configuration",
-  "version": "3.30.0-prerelease.2",
+  "version": "3.30.0-prerelease.4",
   "license": "Apache-2.0",
   "scripts": {
     "lint": "eslint .",

package/.genx/templates/react/component/component.hbs

@@ -2,21 +2,21 @@ import { getUser } from '@genesislcap/foundation-user';
 import { getViewUpdateRightComponent } from '../../../utils';
 import ErrorMessage from '../../../components/ErrorMessage/ErrorMessage';
 {{#if tile.config.createFormUiSchema}}
-import { createFormSchema as createFormSchemaTile } from './{{kebabCase tile.title}}.create.form.schema';
+import { createFormSchema as createFormSchemaTile } from './{{pascalCase tile.title}}CreateFormSchema';
 {{/if}}
 {{#if tile.config.uischema}}
-import { createFormSchema as createFormSchemaTile } from './{{kebabCase tile.title}}.create.form.schema';
+import { createFormSchema as createFormSchemaTile } from './{{pascalCase tile.title}}CreateFormSchema';
 {{/if}}
 {{#if tile.config.updateFormUiSchema}}
-import { updateFormSchema as updateFormSchemaTile } from './{{kebabCase tile.title}}.update.form.schema';
+import { updateFormSchema as updateFormSchemaTile } from './{{pascalCase tile.title}}UpdateFormSchema';
 {{/if}}
 {{#if tile.config.columns}}
-import { columnDefs as columnDefsTile } from './{{kebabCase tile.title}}.column.defs';
+import { columnDefs as columnDefsTile } from './{{pascalCase tile.title}}ColumnDefs';
 {{/if}}
 {{#if tile.config.gridOptions}}
-import { gridOptions as gridOptionsTile } from './{{kebabCase tile.title}}.gridOptions';
+import { gridOptions as gridOptionsTile } from './{{pascalCase tile.title}}GridOptions';
 {{/if}}
-import './{{kebabCase tile.title}}.component.css';
+import './{{pascalCase tile.title}}Component.css';
 
 export const {{pascalCase tile.componentName}} = () => {
   const hasUserPermission = (permissionCode) => getViewUpdateRightComponent(getUser(), permissionCode);{{#if tile.config.createFormUiSchema}}

package/.genx/templates/react/component/component.index.hbs

@@ -1 +1 @@
-export * from './{{kebabCase tile.title}}.component.jsx';
+export * from './{{pascalCase tile.title}}Component.jsx';

package/.genx/templates/react/route.hbs

@@ -1,6 +1,6 @@
 import './{{pascalCase route.name}}.css';
 {{#each route.tiles}}
-import { {{pascalCase this.componentName}} } from './{{kebabCase this.title}}-{{this.componentType}}';
+import { {{pascalCase this.componentName}} } from './{{pascalCase this.title}}{{pascalCase this.componentType}}';
 {{/each}}
 
 const {{pascalCase route.name}} = () => {

package/.genx/utils/generateRoute.js

@@ -14,7 +14,7 @@ const getPathByFramework = {
     route: (clientSrcPath, routeName) => `${clientSrcPath}/${routeName}`,
     component: (routeDir, routeName) => `${routeDir}/${routeName}.ts`,
     template: (routeDir, routeName) => `${routeDir}/${routeName}.template.ts`,
-    style: (routePath, routeName) => `${routePath}/${routeName}.styles.ts`,
+    style: (routeDir, routeName) => `${routeDir}/${routeName}.styles.ts`,
   },
   [FRAMEWORK_ANGULAR_ALIAS]: {
     clientSrcPath: `../../client/src/app/pages`,
@@ -22,15 +22,16 @@ const getPathByFramework = {
     component: (routeDir, routeName) => `${routeDir}/${routeName}.component.ts`,
     template: (routeDir, routeName) =>
       `${routeDir}/${routeName}.component.html`,
-    style: (routePath, routeName) => `${routePath}/${routeName}.component.css`,
+    style: (routeDir, routeName) => `${routeDir}/${routeName}.component.css`,
   },
   [FRAMEWORK_REACT_ALIAS]: {
     clientSrcPath: `../../client/src/pages`,
-    route: (clientSrcPath, routeName) => `${clientSrcPath}/${routeName}`,
+    route: (clientSrcPath, routeName, changeCase) =>
+      `${clientSrcPath}/${changeCase.pascalCase(routeName)}`,
     component: (routeDir, routeName, changeCase) =>
       `${routeDir}/${changeCase.pascalCase(routeName)}.jsx`,
-    style: (routePath, routeName, changeCase) =>
-      `${routePath}/${changeCase.pascalCase(routeName)}.css`,
+    style: (routeDir, routeName, changeCase) =>
+      `${routeDir}/${changeCase.pascalCase(routeName)}.css`,
   },
 };
 
@@ -44,7 +45,7 @@ const generateRoute = (route, { changeCase, writeFileWithData }, framework) => {
   } = getPathByFramework[framework];
   const routeName = changeCase.paramCase(route.name);
   const sourceTemplateDir = `../${DIR_TEMPLATE_BY_FRAMEWORK[framework]}`;
-  const routeDir = getRouteDir(clientSrcPath, routeName);
+  const routeDir = getRouteDir(clientSrcPath, routeName, changeCase);
 
   const filesToWrite = [
     {

package/.genx/utils/generateTile.js

@@ -46,16 +46,30 @@ const getPathByFramework = {
     ...defaultPathGetters,
     index: (componentPath) => `${componentPath}/index.jsx`,
     clientSrcPath: `../../client/src/pages`,
-    route: (clientSrcPath, tile, routeName) =>
-      `${clientSrcPath}/${routeName}/${tile.name}-${tile.componentType}`,
-    component: (componentPath, tile) =>
-      `${componentPath}/${tile.name}.component.jsx`,
-    style: (componentPath, tile) =>
-      `${componentPath}/${tile.name}.component.css`,
+    route: (clientSrcPath, tile, routeName, changeCase) =>
+      `${clientSrcPath}/${changeCase.pascalCase(routeName)}/${changeCase.pascalCase(tile.name)}${changeCase.pascalCase(tile.componentType)}`,
+    component: (componentPath, tile, changeCase) =>
+      `${componentPath}/${changeCase.pascalCase(tile.name)}Component.jsx`,
+    style: (componentPath, tile, changeCase) =>
+      `${componentPath}/${changeCase.pascalCase(tile.name)}Component.css`,
+    addForm: (componentPath, tile, changeCase) =>
+      `${componentPath}/${changeCase.pascalCase(tile.name)}CreateFormSchema.ts`,
+    updateForm: (componentPath, tile, changeCase) =>
+      `${componentPath}/${changeCase.pascalCase(tile.name)}UpdateFormSchema.ts`,
+    columnDefs: (componentPath, tile, changeCase) =>
+      `${componentPath}/${changeCase.pascalCase(tile.name)}ColumnDefs.ts`,
+    gridOptions: (componentPath, tile, changeCase) =>
+      `${componentPath}/${changeCase.pascalCase(tile.name)}GridOptions.ts`,
   },
 };
 
-const getFilesToWrite = (tileData, routeName, path, sourceTemplateDir) => {
+const getFilesToWrite = (
+  tileData,
+  routeName,
+  path,
+  sourceTemplateDir,
+  changeCase,
+) => {
   const {
     clientSrcPath,
     route: getRouteDir,
@@ -69,7 +83,7 @@ const getFilesToWrite = (tileData, routeName, path, sourceTemplateDir) => {
     gridOptions: getGridOptionsTarget,
   } = path;
 
-  const routeDir = getRouteDir(clientSrcPath, tileData, routeName);
+  const routeDir = getRouteDir(clientSrcPath, tileData, routeName, changeCase);
 
   const componentIndexFile = {
     source: `${sourceTemplateDir}/component/component.index.hbs`,
@@ -78,32 +92,32 @@ const getFilesToWrite = (tileData, routeName, path, sourceTemplateDir) => {
 
   const componentFile = {
     source: `${sourceTemplateDir}/component/component.hbs`,
-    target: getComponentTarget(routeDir, tileData),
+    target: getComponentTarget(routeDir, tileData, changeCase),
   };
 
   const componentStylesFile = {
     source: `${sourceTemplateDir}/component/component.styles.hbs`,
-    target: getStyleTarget(routeDir, tileData),
+    target: getStyleTarget(routeDir, tileData, changeCase),
   };
 
   const componentAddFormFile = {
     source: `${sourceTemplateDir}/component/component.create.form.hbs`,
-    target: getAddFormTarget(routeDir, tileData),
+    target: getAddFormTarget(routeDir, tileData, changeCase),
   };
 
   const componentUpdateFormFile = {
     source: `${sourceTemplateDir}/component/component.update.form.hbs`,
-    target: getUpdateFormTarget(routeDir, tileData),
+    target: getUpdateFormTarget(routeDir, tileData, changeCase),
   };
 
   const componentColumnsFile = {
     source: `${sourceTemplateDir}/component/component.column.defs.hbs`,
-    target: getColumnDefsTarget(routeDir, tileData),
+    target: getColumnDefsTarget(routeDir, tileData, changeCase),
   };
 
   const componentGridOptionsFile = {
     source: `${sourceTemplateDir}/component/component.gridOptions.hbs`,
-    target: getGridOptionsTarget(routeDir, tileData),
+    target: getGridOptionsTarget(routeDir, tileData, changeCase),
   };
 
   const filesToWrite = [componentIndexFile, componentFile, componentStylesFile];
@@ -160,13 +174,14 @@ const generateTile = (
   const routeName = changeCase.paramCase(route.name);
   const sourceTemplateDir = `../${DIR_TEMPLATE_BY_FRAMEWORK[framework]}`;
   const { clientSrcPath, route: getRouteDir } = getPathByFramework[framework];
-  const routeDir = getRouteDir(clientSrcPath, tileData, routeName);
+  const routeDir = getRouteDir(clientSrcPath, tileData, routeName, changeCase);
 
   const filesToWrite = getFilesToWrite(
     tileData,
     routeName,
     getPathByFramework[framework],
     sourceTemplateDir,
+    changeCase,
   );
 
   makeDirectory(resolve(__dirname, routeDir));

package/.genx/versions.json

@@ -1,5 +1,5 @@
 {
   "UI": "14.206.2",
-  "GSF": "8.3.0-beta5",
-  "Auth": "8.3.0-beta5"
+  "GSF": "8.3.0",
+  "Auth": "8.3.0"
 }

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [3.30.0-prerelease.4](https://github.com/genesiscommunitysuccess/blank-app-seed/compare/v3.30.0-prerelease.3...v3.30.0-prerelease.4) (2024-09-06)
+
+
+### Features
+
+* add unit tests - [FUI-2173](https://github.com/genesiscommunitysuccess/blank-app-seed/issues/2173) (#332) a4168f3
+
+## [3.30.0-prerelease.3](https://github.com/genesiscommunitysuccess/blank-app-seed/compare/v3.30.0-prerelease.2...v3.30.0-prerelease.3) (2024-09-06)
+
+
+### Bug Fixes
+
+* update GSF and Auth dependency versions [PSD-9](https://github.com/genesiscommunitysuccess/blank-app-seed/issues/9) (#336) d5d69e6
+
 ## [3.30.0-prerelease.2](https://github.com/genesiscommunitysuccess/blank-app-seed/compare/v3.30.0-prerelease.1...v3.30.0-prerelease.2) (2024-09-06)
 
 

package/client-tmp/react/.babelrc

@@ -0,0 +1,9 @@
+{
+  "presets": [
+    "@babel/preset-env",
+    "@babel/preset-react"
+  ],
+  "plugins": [
+    "react-require"
+  ]
+}

package/client-tmp/react/jest.config.js

@@ -0,0 +1,10 @@
+module.exports = {
+  testEnvironment: 'jsdom',
+  moduleFileExtensions: ['js', 'jsx'],
+  transform: {
+    '^.+\\.jsx?$': 'babel-jest',
+  },
+  setupFilesAfterEnv: ['<rootDir>/jest.setup.js'],
+  testMatch: ["**/?(*.)+(test).[jt]s?(x)"],
+  watchPathIgnorePatterns: ["<rootDir>/node_modules/", "<rootDir>/dist/"],
+};

package/client-tmp/react/jest.setup.js

@@ -0,0 +1 @@
+import '@testing-library/jest-dom';

package/client-tmp/react/package.json

@@ -19,12 +19,12 @@
     "lint:fix": "eslint src/**/*.js src/**/*.jsx --fix",
     "lint:eslint": "npm lint",
     "lint:stylelint": "node lint-css.js",
-    "test": "genx test",
+    "test": "jest",
+    "test:coverage": "jest --coverage",
+    "test:unit:watch": "jest --watchAll",
     "test:e2e": "genx test --e2e",
     "test:e2e:debug": "genx test --e2e --debug",
-    "test:e2e:ui": "genx test --e2e --interactive",
-    "test:coverage": "genx test --no-watch --coverage",
-    "test:unit:watch": "genx test --watch"
+    "test:e2e:ui": "genx test --e2e --interactive"
   },
   "dependencies": {
     "@ag-grid-community/client-side-row-model": "29.2.0",
@@ -51,6 +51,9 @@
     "react-router-dom": "6.24.1"
   },
   "devDependencies": {
+    "@babel/core": "^7.25.2",
+    "@babel/preset-env": "^7.25.4",
+    "@babel/preset-react": "^7.24.7",
     "@genesislcap/design-system-configurator": "{{versions.UI}}",
     "@genesislcap/eslint-config": "{{versions.UI}}",
     "@genesislcap/prettier-config": "{{versions.UI}}",
@@ -66,9 +69,12 @@
     "@typescript-eslint/eslint-plugin": "^7.13.1",
     "@typescript-eslint/parser": "^7.13.1",
     "@vitejs/plugin-react": "^4.3.1",
+    "babel-plugin-react-require": "^4.0.3",
     "eslint": "^8.57.0",
     "eslint-plugin-react-hooks": "^4.6.2",
     "eslint-plugin-react-refresh": "^0.4.7",
+    "jest": "^29.7.0",
+    "jest-environment-jsdom": "^29.7.0",
     "typescript": "^5.2.2",
     "vite": "^5.3.1"
   },  

package/client-tmp/react/src/App.tsx

@@ -15,7 +15,7 @@ import { AuthProvider } from './store/AuthContext';
 import AuthPage from './pages/AuthPage/AuthPage';
 import NotPermittedPage from './pages/NotPermittedPage/NotPermittedPage';
 {{#each routes}}
-import {{pascalCase this.name}} from './pages/{{kebabCase this.name}}/{{pascalCase this.name}}';
+import {{pascalCase this.name}} from './pages/{{pascalCase this.name}}/{{pascalCase this.name}}';
 {{/each}}
 
 // Genesis Components

package/client-tmp/react/src/components/{ErrorMessage.test.js → ErrorMessage/ErrorMessage.test.js}

@@ -77,4 +77,21 @@ describe('ErrorMessage Component', () => {
       expect(displayedMessage.tagName).toBe(elementType.toUpperCase());
     });
   });
+
+  test('renders the message as a div element when elementType is unknown', () => {
+    render(<ErrorMessage message={message} elementType="unknown" />);
+    const displayedMessage = screen.getByText(message);
+    expect(displayedMessage.tagName).toBe('DIV');
+    expect(displayedMessage).toBeInTheDocument();
+  });
+
+  test('renders nothing if the message is null', () => {
+    const { container } = render(<ErrorMessage message={null} />);
+    expect(container.firstChild).toBeNull();
+  });
+
+  test('renders nothing if the message is undefined', () => {
+    const { container } = render(<ErrorMessage message={undefined} />);
+    expect(container.firstChild).toBeNull();
+  });
 });

package/client-tmp/react/src/pages/AuthPage/AuthPage.test.js

@@ -0,0 +1,10 @@
+import { render } from '@testing-library/react';
+import AuthPage from './AuthPage';
+
+test('renders AuthPage component', () => {
+  const { container } = render(<AuthPage />);
+  const authPageElement = container.querySelector('.auth-page');
+  expect(authPageElement).toBeInTheDocument();
+  const clientAppLoginElement = container.querySelector('client-app-login');
+  expect(clientAppLoginElement).toBeInTheDocument();
+});

package/client-tmp/react/src/pages/NotPermittedPage/NotPermittedPage.test.js

@@ -0,0 +1,18 @@
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import NotPermittedPage from './NotPermittedPage';
+
+jest.mock('../../components/ErrorMessage/ErrorMessage', () => {
+  return jest.fn((props) => <h1 data-testid="error-message">{props.message}</h1>);
+});
+
+describe('NotPermittedPage Component', () => {
+  test('renders the ErrorMessage component with correct props', () => {
+    render(<NotPermittedPage />);
+    
+    const errorMessage = screen.getByTestId('error-message');
+    expect(errorMessage).toBeInTheDocument();
+    expect(errorMessage.tagName).toBe('H1');
+    expect(errorMessage).toHaveTextContent('You do not have permission to access this part of the application, please contact your administrator.');
+  });
+});

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@genesislcap/blank-app-seed",
   "description": "Genesis Blank App Seed",
-  "version": "3.30.0-prerelease.2",
+  "version": "3.30.0-prerelease.4",
   "license": "Apache-2.0",
   "scripts": {
     "release": "semantic-release"