@genesislcap/blank-app-seed 3.29.1-prerelease.6 → 3.29.1-prerelease.8

package/.genx/package.json

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

package/.genx/templates/react/chart.hbs

@@ -1,3 +1,4 @@
+{{#if config.permissions.viewRight}}hasUserPermission('{{config.permissions.viewRight}}') ? ({{/if}}
 <rapid-g2plot-chart
   type="{{ config.type }}"
   config={chartConfig}
@@ -6,4 +7,7 @@
     resourceName="{{ config.resourceName }}"
     server-fields="{{ config.xField }} {{ config.yField }}"
   ></chart-datasource>
-</rapid-g2plot-chart>
+</rapid-g2plot-chart>{{#if config.permissions.viewRight}} 
+) : (
+<ErrorMessage elementType="h3" message="You do not have access to view this component." />
+){{/if}}

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

@@ -1,3 +1,13 @@
+
+{{#if tile.config.permissions.viewRight}}
+import { getUser } from '@genesislcap/foundation-user';
+import { getViewUpdateRightComponent } from '../../../utils';
+import ErrorMessage from '../../../components/ErrorMessage/ErrorMessage';
+{{else}}{{#if tile.config.permissions.updateRight}}
+import { getViewUpdateRightComponent } from '../../../utils';
+import { getUser } from '@genesislcap/foundation-user';
+import ErrorMessage from '../../../components/ErrorMessage/ErrorMessage';
+{{/if}}{{/if}}
 {{#if tile.config.createFormUiSchema}}
 import { createFormSchema } from './{{kebabCase tile.title}}.create.form.schema';
 {{/if}}
@@ -15,7 +25,9 @@ import { gridOptions as tileGridOptions } from './{{kebabCase tile.title}}.gridO
 {{/if}}
 import './{{kebabCase tile.title}}.component.css';
 
-export const {{pascalCase tile.componentName}} = () => { {{#if tile.config.createFormUiSchema}}
+export const {{pascalCase tile.componentName}} = () => { {{#if tile.config.permissions.viewRight}}
+  const hasUserPermission = (permissionCode) => getViewUpdateRightComponent(getUser(), permissionCode);{{else}}{{#if tile.config.permissions.updateRight}}
+  const hasUserPermission = (permissionCode) => getViewUpdateRightComponent(getUser(), permissionCode);{{/if}}{{/if}}{{#if tile.config.createFormUiSchema}}
   const createFormSchema = createFormSchema;{{/if}}{{#if tile.config.uischema}}
   const uischema = createFormSchema;{{/if}}{{#if tile.config.updateFormUiSchema}}
   const updateFormSchema = updateFormSchema;{{/if}}{{#if tile.config.columns}}

package/.genx/templates/react/entityManager.hbs

@@ -1,3 +1,4 @@
+{{#if config.permissions.viewRight}}hasUserPermission('{{config.permissions.viewRight}}') ? ({{/if}}
 <entity-management
     design-system-prefix="rapid"
     enable-row-flashing
@@ -7,19 +8,19 @@
     {{/if}}
     resourceName="{{ config.resourceName }}"
     {{#if config.createEvent}}
-    createEvent="{{ config.createEvent }}"
+    createEvent={hasUserPermission('{{config.permissions.updateRight}}') ? '{{ config.createEvent }}' : undefined}
     {{#if config.createFormUiSchema}}
-    createFormUiSchema={createFormUiSchema}
+    createFormUiSchema={createFormSchema}
     {{/if}}
     {{/if}}
     {{#if config.updateEvent}}
-    updateEvent="{{ config.updateEvent }}"
+    updateEvent={hasUserPermission('{{config.permissions.updateRight}}') ? '{{ config.updateEvent }}' : undefined}
     {{#if config.updateFormUiSchema}}
-    updateFormUiSchema={updateFormUiSchema}
+    updateFormUiSchema={updateFormSchema}
     {{/if}}
     {{/if}}
     {{#if config.deleteEvent}}
-    deleteEvent="{{ config.deleteEvent }}"
+    deleteEvent={hasUserPermission('{{config.permissions.updateRight}}') ? '{{ config.deleteEvent }}' : undefined}
     {{/if}}
     {{#if config.gridOptions}}
     gridOptions={gridOptions}
@@ -42,4 +43,7 @@
     {{#if config.enableSearchBar}}
     enable-search-bar
     {{/if}}
-></entity-management>
+></entity-management>{{#if config.permissions.viewRight}} 
+) : (
+<ErrorMessage elementType="h3" message="You do not have access to view this component." />
+){{/if}}

package/.genx/templates/react/form.hbs

@@ -1,3 +1,4 @@
+{{#if config.permissions.updateRight}}hasUserPermission('{{config.permissions.updateRight}}') ? ({{/if}}
 <foundation-form
   design-system-prefix="rapid"
   resourceName="{{config.resourceName}}"
@@ -5,4 +6,7 @@
   uischema={uischema}
   {{/if}}
 >
-</foundation-form>
+</foundation-form>{{#if config.permissions.updateRight}} 
+) : (
+<ErrorMessage elementType="h3" message="You do not have access to view this component." />
+){{/if}}

package/.genx/templates/react/grid.hbs

@@ -1,3 +1,4 @@
+{{#if config.permissions.viewRight}}hasUserPermission('{{config.permissions.viewRight}}') ? ({{/if}}
 <rapid-grid-pro
   enable-row-flashing
   enable-cell-flashing
@@ -14,4 +15,7 @@
     deferredGridOptions=\{{ onRowClicked: gridOptions?.onRowClicked }}
     {{/if}}
   ></grid-pro-genesis-datasource>
-</rapid-grid-pro>
+</rapid-grid-pro>{{#if config.permissions.viewRight}} 
+) : (
+<ErrorMessage elementType="h3" message="You do not have access to view this component." />
+){{/if}}

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

@@ -8,7 +8,7 @@ const {{pascalCase route.name}} = () => {
   return (
     <section className="{{kebabCase route.name}}-page">
       {{#if route.tiles}}
-      <rapid-layout auto-save-key="{{route.layoutKey}}">
+      <rapid-layout auto-save-key={process.env.NODE_ENV === 'production' ? "{{route.layoutKey}}" : null}>
         {{> (lookup ./route 'layoutType') }}
       </rapid-layout>
       {{else}}

package/.genx/versions.json

@@ -1,5 +1,5 @@
 {
-  "UI": "14.200.0",
-  "GSF": "8.3.0-beta2",
+  "UI": "14.201.0",
+  "GSF": "8.3.0-beta3",
   "Auth": "8.3.0-beta0"
 }

package/.github/workflows/build.yml

@@ -15,6 +15,7 @@ jobs:
       genesisArtifactoryUser: ${{ secrets.JFROG_LIBS_RELEASE_CLIENT_RO_USER }}
       genesisArtifactoryPassword: ${{ secrets.JFROG_LIBS_RELEASE_CLIENT_RO_KEY }}
       USE_DOCKER: 1
+      GRADLE_PARAMS: ${{ github.base_ref == 'prerelease' && '-PuseDevRepo=true' || '' }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -46,7 +47,7 @@ jobs:
 
       - name: Build sample app
         working-directory: /tmp/testapp
-        run: ./gradlew build --info
+        run: ./gradlew ${GRADLE_PARAMS} build --info
 
       - name: Lint UI
         working-directory: /tmp/testapp/client
@@ -62,7 +63,7 @@ jobs:
 
       - name: Create Server Dockerfile
         working-directory: /tmp/testapp
-        run: ./gradlew :server:testapp-app:createDockerfile --info
+        run: ./gradlew ${GRADLE_PARAMS} :server:testapp-app:createDockerfile --info
 
       - name: Build Docker images
         working-directory: /tmp/testapp

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [3.29.1-prerelease.8](https://github.com/genesiscommunitysuccess/blank-app-seed/compare/v3.29.1-prerelease.7...v3.29.1-prerelease.8) (2024-08-23)
+
+
+### Bug Fixes
+
+* updating server version information for GSF [PSD-0](https://github.com/genesiscommunitysuccess/blank-app-seed/issues/0) 0fbf0b3
+
+## [3.29.1-prerelease.7](https://github.com/genesiscommunitysuccess/blank-app-seed/compare/v3.29.1-prerelease.6...v3.29.1-prerelease.7) (2024-08-20)
+
+
+### Bug Fixes
+
+* automated dependency version update [skip-ci] [PSD-9](https://github.com/genesiscommunitysuccess/blank-app-seed/issues/9) (#321) b5d9dd9
+
 ## [3.29.1-prerelease.6](https://github.com/genesiscommunitysuccess/blank-app-seed/compare/v3.29.1-prerelease.5...v3.29.1-prerelease.6) (2024-08-20)
 
 

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

@@ -7,11 +7,13 @@ import {
 } from 'react-router-dom';
 import { history } from './utils/history';
 import LayoutWrapper from './layouts/LayoutWrapper';
-import { routeLayouts } from './config';
+import { AUTH_PATH, NOT_PERMITTED_PATH, routeLayouts } from './config';
 import AuthGuard from './guards/AuthGuard';
+import PermissionsGuard from './guards/PermissionsGuard';
 import { AuthProvider } from './store/AuthContext';
 // Pages Components
-import AuthPage from './pages/auth/AuthPage';
+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}}';
 {{/each}}
@@ -41,14 +43,19 @@ const LayoutWithLocation = () => {
   {{/if}}
 
   let pageComponent;
+  let permissionCode = '{{this.permissions.viewRight}}';
 
   switch (location.pathname) {
-    case '/auth':
+    case `/${AUTH_PATH}`:
       pageComponent = <AuthPage />;
       break;
+    case `/${NOT_PERMITTED_PATH}`:
+      pageComponent = <NotPermittedPage />;
+      break;
   {{#each routes}}
     case '/{{kebabCase this.name}}':
       pageComponent = <{{pascalCase this.name}} />;
+      permissionCode = '{{this.permissions.viewRight}}';
       break;
   {{/each}}
     default:
@@ -63,7 +70,9 @@ const LayoutWithLocation = () => {
   } else {
     return (
       <AuthGuard>
-        <LayoutWrapper layout={layout}>{pageComponent}</LayoutWrapper>
+        <PermissionsGuard permissionCode={permissionCode}>
+          <LayoutWrapper layout={layout}>{pageComponent}</LayoutWrapper>
+        </PermissionsGuard>
       </AuthGuard>
     );
   }

package/client-tmp/react/src/components/ErrorMessage/ErrorMessage.jsx

@@ -0,0 +1,62 @@
+import React from 'react';
+
+const styles = {
+  errorMessageWrapper: {
+    display: 'flex',
+    flexDirection: 'column',
+    justifyContent: 'center',
+    alignItems: 'center',
+    height: '100%',
+    width: '100%',
+  },
+  errorMessage: {
+    color: 'var(--neutral-foreground-rest)',
+    backgroundColor: 'var(--neutral-layer-4)',
+    borderColor: 'var(--error-color)',
+    borderRadius: '7px',
+    borderStyle: 'solid',
+    borderWidth: '4px',
+    padding: '5px',
+    margin: '15px',
+    textAlign: 'center',
+    width: 'fit-content',
+    alignSelf: 'center',
+    height: 'auto',
+    maxHeight: '100%'
+  },
+};
+
+const ErrorMessage = ({ elementType = 'div', message = '' }) => {
+  const ElementType = elementType;
+
+  return (
+    <section style={styles.errorMessageWrapper}>
+      <div style={styles.errorMessage}>
+        {(() => {
+          switch (ElementType) {
+            case 'h1':
+              return <h1>{message}</h1>;
+            case 'h2':
+              return <h2>{message}</h2>;
+            case 'h3':
+              return <h3>{message}</h3>;
+            case 'h4':
+              return <h4>{message}</h4>;
+            case 'h5':
+              return <h5>{message}</h5>;
+            case 'h6':
+              return <h6>{message}</h6>;
+            case 'p':
+              return <p>{message}</p>;
+            case 'span':
+              return <span>{message}</span>;
+            default:
+              return <div>{message}</div>;
+          }
+        })()}
+      </div>
+    </section>
+  );
+};
+
+export default ErrorMessage;

package/client-tmp/react/src/config.ts

@@ -9,6 +9,7 @@ export const routeLayouts: RouteLayouts = {
 import type { MainMenu } from './types/menu';
 
 export const AUTH_PATH = 'auth';
+export const NOT_PERMITTED_PATH = 'not-permitted';
 
 export const API_DATA = {
   URL: '',

package/client-tmp/react/src/guards/PermissionsGuard.tsx

@@ -0,0 +1,37 @@
+import { useEffect, useState, ReactNode } from 'react';
+import { useNavigate } from 'react-router-dom';
+import { getUser } from '@genesislcap/foundation-user';
+import { NOT_PERMITTED_PATH } from '../config';
+
+interface PermissionsGuardProps {
+  children: ReactNode;
+  permissionCode?: string;
+}
+
+const PermissionsGuard: React.FC<PermissionsGuardProps> = ({ children, permissionCode }: PermissionsGuardProps) => {
+  const navigate = useNavigate();
+  const [isAuthorized, setIsAuthorized] = useState(false);
+  const [isLoading, setIsLoading] = useState(true);
+
+  useEffect(() => {
+    const checkPermission = async () => {
+      const user = getUser();
+      if (permissionCode && !user.hasPermission(permissionCode)) {
+        navigate(`/${NOT_PERMITTED_PATH}`);
+      } else {
+        setIsAuthorized(true);
+      }
+      setIsLoading(false);
+    };
+
+    checkPermission();
+  }, [navigate, permissionCode]);
+
+  if (isLoading) {
+    return <div>Loading...</div>; // Or some loading component
+  }
+
+  return isAuthorized ? <>{children}</> : null;
+};
+
+export default PermissionsGuard;

package/client-tmp/react/src/pages/NotPermittedPage/NotPermittedPage.jsx

@@ -0,0 +1,13 @@
+import ErrorMessage from '../../components/ErrorMessage/ErrorMessage';
+import './NotPermittedPage.css';
+
+const NotPermittedPage = () => {
+  return (
+    <ErrorMessage
+    elementType="h1"
+    message="You do not have permission to access this part of the application, please contact your administrator."
+    ></ErrorMessage>
+  );
+};
+
+export default NotPermittedPage;

package/client-tmp/react/src/utils/index.ts

@@ -1,2 +1,3 @@
 export * from './history';
-export * from './fdc3';
+export * from './fdc3';
+export * from './permissions';

package/client-tmp/react/src/utils/permissions.ts

@@ -0,0 +1,7 @@
+import { User } from '@genesislcap/foundation-user';
+
+export const getViewUpdateRightComponent = (
+  user: User,
+  right: string,
+  event: string | boolean = true,
+) => (!right || user.hasPermission(right) ? event : '');

package/package.json

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