mirror of
https://github.com/ToolJet/ToolJet
synced 2026-05-24 09:28:31 +00:00
* feat: jsonb datatype support in tooljet database inprogress
* feat: jsonb support added for tooljet database column operations as well as create and edit table
* feat: added support to query JSONB values in JOIN operation
* added dto validation for join operation
* Added json data type in tjdb
* single line editor bug fixed
* Basic UI implementation for create table drawer for jsonb column type
* removed the console
* Added the sanitization for json default value in the dto
* Added jsonb svg for jsonb column type
* Updated UI for created column form
* Updated UI for edit column form
* Change the UI for create row
* Updated UI for edit row form
* Show dummy {...} value on table cell
* Setting up the codehinter in tjdb dashboard
* Created codehinter wrapper for tjdb table celljsonb data type
* Codehineter for tjdb cell
* Made changes in tjdb column and row drawers
* removed unwanted code
* Added maximum height for codehinter wrapper in each drawers
Avoided keydown event in create column drawer
* Set max height to codehinter for tjdb table cell
* Added jsonb path option for list row operation [rebase]
* Added filtering out column with json datatype in udpate rows operation
* Added filter option with jsonpath in delete row operation
* Made changes for join tables
* added json path in jon filter condition
* fix: parsing the jsonb default values in view table api
* Made on change and initial value value changes for all tjdb dashboard changes
* updated intial value and component name for codehinter in all drawers for tooljetdb
* Table cell edit codehinter initial value
* Updated codehinter onchange and initial value
* Added json path field for join sort section
* TJDB query manager updates for jsonb column type
* Tjdb dashboard bug fixes
* fix: joins jsonbpath expression can be sent without single quotes
* Added error validation for JSON in codehinter
* Removed console
* Added codehinter wrapper for tjdb cell
* Made default functional
* Made set to null functionality working
* Toggle functionality for default value
* Toggle null functionality
* Clean code
* create row form added handle disable input click
* cutom-footer css and add new data css
* Fixed tooltip
* Updated tooltip for join codehinters in query manager
* fix: jsonb column values validation in server side
* Made the initial value empty string if value is undefined
* active tab in edit row form bug
* Error state in tjdb hinter inside cell
* code mirror breaks, on the initial render
* Added placeholder and adjusted icon size in dropdown
* Fixed: Opening the cell with keyboard nav shows ‘enter to save’.
* bug fixed
* json icon alignment in the dropdown fixed
* In create and edit table, codehinter text is vertcially centered aligned
* Create row and update row info message for jsonb column type fixed
* SHowing popover when clicked on the jsonb cell
* Showing unique constraint in disable state for jsonb
* bugfix: bulkupload in tjdb for jsonb datatype should accept different json format
* Bug fixed for cellhinter and row form
* Avoided flickering in column form
* removed console
* zindex issue for codehinter in react portal for table cell
* Single line editor file changes removed
* row form bug fixed
* single quotes string escaped as it needs to be inserted as default value in JSONB column
* Bug fixed
* Edit and create row active tab bug fixed
* If value is empty, then dont show error in the codehinter
* fix: error handling for invalid jsonpath in join expression
* Handled null and Null edge cases for edit and create row
* Removed console
* Bug fix for save chages button in edit and create row drawer
* Error toast message for invalid syntax
* removed debounce time
* Copied all query manager and codehinter changes from editor to appbuilder directory
* Updated imports of codehinter in tjdb forms inside dashboard
* Discarded all changes made to editor directory
* Removed console
* Fixed flickering effect in the edit and create row drawer in TJDB dashboard
* Added focused state to codehinter in tjdb drawer, updated font size for the same
* Updated error message
* bug fixed : Pop up icon not visible inside codehinter
* Fixed : border issue in tjdb codehinter
* bugfix: array is not allowed to insert in JSONB column (#2734)
* Error message in tjdb drawers
* Error state for table schema
* Error message for cell hinter wrapper
* fixed : space between {} and table name in popup
* Spacing issue in create and update column UI in query manager fixed
* Show tooltip in fk column dropdown
* Bug fixed: edit drawer on first render cutom value is always empty
* Bug fixed
* Reverting react portal changes
* bug fixed for error copyright
* z index issue fixed for tableschema
* reverting back the changes for table form from last commit
* Bug fix: Flickering issue in table schema for codehinter input
* Bug fixed : toggle bwtween null and default value
* Handled spacing between the component name in react portal
* added new schema definition as we have introduced jsonb datatype default values can have Object and Array
* fix: removed the support for error code mapping for undefined function error because database has different error text for it based on the scenario like jsonb aggregates etc
---------
Co-authored-by: Ganesh Kumar <ganesh8056234@gmail.com>
Co-authored-by: Ganesh Kumar <40178541+ganesh8056@users.noreply.github.com>
Co-authored-by: Akshay <akshaysasidharan93@gmail.com>
567 lines
20 KiB
JavaScript
567 lines
20 KiB
JavaScript
import React, { useCallback, useContext } from 'react';
|
|
import { Col, Container, Row } from 'react-bootstrap';
|
|
import { ButtonSolid } from '@/_ui/AppButton/AppButton';
|
|
import Trash from '@/_ui/Icon/solidIcons/Trash';
|
|
import AddRectangle from '@/_ui/Icon/bulkIcons/AddRectangle';
|
|
import { clone, isEmpty } from 'lodash';
|
|
import { TooljetDatabaseContext } from '@/TooljetDatabase/index';
|
|
import DropDownSelect from './DropDownSelect';
|
|
import JoinConstraint from './JoinConstraint';
|
|
import JoinSelect from './JoinSelect';
|
|
import JoinSort from './JoinSort';
|
|
import { filterOperatorOptions, nullOperatorOptions } from './util';
|
|
import CodeHinter from '@/AppBuilder/CodeEditor';
|
|
import { AggregateFilter } from './AggregateUI';
|
|
import { NoCondition } from './NoConditionUI';
|
|
import { ToolTip } from '@/_components';
|
|
|
|
export const JoinTable = React.memo(({ darkMode }) => {
|
|
return (
|
|
<div>
|
|
<SelectTableMenu darkMode={darkMode} />
|
|
</div>
|
|
);
|
|
});
|
|
|
|
const SelectTableMenu = ({ darkMode }) => {
|
|
const {
|
|
selectedTableId,
|
|
joinOptions,
|
|
setJoinOptions: setJoins,
|
|
joinTableOptions,
|
|
joinTableOptionsChange,
|
|
deleteJoinTableOptions,
|
|
} = useContext(TooljetDatabaseContext);
|
|
|
|
const joins = clone(joinOptions);
|
|
|
|
const handleJoinChange = (newJoin, index) => {
|
|
const updatedJoin = joinOptions.map((join, i) => {
|
|
if (i === index) return newJoin;
|
|
return join;
|
|
});
|
|
|
|
const cleanedJoin = [];
|
|
const tableSet = new Set();
|
|
(updatedJoin || []).forEach((join, i) => {
|
|
const { conditions } = join;
|
|
let leftTable, rightTable;
|
|
conditions?.conditionsList?.forEach((condition) => {
|
|
const { leftField = {}, rightField = {} } = condition;
|
|
if (leftField?.table) leftTable = leftField?.table;
|
|
if (rightField?.table) rightTable = rightField?.table;
|
|
});
|
|
|
|
if ((tableSet.has(leftTable) && !tableSet.has(rightTable)) || i === 0) {
|
|
if (leftTable) tableSet.add(leftTable);
|
|
if (rightTable) tableSet.add(rightTable);
|
|
cleanedJoin.push({ ...join });
|
|
}
|
|
});
|
|
// tableSet.add(selectedTable);
|
|
setJoins(cleanedJoin);
|
|
};
|
|
|
|
const calcUpdatedJoins = (updatedJoin) => {
|
|
const cleanedJoin = [];
|
|
const tableSet = new Set();
|
|
(updatedJoin || []).forEach((join, i) => {
|
|
const { _table, conditions } = join;
|
|
let leftTable, rightTable;
|
|
conditions?.conditionsList?.forEach((condition) => {
|
|
const { leftField, rightField } = condition;
|
|
if (leftField?.table) {
|
|
// tableSet.add(leftField?.table);
|
|
leftTable = leftField?.table;
|
|
}
|
|
if (rightField?.table) {
|
|
// tableSet.add(rightField?.table);
|
|
rightTable = rightField?.table;
|
|
}
|
|
});
|
|
if ((tableSet.has(leftTable) && !tableSet.has(rightTable)) || i === 0) {
|
|
tableSet.add(leftTable);
|
|
tableSet.add(rightTable);
|
|
cleanedJoin.push({ ...join });
|
|
}
|
|
});
|
|
return cleanedJoin;
|
|
};
|
|
|
|
const showSelectSection = useCallback(() => {
|
|
const groupBy = joinTableOptions?.group_by || {};
|
|
const aggregates = joinTableOptions?.aggregates || {};
|
|
const isGroupByUsed = Object?.values(groupBy)?.some((columnList) => columnList?.length >= 1);
|
|
//checking if isGroupby is valid or aggregates is not empty then hide select or else show select options
|
|
return isGroupByUsed || !isEmpty(aggregates) ? false : true;
|
|
}, [joinTableOptions]);
|
|
|
|
const { joinOrderByOptions } = useContext(TooljetDatabaseContext);
|
|
|
|
return (
|
|
<div>
|
|
{/* Join Section */}
|
|
<div className="field-container d-flex" style={{ marginBottom: '1.5rem' }}>
|
|
<label className="form-label flex-shrink-0">From</label>
|
|
<div className="field flex-grow-1 mt-1">
|
|
{joins.map((join, joinIndex) => (
|
|
<JoinConstraint
|
|
darkMode={darkMode}
|
|
key={join?.id}
|
|
index={joinIndex}
|
|
data={join}
|
|
onChange={(value) => handleJoinChange(value, joinIndex)}
|
|
onRemove={() => setJoins(calcUpdatedJoins(joins.filter((join, index) => index !== joinIndex)))}
|
|
/>
|
|
))}
|
|
<Row className="mx-0">
|
|
<ButtonSolid
|
|
variant="secondary"
|
|
size="sm"
|
|
onClick={() =>
|
|
setJoins([
|
|
...joins,
|
|
{
|
|
id: new Date().getTime(),
|
|
conditions: {
|
|
operator: 'AND',
|
|
conditionsList: [
|
|
{
|
|
operator: '=',
|
|
leftField: { table: selectedTableId },
|
|
},
|
|
],
|
|
},
|
|
joinType: 'INNER',
|
|
},
|
|
])
|
|
}
|
|
>
|
|
<AddRectangle width="15" fill="#3E63DD" opacity="1" secondaryFill="#ffffff" />
|
|
Add another table
|
|
</ButtonSolid>
|
|
</Row>
|
|
</div>
|
|
</div>
|
|
<AggregateFilter darkMode={darkMode} operation="joinTable" />
|
|
|
|
{/* Filter Section */}
|
|
<div className="tdb-join-filtersection field-container d-flex" style={{ marginBottom: '1.5rem' }}>
|
|
<label className="form-label flex-shrink-0">Filter</label>
|
|
<div className="field flex-grow-1">
|
|
<RenderFilterSection darkMode={darkMode} />
|
|
</div>
|
|
</div>
|
|
{/* Sort Section */}
|
|
<div className="field-container tooljetdb-worflow-operations d-flex" style={{ marginBottom: '1.5rem' }}>
|
|
<label className="form-label flex-shrink-0">Sort</label>
|
|
<div className={`field flex-grow-1 ${!isEmpty(joinOrderByOptions) && 'minw-400-w-400'} `}>
|
|
<JoinSort darkMode={darkMode} />
|
|
</div>
|
|
</div>
|
|
{/* Limit Section */}
|
|
<div className="field-container tooljetdb-worflow-operations d-flex" style={{ marginBottom: '1.5rem' }}>
|
|
<label className="form-label flex-shrink-0">Limit</label>
|
|
<div className="field flex-grow-1 minw-400-w-400 tjdb-limit-offset-codehinter">
|
|
<CodeHinter
|
|
type="basic"
|
|
className="tjdb-codehinter border rounded"
|
|
height={'32px'}
|
|
placeholder="Enter limit"
|
|
initialValue={joinTableOptions?.limit ?? ''}
|
|
onChange={(value) => {
|
|
if (value.length) {
|
|
joinTableOptionsChange('limit', value);
|
|
} else {
|
|
deleteJoinTableOptions('limit');
|
|
}
|
|
}}
|
|
/>
|
|
</div>
|
|
</div>
|
|
{/* Offset Section */}
|
|
<div className="field-container tooljetdb-worflow-operations d-flex" style={{ marginBottom: '1.5rem' }}>
|
|
<label className="form-label flex-shrink-0">Offset</label>
|
|
<div className="field flex-grow-1 minw-400-w-400 tjdb-limit-offset-codehinter">
|
|
<CodeHinter
|
|
className="tjdb-codehinter border rounded"
|
|
placeholder="Enter offset"
|
|
type="basic"
|
|
initialValue={joinTableOptions?.offset ?? ''}
|
|
onChange={(value) => {
|
|
if (value.length) {
|
|
joinTableOptionsChange('offset', value);
|
|
} else {
|
|
deleteJoinTableOptions('offset');
|
|
}
|
|
}}
|
|
/>
|
|
</div>
|
|
</div>
|
|
{/* Select Section */}
|
|
{showSelectSection() && (
|
|
<div className="field-container tooljetdb-worflow-operations d-flex" style={{ marginBottom: '1.5rem' }}>
|
|
<label className="form-label flex-shrink-0">Select</label>
|
|
<div className="field flex-grow-1">
|
|
<JoinSelect darkMode={darkMode} />
|
|
</div>
|
|
</div>
|
|
)}
|
|
</div>
|
|
);
|
|
};
|
|
|
|
// Component to Render Filter Section
|
|
const RenderFilterSection = ({ darkMode }) => {
|
|
const { tableInfo, joinTableOptions, joinTableOptionsChange, deleteJoinTableOptions, joinOptions, findTableDetails } =
|
|
useContext(TooljetDatabaseContext);
|
|
const { conditions = {} } = joinTableOptions;
|
|
const { conditionsList = [] } = conditions;
|
|
|
|
function handleWhereFilterChange(conditionsEdited) {
|
|
joinTableOptionsChange('conditions', conditionsEdited);
|
|
}
|
|
|
|
function addNewFilterConditionEntry() {
|
|
let editedFilterCondition = {};
|
|
|
|
const emptyConditionTemplate = { operator: '=', leftField: {}, rightField: {} };
|
|
|
|
// First time populate operator & conditionList details
|
|
if (!Object.keys(conditions).length) {
|
|
editedFilterCondition = {
|
|
operator: 'AND',
|
|
conditionsList: [{ ...emptyConditionTemplate }],
|
|
};
|
|
} else {
|
|
editedFilterCondition = {
|
|
operator: 'AND',
|
|
...conditions,
|
|
conditionsList: [...conditionsList, { ...emptyConditionTemplate }],
|
|
};
|
|
}
|
|
|
|
handleWhereFilterChange(editedFilterCondition);
|
|
}
|
|
|
|
function removeFilterConditionEntry(index) {
|
|
if (!Object.keys(conditions).length || !conditionsList.length) return;
|
|
|
|
// If there is one condition left, then make the 'conditions' state to default.
|
|
let editedFilterConditions = {};
|
|
if (conditionsList.length > 1) {
|
|
editedFilterConditions = {
|
|
...conditions,
|
|
conditionsList: conditionsList.filter((condition, i) => i !== index),
|
|
};
|
|
}
|
|
|
|
if (Object.keys(editedFilterConditions).length === 0) {
|
|
deleteJoinTableOptions('conditions');
|
|
} else {
|
|
handleWhereFilterChange(editedFilterConditions);
|
|
}
|
|
}
|
|
|
|
function updateFilterConditionEntry(type, indexToUpdate, valueToUpdate) {
|
|
if (!Object.keys(conditions).length || !conditionsList.length) return;
|
|
// type: Column | Value | Operator
|
|
|
|
// @desc : Input Need for Each Type
|
|
// Column -> table, columnName, isLeftSideCondition
|
|
// Value -> value, isLeftSideCondition
|
|
// Operator -> operator
|
|
|
|
const editedConditionList = conditionsList.map((conditionDetail, index) => {
|
|
if (indexToUpdate === index) {
|
|
switch (type) {
|
|
case 'Column':
|
|
return valueToUpdate.isLeftSideCondition
|
|
? {
|
|
...conditionDetail,
|
|
leftField: {
|
|
columnName: valueToUpdate.columnName,
|
|
table: valueToUpdate.table,
|
|
type: 'Column',
|
|
},
|
|
}
|
|
: {
|
|
...conditionDetail,
|
|
rightField: {
|
|
columnName: valueToUpdate.columnName,
|
|
table: valueToUpdate.table,
|
|
type: 'Column',
|
|
},
|
|
};
|
|
case 'Value':
|
|
return valueToUpdate.isLeftSideCondition
|
|
? {
|
|
...conditionDetail,
|
|
leftField: {
|
|
value: valueToUpdate.value,
|
|
type: 'Value',
|
|
},
|
|
}
|
|
: {
|
|
...conditionDetail,
|
|
rightField: {
|
|
value: valueToUpdate.value,
|
|
type: 'Value',
|
|
},
|
|
};
|
|
case 'Operator':
|
|
return {
|
|
...conditionDetail,
|
|
...((conditionDetail.operator === 'IS' || valueToUpdate.operator === 'IS') && {
|
|
rightField: {
|
|
value: '',
|
|
type: 'Value',
|
|
},
|
|
}),
|
|
operator: valueToUpdate.operator,
|
|
};
|
|
case 'Jsonpath': {
|
|
return valueToUpdate.isLeftSideCondition
|
|
? {
|
|
...conditionDetail,
|
|
leftField: {
|
|
...conditionDetail.leftField,
|
|
jsonpath: valueToUpdate.jsonpath,
|
|
},
|
|
}
|
|
: {
|
|
...conditionDetail,
|
|
rightField: {
|
|
...conditionDetail.rightField,
|
|
jsonpath: valueToUpdate.jsonpath,
|
|
},
|
|
};
|
|
}
|
|
default:
|
|
return conditionDetail;
|
|
}
|
|
}
|
|
return conditionDetail;
|
|
});
|
|
handleWhereFilterChange({ ...conditions, conditionsList: [...editedConditionList] });
|
|
}
|
|
|
|
function updateOperatorForConditions(changedOperator) {
|
|
let editedFilterConditions = { ...conditions, operator: changedOperator };
|
|
handleWhereFilterChange(editedFilterConditions);
|
|
}
|
|
|
|
const tableSet = new Set();
|
|
(joinOptions || []).forEach((join) => {
|
|
const { table, conditions } = join;
|
|
tableSet.add(table);
|
|
conditions?.conditionsList?.forEach((condition) => {
|
|
const { leftField, rightField } = condition;
|
|
if (leftField?.table) {
|
|
tableSet.add(leftField?.table);
|
|
}
|
|
if (rightField?.table) {
|
|
tableSet.add(rightField?.table);
|
|
}
|
|
});
|
|
});
|
|
|
|
const tables = [...tableSet];
|
|
const tableList = [];
|
|
|
|
tables.forEach((tableId) => {
|
|
const tableDetails = findTableDetails(tableId);
|
|
if (tableDetails?.table_name && tableInfo[tableDetails.table_name]) {
|
|
const tableDetailsForDropDown = {
|
|
label: tableDetails.table_name,
|
|
value: tableId,
|
|
options:
|
|
tableInfo[tableDetails.table_name]?.map((columns) => ({
|
|
label: columns.Header,
|
|
value: columns.Header + '-' + tableId,
|
|
table: tableId,
|
|
icon: columns?.dataType,
|
|
// columnDataType: columns?.dataType,
|
|
})) || [],
|
|
};
|
|
tableList.push(tableDetailsForDropDown);
|
|
}
|
|
});
|
|
|
|
const groupOperators = [
|
|
{ value: 'AND', label: 'AND' },
|
|
{ value: 'OR', label: 'OR' },
|
|
];
|
|
|
|
const filterComponents = conditionsList.map((conditionDetail, index) => {
|
|
const { operator = '', leftField = {}, rightField = {} } = conditionDetail;
|
|
const LeftSideTableDetails = leftField?.table ? findTableDetails(leftField?.table) : '';
|
|
const isSelectedColumnJsonb =
|
|
leftField?.table &&
|
|
tableInfo[LeftSideTableDetails?.table_name]?.find((col) => col.accessor === leftField?.columnName)?.dataType ===
|
|
'jsonb';
|
|
return (
|
|
<Row className="mb-2 mx-0" key={index}>
|
|
<Col sm="2" className="p-0">
|
|
{index === 1 && (
|
|
<DropDownSelect
|
|
buttonClasses="border border-end-0 rounded-start"
|
|
showPlaceHolder
|
|
onChange={(change) => updateOperatorForConditions(change?.value)}
|
|
options={groupOperators}
|
|
darkMode={darkMode}
|
|
value={groupOperators.find((op) => op.value === conditions.operator)}
|
|
/>
|
|
)}
|
|
{index === 0 && (
|
|
<div
|
|
style={{
|
|
borderRadius: 0,
|
|
height: '30px',
|
|
}}
|
|
className="tj-small-btn px-2 border border-end-0 rounded-start"
|
|
>
|
|
Where
|
|
</div>
|
|
)}
|
|
{index > 1 && (
|
|
<div
|
|
style={{
|
|
borderRadius: 0,
|
|
height: '30px',
|
|
}}
|
|
className="tj-small-btn px-2 rounded-start border"
|
|
>
|
|
{conditions?.operator}
|
|
</div>
|
|
)}
|
|
</Col>
|
|
<Col sm="3" className="p-0">
|
|
<DropDownSelect
|
|
buttonClasses="border"
|
|
showPlaceHolder
|
|
onChange={(newValue) =>
|
|
updateFilterConditionEntry('Column', index, {
|
|
table: newValue.table,
|
|
columnName: newValue.label,
|
|
isLeftSideCondition: true,
|
|
})
|
|
}
|
|
value={{
|
|
label: LeftSideTableDetails?.table_name
|
|
? LeftSideTableDetails?.table_name + '.' + leftField?.columnName
|
|
: leftField?.columnName,
|
|
value: leftField?.columnName && leftField?.table ? leftField?.columnName + '-' + leftField?.table : '',
|
|
table: leftField?.table,
|
|
}}
|
|
options={tableList}
|
|
darkMode={darkMode}
|
|
/>
|
|
{isSelectedColumnJsonb && (
|
|
<div className="tjdb-codehinter-jsonpath">
|
|
<ToolTip
|
|
message={
|
|
leftField?.jsonpath
|
|
? leftField.jsonpath
|
|
: 'Access nested JSON fields by using -> for JSON object and ->> for text'
|
|
}
|
|
tooltipClassName="tjdb-table-tooltip"
|
|
placement="top"
|
|
trigger={['hover', 'focus']}
|
|
width="160px"
|
|
>
|
|
<span>
|
|
<CodeHinter
|
|
type="basic"
|
|
initialValue={leftField?.jsonpath || ''}
|
|
lang="javascript"
|
|
onChange={(value) => {
|
|
updateFilterConditionEntry('Jsonpath', index, {
|
|
jsonpath: value,
|
|
isLeftSideCondition: true,
|
|
});
|
|
}}
|
|
enablePreview={false}
|
|
height="30"
|
|
placeholder="->>'key'"
|
|
componentName={leftField?.columnName ? `{}${leftField.columnName}` : ''}
|
|
/>
|
|
</span>
|
|
</ToolTip>
|
|
</div>
|
|
)}
|
|
</Col>
|
|
<Col sm="2" className="p-0">
|
|
<DropDownSelect
|
|
buttonClasses="border border-start-0 border-end-0"
|
|
showPlaceHolder
|
|
onChange={(change) => updateFilterConditionEntry('Operator', index, { operator: change?.value })}
|
|
value={filterOperatorOptions.find((op) => op.value === operator)}
|
|
options={filterOperatorOptions}
|
|
darkMode={darkMode}
|
|
/>
|
|
</Col>
|
|
<Col className="p-0 d-flex">
|
|
<div className="col-11 tjdb-codhinter-wrapper">
|
|
{operator === 'IS' ? (
|
|
<DropDownSelect
|
|
buttonClasses="border border-end-0"
|
|
showPlaceHolder
|
|
onChange={(change) =>
|
|
updateFilterConditionEntry('Value', index, { value: change?.value, isLeftSideCondition: false })
|
|
}
|
|
options={nullOperatorOptions}
|
|
darkMode={darkMode}
|
|
value={nullOperatorOptions.find((op) => op.value === rightField.value)}
|
|
/>
|
|
) : (
|
|
<CodeHinter
|
|
type="basic"
|
|
initialValue={
|
|
rightField?.value
|
|
? typeof rightField?.value === 'string'
|
|
? rightField?.value
|
|
: JSON.stringify(rightField?.value)
|
|
: rightField?.value
|
|
}
|
|
className="border border-end-0 fs-12 tjdb-codehinter"
|
|
placeholder="Value"
|
|
onChange={(newValue) =>
|
|
updateFilterConditionEntry('Value', index, { value: newValue, isLeftSideCondition: false })
|
|
}
|
|
/>
|
|
)}
|
|
</div>
|
|
|
|
<ButtonSolid
|
|
customStyles={{
|
|
height: '30px',
|
|
maxWidth: '30px',
|
|
}}
|
|
size="sm"
|
|
variant="ghostBlack"
|
|
className="px-1 rounded-0 border rounded-end col-2"
|
|
onClick={() => removeFilterConditionEntry(index)}
|
|
>
|
|
<Trash fill="var(--slate9)" style={{ height: '16px' }} />
|
|
</ButtonSolid>
|
|
</Col>
|
|
</Row>
|
|
);
|
|
});
|
|
|
|
return (
|
|
<Container fluid className="p-0">
|
|
{conditionsList.length === 0 && <NoCondition />}
|
|
{filterComponents}
|
|
<Row className="mx-1 mb-1">
|
|
<Col className="p-0">
|
|
<ButtonSolid variant="ghostBlue" size="sm" onClick={() => addNewFilterConditionEntry()}>
|
|
<AddRectangle width="15" fill="#3E63DD" opacity="1" secondaryFill="#ffffff" />
|
|
Add more
|
|
</ButtonSolid>
|
|
</Col>
|
|
</Row>
|
|
</Container>
|
|
);
|
|
};
|