Skip to content

Commit 003e3e5

Browse files
authored
fix(project): demo config reset doesnt work (#609)
refactor(project): remove unnecessary form target refactor(project): update snapshot
1 parent 5231d86 commit 003e3e5

File tree

2 files changed

+3
-19
lines changed

2 files changed

+3
-19
lines changed

platforms/web/src/components/DemoConfigDialog/DemoConfigDialog.tsx

+3-18
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import React, { type ChangeEventHandler, type MouseEventHandler, useEffect, useState } from 'react';
22
import { useTranslation } from 'react-i18next';
3-
import { type NavigateFunction, useNavigate } from 'react-router';
43
import { Helmet } from 'react-helmet';
54
import { createURL } from '@jwp/ott-common/src/utils/urlFormatting';
65
import { CONFIG_QUERY_KEY } from '@jwp/ott-common/src/constants';
@@ -12,6 +11,7 @@ import LoadingOverlay from '@jwp/ott-ui-react/src/components/LoadingOverlay/Load
1211
import DevStackTrace from '@jwp/ott-ui-react/src/components/DevStackTrace/DevStackTrace';
1312
import type { BootstrapData } from '@jwp/ott-hooks-react/src/useBootstrapApp';
1413
import { AppError } from '@jwp/ott-common/src/utils/error';
14+
import { PATH_HOME } from '@jwp/ott-common/src/paths';
1515

1616
import styles from './DemoConfigDialog.module.scss';
1717

@@ -32,26 +32,11 @@ const initialState: State = {
3232
loaded: false,
3333
};
3434

35-
export function getConfigNavigateCallback(navigate: NavigateFunction) {
36-
return (configSource: string) => {
37-
navigate(
38-
{
39-
pathname: '/',
40-
search: new URLSearchParams([[CONFIG_QUERY_KEY, configSource]]).toString(),
41-
},
42-
{ replace: true },
43-
);
44-
};
45-
}
46-
4735
const DemoConfigDialog = ({ query }: { query: BootstrapData }) => {
4836
const { data, isLoading, error, refetch, isSuccess } = query;
4937
const { configSource: selectedConfigSource } = data || {};
5038

5139
const { t } = useTranslation('demo');
52-
const navigate = useNavigate();
53-
const navigateCallback = getConfigNavigateCallback(navigate);
54-
5540
const [state, setState] = useState<State>(initialState);
5641

5742
const errorTitle = error && error instanceof AppError ? error.payload.title : '';
@@ -91,7 +76,7 @@ const DemoConfigDialog = ({ query }: { query: BootstrapData }) => {
9176

9277
const clearConfig = () => {
9378
setState(initialState);
94-
navigateCallback('');
79+
window.location.href = createURL(PATH_HOME, { [CONFIG_QUERY_KEY]: '' });
9580
};
9681

9782
const isValidSource = (configSource: string) => configSource.match(regex)?.some((m) => m === configSource);
@@ -170,7 +155,7 @@ const DemoConfigDialog = ({ query }: { query: BootstrapData }) => {
170155
helpLink={'https://docs.jwplayer.com/platform/docs/ott-create-an-app-config'}
171156
error={typeof state.error === 'string' ? undefined : state.error}
172157
>
173-
<form method={'GET'} target={'/'}>
158+
<form method={'GET'}>
174159
<TextField
175160
required
176161
disabled={isLoading}

platforms/web/src/components/DemoConfigDialog/__snapshots__/DemoConfigDialog.test.tsx.snap

-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ exports[`<DemoConfigDialog> > renders and matches snapshot error dialog 1`] = `
5252
</p>
5353
<form
5454
method="GET"
55-
target="/"
5655
>
5756
<div
5857
class="_formField_a245e1 _textField_0fa545 _maxWidth_561a54"

0 commit comments

Comments
 (0)