@genesislcap/blank-app-seed 5.22.2-prerelease.2 → 5.23.1

package/.genx/templates/angular/grid.hbs

@@ -1,40 +1,43 @@
-    <rapid-grid-pro
-      header-case-type="capitalCase"{{#if config.useOnlyTemplateCols}}
-      only-template-col-defs{{/if}}
-      enable-row-flashing
-      enable-cell-flashing{{#if config.permissions.viewRight}}
-      [ngStyle]="{ display: hasUserPermission('{{config.permissions.viewRight}}') ? 'block' : 'none' }"{{/if}}
-      >
-      <grid-pro-genesis-datasource
-        resource-name="{{config.resourceName}}"
-        {{#if config.snapshot}}
-        isSnapshot="{{config.snapshot}}"
-        {{/if}}
-        {{#if config.reqrep}}
-        polling-interval="5000"
-        request-auto-setup="false"
-        {{/if}}
-        {{#if config.eventing.listener}}
-        [criteria]="criteria()"
-        {{/if}}
-        {{#ifAny config.gridOptions config.eventing.publishEventName}}
-        [deferredGridOptions]="gridOptionsModel"
-        {{/ifAny}}
-      ></grid-pro-genesis-datasource>
-      {{#if config.gridOptions}}
-      <grid-pro-column *ngFor="let columnDef of gridOptions?.columnDefs" [definition]="columnDef"></grid-pro-column>
-      {{/if}}
-    </rapid-grid-pro>{{#if config.permissions.viewRight}}
-  <section 
-    [ngStyle]="{ 
-      height: '100%',
-      width: '100%',
-      display: !hasUserPermission('{{config.permissions.viewRight}}') ? 'block' : 'none'
-    }"
-  >
-    <app-error-message
-      style="width: 100%; height: 100%; display: flex; justify-content: center; align-items: center;"
-      elementType="h3"
-      message="You do not have access to view this component.">
-    </app-error-message>
-  </section>{{/if}}
+<rapid-grid-pro
+  header-case-type="capitalCase"{{#if config.useOnlyTemplateCols}}
+  only-template-col-defs{{/if}}
+  enable-row-flashing
+  enable-cell-flashing{{#if config.permissions.viewRight}}
+  [ngStyle]="{ display: hasUserPermission('{{config.permissions.viewRight}}') ? 'block' : 'none' }"{{/if}}
+>
+  <grid-pro-genesis-datasource
+    resource-name="{{config.resourceName}}"
+    {{#if config.snapshot}}
+    isSnapshot="{{config.snapshot}}"
+    {{/if}}
+    {{#if config.reqrep}}
+    polling-interval="5000"
+    request-auto-setup="false"
+    {{/if}}
+    {{#if config.eventing.listener}}
+    [criteria]="criteria()"
+    {{/if}}
+    {{#ifAny config.gridOptions config.eventing.publishEventName}}
+    [deferredGridOptions]="gridOptionsModel"
+    {{/ifAny}}
+  ></grid-pro-genesis-datasource>
+  {{#if config.gridOptions}}
+  <grid-pro-column
+    *ngFor="let columnDef of gridOptions?.columnDefs"
+    [definition]="columnDef"
+  ></grid-pro-column>
+  {{/if}}
+</rapid-grid-pro>{{#if config.permissions.viewRight}}
+<section
+  [ngStyle]="{
+    height: '100%',
+    width: '100%',
+    display: !hasUserPermission('{{config.permissions.viewRight}}') ? 'block' : 'none',
+  }"
+>
+  <app-error-message
+    style="width: 100%; height: 100%; display: flex; justify-content: center; align-items: center"
+    elementType="h3"
+    message="You do not have access to view this component."
+  ></app-error-message>
+</section>{{/if}}

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

@@ -1,9 +1,14 @@
-import { Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import { environment } from '../../../environments/environment';
+{{#if route.tiles}}
+// Tile imports are emitted in the order the tiles are declared in the route definition.
+/* eslint-disable import-es/order */
 {{#each route.tiles}}
 import { {{pascalCase this.componentName}} } from './{{kebabCase this.title}}-{{this.componentType}}';
 {{/each}}
-import { environment } from '../../../environments/environment';
+/* eslint-enable import-es/order */
+{{/if}}
 
 @Component({
   selector: 'app-{{kebabCase route.name}}',
@@ -12,6 +17,7 @@ import { environment } from '../../../environments/environment';
     {{#each route.tiles}}
     {{pascalCase this.componentName}},
     {{/each}}
+    // CommonModule provides the built-in directives (ngIf/ngFor) used by the template.
     CommonModule,
   ],
   schemas: [CUSTOM_ELEMENTS_SCHEMA],

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

@@ -1,14 +1,14 @@
   {{#if route.tiles}}
- <rapid-flex-layout>
-    <rapid-tabs>
+<rapid-flex-layout>
+  <rapid-tabs>
     {{#each route.tiles}}
-      <rapid-tab slot="tab">{{this.title}}</rapid-tab>
+    <rapid-tab slot="tab">{{this.title}}</rapid-tab>
     {{/each}}
 
     {{> (lookup ./route 'layoutType') }}
-    </rapid-tabs>
-  </rapid-flex-layout>
+  </rapid-tabs>
+</rapid-flex-layout>
   {{else}}
-  <!-- insert template code here -->
-  Welcome to {{sentenceCase route.name}}
+<!-- insert template code here -->
+Welcome to {{sentenceCase route.name}}
   {{/if}}

package/.genx/templates/angular/slices/eventing.slice.hbs

@@ -1,20 +1,28 @@
+{{#if listeners.length}}
 import { CriteriaBuilder, ExpressionBuilder, Serialisers } from '@genesislcap/foundation-criteria';
+{{/if}}
 import { createSlice } from '@genesislcap/foundation-redux';
 
 export const eventingSlice = createSlice({
   name: 'eventing',
+{{#if events.length}}
   initialState: {
 {{#each events}}
-    {{this}}: null{{#unless @last}},{{/unless}}
+    {{this}}: null as Record<string, any> | null,
 {{/each}}
   },
   reducers: {
 {{#each events}}
     publish{{pascalCase this}}: (state, action) => {
       state.{{this}} = action.payload;
-    }{{#unless @last}},{{/unless}}
+    },
 {{/each}}
   },
+{{else}}
+  initialState: {},
+  reducers: {},
+{{/if}}
+{{#if listeners.length}}
   selectors: {
 {{#each listeners}}
     getCriteriaFor{{pascalCase tileName}}: (state) => {
@@ -24,18 +32,21 @@ export const eventingSlice = createSlice({
 
 {{#each mappings}}
       if (data.{{sourceField}}) {
-        criteriaBuilder.And(new ExpressionBuilder()
-          .withField('{{targetField}}')
-          .withValue(data.{{sourceField}})
-          .withSerialiser(Serialisers.EQ)
-          .build());
+        criteriaBuilder.And(
+          new ExpressionBuilder()
+            .withField('{{targetField}}')
+            .withValue(data.{{sourceField}})
+            .withSerialiser(Serialisers.EQ)
+            .build(),
+        );
       }
 {{/each}}
 
       return criteriaBuilder.build();
-    }{{#unless @last}},{{/unless}}
+    },
 {{/each}}
   },
+{{else}}
+  selectors: {},
+{{/if}}
 });
-
-

package/.genx/templates/angular/store.hbs

@@ -2,11 +2,7 @@ import { createStore } from '@genesislcap/foundation-redux';
 import { eventingSlice } from './slices/eventing.slice';
 
 export const { reduxStore, store, actions, selectors } = createStore([eventingSlice], {
-  eventing: {
-    {{#each events}}
-    {{this}}: null{{#unless @last}},{{/unless}}
-    {{/each}}
-  },
+  eventing: eventingSlice.getInitialState(),
 });
 
 export type Store = typeof store;

package/.genx/templates/angular/tabsPanel.hbs

@@ -1,5 +1,5 @@
 {{#each route.tiles}}
 <rapid-tab-panel slot="tabpanel">
-    <app-{{kebabCase this.componentName}}></app-{{kebabCase this.componentName}}>
+  <app-{{kebabCase this.componentName}}></app-{{kebabCase this.componentName}}>
 </rapid-tab-panel>
-{{/each}}
+{{/each}}

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

@@ -1,17 +1,8 @@
-{{#if config.permissions.viewRight~}}
-hasUserPermission('{{config.permissions.viewRight}}') ? (
+{{#if config.type}}
+<G2PlotChart type="{{ config.type }}" config={chartConfig}>
+{{else}}
+{{! `type` is optional: G2PlotChart falls back to its own default when it is absent, and type="" is not a ChartTypes. }}
+<G2PlotChart config={chartConfig}>
 {{/if}}
-<G2PlotChart
-  type="{{ config.type }}"
-  config={chartConfig}
->
-  <ChartDatasource
-    resourceName="{{ config.resourceName }}"
-    serverFields="{{ config.xField }} {{ config.yField }}"
-  />
+  <ChartDatasource resourceName="{{ config.resourceName }}" serverFields="{{ config.xField }} {{ config.yField }}" />
 </G2PlotChart>
-{{#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,16 +1,22 @@
-{{#if tile.config.columns~}}
-import { ColDef } from '@ag-grid-community/core';
+{{#if tile.config.columns}}
+import type { ColDef } from '@ag-grid-community/core';
 {{/if}}
-{{#if tile.config.hasNumberFormatter~}}
+{{! Formatter imports are gated on this file's own serialised content, so a formatter used only in tile.config.gridOptions does not leak an unused import in here. }}
+{{#ifContains tile.config.columns 'getNumberFormatter'}}
+{{#ifContains tile.config.columns 'getDateFormatter'}}
+import { getDateFormatter, getNumberFormatter } from '@genesislcap/foundation-utils';
+{{else}}
 import { getNumberFormatter } from '@genesislcap/foundation-utils';
-{{/if}}
-{{#if tile.config.hasDateFormatter~}}
+{{/ifContains}}
+{{else}}
+{{#ifContains tile.config.columns 'getDateFormatter'}}
 import { getDateFormatter } from '@genesislcap/foundation-utils';
-{{/if}}
-{{#if route.FDC3EventHandlersEnabled~}}
+{{/ifContains}}
+{{/ifContains}}
+{{#ifContains tile.config.columns 'sendEventOnChannel'}}
 import { sendEventOnChannel } from '../../../utils';
-{{/if}}
+{{/ifContains}}
 
-{{#if tile.config.columns~}}
-export const columnDefs: ColDef[] = {{{ 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~}}
-export const createFormSchema: UiSchema = {{{ tile.config.createFormUiSchema }}}
+export const createFormSchema: UiSchema = {{{ tile.config.createFormUiSchema }}};
 {{/if}}
 {{#if tile.config.uischema~}}
-export const createFormSchema: UiSchema = {{{ tile.config.uischema }}}
+export const createFormSchema: UiSchema = {{{ tile.config.uischema }}};
 {{/if}}

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

@@ -1,11 +1,36 @@
-import { type CustomAction, CrudMenuPosition, UiSchema } from '@genesislcap/foundation-entity-management';
+{{#ifContains tile.config.customEvents '"position":'}}
+{{#ifContains tile.config.customEvents '"uischema":'}}
+import {
+  type CustomAction,
+  CrudMenuPosition,
+  UiSchema,
+} from '@genesislcap/foundation-entity-management';
+{{else}}
+import { type CustomAction, CrudMenuPosition } from '@genesislcap/foundation-entity-management';
+{{/ifContains}}
+{{else}}
+{{#ifContains tile.config.customEvents '"uischema":'}}
+import { type CustomAction, UiSchema } from '@genesislcap/foundation-entity-management';
+{{else}}
+import { type CustomAction } from '@genesislcap/foundation-entity-management';
+{{/ifContains}}
+{{/ifContains}}
 
+{{#ifContains tile.config.customEvents '"uischema":'}}
 {{#each tile.config.customEvents}}
 {{#if this.hasForm}}
 export const {{camelCase this.name}}FormSchema: UiSchema = {{{this.uischema}}};
 {{/if}}
 {{/each}}
 
+{{/ifContains}}
+{{#each tile.config.customEvents}}
+{{#if this.defaultValues}}
+{{! Hoisted so the serialised literal keeps its own indentation; `as const` keeps the record-type discriminators literal so they still satisfy `DefaultValues`. }}
+const {{camelCase this.name}}DefaultValues = {{{this.defaultValues}}} as const;
+
+{{/if}}
+{{/each}}
 export const customActions: CustomAction[] = [
   {{#each tile.config.customEvents}}
   {
@@ -17,7 +42,9 @@ export const customActions: CustomAction[] = [
       {{#if this.hasForm}}
       uiSchema: {{camelCase this.name}}FormSchema,
       {{/if}}
-      defaultValues: {{{this.defaultValues}}},
+      {{#if this.defaultValues}}
+      defaultValues: {{camelCase this.name}}DefaultValues,
+      {{/if}}
     },
     {{#if this.position}}
     position: CrudMenuPosition.{{{pascalCase this.position}}},
@@ -26,12 +53,12 @@ export const customActions: CustomAction[] = [
     icon: '{{this.icon}}',
     {{/if}}
     {{#if this.tooltip}}
-    tooltip: '{{this.tooltip}}',
+    tooltip: {{{this.tooltipJs}}},
     {{/if}}
     {{#if this.confirmSubmit}}
     confirmSubmit: {
-      state: '{{this.confirmSubmit.state}}',
-      message: '{{this.confirmSubmit.message}}'
+      state: '{{#if this.confirmSubmit.state}}{{this.confirmSubmit.state}}{{else}}enabled{{/if}}',
+      message: {{{this.confirmSubmitMessageJs}}},
     },
     {{/if}}
     requiresSelection: true,

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

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

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

@@ -1,16 +1,22 @@
-{{#if tile.config.gridOptions~}}
-import { GridOptions } from '@ag-grid-community/core';
+{{#if tile.config.gridOptions}}
+import type { GridOptions } from '@ag-grid-community/core';
 {{/if}}
-{{#if tile.config.hasNumberFormatter~}}
+{{! Formatter imports are gated on this file's own serialised content, so a formatter used only in tile.config.columns does not leak an unused import in here. }}
+{{#ifContains tile.config.gridOptions 'getNumberFormatter'}}
+{{#ifContains tile.config.gridOptions 'getDateFormatter'}}
+import { getDateFormatter, getNumberFormatter } from '@genesislcap/foundation-utils';
+{{else}}
 import { getNumberFormatter } from '@genesislcap/foundation-utils';
-{{/if}}
-{{#if tile.config.hasDateFormatter~}}
+{{/ifContains}}
+{{else}}
+{{#ifContains tile.config.gridOptions 'getDateFormatter'}}
 import { getDateFormatter } from '@genesislcap/foundation-utils';
-{{/if}}
-{{#if route.FDC3EventHandlersEnabled~}}
+{{/ifContains}}
+{{/ifContains}}
+{{#ifContains tile.config.gridOptions 'sendEventOnChannel'}}
 import { sendEventOnChannel } from '../../../utils';
-{{/if}}
+{{/ifContains}}
 
-{{#if tile.config.gridOptions~}}
-export const gridOptions: GridOptions = {{{ tile.config.gridOptions }}}
-{{/if}}
+{{#if tile.config.gridOptions}}
+export const gridOptions: GridOptions = {{{ tile.config.gridOptions }}};
+{{/if}}

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

@@ -1,64 +1,78 @@
+{{#ifEquals tile.type 'grid-pro'}}
+{{#ifAny tile.config.gridOptions tile.config.eventing.publishEventName}}
+import type { GridOptions } from '@ag-grid-community/core';
+{{/ifAny}}
+{{/ifEquals}}
+{{#ifAny tile.config.snapshot tile.config.reqrep tile.config.eventing.listener}}
+{{#ifContains 'entity-manager|grid-pro' tile.type}}
+import { DatasourceConfiguration } from '@genesislcap/foundation-entity-management';
+{{/ifContains}}
+{{/ifAny}}
 {{#ifEquals tile.type 'entity-manager'}}
 import { EntityManagement } from '@genesislcap/foundation-entity-management/react';
 {{/ifEquals}}
-{{#ifEquals tile.type 'grid-pro'}}
-import { RapidGridPro } from '@genesislcap/rapid-grid-pro/react';
-import { GridProGenesisDatasource{{#if tile.config.gridOptions}}, GridProColumn{{/if}} } from '@genesislcap/grid-pro/react';
-import { GridProCaseType } from '@genesislcap/grid-pro';
-{{/ifEquals}}
 {{#ifEquals tile.type 'smart-form'}}
 import { Form } from '@genesislcap/foundation-forms/react';
 {{/ifEquals}}
+{{#if tile.config.usesPermissionHelper}}
+import { getUser } from '@genesislcap/foundation-user';
+{{/if}}
 {{#ifEquals tile.type 'chart'}}
-import { G2PlotChart, ChartDatasource } from '@genesislcap/g2plot-chart/react';
 import { ChartConfig } from '@genesislcap/g2plot-chart';
+import { G2PlotChart, ChartDatasource } from '@genesislcap/g2plot-chart/react';
 {{/ifEquals}}
-{{#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 { getUser } from '@genesislcap/foundation-user';
-{{#if tile.config.customEvents}}
-import { customEvent } from '@genesislcap/foundation-events';
+{{#ifEquals tile.type 'grid-pro'}}
+import { GridProCaseType } from '@genesislcap/grid-pro';
+import { GridProGenesisDatasource{{#if tile.config.gridOptions}}, GridProColumn{{/if}} } from '@genesislcap/grid-pro/react';
+import { RapidGridPro } from '@genesislcap/rapid-grid-pro/react';
+{{/ifEquals}}
+{{#if tile.config.eventing.listener}}
+import { useSelector } from 'react-redux';
 {{/if}}
-import { getViewUpdateRightComponent{{#if tile.config.customEvents}}, submitFailureNotification{{/if}} } from '../../../utils';
+{{#if tile.config.wholeTileRight}}
 import ErrorMessage from '../../../components/ErrorMessage/ErrorMessage';
 {{/if}}
-{{#if tile.config.customEvents}}
-import { customActions } from './{{pascalCase tile.title}}EventsConfig';
+{{#if tile.config.eventing.publishEventName}}
+{{#if tile.config.eventing.listener}}
+import { actions, selectors } from '../../../store/store';
+{{else}}
+import { actions } from '../../../store/store';
+{{/if}}
+{{else}}
+{{#if tile.config.eventing.listener}}
+import { selectors } from '../../../store/store';
+{{/if}}
 {{/if}}
+{{#if tile.config.usesPermissionHelper}}
+import { getViewUpdateRightComponent } from '../../../utils';
+{{/if}}
+{{#if tile.config.columns~}}
+import { columnDefs as columnDefsTile } from './{{pascalCase tile.title}}ColumnDefs';
+{{/if}}
+{{#if tile.config.createEvent}}
 {{#if tile.config.createFormUiSchema~}}
 import { createFormSchema as createFormSchemaTile } from './{{pascalCase tile.title}}CreateFormSchema';
 {{/if}}
+{{/if}}
 {{#if tile.config.uischema~}}
 import { createFormSchema as createFormSchemaTile } from './{{pascalCase tile.title}}CreateFormSchema';
 {{/if}}
-{{#if tile.config.updateFormUiSchema~}}
-import { updateFormSchema as updateFormSchemaTile } from './{{pascalCase tile.title}}UpdateFormSchema';
+{{#if tile.config.customEvents}}
+import { customActions } from './{{pascalCase tile.title}}EventsConfig';
 {{/if}}
+{{#if tile.config.enableFilters}}
 {{#if tile.config.filterFormUiSchema~}}
 import { filterFormSchema as filterFormSchemaTile } from './{{pascalCase tile.title}}FilterFormSchema';
 {{/if}}
-{{#if tile.config.columns~}}
-import { columnDefs as columnDefsTile } from './{{pascalCase tile.title}}ColumnDefs';
 {{/if}}
 {{#if tile.config.gridOptions~}}
-import { GridOptions } from '@ag-grid-community/core';
 import { gridOptions as gridOptionsTile } from './{{pascalCase tile.title}}GridOptions';
 {{/if}}
-{{#if tile.config.eventing.publishEventName}}
-import { actions } from '../../../store/store';
+{{#if tile.config.updateEvent}}
+{{#if tile.config.updateFormUiSchema~}}
+import { updateFormSchema as updateFormSchemaTile } from './{{pascalCase tile.title}}UpdateFormSchema';
 {{/if}}
-{{#if tile.config.eventing.listener}}
-import { useSelector } from 'react-redux';
-import { selectors } from '../../../store/store';
 {{/if}}
-{{#ifAny tile.config.snapshot tile.config.reqrep tile.config.eventing.listener}}
-{{#ifContains 'entity-manager|grid-pro' tile.type}}
-import { DatasourceConfiguration } from '@genesislcap/foundation-entity-management';
-{{/ifContains}}
-{{/ifAny}}
 import './{{pascalCase tile.title}}Component.css';
 
 {{#ifAny tile.metadata.comment tile.metadata.todo}}
@@ -69,13 +83,19 @@ import './{{pascalCase tile.title}}Component.css';
  * TODO: {{{ tile.metadata.todo }}}{{/if}}
  */
 {{/ifAny}}
-
 export const {{pascalCase tile.componentName}}: React.FC = () => {
-  {{#if tile.config.permissions.viewRight}}
-  const hasUserPermission = (permissionCode: string): string | boolean => getViewUpdateRightComponent(getUser(), permissionCode);
-  {{else if tile.config.permissions.updateRight}}
-  const hasUserPermission = (permissionCode: string): string | boolean => getViewUpdateRightComponent(getUser(), permissionCode);
+  {{#if tile.config.usesPermissionHelper}}
+  const hasUserPermission = (permissionCode: string): string | boolean =>
+    getViewUpdateRightComponent(getUser(), permissionCode);
   {{/if}}
+  {{#ifEquals tile.type 'entity-manager'}}
+  {{#if tile.config.permissions.updateRight}}
+  {{#ifAny tile.config.createEvent tile.config.updateEvent tile.config.deleteEvent}}
+  {{! Hoisted so the CRUD event props stay inside the print width whatever the event names are. }}
+  const canUpdate = hasUserPermission('{{tile.config.permissions.updateRight}}');
+  {{/ifAny}}
+  {{/if}}
+  {{/ifEquals}}
   {{#if tile.config.eventing.publishEventName}}
   const handleRowSelection = (e: any) => {
     {{#ifEquals tile.type 'entity-manager'}}
@@ -91,18 +111,24 @@ export const {{pascalCase tile.componentName}}: React.FC = () => {
     actions.eventing.publish{{pascalCase tile.config.eventing.publishEventName}}(data);
   };
   {{/if}}
+  {{#if tile.config.createEvent}}
   {{#if tile.config.createFormUiSchema}}
   const createFormSchema: typeof createFormSchemaTile = createFormSchemaTile;
   {{/if}}
+  {{/if}}
   {{#if tile.config.uischema}}
   const uischema: typeof createFormSchemaTile = createFormSchemaTile;
   {{/if}}
+  {{#if tile.config.updateEvent}}
   {{#if tile.config.updateFormUiSchema}}
   const updateFormSchema: typeof updateFormSchemaTile = updateFormSchemaTile;
   {{/if}}
+  {{/if}}
+  {{#if tile.config.enableFilters}}
   {{#if tile.config.filterFormUiSchema}}
   const filterFormSchema: typeof filterFormSchemaTile = filterFormSchemaTile;
   {{/if}}
+  {{/if}}
   {{#if tile.config.columns}}
   const columnDefs: typeof columnDefsTile = [...columnDefsTile];
   {{/if}}
@@ -116,7 +142,7 @@ export const {{pascalCase tile.componentName}}: React.FC = () => {
     onSelectionChanged: handleRowSelection,
     rowSelection: 'single',
     {{/if}}
-  }
+  };
   {{/ifAny}}
   {{/ifEquals}}
   {{#ifAny tile.config.snapshot tile.config.reqrep tile.config.eventing.listener}}
@@ -132,10 +158,11 @@ export const {{pascalCase tile.componentName}}: React.FC = () => {
     {{#if tile.config.eventing.listener}}
     criteria: useSelector(selectors.eventing.getCriteriaFor{{pascalCase tile.title}}),
     {{/if}}
-  }
+  };
   {{/ifContains}}
   {{/ifAny}}
-  {{#if tile.config.type}}
+  {{#ifEquals tile.type 'chart'}}
+  {{! Declared for every chart tile: the chart partial always passes config={chartConfig}. }}
   const chartConfig: ChartConfig = {
     {{#ifEquals tile.config.type 'pie'}}
     radius: 0.75,
@@ -146,9 +173,24 @@ export const {{pascalCase tile.componentName}}: React.FC = () => {
     yField: 'value',
     {{/ifEquals}}
   };
-  {{/if}}
-
+  {{/ifEquals}}
+{{#if tile.config.wholeTileRight}}
+  return hasUserPermission('{{tile.config.wholeTileRight}}') ? (
+{{#ifEquals tile.type 'smart-form'}}
+    {{! smart-form renders as a single line; keep the partial inline so its trailing newline survives }}{{> (lookup tile 'type') tile}}
+{{else}}
+    {{> (lookup tile 'type') tile}}
+{{/ifEquals}}
+  ) : (
+    <ErrorMessage elementType="h3" message="You do not have access to view this component." />
+  );
+{{else}}
+{{#ifEquals tile.type 'smart-form'}}
+  return {{> (lookup tile 'type') tile}};
+{{else}}
   return (
     {{> (lookup tile 'type') tile}}
   );
+{{/ifEquals}}
+{{/if}}
 };

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

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