Skip to content

Commit 7c6bb8e

Browse files
committed
Consistently check if advanced options are set
1 parent 9ce6f52 commit 7c6bb8e

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

ui/frontend/AdvancedOptionsMenu.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { Backtrace, Edition } from './types';
1010
const AdvancedOptionsMenu: React.FC = () => {
1111
const isEditionDefault = useAppSelector(selectors.isEditionDefault);
1212
const edition = useAppSelector((state) => state.configuration.edition);
13-
const isBacktraceSet = useAppSelector(selectors.getBacktraceSet);
13+
const isBacktraceDefault = useAppSelector(selectors.isBacktraceDefault);
1414
const backtrace = useAppSelector((state) => state.configuration.backtrace);
1515

1616
const dispatch = useAppDispatch();
@@ -41,7 +41,7 @@ const AdvancedOptionsMenu: React.FC = () => {
4141
a={Backtrace.Disabled}
4242
b={Backtrace.Enabled}
4343
value={backtrace}
44-
isNotDefault={isBacktraceSet}
44+
isNotDefault={!isBacktraceDefault}
4545
onChange={changeBacktrace}
4646
/>
4747
</MenuGroup>

ui/frontend/selectors/index.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -172,18 +172,18 @@ export const getChannelLabel = createSelector(channelSelector, (channel) => `${c
172172

173173
export const isEditionDefault = createSelector(
174174
editionSelector,
175-
edition => edition == Edition.Rust2024,
175+
edition => edition === Edition.Rust2024,
176176
);
177177

178-
export const getBacktraceSet = (state: State) => (
179-
state.configuration.backtrace !== Backtrace.Disabled
178+
export const isBacktraceDefault = (state: State) => (
179+
state.configuration.backtrace === Backtrace.Disabled
180180
);
181181

182+
export const getBacktraceSet = createSelector(isBacktraceDefault, (b) => !b);
183+
182184
export const getAdvancedOptionsSet = createSelector(
183-
isEditionDefault, getBacktraceSet,
184-
(editionDefault, backtraceSet) => (
185-
!editionDefault || backtraceSet
186-
),
185+
isEditionDefault, isBacktraceDefault,
186+
(...areDefault) => !areDefault.every(n => n),
187187
);
188188

189189
export const hasProperties = (obj: object) => Object.values(obj).some(val => !!val);

0 commit comments

Comments
 (0)