|
|
|
@ -52,7 +52,6 @@ export const pathToParams = (path: string): PayloadAction<RouterLocationState> =
|
|
|
|
|
export const paramsValidation = (params: RouterLocationState): PayloadAction<boolean> => (dispatch: Dispatch, getState: GetState): boolean => {
|
|
|
|
|
// validate requested device
|
|
|
|
|
|
|
|
|
|
console.log('params', params);
|
|
|
|
|
if (params.hasOwnProperty('device')) {
|
|
|
|
|
const { devices } = getState();
|
|
|
|
|
|
|
|
|
@ -140,8 +139,6 @@ export const getValidUrl = (action: RouterAction): PayloadAction<string> => (dis
|
|
|
|
|
return '/';
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
console.log('action', action);
|
|
|
|
|
|
|
|
|
|
const requestedUrl = action.payload.location.pathname;
|
|
|
|
|
// Corner case: LOCATION_CHANGE was called but pathname didn't changed (redirect action from RouterService)
|
|
|
|
|
if (requestedUrl === location.pathname) return requestedUrl;
|
|
|
|
@ -277,7 +274,6 @@ export const selectFirstAvailableDevice = (gotoRoot: boolean = false): ThunkActi
|
|
|
|
|
const url = dispatch(getFirstAvailableDeviceUrl());
|
|
|
|
|
if (url) {
|
|
|
|
|
const currentParams = getState().router.location.state;
|
|
|
|
|
console.log('currentParams', currentParams);
|
|
|
|
|
const requestedParams = dispatch(pathToParams(url));
|
|
|
|
|
if (gotoRoot || currentParams.device !== requestedParams.device || currentParams.deviceInstance !== requestedParams.deviceInstance) {
|
|
|
|
|
dispatch(goto(url));
|
|
|
|
|