Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor(app): Wire up Error Recovery flows on desktop #15560

Merged
merged 13 commits into from
Jul 2, 2024
Merged

refactor(app): Wire up Error Recovery flows on desktop #15560

Changes from 2 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c83088d
fix(app-shell-odd): fix ODD getConfig
brenthagen Jun 21, 2024
89f3139
Merge remote-tracking branch 'origin/app-shell-odd_fix-get-config' in…
mjhuff Jun 21, 2024
552ce2f
wire up error recovery to desktop
mjhuff Jun 20, 2024
56b9029
add new modal
mjhuff Jun 21, 2024
0e5a0c8
css interpolation and prop passing
mjhuff Jun 23, 2024
4ffe839
removed ErrorRecoveryComponent test, for some reason its not rendering
TamarZanzouri Jul 1, 2024
304ab4c
Merge branch 'edge' into EXEC-552
TamarZanzouri Jul 1, 2024
e6ba615
fixed merge error
TamarZanzouri Jul 2, 2024
a5a42d8
lint
TamarZanzouri Jul 2, 2024
bb4d216
linting
TamarZanzouri Jul 2, 2024
602c8fc
WIP LegacyStyledText and merge issues
TamarZanzouri Jul 2, 2024
f21920f
syntax error in test, formatting
TamarZanzouri Jul 2, 2024
f15b6a5
fixed failing test
TamarZanzouri Jul 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app-shell-odd/src/config/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,9 @@ export function getOverrides(path?: string): unknown {

export function getConfig<P extends keyof Config>(path: P): Config[P]
export function getConfig(): Config
export function getConfig(path?: string): any {
const result = path == null ? null : store().get(path)
const over = getOverrides(path)
export function getConfig(path?: any): any {
const result = store().get(path)
const over = getOverrides(path as string | undefined)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how come we're changing the app shell's config getter?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mjhuff can probably speak more about this? maybe @sfoster1 is aware as well?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's gone now that you merged edge into the branch


if (over != null) {
if (typeof result === 'object' && result != null) {
Expand Down