@genesislcap/blank-app-seed 3.29.2 → 3.30.0-prerelease.10

package/.genx/package.json

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

package/.genx/scripts/update-versions.js

@@ -4,23 +4,30 @@ const { resolve } = require('node:path');
 const current = require('../versions.json');
 
 const args = process.argv.slice(2);
-const patchOnly = args.indexOf("--patch-only") >= 0;
-const dryRun = args.indexOf("--dry-run") >= 0;
 
-const VERSION_REGEX = /\d+$/;
+const argDefined = (name) => args.indexOf(name) >= 0;
+
+const patchOnly = argDefined("--patch-only");
+const dryRun = argDefined("--dry-run");
+const skipServer = argDefined("--skip-server");
 
-const jfrogVersionMatcher = patchOnly ? current.GSF.replace(VERSION_REGEX, '*') : undefined;
+const VERSION_REGEX = /\d+$/;
+const JFROG_BASE_EXCLUSIONS = '*-SNAPSHOT*;*maven-metadata*;*test*;*TEST*';
 
-const npmVersionMatcher = patchOnly ? current.UI.replace(VERSION_REGEX, 'x') : 'latest';
+const { jfrogVersionMatcher, jfrogExclusionsMatcher, npmVersionMatcher } = patchOnly
+  ? { jfrogVersionMatcher: current.GSF.replace(VERSION_REGEX, '*'), jfrogExclusionsMatcher: `*-beta*;*-RC*;${JFROG_BASE_EXCLUSIONS}`, npmVersionMatcher: current.UI.replace(VERSION_REGEX, 'x') }
+  : { jfrogVersionMatcher: undefined, jfrogExclusionsMatcher: JFROG_BASE_EXCLUSIONS, npmVersionMatcher: 'latest' };
 
-console.log('Running with: ', {patchOnly, dryRun, npmVersionMatcher, jfrogVersionMatcher})
+console.log('Running with: ', { patchOnly, skipServer, dryRun, npmVersionMatcher, jfrogVersionMatcher, jfrogExclusionsMatcher });
 
-const run = (command) =>
-  execSync(command, {
+const run = (command) => {
+  console.debug('running:', command);
+  return execSync(command, {
     stdio: ['pipe', 'pipe', 'ignore'],
   })
     .toString('utf8')
     .trim();
+};
 
 const writeJSON = (json, path) => {
   const data = JSON.stringify(json, null, 2) + '\n';
@@ -32,15 +39,38 @@ const writeJSON = (json, path) => {
   }
 };
 
-const UI = run(`npm info @genesislcap/foundation-ui@${npmVersionMatcher} version`);
+/**
+ * NPM Info returns a string if there's only one version in the channel;, otherwise it returns a valid json array,
+ * where the most recent version will be the last value;
+ * @param {*} output 
+ * @returns 
+ */
+const parseNpmInfo = (output) => {
+  try {
+    const versions = JSON.parse(output);
+    return Array.isArray(versions) ? versions[versions.length-1] : versions;
+  } catch (err) {
+    return output;
+  }
+}
+
+const npmInfo = run(`npm info @genesislcap/foundation-ui@${npmVersionMatcher} version --json`);
+console.debug('Npm raw output:', npmInfo);
+const UI = parseNpmInfo(npmInfo);
+
+const serverOsCommandPipeline = `grep path | tr -s ' ' | sed 's/"path": //g' | awk -F'/' '{print $(NF-1)}' | sort -V | tail -n 1`;
 
-const GSF = run(
-  `jf rt s "libs-release-client/global/genesis/genesis-distribution/${jfrogVersionMatcher ?? ''}" --exclusions="*-RC*;*-SNAPSHOT*;*maven-metadata*;*test*;*TEST*" | grep path | tr -s ' ' | sed 's/"path": //g' | awk -F'/' '{print $(NF-1)}' | sort -V | tail -n 1`,
-);
+const { GSF, Auth } = skipServer
+  ? { GSF: current.GSF, Auth: current.Auth }
+  : {
+    GSF: run(
+      `jf rt s "libs-release-client/global/genesis/genesis-distribution/${jfrogVersionMatcher ?? ''}" --exclusions="${jfrogExclusionsMatcher}" | ${serverOsCommandPipeline}`
+    ),
+    Auth: run(
+      `jf rt s "libs-release-client/global/genesis/auth-distribution/${jfrogVersionMatcher ?? ''}" --exclusions="${jfrogExclusionsMatcher}" | ${serverOsCommandPipeline}`,
+    )
+  };
 
-const Auth = run(
-  `jf rt s "libs-release-client/global/genesis/auth-distribution/${jfrogVersionMatcher ?? ''}" --exclusions="*-RC*;*-SNAPSHOT*;*maven-metadata*;*test*;*TEST*" | grep path | tr -s ' ' | sed 's/"path": //g' | awk -F'/' '{print $(NF-1)}' | sort -V | tail -n 1`,
-);
 const latest = { UI, GSF, Auth };
 
 console.log('Current:', current);

package/.genx/templates/angular/entityManager.hbs

@@ -33,6 +33,9 @@
       {{#if config.reqrep}}
       [datasourceConfig]="reqrep"
       {{/if}}
+      {{#if config.entityName}}
+      entityLabel="{{ config.entityName }}"
+      {{/if}}
       {{#if config.columns}}
       [columns]="columnDefs"
       {{/if}}

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,9 +1,17 @@
+{{#if config.permissions.viewRight~}}
+hasUserPermission('{{config.permissions.viewRight}}') ? (
+{{/if}}
 <rapid-g2plot-chart
   type="{{ config.type }}"
-  config={tile{{ config.index }}.chartConfig}
+  config={chartConfig}
 >
   <chart-datasource
     resourceName="{{ config.resourceName }}"
     server-fields="{{ config.xField }} {{ config.yField }}"
   ></chart-datasource>
 </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.column.defs.hbs

@@ -1,9 +1,11 @@
+{{#if tile.config.columns~}}
 import { ColDef } from '@ag-grid-community/core';
+{{/if}}
 import { getNumberFormatter, getDateFormatter } from '@genesislcap/foundation-utils';
-{{#if route.FDC3EventHandlersEnabled}}
+{{#if route.FDC3EventHandlersEnabled~}}
 import { sendEventOnChannel } from '../../../utils';
 {{/if}}
 
-{{#if tile.config.columns}}
+{{#if tile.config.columns~}}
 export const columnDefs: ColDef[] = {{{ tile.config.columns }}}
 {{/if}}

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

@@ -1,8 +1,8 @@
 import { UiSchema } from '@genesislcap/foundation-forms';
 
-{{#if tile.config.createFormUiSchema}}
+{{#if tile.config.createFormUiSchema~}}
 export const createFormSchema: UiSchema = {{{ tile.config.createFormUiSchema }}}
 {{/if}}
-{{#if tile.config.uischema}}
+{{#if tile.config.uischema~}}
 export const createFormSchema: UiSchema = {{{ tile.config.uischema }}}
 {{/if}}

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

@@ -1,9 +1,11 @@
+{{#if tile.config.gridOptions~}}
 import { GridOptionsConfig } from '@genesislcap/rapid-grid-pro';
+{{/if}}
 import { getNumberFormatter, getDateFormatter } from '@genesislcap/foundation-utils';
-{{#if route.FDC3EventHandlersEnabled}}
+{{#if route.FDC3EventHandlersEnabled~}}
 import { sendEventOnChannel } from '../../../utils';
 {{/if}}
 
-{{#if tile.config.gridOptions}}
+{{#if tile.config.gridOptions~}}
 export const gridOptions: GridOptionsConfig = {{{ tile.config.gridOptions }}}
-{{/if}}
+{{/if}}

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

@@ -1,32 +1,77 @@
-import { Component, Input, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { CommonModule } from '@angular/common';
+{{#if tile.config.permissions.viewRight~}}
 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";
+import ErrorMessage from '../../../components/ErrorMessage/ErrorMessage';
+{{else if tile.config.permissions.updateRight~}}
+import { getUser } from '@genesislcap/foundation-user';
+import { getViewUpdateRightComponent } from '../../../utils';
+import ErrorMessage from '../../../components/ErrorMessage/ErrorMessage';
 {{/if}}
-{{#if tile.config.createFormUiSchema}}
-import { createFormSchema } from './{{kebabCase tile.title}}.create.form.schema';
+{{#if tile.config.createFormUiSchema~}}
+import { createFormSchema as createFormSchemaTile } from './{{pascalCase tile.title}}CreateFormSchema';
 {{/if}}
-{{#if tile.config.uischema}}
-import { createFormSchema } from './{{kebabCase tile.title}}.create.form.schema';
+{{#if tile.config.uischema~}}
+import { createFormSchema as createFormSchemaTile } from './{{pascalCase tile.title}}CreateFormSchema';
 {{/if}}
-{{#if tile.config.updateFormUiSchema}}
-import { updateFormSchema } from './{{kebabCase tile.title}}.update.form.schema';
+{{#if tile.config.updateFormUiSchema~}}
+import { updateFormSchema as updateFormSchemaTile } from './{{pascalCase tile.title}}UpdateFormSchema';
 {{/if}}
-{{#if tile.config.columns}}
-import { columnDefs } from './{{kebabCase tile.title}}.column.defs';
+{{#if tile.config.columns~}}
+import { columnDefs as columnDefsTile } from './{{pascalCase tile.title}}ColumnDefs';
 {{/if}}
-{{#if tile.config.gridOptions}}
-import { gridOptions } from './{{kebabCase tile.title}}.gridOptions';
+{{#if tile.config.gridOptions~}}
+import { GridOptionsConfig } from '@genesislcap/rapid-grid-pro';
+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}}: React.FC = () => {
+  {{#if tile.config.permissions.viewRight~}}
+  const hasUserPermission = (permissionCode: string): boolean => getViewUpdateRightComponent(getUser(), permissionCode);
+  {{else if tile.config.permissions.updateRight~}}
+  const hasUserPermission = (permissionCode: string): boolean => getViewUpdateRightComponent(getUser(), permissionCode);
+  {{/if}}
+  {{#if tile.config.createFormUiSchema~}}
+  const createFormSchema: typeof createFormSchemaTile = createFormSchemaTile;
+  {{/if}}
+  {{#if tile.config.uischema~}}
+  const uischema: typeof createFormSchemaTile = createFormSchemaTile;
+  {{/if}}
+  {{#if tile.config.updateFormUiSchema~}}
+  const updateFormSchema: typeof updateFormSchemaTile = updateFormSchemaTile;
+  {{/if}}
+  {{#if tile.config.columns~}}
+  const columnDefs: typeof columnDefsTile = columnDefsTile;
+  {{/if}}
+  {{#if tile.config.gridOptions~}}
+  const deferredGridOptions: { onRowClicked: GridOptionsConfig.onRowClicked } = { onRowClicked: gridOptionsTile?.onRowClicked  }
+  {{/if}}
+  {{#if tile.config.reqrep~}}
+  const reqrep: { pollingInterval: number } = { pollingInterval: 5000 };
+  {{/if}}
+  {{#if tile.config.type~}}
+  const chartConfig: {
+    {{#ifEquals tile.config.type 'pie'~}}
+    radius: number;
+    angleField: string;
+    colorField: string;
+    {{else~}}
+    xField: string;
+    yField: string;
+    {{/ifEquals}}
+  } = {
+    {{#ifEquals tile.config.type 'pie'~}}
+    radius: 0.75,
+    angleField: 'value',
+    colorField: 'groupBy',
+    {{else~}}
+    xField: 'groupBy',
+    yField: 'value',
+    {{/ifEquals}}
+  };
+  {{/if}}
 
-const {{pascalCase tile.componentName}} = () => {
   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 './{{pascalCase tile.title}}Component.tsx';

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

@@ -1,5 +1,5 @@
 import { UiSchema } from '@genesislcap/foundation-forms';
 
-{{#if tile.config.updateFormUiSchema}}
+{{#if tile.config.updateFormUiSchema~}}
 export const updateFormSchema: UiSchema = {{{ tile.config.updateFormUiSchema }}}
 {{/if}}

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

@@ -1,45 +1,65 @@
+{{#if config.permissions.viewRight~}}
+hasUserPermission('{{config.permissions.viewRight}}') ? (
+{{/if}}
 <entity-management
-    design-system-prefix="rapid"
-    enable-row-flashing
-    enable-cell-flashing
-    {{#if config.title}}
-    title="{{ config.title }}"
-    {{/if}}
-    resourceName="{{ config.resourceName }}"
-    {{#if config.createEvent}}
-    createEvent="{{ config.createEvent }}"
-    {{#if config.createFormUiSchema}}
-    createFormUiSchema={tile{{ config.index }}.createFormUiSchema}
-    {{/if}}
-    {{/if}}
-    {{#if config.updateEvent}}
-    updateEvent="{{ config.updateEvent }}"
-    {{#if config.updateFormUiSchema}}
-    updateFormUiSchema={tile{{ config.index }}.updateFormUiSchema}
-    {{/if}}
-    {{/if}}
-    {{#if config.deleteEvent}}
-    deleteEvent="{{ config.deleteEvent }}"
-    {{/if}}
-    {{#if config.gridOptions}}
-    gridOptions={{{ config.gridOptions }}}
-    {{/if}}
-    {{#if config.snapshot}}
-    datasourceConfig={ isSnapshot: {{ config.snapshot }} }
-    {{/if}}
-    {{#if config.reqrep}}
-    datasourceConfig={tile{{ config.index }}.reqrep}
-    {{/if}}
-    {{#if config.columns}}
-    columns={tile{{ config.index }}.columns}
-    {{/if}}
-    {{#if config.modalPosition}}
-    modal-position="{{ config.modalPosition }}"
-    {{/if}}
-    {{#if config.sizeColumnsToFit}}
-    size-columns-to-fit
-    {{/if}}
-    {{#if config.enableSearchBar}}
-    enable-search-bar
-    {{/if}}
+  design-system-prefix="rapid"
+  enable-row-flashing
+  enable-cell-flashing
+  {{#if config.title~}}
+  title="{{ config.title }}"
+  {{/if}}
+  resourceName="{{ config.resourceName }}"
+  {{#if config.createEvent~}}
+  {{#if config.permissions.updateRight~}}
+  createEvent={hasUserPermission('{{config.permissions.updateRight}}') ? '{{ config.createEvent }}' : undefined}
+  {{else~}}
+  createEvent="{{ config.updateEvent }}"
+  {{/if}}
+  {{#if config.createFormUiSchema~}}
+  createFormUiSchema={createFormSchema}
+  {{/if}}
+  {{/if}}
+  {{#if config.updateEvent~}}
+  {{#if config.permissions.updateRight~}}
+  updateEvent={hasUserPermission('{{config.permissions.updateRight}}') ? '{{ config.updateEvent }}' : undefined}
+  {{else~}}
+  updateEvent="{{ config.updateEvent }}"
+  {{/if}}
+  {{#if config.updateFormUiSchema~}}
+  updateFormUiSchema={updateFormSchema}
+  {{/if}}
+  {{/if}}
+  {{#if config.deleteEvent~}}
+  {{#if config.permissions.updateRight~}}
+  deleteEvent={hasUserPermission('{{config.permissions.updateRight}}') ? '{{ config.deleteEvent }}' : undefined}
+  {{else~}}
+  deleteEvent="{{ config.deleteEvent }}"
+  {{/if}}
+  {{/if}}
+  {{#if config.gridOptions~}}
+  gridOptions={gridOptions}
+  {{/if}}
+  {{#if config.snapshot~}}
+  datasourceConfig={ isSnapshot: {{ config.snapshot }} }
+  {{/if}}
+  {{#if config.reqrep~}}
+  datasourceConfig={reqrep}
+  {{/if}}
+  {{#if config.columns~}}
+  columns={columnDefs}
+  {{/if}}
+  {{#if config.modalPosition~}}
+  modal-position="{{ config.modalPosition }}"
+  {{/if}}
+  {{#if config.sizeColumnsToFit~}}
+  size-columns-to-fit
+  {{/if}}
+  {{#if config.enableSearchBar~}}
+  enable-search-bar
+  {{/if}}
 ></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,8 +1,16 @@
+{{#if config.permissions.updateRight~}}
+hasUserPermission('{{config.permissions.updateRight}}') ? (
+{{/if}}
 <foundation-form
   design-system-prefix="rapid"
   resourceName="{{config.resourceName}}"
   {{#if config.uischema}}
-  uischema={tile{{ config.index }}.uischema}
+  uischema={uischema}
   {{/if}}
 >
 </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,18 +1,34 @@
+{{#if config.permissions.viewRight~}}
+hasUserPermission('{{config.permissions.viewRight}}') ? (
+{{/if}}
 <rapid-grid-pro
+  header-case-type="capitalCase"
+  {{#if config.useOnlyTemplateCols~}}
+  only-template-col-defs
+  {{/if}}
   enable-row-flashing
   enable-cell-flashing
   >
   <grid-pro-genesis-datasource
     resource-name="{{config.resourceName}}"
-    {{#if config.snapshot}}
+    {{#if config.snapshot~}}
     isSnapshot="{{config.snapshot}}"
     {{/if}}
-    {{#if config.reqrep}}
-    datasourceConfig={tile{{ config.index }}.reqrep}
+    {{#if config.reqrep~}}
+    datasourceConfig="reqrep"
     {{/if}}
-    {{#if config.gridOptions}}
-    deferredGridOptions={tile{{ config.index }}.gridOptions}
+    {{#if config.gridOptions~}}
+    deferredGridOptions={deferredGridOptions}
     {{/if}}
-  >
-  </grid-pro-genesis-datasource>
+  ></grid-pro-genesis-datasource>
+  {{#if config.gridOptions}}
+  {gridOptionsTile?.columnDefs?.map((columnDef, index) => (
+    <grid-pro-column key={index} definition={columnDef}></grid-pro-column>
+  ))}
+  {{/if}}
 </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/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,28 +1,13 @@
 import './{{pascalCase route.name}}.css';
+{{#each route.tiles}}
+import { {{pascalCase this.componentName}} } from './{{pascalCase this.title}}{{pascalCase 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">
       {{#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/templates/react/tabsLayout.hbs

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

package/.genx/templates/web-components/entityManager.hbs

@@ -34,6 +34,9 @@ ${whenElse(
             {{#if config.reqrep}}
             :datasourceConfig=${() => ({pollingInterval: 5000 })}
             {{/if}}
+            {{#if config.entityName}}
+            entityLabel="{{ config.entityName }}"
+            {{/if}}
             {{#if config.columns}}
             :columns=${() => columnDefs }
             {{/if}}

package/.genx/utils/formatRouteData.js

@@ -37,7 +37,7 @@ const formatRouteData = (framework, route) => {
         ...config,
         index,
         gridOptions: gridOptionsSerializer(gridOptions),
-        useOnlyTemplateCols: !!gridOptions?.columnDefs,
+        useOnlyTemplateCols: !!gridOptions?.columns,
         createFormUiSchema: formatJSONValue(createFormUiSchema),
         updateFormUiSchema: formatJSONValue(updateFormUiSchema),
         uischema: formatJSONValue(uischema),

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`,
+      `${routeDir}/${changeCase.pascalCase(routeName)}.tsx`,
+    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 = [
     {