Skip to content

Commit

Permalink
Fixing CI pipeline
Browse files Browse the repository at this point in the history
  • Loading branch information
GermanBluefox committed Dec 11, 2024
1 parent 905f707 commit f0f9b4d
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 3 deletions.
12 changes: 9 additions & 3 deletions packages/admin/src-admin/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2411,9 +2411,13 @@ class App extends Router<AppProps, AppState> {
if (this.state.user && this.props.width !== 'xs' && this.props.width !== 'sm') {
return (
<div>
{this.state.systemConfig.common.siteName ? (
<div style={styles.siteName}>{this.state.systemConfig.common.siteName}</div>
) : null}
{
// @ts-expect-error fixed in js-controller 7
this.state.systemConfig.common.siteName ? (
// @ts-expect-error fixed in js-controller 7
<div style={styles.siteName}>{this.state.systemConfig.common.siteName}</div>
) : null
}

<Box
component="div"
Expand Down Expand Up @@ -2456,7 +2460,9 @@ class App extends Router<AppProps, AppState> {
</div>
);
}
// @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 <div style={styles.siteName}>{this.state.systemConfig.common.siteName}</div>;
}
return null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -520,6 +520,7 @@ class ObjectChart extends Component<ObjectChartProps, ObjectChartState> {
from: false,
ack: false,
q: false,
// @ts-expect-error fixed in js-controller 7
addId: false,
aggregate: 'none',
})
Expand Down Expand Up @@ -565,6 +566,7 @@ class ObjectChart extends Component<ObjectChartProps, ObjectChartState> {
from: false,
ack: false,
q: false,
// @ts-expect-error fixed in js-controller 7
addId: false,
aggregate: 'none',
returnNewestEntries: true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,7 @@ class ObjectHistoryData extends Component<ObjectHistoryDataProps, ObjectHistoryD
from: true,
ack: true,
q: true,
// @ts-expect-error fixed in js-controller 7
addId: false,
aggregate: 'none',
returnNewestEntries: true,
Expand Down Expand Up @@ -633,6 +634,7 @@ class ObjectHistoryData extends Component<ObjectHistoryDataProps, ObjectHistoryD
from: false,
ack: false,
q: false,
// @ts-expect-error fixed in js-controller 7
addId: false,
aggregate: 'none',
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -655,13 +655,15 @@ class MainSettingsDialog extends BaseSystemSettingsDialog<Props, State> {
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(
"This name will be shown in admin's header. Just to identify the whole installation",
)}
slotProps={{
input: {
// @ts-expect-error Fixed in js-controller 7
endAdornment: this.props.data.common.siteName ? (
<InputAdornment position="end">
<IconButton
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -459,6 +459,7 @@ class RepositoriesDialog extends BaseSystemSettingsDialog<RepositoriesDialogProp
<span>
<Checkbox
disabled
// @ts-expect-error Fixed in js-controller 7
checked={this.props.repoInfo[item.title]?.stable}
indeterminate={!this.props.repoInfo[item.title]}
/>
Expand Down

0 comments on commit f0f9b4d

Please sign in to comment.