Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Visual Editor: Disallow to choose already selected fields #251

Merged
merged 6 commits into from
Feb 9, 2024
Merged

Visual Editor: Disallow to choose already selected fields #251

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
922a3a4
fixed - prevent add existed items
vitPinchuk Feb 8, 2024
a469826
fix - change .find to .some
vitPinchuk Feb 8, 2024
0324b72
fix - add test to Select
vitPinchuk Feb 8, 2024
9f4ee4b
fix PR feedback
vitPinchuk Feb 8, 2024
9109f5f
Update CHANGELOG.md
mikhail-vl Feb 9, 2024
269bb94
Merge branch 'main' into feat/delete-dataset-item
mikhail-vl Feb 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions src/components/DatasetEditor/DatasetEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,17 +99,21 @@ export const DatasetEditor: React.FC<Props> = ({ value, onChange, data }) => {
* Available Field Options
*/
const availableFieldOptions = useMemo(() => {
return data.reduce((acc: SelectableValue[], dataFrame) => {
return acc.concat(
dataFrame.fields.map((field) => ({
value: `${dataFrame.refId}:${field.name}`,
fieldName: field.name,
label: `${dataFrame.refId ? `${dataFrame.refId}:` : ''}${field.name}`,
source: dataFrame.refId,
}))
);
}, []);
}, [data]);
return data
.reduce((acc: SelectableValue[], dataFrame) => {
return acc.concat(
dataFrame.fields.map((field) => ({
value: `${dataFrame.refId}:${field.name}`,
fieldName: field.name,
label: `${dataFrame.refId ? `${dataFrame.refId}:` : ''}${field.name}`,
source: dataFrame.refId,
}))
);
}, [])
.filter((field) => {
return !items.find((item) => item.name === field.fieldName && item.source === field.source);
asimonok marked this conversation as resolved.
Show resolved Hide resolved
});
}, [items, data]);

/**
* Add New Item
Expand Down
Loading