-
Notifications
You must be signed in to change notification settings - Fork 304
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/candidate-9.2.x' into candidate-…
…9.4.x Signed-off-by: Gordon Smith <[email protected]> # Conflicts: # helm/hpcc/Chart.yaml # helm/hpcc/templates/_helpers.tpl # version.cmake
- Loading branch information
Showing
18 changed files
with
366 additions
and
207 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| import * as React from "react"; | ||
| import { PrimaryButton, DefaultButton, mergeStyleSets, Checkbox, Stack } from "@fluentui/react"; | ||
| import { resetCookies, resetModernMode } from "src/Session"; | ||
| import nlsHPCC from "src/nlsHPCC"; | ||
| import { pushUrl, replaceUrl } from "../util/history"; | ||
| import { resetMetricsViews } from "../hooks/metrics"; | ||
| import { resetHistory } from "../util/history"; | ||
| import { MessageBox } from "../layouts/MessageBox"; | ||
| import { resetTheme, useUserTheme } from "../hooks/theme"; | ||
| import { resetFavorites } from "../hooks/favorite"; | ||
| import { resetCookieConsent } from "./Frame"; | ||
| import { resetWorkunitOptions } from "./Workunits"; | ||
|
|
||
| export interface ResetDialogProps { | ||
| } | ||
|
|
||
| export const ResetDialog: React.FunctionComponent<ResetDialogProps> = ({ | ||
| }) => { | ||
|
|
||
| const [show, setShow] = React.useState(true); | ||
| const [checkMetricOptions, setCheckMetricOptions] = React.useState(true); | ||
| const [checkWorkunitOptions, setCheckWorkunitOptions] = React.useState(true); | ||
| const [checkHistory, setCheckHistoryCheckbox] = React.useState(true); | ||
| const [checkFavorites, setCheckFavorites] = React.useState(true); | ||
| const [checkEclWatchVersion, setCheckEclWatchVersion] = React.useState(true); | ||
| const [checkTheme, setCheckTheme] = React.useState(true); | ||
| const [checkCookies, setCheckCookies] = React.useState(false); | ||
| const { theme } = useUserTheme(); | ||
|
|
||
| const styles = React.useMemo(() => mergeStyleSets({ | ||
| root: { | ||
| height: "100%", | ||
| backgroundColor: theme.semanticColors.bodyBackground | ||
| }, | ||
| }), [theme.semanticColors.bodyBackground]); | ||
|
|
||
| return <div className={styles.root}> | ||
| <MessageBox show={show} setShow={setShow} title={`${nlsHPCC.ResetUserSettings}?`} footer={ | ||
| <> | ||
| <PrimaryButton text={nlsHPCC.Reset} onClick={async () => { | ||
| if (checkMetricOptions) { | ||
| await resetMetricsViews(); | ||
| } | ||
| if (checkWorkunitOptions) { | ||
| await resetWorkunitOptions(); | ||
| } | ||
| if (checkHistory) { | ||
| await resetHistory(); | ||
| } | ||
| if (checkFavorites) { | ||
| await resetFavorites(); | ||
| } | ||
| if (checkHistory) { | ||
| await resetHistory(); | ||
| } | ||
| if (checkEclWatchVersion) { | ||
| await resetModernMode(); | ||
| } | ||
| if (checkTheme) { | ||
| await resetTheme(); | ||
| } | ||
| if (checkCookies) { | ||
| await resetCookies(); | ||
| await resetCookieConsent(); | ||
| } | ||
| setShow(false); | ||
| replaceUrl("/"); | ||
| window.location.reload(); | ||
| }} /> | ||
| <DefaultButton text={nlsHPCC.Cancel} onClick={() => { | ||
| setShow(false); | ||
| pushUrl("/"); | ||
| }} /> | ||
| </> | ||
| }> | ||
| <Stack tokens={{ childrenGap: 10 }}> | ||
| <Checkbox label={nlsHPCC.MetricOptions} checked={checkMetricOptions} onChange={(ev, checked) => setCheckMetricOptions(checked)} /> | ||
| <Checkbox label={nlsHPCC.WorkunitOptions} checked={checkWorkunitOptions} onChange={(ev, checked) => setCheckWorkunitOptions(checked)} /> | ||
| <Checkbox label={nlsHPCC.History} checked={checkHistory} onChange={(ev, checked) => setCheckHistoryCheckbox(checked)} /> | ||
| <Checkbox label={nlsHPCC.Favorites} checked={checkFavorites} onChange={(ev, checked) => setCheckFavorites(checked)} /> | ||
| <Checkbox label={nlsHPCC.ECLWatchVersion} checked={checkEclWatchVersion} onChange={(ev, checked) => setCheckEclWatchVersion(checked)} /> | ||
| <Checkbox label={nlsHPCC.Theme} checked={checkTheme} onChange={(ev, checked) => setCheckTheme(checked)} /> | ||
| <Checkbox label={nlsHPCC.Cookies} checked={checkCookies} onChange={(ev, checked) => setCheckCookies(checked)} /> | ||
| </Stack> | ||
| </MessageBox> | ||
| </div>; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.