Skip to content

Commit 307ea39

Browse files
sonic16xsonic16x
authored
refactor(new-ui): change url format
1 parent 51debfd commit 307ea39

File tree

47 files changed

+351
-156
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+351
-156
lines changed

‎lib/constants/index.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,5 @@ export * from './test-statuses';
1313
export * from './tool-names';
1414
export * from './two-up-modes';
1515
export * from './view-modes';
16+
export * from './pages';
17+
export * from './expand-modes';

‎lib/constants/pages.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
export enum Page {
2+
suitesPage = 'suitesPage',
3+
visualChecksPage = 'visualChecksPage',
4+
}
5+
6+
export enum PathNames {
7+
suites = '/suites',
8+
visualChecks = '/visual-checks',
9+
}

‎lib/static/modules/actions/filters.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ import actionNames from '@/static/modules/action-names';
22
import type {Action} from '@/static/modules/actions/types';
33
import {setFilteredBrowsers} from '@/static/modules/query-params';
44
import {BrowserItem} from '@/types';
5-
import {ViewMode} from '@/constants';
6-
import {Page} from '@/static/new-ui/types/store';
5+
import {Page, ViewMode} from '@/constants';
76

87
interface FilterPayload<T>{
98
page: Page;

‎lib/static/modules/actions/suites-page.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import actionNames from '@/static/modules/action-names';
22
import {Action} from '@/static/modules/actions/types';
3-
import {Page, TreeViewMode} from '@/static/new-ui/types/store';
3+
import {TreeViewMode} from '@/static/new-ui/types/store';
4+
import {Page} from '@/constants';
45

56
export type SuitesPageSetCurrentTreeNodeAction = Action<typeof actionNames.SUITES_PAGE_SET_CURRENT_SUITE, Partial<{
67
treeNodeId: string;

‎lib/static/modules/actions/visual-checks-page.ts‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,15 @@ import actionNames from '@/static/modules/action-names';
22
import {Action} from '@/static/modules/actions/types';
33
import {DiffModeId, TwoUpFitMode} from '@/constants';
44

5-
export type VisualChecksPageSetCurrentNamedImageAction = Action<typeof actionNames.VISUAL_CHECKS_PAGE_SET_CURRENT_NAMED_IMAGE, {
6-
namedImageId: string;
7-
}>;
5+
export type VisualChecksPageSetCurrentNamedImageData = {
6+
currentBrowserId?: string;
7+
stateName?: string;
8+
};
9+
10+
export type VisualChecksPageSetCurrentNamedImageAction = Action<typeof actionNames.VISUAL_CHECKS_PAGE_SET_CURRENT_NAMED_IMAGE, VisualChecksPageSetCurrentNamedImageData>;
811

9-
export const visualChecksPageSetCurrentNamedImage = (namedImageId: string): VisualChecksPageSetCurrentNamedImageAction => {
10-
return {type: actionNames.VISUAL_CHECKS_PAGE_SET_CURRENT_NAMED_IMAGE, payload: {namedImageId}};
12+
export const visualChecksPageSetCurrentNamedImage = (data: VisualChecksPageSetCurrentNamedImageData): VisualChecksPageSetCurrentNamedImageAction => {
13+
return {type: actionNames.VISUAL_CHECKS_PAGE_SET_CURRENT_NAMED_IMAGE, payload: data};
1114
};
1215

1316
export type Toggle2UpDiffVisibilityAction = Action<typeof actionNames.VISUAL_CHECKS_TOGGLE_2UP_DIFF_VISIBILITY, {

‎lib/static/modules/default-state.ts‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
import {configDefaults} from '../../constants/defaults';
2-
import {ViewMode} from '../../constants/view-modes';
3-
import {DiffModes} from '../../constants/diff-modes';
4-
import {EXPAND_ERRORS} from '../../constants/expand-modes';
5-
import {RESULT_KEYS} from '../../constants/group-tests';
6-
import {ToolName, TwoUpFitMode} from '../../constants';
7-
import {Page, SortDirection, State, TreeViewMode} from '@/static/new-ui/types/store';
1+
import {
2+
Page, ToolName, TwoUpFitMode, RESULT_KEYS, EXPAND_ERRORS, DiffModes, ViewMode, configDefaults
3+
} from '@/constants';
4+
import {SortDirection, State, TreeViewMode} from '@/static/new-ui/types/store';
85
import {MIN_SECTION_SIZE_PERCENT} from '../new-ui/features/suites/constants';
96

107
export default Object.assign({config: configDefaults}, {
@@ -32,6 +29,7 @@ export default Object.assign({config: configDefaults}, {
3229
},
3330
suites: {
3431
byId: {},
32+
byHash: {},
3533
allIds: [],
3634
allRootIds: [],
3735
failedRootIds: [],
@@ -113,7 +111,8 @@ export default Object.assign({config: configDefaults}, {
113111
filteredBrowsers: []
114112
},
115113
[Page.visualChecksPage]: {
116-
currentNamedImageId: null,
114+
currentBrowserId: null,
115+
stateName: null,
117116

118117
viewMode: ViewMode.ALL,
119118
nameFilter: '',

‎lib/static/modules/reducers/filters.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import {Page, State} from '@/static/new-ui/types/store';
1+
import {State} from '@/static/new-ui/types/store';
2+
import {Page, PathNames} from '@/constants';
23
import actionNames from '@/static/modules/action-names';
34
import {FiltersAction, InitGuiReportAction, InitStaticReportAction} from '@/static/modules/actions';
45
import {DiffModeId, DiffModes, ViewMode} from '@/constants';
@@ -49,7 +50,7 @@ export default (state: State, action: FiltersAction | InitGuiReportAction | Init
4950
}
5051
);
5152

52-
if (window.location.hash?.startsWith('#/visual-checks')) {
53+
if (window.location.hash?.startsWith(`#${PathNames.visualChecks}`)) {
5354
newState.app[Page.visualChecksPage].filteredBrowsers = viewQuery.filteredBrowsers as BrowserItem[];
5455
newState.app[Page.visualChecksPage].viewMode = viewQuery.viewMode as ViewMode || visualChecksPageViewMode;
5556
newState.app[Page.visualChecksPage].nameFilter = viewQuery.testNameFilter as string || '';

‎lib/static/modules/reducers/sort-tests.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import {Page, SortDirection, State} from '@/static/new-ui/types/store';
1+
import {SortDirection, State} from '@/static/new-ui/types/store';
2+
import {Page} from '@/constants';
23
import {SomeAction} from '@/static/modules/actions/types';
34
import actionNames from '@/static/modules/action-names';
45
import {applyStateUpdate} from '@/static/modules/utils';

‎lib/static/modules/reducers/suites-page.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {Page, State} from '@/static/new-ui/types/store';
1+
import {State} from '@/static/new-ui/types/store';
22
import actionNames from '@/static/modules/action-names';
33
import {applyStateUpdate} from '@/static/modules/utils/state';
44
import {SomeAction} from '@/static/modules/actions/types';
@@ -7,7 +7,7 @@ import {findTreeNodeByBrowserId, findTreeNodeById, getGroupId} from '@/static/ne
77
import * as localStorageWrapper from '../local-storage-wrapper';
88
import {MIN_SECTION_SIZE_PERCENT} from '@/static/new-ui/features/suites/constants';
99
import {TIME_TRAVEL_PLAYER_VISIBILITY_KEY, TWO_UP_DIFF_VISIBILITY_KEY, TWO_UP_FIT_MODE_KEY} from '@/constants/local-storage';
10-
import {TwoUpFitMode} from '@/constants';
10+
import {Page, TwoUpFitMode} from '@/constants';
1111

1212
const SECTION_SIZES_LOCAL_STORAGE_KEY = 'suites-page-section-sizes';
1313

‎lib/static/modules/reducers/tree/nodes/suites.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ export function failSuites(tree, suiteIds, diff = tree) {
131131

132132
diff.suites ||= {};
133133
diff.suites.byId ||= {};
134+
diff.suites.byHash ||= {};
134135
diff.suites.failedRootIds ||= [].concat(tree.suites.failedRootIds);
135136

136137
while (!_.isEmpty(processingSuiteIds)) {

0 commit comments

Comments
 (0)