Skip to content

Commit ed4db8e

Browse files
committed
Fix review 3
1 parent 33eba02 commit ed4db8e

File tree

3 files changed

+24
-24
lines changed

3 files changed

+24
-24
lines changed

src/chart/parameter/component/FreeTextParameterSelect.tsx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,20 @@ const FreeTextParameterSelectComponent = (props: ParameterSelectProps) => {
1919
const clearParameterOnFieldClear =
2020
props.settings && props.settings.clearParameterOnFieldClear ? props.settings.clearParameterOnFieldClear : false;
2121
const [running, setRunning] = React.useState(false);
22-
const [paramValueTemp, setParamValueTemp] = React.useState(null);
22+
const [paramValueLocal, setParamValueLocal] = React.useState(null);
2323

2424
const setParameterValue = (value) => {
2525
setRunning(false);
2626
props.setParameterValue(value);
2727
};
2828
const debouncedSetParameterValue = useCallback(debounce(setParameterValue, setParameterTimeout), []);
2929

30-
const manualHandleParameters = () => {
31-
handleParameters(paramValueTemp, false);
30+
const manualHandleParametersUpdate = () => {
31+
handleParametersUpdate(paramValueLocal, false);
3232
};
3333

34-
const handleParameters = (value, manual = false) => {
35-
setParamValueTemp(value);
34+
const handleParametersUpdate = (value, manual = false) => {
35+
setParamValueLocal(value);
3636

3737
if (manual) {
3838
return;
@@ -70,11 +70,11 @@ const FreeTextParameterSelectComponent = (props: ParameterSelectProps) => {
7070
setRunning(true);
7171
setInputText(newValue);
7272

73-
handleParameters(newValue, manualParameterSave);
73+
handleParametersUpdate(newValue, manualParameterSave);
7474
}}
7575
/>
7676
{manualParameterSave ? (
77-
<SelectionConfirmationButton onClick={() => manualHandleParameters()} key={`selectionConfirmation`} />
77+
<SelectionConfirmationButton onClick={() => manualHandleParametersUpdate()} key={`selectionConfirmation`} />
7878
) : (
7979
<></>
8080
)}

src/chart/parameter/component/NodePropertyParameterSelect.tsx

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ const NodePropertyParameterSelectComponent = (props: ParameterSelectProps) => {
2929
);
3030
const [inputValue, setInputValue] = React.useState(getInitialValue(props.parameterDisplayValue, multiSelector));
3131

32-
const [paramValueTemp, setParamValueTemp] = React.useState(props.parameterValue);
33-
const [paramValueDisplayTemp, setParamValueDisplayTemp] = React.useState(props.parameterDisplayValue);
32+
const [paramValueLocal, setParamValueLocal] = React.useState(props.parameterValue);
33+
const [paramValueDisplayLocal, setParamValueDisplayLocal] = React.useState(props.parameterDisplayValue);
3434

3535
const debouncedQueryCallback = useCallback(debounce(props.queryCallback, suggestionsUpdateTimeout), []);
3636
const label = props.settings && props.settings.entityType ? props.settings.entityType : '';
@@ -46,12 +46,12 @@ const NodePropertyParameterSelectComponent = (props: ParameterSelectProps) => {
4646

4747
const realValueRowIndex = props.compatibilityMode ? 0 : 1 - displayValueRowIndex;
4848

49-
const manualHandleParameters = () => {
50-
handleParameters(paramValueTemp, paramValueDisplayTemp, false);
49+
const manualHandleParametersUpdate = () => {
50+
handleParametersUpdate(paramValueLocal, paramValueDisplayLocal, false);
5151
};
52-
const handleParameters = (value, displayValue, manual = false) => {
53-
setParamValueTemp(value);
54-
setParamValueDisplayTemp(displayValue);
52+
const handleParametersUpdate = (value, displayValue, manual = false) => {
53+
setParamValueLocal(value);
54+
setParamValueDisplayLocal(displayValue);
5555

5656
if (manual) {
5757
return;
@@ -64,23 +64,23 @@ const NodePropertyParameterSelectComponent = (props: ParameterSelectProps) => {
6464
if (isMulti) {
6565
if (value.length == 0 && clearParameterOnFieldClear) {
6666
setInputValue([]);
67-
handleParameters(undefined, undefined, manualParameterSave);
67+
handleParametersUpdate(undefined, undefined, manualParameterSave);
6868
return true;
6969
}
7070
if (value.length == 0) {
7171
setInputValue([]);
72-
handleParameters([], [], manualParameterSave);
72+
handleParametersUpdate([], [], manualParameterSave);
7373
return true;
7474
}
7575
} else {
7676
if (value && clearParameterOnFieldClear) {
7777
setInputValue(null);
78-
handleParameters(undefined, undefined, manualParameterSave);
78+
handleParametersUpdate(undefined, undefined, manualParameterSave);
7979
return true;
8080
}
8181
if (value == null) {
8282
setInputValue(null);
83-
handleParameters(defaultValue, defaultValue, manualParameterSave);
83+
handleParametersUpdate(defaultValue, defaultValue, manualParameterSave);
8484
return true;
8585
}
8686
return false;
@@ -92,8 +92,8 @@ const NodePropertyParameterSelectComponent = (props: ParameterSelectProps) => {
9292
return;
9393
}
9494
let newValue;
95-
let valReference = manualParameterSave ? paramValueTemp : props.parameterValue;
96-
let valDisplayReference = manualParameterSave ? paramValueDisplayTemp : props.parameterDisplayValue;
95+
let valReference = manualParameterSave ? paramValueLocal : props.parameterValue;
96+
let valDisplayReference = manualParameterSave ? paramValueDisplayLocal : props.parameterDisplayValue;
9797
// Multiple and new entry
9898
if (isMulti && inputValue.length < newDisplay.length) {
9999
newValue = Array.isArray(valReference) ? [...valReference] : [valReference];
@@ -118,7 +118,7 @@ const NodePropertyParameterSelectComponent = (props: ParameterSelectProps) => {
118118
setInputDisplayText(isMulti ? '' : newDisplay);
119119
setInputValue(newDisplay);
120120

121-
handleParameters(newValue, newDisplay, manualParameterSave);
121+
handleParametersUpdate(newValue, newDisplay, manualParameterSave);
122122
};
123123
return (
124124
<div className={'n-flex n-flex-row n-flex-wrap n-items-center'}>
@@ -154,7 +154,7 @@ const NodePropertyParameterSelectComponent = (props: ParameterSelectProps) => {
154154
getOptionLabel={(option) => RenderSubValue(option)}
155155
/>
156156
{manualParameterSave ? (
157-
<SelectionConfirmationButton onClick={() => manualHandleParameters()} key={`selectionConfirmation`} />
157+
<SelectionConfirmationButton onClick={() => manualHandleParametersUpdate()} key={`selectionConfirmation`} />
158158
) : (
159159
<></>
160160
)}

src/chart/parameter/component/SelectionConfirmationButton.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import { Tooltip } from '@mui/material';
3-
import { CheckBadgeIconOutline } from '@neo4j-ndl/react/icons';
3+
import { PlayIconOutline } from '@neo4j-ndl/react/icons';
44
import { IconButton } from '@neo4j-ndl/react';
55
/**
66
* Returns a button to confirm a selection entry from the parameter selector.
@@ -16,7 +16,7 @@ export const SelectionConfirmationButton = ({ onClick, key }) => {
1616
onClick={onClick}
1717
clean
1818
>
19-
<CheckBadgeIconOutline className='header-icon' type='outline' />
19+
<PlayIconOutline className='header-icon' type='outline' />
2020
</IconButton>
2121
</Tooltip>
2222
);

0 commit comments

Comments
 (0)