Cleanup usages of isMono

This commit is contained in:
Mark McDowall 2022-05-29 18:07:45 -07:00
parent d3018fb501
commit fbe412d847
5 changed files with 11 additions and 12 deletions

View File

@ -100,7 +100,6 @@ class GeneralSettings extends Component {
settings,
hasSettings,
isResettingApiKey,
isMono,
isWindows,
isWindowsService,
mode,
@ -166,7 +165,7 @@ class GeneralSettings extends Component {
<UpdateSettings
advancedSettings={advancedSettings}
settings={settings}
isMono={isMono}
isWindows={isWindows}
packageUpdateMechanism={packageUpdateMechanism}
onInputChange={onInputChange}
/>
@ -208,7 +207,6 @@ GeneralSettings.propTypes = {
settings: PropTypes.object.isRequired,
isResettingApiKey: PropTypes.bool.isRequired,
hasSettings: PropTypes.bool.isRequired,
isMono: PropTypes.bool.isRequired,
isWindows: PropTypes.bool.isRequired,
isWindowsService: PropTypes.bool.isRequired,
mode: PropTypes.string.isRequired,

View File

@ -24,7 +24,6 @@ function createMapStateToProps() {
return {
advancedSettings,
isResettingApiKey,
isMono: systemStatus.isMono,
isWindows: systemStatus.isWindows,
isWindowsService: systemStatus.isWindows && systemStatus.mode === 'service',
mode: systemStatus.mode,

View File

@ -16,7 +16,7 @@ function UpdateSettings(props) {
const {
advancedSettings,
settings,
isMono,
isWindows,
packageUpdateMechanism,
onInputChange
} = props;
@ -68,7 +68,8 @@ function UpdateSettings(props) {
</FormGroup>
{
isMono &&
isWindows ?
null :
<div>
<FormGroup
advancedSettings={advancedSettings}
@ -129,7 +130,7 @@ function UpdateSettings(props) {
UpdateSettings.propTypes = {
advancedSettings: PropTypes.bool.isRequired,
settings: PropTypes.object.isRequired,
isMono: PropTypes.bool.isRequired,
isWindows: PropTypes.bool.isRequired,
packageUpdateMechanism: PropTypes.string.isRequired,
onInputChange: PropTypes.func.isRequired
};

View File

@ -50,7 +50,7 @@ class MediaManagement extends Component {
error,
settings,
hasSettings,
isMono,
isWindows,
onInputChange,
onSavePress,
...otherProps
@ -147,7 +147,8 @@ class MediaManagement extends Component {
</FormGroup>
{
isMono &&
isWindows ?
null :
<FormGroup
advancedSettings={advancedSettings}
isAdvanced={true}
@ -357,7 +358,7 @@ class MediaManagement extends Component {
</FieldSet>
{
advancedSettings && isMono &&
advancedSettings && !isWindows &&
<FieldSet
legend="Permissions"
>
@ -432,7 +433,7 @@ MediaManagement.propTypes = {
error: PropTypes.object,
settings: PropTypes.object.isRequired,
hasSettings: PropTypes.bool.isRequired,
isMono: PropTypes.bool.isRequired,
isWindows: PropTypes.bool.isRequired,
onSavePress: PropTypes.func.isRequired,
onInputChange: PropTypes.func.isRequired
};

View File

@ -22,7 +22,7 @@ function createMapStateToProps() {
advancedSettings,
...sectionSettings,
hasPendingChanges: !_.isEmpty(namingSettings.pendingChanges) || sectionSettings.hasPendingChanges,
isMono: systemStatus.isMono
isWindows: systemStatus.isWindows
};
}
);