diff --git a/lib/static/new-ui/features/suites/components/TreeViewItemTitle/index.tsx b/lib/static/new-ui/features/suites/components/TreeViewItemTitle/index.tsx
index e54145436..e248e2ab2 100644
--- a/lib/static/new-ui/features/suites/components/TreeViewItemTitle/index.tsx
+++ b/lib/static/new-ui/features/suites/components/TreeViewItemTitle/index.tsx
@@ -5,7 +5,6 @@ import classNames from 'classnames';
import {Checkbox} from '@gravity-ui/uikit';
import {useDispatch, useSelector} from 'react-redux';
import {toggleBrowserCheckbox, toggleSuiteCheckbox} from '@/static/modules/actions';
-import {State} from '@/static/new-ui/types/store';
import {getToggledCheckboxState, isCheckboxChecked, isCheckboxIndeterminate} from '@/common-utils';
interface TreeViewItemTitleProps {
@@ -15,7 +14,7 @@ interface TreeViewItemTitleProps {
export function TreeViewItemTitle({item, className}: TreeViewItemTitleProps): React.JSX.Element {
const dispatch = useDispatch();
- const checkStatus = useSelector((state: State) =>
+ const checkStatus = useSelector(state =>
item.type === TreeViewItemType.Suite ? state.tree.suites.stateById[item.id].checkStatus : state.tree.browsers.stateById[item.id].checkStatus);
const ref = useRef
(null);
diff --git a/lib/static/new-ui/features/visual-checks/components/VisualChecksPage/index.tsx b/lib/static/new-ui/features/visual-checks/components/VisualChecksPage/index.tsx
index 90d3ade23..35efb0bfd 100644
--- a/lib/static/new-ui/features/visual-checks/components/VisualChecksPage/index.tsx
+++ b/lib/static/new-ui/features/visual-checks/components/VisualChecksPage/index.tsx
@@ -5,7 +5,6 @@ import React, {ReactNode} from 'react';
import {useDispatch, useSelector} from 'react-redux';
import {SplitViewLayout} from '@/static/new-ui/components/SplitViewLayout';
-import {State} from '@/static/new-ui/types/store';
import {UiCard} from '@/static/new-ui/components/Card/UiCard';
import {
getCurrentImage,
@@ -40,17 +39,17 @@ export function VisualChecksPage(): ReactNode {
const onPreviousImageHandler = (): void => void dispatch(visualChecksPageSetCurrentNamedImage(visibleNamedImageIds[currentNamedImageIndex - 1]));
const onNextImageHandler = (): void => void dispatch(visualChecksPageSetCurrentNamedImage(visibleNamedImageIds[currentNamedImageIndex + 1]));
- const diffMode = useSelector((state: State) => state.view.diffMode);
+ const diffMode = useSelector(state => state.view.diffMode);
const onChangeHandler = (diffMode: DiffModeId): void => {
dispatch(changeDiffMode(diffMode));
};
- const isStaticImageAccepterEnabled = useSelector((state: State) => state.staticImageAccepter.enabled);
- const isEditScreensAvailable = useSelector((state: State) => state.app.availableFeatures)
+ const isStaticImageAccepterEnabled = useSelector(state => state.staticImageAccepter.enabled);
+ const isEditScreensAvailable = useSelector(state => state.app.availableFeatures)
.find(feature => feature.name === EditScreensFeature.name);
- const isRunning = useSelector((state: State) => state.running);
- const isProcessing = useSelector((state: State) => state.processing);
- const isGui = useSelector((state: State) => state.gui);
+ const isRunning = useSelector(state => state.running);
+ const isProcessing = useSelector(state => state.processing);
+ const isGui = useSelector(state => state.gui);
const onScreenshotAccept = (): void => {
if (!currentImage) {
@@ -75,14 +74,14 @@ export function VisualChecksPage(): ReactNode {
}
};
- const currentBrowserId = useSelector((state: State) => state.tree.results.byId[currentImage?.parentId ?? '']?.parentId);
- const currentBrowser = useSelector((state: State) => currentBrowserId && state.tree.browsers.byId[currentBrowserId]);
+ const currentBrowserId = useSelector(state => state.tree.results.byId[currentImage?.parentId ?? '']?.parentId);
+ const currentBrowser = useSelector(state => currentBrowserId && state.tree.browsers.byId[currentBrowserId]);
const currentResultId = currentImage?.parentId;
const isLastResult = Boolean(currentResultId && currentBrowser && currentResultId === currentBrowser.resultIds[currentBrowser.resultIds.length - 1]);
const isUndoAvailable = isScreenRevertable({gui: isGui, image: currentImage ?? {}, isLastResult, isStaticImageAccepterEnabled});
- const isInitialized = useSelector((state: State) => state.app.isInitialized);
+ const isInitialized = useSelector(state => state.app.isInitialized);
return
diff --git a/lib/static/new-ui/store/selectors.ts b/lib/static/new-ui/store/selectors.ts
index 021f53431..5b025a212 100644
--- a/lib/static/new-ui/store/selectors.ts
+++ b/lib/static/new-ui/store/selectors.ts
@@ -18,5 +18,5 @@ export const getResults = (state: State): Record => state.
export const getImages = (state: State): Record => state.tree.images.byId;
export const getIsInitialized = (state: State): boolean => state.app.isInitialized;
-export const getIsStaticImageAccepterEnabled = (state: State): boolean => state.config.staticImageAccepter.enabled;
+export const getIsStaticImageAccepterEnabled = (state: State): boolean => state.staticImageAccepter.enabled;
export const getIsGui = (state: State): boolean => state.gui;
diff --git a/lib/static/new-ui/types/store.ts b/lib/static/new-ui/types/store.ts
index 7e8c1891f..3134ef939 100644
--- a/lib/static/new-ui/types/store.ts
+++ b/lib/static/new-ui/types/store.ts
@@ -210,3 +210,8 @@ export interface State {
imagesToCommitCount: number;
};
}
+
+declare module 'react-redux' {
+ // eslint-disable-next-line @typescript-eslint/no-empty-interface
+ export interface DefaultRootState extends State {}
+}
diff --git a/lib/static/new-ui/utils/assert-view-status.tsx b/lib/static/new-ui/utils/assert-view-status.tsx
index f45f49260..aa445695e 100644
--- a/lib/static/new-ui/utils/assert-view-status.tsx
+++ b/lib/static/new-ui/utils/assert-view-status.tsx
@@ -17,20 +17,23 @@ import React, {ReactNode} from 'react';
export const getAssertViewStatusIcon = (image: ImageEntity | null): ReactNode => {
if (image === null) {
return ;
- } else if (image.status === TestStatus.SUCCESS) {
- return ;
- } else if (image.status === TestStatus.STAGED) {
- return ;
- } else if (image.status === TestStatus.COMMITED) {
- return ;
} else if (isNoRefImageError((image as ImageEntityError).error)) {
return ;
} else if (isInvalidRefImageError((image as ImageEntityError).error)) {
return ;
- } else if (image.status === TestStatus.FAIL) {
- return ;
- } else if (image.status === TestStatus.UPDATED) {
- return ;
+ }
+
+ switch (image.status) {
+ case TestStatus.SUCCESS:
+ return ;
+ case TestStatus.STAGED:
+ return ;
+ case TestStatus.COMMITED:
+ return ;
+ case TestStatus.FAIL:
+ return ;
+ case TestStatus.UPDATED:
+ return ;
}
return ;
@@ -39,20 +42,23 @@ export const getAssertViewStatusIcon = (image: ImageEntity | null): ReactNode =>
export const getAssertViewStatusMessage = (image: ImageEntity | null): string => {
if (image === null) {
return 'Image is absent';
- } else if (image.status === TestStatus.SUCCESS) {
- return 'Images match';
- } else if (image.status === TestStatus.STAGED) {
- return 'Image is staged';
- } else if (image.status === TestStatus.COMMITED) {
- return 'Image was committed';
} else if (isNoRefImageError((image as ImageEntityError).error)) {
return 'Reference not found';
} else if (isInvalidRefImageError((image as ImageEntityError).error)) {
return 'Reference is broken';
- } else if (image.status === TestStatus.FAIL) {
- return 'Difference detected';
- } else if (image.status === TestStatus.UPDATED) {
- return 'Reference updated';
+ }
+
+ switch (image.status) {
+ case TestStatus.SUCCESS:
+ return 'Images match';
+ case TestStatus.STAGED:
+ return 'Image is staged';
+ case TestStatus.COMMITED:
+ return 'Image was committed';
+ case TestStatus.FAIL:
+ return 'Difference detected';
+ case TestStatus.UPDATED:
+ return 'Reference updated';
}
return 'Failed to compare';
diff --git a/test/unit/lib/static/modules/reducers/static-image-accepter.ts b/test/unit/lib/static/modules/reducers/static-image-accepter.ts
index 0757fea1e..fe2b3c12e 100644
--- a/test/unit/lib/static/modules/reducers/static-image-accepter.ts
+++ b/test/unit/lib/static/modules/reducers/static-image-accepter.ts
@@ -144,9 +144,11 @@ describe('lib/static/modules/reducers/static-image-accepter', () => {
});
describe(actionNames.STATIC_ACCEPTER_UNSTAGE_SCREENSHOT, () => {
- it('should unstage image, decrementing "imagesToCommitCount"', () => {
+ it('should unstage images, decrementing "imagesToCommitCount"', () => {
const staticImageAccepter = mkStaticImageAccepter({acceptableImages: {
- 'imageId': mkAcceptableImage({id: 'imageId'})
+ 'imageId1': mkAcceptableImage({id: 'imageId1'}),
+ 'imageId2': mkAcceptableImage({id: 'imageId2'}),
+ 'imageId3': mkAcceptableImage({id: 'imageId3'})
}});
const imagesById = mkImage({id: 'imageId', stateName: 'state', parentId: 'resultId'});
@@ -156,11 +158,12 @@ describe('lib/static/modules/reducers/static-image-accepter', () => {
const state = {staticImageAccepter, tree};
- const newState = reducer(state, {type: actionNames.STATIC_ACCEPTER_UNSTAGE_SCREENSHOT, payload: ['imageId']});
+ const newState = reducer(state, {type: actionNames.STATIC_ACCEPTER_UNSTAGE_SCREENSHOT, payload: ['imageId1', 'imageId2']});
- assert.equal(newState.staticImageAccepter.acceptableImages['imageId'].commitStatus, null);
+ assert.equal(newState.staticImageAccepter.acceptableImages['imageId1'].commitStatus, null);
+ assert.equal(newState.staticImageAccepter.acceptableImages['imageId2'].commitStatus, null);
- assert.equal(newState.staticImageAccepter.imagesToCommitCount, state.staticImageAccepter.imagesToCommitCount - 1);
+ assert.equal(newState.staticImageAccepter.imagesToCommitCount, state.staticImageAccepter.imagesToCommitCount - 2);
});
});