diff --git a/packages/admin/src-admin/src/App.tsx b/packages/admin/src-admin/src/App.tsx index e041be171..e3fc2c3d8 100644 --- a/packages/admin/src-admin/src/App.tsx +++ b/packages/admin/src-admin/src/App.tsx @@ -2411,9 +2411,13 @@ class App extends Router { if (this.state.user && this.props.width !== 'xs' && this.props.width !== 'sm') { return (
- {this.state.systemConfig.common.siteName ? ( -
{this.state.systemConfig.common.siteName}
- ) : null} + { + // @ts-expect-error fixed in js-controller 7 + this.state.systemConfig.common.siteName ? ( + // @ts-expect-error fixed in js-controller 7 +
{this.state.systemConfig.common.siteName}
+ ) : null + } {
); } + // @ts-expect-error fixed in js-controller 7 if (this.props.width !== 'xs' && this.props.width !== 'sm' && this.state.systemConfig.common.siteName) { + // @ts-expect-error fixed in js-controller 7 return
{this.state.systemConfig.common.siteName}
; } return null; diff --git a/packages/admin/src-admin/src/components/Object/ObjectChart.tsx b/packages/admin/src-admin/src/components/Object/ObjectChart.tsx index 191d037a8..87b2682d4 100644 --- a/packages/admin/src-admin/src/components/Object/ObjectChart.tsx +++ b/packages/admin/src-admin/src/components/Object/ObjectChart.tsx @@ -520,6 +520,7 @@ class ObjectChart extends Component { from: false, ack: false, q: false, + // @ts-expect-error fixed in js-controller 7 addId: false, aggregate: 'none', }) @@ -565,6 +566,7 @@ class ObjectChart extends Component { from: false, ack: false, q: false, + // @ts-expect-error fixed in js-controller 7 addId: false, aggregate: 'none', returnNewestEntries: true, diff --git a/packages/admin/src-admin/src/components/Object/ObjectHistoryData.tsx b/packages/admin/src-admin/src/components/Object/ObjectHistoryData.tsx index 4a388a6fb..ffd987957 100644 --- a/packages/admin/src-admin/src/components/Object/ObjectHistoryData.tsx +++ b/packages/admin/src-admin/src/components/Object/ObjectHistoryData.tsx @@ -522,6 +522,7 @@ class ObjectHistoryData extends Component { variant="standard" id="siteName" label={this.props.t('Site name')} + // @ts-expect-error Fixed in js-controller 7 value={this.props.data.common.siteName || ''} onChange={e => this.doChange('siteName', e.target.value)} helperText={this.props.t( @@ -662,6 +663,7 @@ class MainSettingsDialog extends BaseSystemSettingsDialog { )} slotProps={{ input: { + // @ts-expect-error Fixed in js-controller 7 endAdornment: this.props.data.common.siteName ? (