Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-06 06:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #5753 from ToolJet/fix/tjdb-same-col-filters

Browse source 
Fix: Tooljet database filter conditions using same column
This commit is contained in:
Akshay 2023-04-12 21:53:36 +05:30 committed by GitHub
commit a00e431de9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/DeleteRows.jsx
View file

@ -44,18 +44,11 @@ export const DeleteRows = React.memo(({ currentState, darkMode }) => {
}
const RenderFilterFields = ({ column, operator, value, id }) => {
const existingColumnOptions = Object.values(deleteRowsOptions?.where_filters).map((f) => f.column);
let displayColumns = columns.map(({ accessor }) => ({
value: accessor,
label: accessor,
}));
if (existingColumnOptions.length > 0) {
displayColumns = displayColumns.filter(
({ value }) => !existingColumnOptions.map((item) => item !== column && item).includes(value)
);
}
const handleColumnChange = (selectedOption) => {
updateFilterOptionsChanged({ ...deleteRowsOptions?.where_filters[id], ...{ column: selectedOption } });
};

8
frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/ListRows.jsx
View file

@ -77,19 +77,11 @@ export const ListRows = React.memo(({ currentState, darkMode }) => {
}
const RenderFilterFields = ({ column, operator, value, id }) => {
const existingColumnOptions = Object.values(listRowsOptions?.where_filters).map((f) => f.column);
let displayColumns = columns.map(({ accessor }) => ({
value: accessor,
label: accessor,
}));
if (existingColumnOptions.length > 0) {
displayColumns = displayColumns.filter(
({ value }) => !existingColumnOptions.map((item) => item !== column && item).includes(value)
);
}
const handleColumnChange = (selectedOption) => {
updateFilterOptionsChanged({ ...listRowsOptions?.where_filters[id], ...{ column: selectedOption } });
};

7
frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/UpdateRows.jsx
View file

@ -70,18 +70,11 @@ export const UpdateRows = React.memo(({ currentState, darkMode }) => {
}
const RenderFilterFields = ({ column, operator, value, id }) => {
const existingColumnOptions = Object.values(updateRowsOptions?.where_filters).map((f) => f.column);
let displayColumns = columns.map(({ accessor }) => ({
value: accessor,
label: accessor,
}));
if (existingColumnOptions.length > 0) {
displayColumns = displayColumns.filter(
({ value }) => !existingColumnOptions.map((item) => item !== column && item).includes(value)
);
}
const handleColumnChange = (selectedOption) => {
updateFilterOptionsChanged({ ...updateRowsOptions?.where_filters[id], ...{ column: selectedOption } });
};