Skip to content

Commit

Permalink
activate close button if stopped on error (#2144)
Browse files Browse the repository at this point in the history
- closes #2143
  • Loading branch information
foxriver76 authored Oct 9, 2023
1 parent 5107c8e commit 7ae5b5c
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 5 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ The icons may not be reused in other projects without the proper flaticon licens
## Changelog
### **WORK IN PROGRESS**
* (foxriver76) JSON config component `port` does no longer mark port as occupied if it is only occupied on another host
* (foxriver76) if upgrade all is stopped on error, activate close button

### 6.10.4 (2023-09-25)
* (foxriver76) fixed parsing `jsonConfig`
Expand Down
3 changes: 1 addition & 2 deletions src/src/components/TabContainer.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
// please do not delete React, as without it other projects could not be compiled: ReferenceError: React is not defined
import React, { ReactChildren, ReactElement } from 'react';
import React from 'react';
import { withStyles } from '@mui/styles';
import { Grid, Paper } from '@mui/material';
import { Utils } from '@iobroker/adapter-react-v5';
import type { ReactElementLike, ReactNodeLike } from 'prop-types';

const styles = {
root: {
Expand Down
1 change: 0 additions & 1 deletion src/src/components/TabContent.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import type { ReactNodeLike } from 'prop-types';
import { withStyles } from '@mui/styles';
import { Grid } from '@mui/material';
import { Utils } from '@iobroker/adapter-react-v5';
Expand Down
4 changes: 2 additions & 2 deletions src/src/dialogs/AdaptersUpdaterDialog.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -269,8 +269,8 @@ class AdaptersUpdaterDialog extends Component {
<Button
variant="contained"
onClick={() => this.props.onClose(!!this.state.updated.length)}
disabled={this.state.inProcess}
color="grey"
disabled={this.state.inProcess && !this.state.stoppedOnError}
color={this.state.stoppedOnError ? 'error' : 'grey'}
startIcon={<CloseIcon />}
>
{this.props.t('Close')}
Expand Down

0 comments on commit 7ae5b5c

Please sign in to comment.