Skip to content

Commit b6b3e72

Browse files
committed
updated the filter dialog UI
1 parent 3e5f899 commit b6b3e72

File tree

1 file changed

+24
-2
lines changed

1 file changed

+24
-2
lines changed

src/components/Filter/Filter.react.js

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import * as Filters from 'lib/Filters';
99
import { List, Map } from 'immutable';
1010
import PropTypes from 'lib/PropTypes';
11-
import React from 'react';
11+
import React, { useState } from 'react';
1212
import stringCompare from 'lib/stringCompare';
1313
import { CurrentApp } from 'context/currentApp';
1414

@@ -61,7 +61,7 @@ function changeConstraint(schema, currentClassName, filters, index, newConstrain
6161
class: currentClassName,
6262
field: field,
6363
constraint: newConstraint,
64-
compareTo: prevCompareTo ?? Filters.DefaultComparisons[compareType],
64+
compareTo: Filters.DefaultComparisons[compareType],
6565
});
6666
return filters.set(index, newFilter);
6767
}
@@ -85,6 +85,12 @@ const Filter = ({
8585
blacklist,
8686
className,
8787
}) => {
88+
const [compare, setCompare] = useState(false);
89+
const hasCompareTo = filters.some(filter => filter.get('compareTo') !== undefined);
90+
91+
if(compare !== hasCompareTo){
92+
setCompare(hasCompareTo);
93+
}
8894
const currentApp = React.useContext(CurrentApp);
8995
blacklist = blacklist || [];
9096
const available = Filters.findRelatedClasses(className, allClasses, blacklist, filters);
@@ -96,6 +102,22 @@ const Filter = ({
96102
overflowY: 'auto',
97103
}}
98104
>
105+
<div
106+
style={{
107+
display: 'flex',
108+
gap: '10px',
109+
padding: '12px 15px 0px 15px',
110+
color: '#343445',
111+
'font-weight': '600'
112+
}}
113+
>
114+
<div style={{ width: '140px' }}>Class</div>
115+
<div style={{ width: '140px' }}>Field</div>
116+
<div style={{ width: '175px' }}>Condition</div>
117+
{compare && <div>Value</div>}
118+
<div></div>
119+
</div>
120+
99121
{filters.toArray().map((filter, i) => {
100122
const currentClassName = filter.get('class');
101123
const field = filter.get('field');

0 commit comments

Comments
 (0)