Skip to content

Commit e9c22a1

Browse files
committed
Replace selector usage
1 parent cc9245a commit e9c22a1

File tree

2 files changed

+16
-11
lines changed

2 files changed

+16
-11
lines changed

src/ui/units/wizard/components/Dialogs/DialogColor/DialogColor.tsx

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,16 @@ import {ALLOWED_FOR_NULL_MODE_VISUALIZATIONS} from 'ui/units/wizard/constants/di
1515
import {setDialogColorPaletteState} from 'units/wizard/actions/dialogColor';
1616
import {selectDataset, selectParameters} from 'units/wizard/selectors/dataset';
1717
import {selectUpdates} from 'units/wizard/selectors/preview';
18-
import {selectDashboardParameters, selectFilters} from 'units/wizard/selectors/visualization';
18+
import {
19+
selectDashboardParameters,
20+
selectFilters,
21+
selectVisualization,
22+
} from 'units/wizard/selectors/visualization';
1923

2024
import {
2125
isGradientDialog,
2226
selectDialogColorGradientState,
2327
selectDialogColorPaletteState,
24-
selectDialogColorVisualizationId,
2528
} from '../../../selectors/dialogColor';
2629

2730
import ColorSettingsContainer from './ColorSettingsContainer/ColorSettingsContainer';
@@ -90,20 +93,25 @@ class DialogColorComponent extends React.Component<Props, State> {
9093
}
9194

9295
render() {
93-
const {item, items, dataset, isColorModeChangeAvailable, colorSectionFields} = this.props;
96+
const {
97+
item,
98+
items,
99+
dataset,
100+
isColorModeChangeAvailable,
101+
colorSectionFields,
102+
visualization,
103+
} = this.props;
94104
const {mountedColors = {}} = this.props.paletteState;
95105
const {validationStatus} = this.props.gradientState;
96106
const {colorMode} = this.state;
97107

98-
if (!item || !dataset) {
108+
if (!item || !dataset || !visualization) {
99109
return null;
100110
}
101111

102112
const canSetNullMode =
103113
this.props.canSetNullMode &&
104-
(ALLOWED_FOR_NULL_MODE_VISUALIZATIONS as (string | undefined)[]).includes(
105-
this.props.visualizationId,
106-
);
114+
(ALLOWED_FOR_NULL_MODE_VISUALIZATIONS as string[]).includes(visualization.id);
107115

108116
return (
109117
<Dialog open={true} onClose={this.onClose} disableFocusTrap={true}>
@@ -240,7 +248,7 @@ const mapStateToProps = (state: DatalensGlobalState) => {
240248
dataset: selectDataset(state),
241249
gradientState: selectDialogColorGradientState(state),
242250
paletteState: selectDialogColorPaletteState(state),
243-
visualizationId: selectDialogColorVisualizationId(state),
251+
visualization: selectVisualization(state),
244252
};
245253
};
246254

src/ui/units/wizard/selectors/dialogColor.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ export const selectDialogColorPaletteState = (state: DatalensGlobalState) =>
1717
export const selectDialogColorGradientState = (state: DatalensGlobalState) =>
1818
state.wizard.dialogColor.gradientState;
1919

20-
export const selectDialogColorVisualizationId = (state: DatalensGlobalState) =>
21-
state.wizard.visualization.visualization?.id;
22-
2320
export const selectClientPaletteColors = (state: DatalensGlobalState) => {
2421
const {palette} = state.wizard.dialogColor.paletteState;
2522
const {colorPalettes} = state.colorPaletteEditor;

0 commit comments

Comments
 (0)