@genesislcap/blank-app-seed 3.29.1-prerelease.5 → 3.29.1-prerelease.7

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.5",
+  "version": "3.29.1-prerelease.7",
   "license": "Apache-2.0",
   "scripts": {
     "lint": "eslint .",

package/.genx/templates/angular/route.hbs

@@ -5,7 +5,6 @@ import { {{pascalCase this.componentName}} } from './{{kebabCase this.title}}-{{
 {{/each}}
 import { environment } from '../../../environments/environment';
 
-
 @Component({
   selector: 'app-{{kebabCase route.name}}',
   standalone: true,

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

@@ -1,6 +1,6 @@
 <rapid-g2plot-chart
   type="{{ config.type }}"
-  config={tile{{ config.index }}.chartConfig}
+  config={chartConfig}
 >
   <chart-datasource
     resourceName="{{ config.resourceName }}"

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

@@ -6,4 +6,4 @@ import { sendEventOnChannel } from '../../../utils';
 
 {{#if tile.config.gridOptions}}
 export const gridOptions: GridOptionsConfig = {{{ tile.config.gridOptions }}}
-{{/if}}
+{{/if}}

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

@@ -1,11 +1,3 @@
-import { Component, Input, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { getUser } from '@genesislcap/foundation-user';
-import { ErrorMessageComponent } from '../../../components/error-message/error-message.component';
-import { getViewUpdateRightComponent } from '../../../utils';
-{{#if tile.config.gridOptions}}
-import { GridOptionsConfig } from "@genesislcap/rapid-grid-pro";
-{{/if}}
 {{#if tile.config.createFormUiSchema}}
 import { createFormSchema } from './{{kebabCase tile.title}}.create.form.schema';
 {{/if}}
@@ -19,14 +11,26 @@ import { updateFormSchema } from './{{kebabCase tile.title}}.update.form.schema'
 import { columnDefs } from './{{kebabCase tile.title}}.column.defs';
 {{/if}}
 {{#if tile.config.gridOptions}}
-import { gridOptions } from './{{kebabCase tile.title}}.gridOptions';
+import { gridOptions as tileGridOptions } from './{{kebabCase tile.title}}.gridOptions';
 {{/if}}
 import './{{kebabCase tile.title}}.component.css';
 
-const {{pascalCase tile.componentName}} = () => {
+export const {{pascalCase tile.componentName}} = () => { {{#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}}
+  const columnDefs = columnDefs;{{/if}}{{#if tile.config.gridOptions}}
+  const gridOptions = tileGridOptions;{{/if}}{{#if tile.config.reqrep}}
+  const reqrep = { pollingInterval: 5000 };{{/if}}{{#if tile.config.type}}
+  const chartConfig = { {{#ifEquals tile.config.type 'pie'}}
+      "radius": 0.75,
+      "angleField": "value",
+      "colorField": "groupBy",{{else}}
+      "xField": "groupBy",
+      "yField": "value",{{/ifEquals}}
+  };{{/if}}
+
   return (
     {{> (lookup tile 'type') tile}}
   );
 };
-
-export default {{pascalCase tile.componentName}};

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

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

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

@@ -9,29 +9,29 @@
     {{#if config.createEvent}}
     createEvent="{{ config.createEvent }}"
     {{#if config.createFormUiSchema}}
-    createFormUiSchema={tile{{ config.index }}.createFormUiSchema}
+    createFormUiSchema={createFormUiSchema}
     {{/if}}
     {{/if}}
     {{#if config.updateEvent}}
     updateEvent="{{ config.updateEvent }}"
     {{#if config.updateFormUiSchema}}
-    updateFormUiSchema={tile{{ config.index }}.updateFormUiSchema}
+    updateFormUiSchema={updateFormUiSchema}
     {{/if}}
     {{/if}}
     {{#if config.deleteEvent}}
     deleteEvent="{{ config.deleteEvent }}"
     {{/if}}
     {{#if config.gridOptions}}
-    gridOptions={{{ config.gridOptions }}}
+    gridOptions={gridOptions}
     {{/if}}
     {{#if config.snapshot}}
     datasourceConfig={ isSnapshot: {{ config.snapshot }} }
     {{/if}}
     {{#if config.reqrep}}
-    datasourceConfig={tile{{ config.index }}.reqrep}
+    datasourceConfig={reqrep}
     {{/if}}
     {{#if config.columns}}
-    columns={tile{{ config.index }}.columns}
+    columns={columnDefs}
     {{/if}}
     {{#if config.modalPosition}}
     modal-position="{{ config.modalPosition }}"

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

@@ -2,7 +2,7 @@
   design-system-prefix="rapid"
   resourceName="{{config.resourceName}}"
   {{#if config.uischema}}
-  uischema={tile{{ config.index }}.uischema}
+  uischema={uischema}
   {{/if}}
 >
 </foundation-form>

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

@@ -8,11 +8,10 @@
     isSnapshot="{{config.snapshot}}"
     {{/if}}
     {{#if config.reqrep}}
-    datasourceConfig={tile{{ config.index }}.reqrep}
+    datasourceConfig="reqrep"
     {{/if}}
     {{#if config.gridOptions}}
-    deferredGridOptions={tile{{ config.index }}.gridOptions}
+    deferredGridOptions=\{{ onRowClicked: gridOptions?.onRowClicked }}
     {{/if}}
-  >
-  </grid-pro-genesis-datasource>
+  ></grid-pro-genesis-datasource>
 </rapid-grid-pro>

package/.genx/templates/react/gridLayout.hbs

@@ -1,30 +1,30 @@
 <rapid-layout-region type="horizontal">
-    <rapid-layout-region type="vertical">
-    {{#each route.tiles}}
-        {{#ifEquals @index 0}}
-        <rapid-layout-item title="{{../title}}">
-            {{> (lookup ../this 'type') ../this}}
-        </rapid-layout-item>
-        {{/ifEquals}}
-        {{#ifEquals @index 1}}
-        <rapid-layout-item title="{{../title}}">
-            {{> (lookup ../this 'type') ../this}}
-        </rapid-layout-item>
-        {{/ifEquals}}
-    {{/each}}
-    </rapid-layout-region>
-    <rapid-layout-region type="vertical">
-    {{#each route.tiles}}
-        {{#ifEquals @index 2}}
-        <rapid-layout-item title="{{../title}}">
-            {{> (lookup ../this 'type') ../this}}
-        </rapid-layout-item>
-        {{/ifEquals}}
-        {{#ifEquals @index 3}}
-        <rapid-layout-item title="{{../title}}">
-            {{> (lookup ../this 'type') ../this}}
-        </rapid-layout-item>
-        {{/ifEquals}}
-    {{/each}}
-    </rapid-layout-region>
+  <rapid-layout-region type="vertical">
+  {{#each route.tiles}}
+    {{#ifEquals @index 0}}
+    <rapid-layout-item title="{{../title}}">
+      <{{pascalCase ../componentName}}></{{pascalCase ../componentName}}>
+    </rapid-layout-item>
+    {{/ifEquals}}
+    {{#ifEquals @index 1}}
+    <rapid-layout-item title="{{../title}}">
+      <{{pascalCase ../componentName}}></{{pascalCase ../componentName}}>
+    </rapid-layout-item>
+    {{/ifEquals}}
+  {{/each}}
+  </rapid-layout-region>
+  <rapid-layout-region type="vertical">
+  {{#each route.tiles}}
+    {{#ifEquals @index 2}}
+    <rapid-layout-item title="{{../title}}">
+      <{{pascalCase ../componentName}}></{{pascalCase ../componentName}}>
+    </rapid-layout-item>
+    {{/ifEquals}}
+    {{#ifEquals @index 3}}
+    <rapid-layout-item title="{{../title}}">
+      <{{pascalCase ../componentName}}></{{pascalCase ../componentName}}>
+    </rapid-layout-item>
+    {{/ifEquals}}
+  {{/each}}
+  </rapid-layout-region>
 </rapid-layout-region>

package/.genx/templates/react/horizontalLayout.hbs

@@ -1,7 +1,7 @@
 <rapid-layout-region>
-    {{#each route.tiles}}
-    <rapid-layout-item title="{{this.title}}">
-        {{> (lookup . 'type') }}
-    </rapid-layout-item>
-    {{/each}}
+  {{#each route.tiles}}
+  <rapid-layout-item title="{{this.title}}">
+    <{{pascalCase this.componentName}}></{{pascalCase this.componentName}}>
+  </rapid-layout-item>
+  {{/each}}
 </rapid-layout-region>

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

@@ -1,23 +1,9 @@
 import './{{pascalCase route.name}}.css';
+{{#each route.tiles}}
+import { {{pascalCase this.componentName}} } from './{{kebabCase this.title}}-{{this.componentType}}';
+{{/each}}
 
 const {{pascalCase route.name}} = () => {
-  {{#each route.tiles}}
-  const tile{{this.config.index}} = { {{#if this.config.createFormUiSchema}}
-    "createFormUiSchema": {{{ this.config.createFormUiSchema }}},{{/if}}{{#if this.config.updateFormUiSchema}}
-    "updateFormUiSchema": {{{ this.config.updateFormUiSchema }}},{{/if}}{{#if this.config.uischema}}
-    "uischema": {{{ this.config.uischema }}},{{/if}}{{#if this.config.gridOptions}}
-    "gridOptions": {{{ this.config.gridOptions }}},{{/if}}{{#if this.config.reqrep}}
-    "reqrep": {{{ this.config.reqrep }}},{{/if}}{{#if this.config.columns}}
-    "columns": {{{ this.config.columns }}},{{/if}}{{#if this.config.type}}
-    "chartConfig": { {{#ifEquals this.config.type 'pie'}}
-      "radius": 0.75,
-      "angleField": "value",
-      "colorField": "groupBy",{{else}}
-      "xField": "groupBy",
-      "yField": "value",{{/ifEquals}}
-    },{{/if}}
-  };
-  {{/each}}
 
   return (
     <section className="{{kebabCase route.name}}-page">

package/.genx/utils/generateTile.js

@@ -44,6 +44,7 @@ const getPathByFramework = {
   },
   [FRAMEWORK_REACT_ALIAS]: {
     ...defaultPathGetters,
+    index: (componentPath) => `${componentPath}/index.js`,
     clientSrcPath: `../../client/src/pages`,
     route: (clientSrcPath, tile, routeName) =>
       `${clientSrcPath}/${routeName}/${tile.name}-${tile.componentType}`,

package/.genx/versions.json

@@ -1,5 +1,5 @@
 {
-  "UI": "14.200.0",
-  "GSF": "8.3.0-beta1",
+  "UI": "14.201.0",
+  "GSF": "8.3.0-beta2",
   "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.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)
+
+
+### Bug Fixes
+
+* updating server version information for GSF [PSD-0](https://github.com/genesiscommunitysuccess/blank-app-seed/issues/0) f18c4cf
+
 ## [3.29.1-prerelease.5](https://github.com/genesiscommunitysuccess/blank-app-seed/compare/v3.29.1-prerelease.4...v3.29.1-prerelease.5) (2024-08-16)
 
 

package/client-tmp/react/package.json

@@ -19,6 +19,9 @@
     "@ag-grid-enterprise/core": "29.2.0",
     "@ag-grid-enterprise/row-grouping": "29.2.0",
     "@ag-grid-enterprise/server-side-row-model": "29.2.0",
+    {{#if FDC3.includeDependencies}}
+    "@genesislcap/foundation-fdc3": "{{versions.UI}}",
+    {{/if}}
     "@genesislcap/foundation-comms": "{{versions.UI}}",
     "@genesislcap/foundation-login": "{{versions.UI}}",
     "@genesislcap/foundation-entity-management": "{{versions.UI}}",

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

@@ -1,11 +1,11 @@
-import React from 'react';
+import { useEffect } from 'react';
 import {
   unstable_HistoryRouter as HistoryRouter,
   Routes,
   Route,
   useLocation,
 } from 'react-router-dom';
-import history from './utils/history';
+import { history } from './utils/history';
 import LayoutWrapper from './layouts/LayoutWrapper';
 import { routeLayouts } from './config';
 import AuthGuard from './guards/AuthGuard';
@@ -15,12 +15,30 @@ import AuthPage from './pages/auth/AuthPage';
 {{#each routes}}
 import {{pascalCase this.name}} from './pages/{{kebabCase this.name}}/{{pascalCase this.name}}';
 {{/each}}
+{{#if FDC3.channels.length}}
+import { listenToChannel, onFDC3Ready } from './utils';
+{{/if}}
 // Genesis Components
 import './share/genesis-components';
 
 const LayoutWithLocation = () => {
   const location = useLocation();
   const layout = routeLayouts[location.pathname] || 'default';
+  {{#if FDC3.channels.length}}
+  useEffect(() => {
+    {{#each FDC3.channels}}
+    listenToChannel('{{this.name}}', '{{this.type}}', (result) => {
+      console.log('Received FDC3 channel message on: {{this.name}} channel, type: {{this.type}}', result);
+      // TODO: Add your listener logic here
+      // E.g. open a modal or route to specific page: Route.path.push(`[Route name]`);
+    });
+    {{/each}}
+    
+    return () => {
+      console.log('Component is being unmounted');
+    };
+  }, []);
+  {{/if}}
 
   let pageComponent;
 

package/client-tmp/react/src/share/foundation-login.ts

@@ -1,7 +1,7 @@
 import {configure, define} from '@genesislcap/foundation-login';
 import { AUTH_PATH } from '../config';
 import { DI } from '@microsoft/fast-foundation';
-import history from '../utils/history';
+import { history } from '../utils/history';
 
 /**
  * Configure the micro frontend

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

@@ -0,0 +1,32 @@
+{{#if FDC3.includeDependencies}}
+import { DefaultFDC3 } from '@genesislcap/foundation-fdc3';
+{{/if}}
+export const isFDC3 = (): boolean => !!(window as any).fdc3;
+{{#if FDC3.includeDependencies}}
+
+export const onFDC3Ready = async (FDC3ReadyCb: () => any): Promise<void> => {
+  isFDC3()
+    ? await FDC3ReadyCb()
+    : window.addEventListener('fdc3Ready', async () => {
+      await FDC3ReadyCb();
+    });
+};
+
+export const listenToChannel = async (
+  channelName: string,
+  type: string,
+  callback: (result: any) => void,
+): Promise<void> => {
+  const fdc3Service = new DefaultFDC3();
+  fdc3Service.addChannelListener(channelName, type, callback);
+};
+
+export const sendEventOnChannel = (channelName: string, type: string) => {
+  return async (e: any) => {
+    const fdc3Service = new DefaultFDC3();
+    // check for ag-grid-specific events, fall back to standard events
+    const payload = e.data || e.detail;
+    await fdc3Service.broadcastOnChannel(channelName, type, payload);
+  };
+};
+{{/if}}

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

@@ -1,5 +1,3 @@
 import { createBrowserHistory } from 'history';
 
-const history = createBrowserHistory();
-
-export default history;
+export const history = createBrowserHistory();

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

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

package/package.json

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