diff options
Diffstat (limited to 'src/client/views')
| -rw-r--r-- | src/client/views/PropertiesView.tsx | 3 | ||||
| -rw-r--r-- | src/client/views/nodes/FilterBox.tsx | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/client/views/PropertiesView.tsx b/src/client/views/PropertiesView.tsx index c677478cb..b4e15b536 100644 --- a/src/client/views/PropertiesView.tsx +++ b/src/client/views/PropertiesView.tsx @@ -74,6 +74,9 @@ export class PropertiesView extends React.Component<PropertiesViewProps> { @observable openTransform: boolean = true; @observable openFilters: boolean = true; // should be false + /** + * autorun to set up the filter doc of a collection if that collection has been selected and the filters panel is open + */ private selectedDocListenerDisposer: Opt<Lambda>; // @observable selectedUser: string = ""; diff --git a/src/client/views/nodes/FilterBox.tsx b/src/client/views/nodes/FilterBox.tsx index d410d2b33..2ed3dc21f 100644 --- a/src/client/views/nodes/FilterBox.tsx +++ b/src/client/views/nodes/FilterBox.tsx @@ -44,7 +44,6 @@ export class FilterBox extends ViewBoxBaseComponent<FieldViewProps, FilterBoxDoc } public static LayoutString(fieldKey: string) { return FieldView.LayoutString(FilterBox, fieldKey); } - @observable static _filterBoolean = "AND"; @observable static _filterScope = "Current Dashboard"; public _filterSelected = false; public _filterMatch = "matched"; @@ -279,11 +278,11 @@ export class FilterBox extends ViewBoxBaseComponent<FieldViewProps, FilterBoxDoc } /** - * Changes the value of the variable that determines whether filters are ANDed or ORed together + * Sets whether filters are ANDed or ORed together */ @action changeBool = (e: any) => { - FilterBox._filterBoolean = e.currentTarget.value; + (FilterBox.targetDoc.currentFilter as Doc).filterBoolean = e.currentTarget.value; } /** @@ -388,8 +387,8 @@ export class FilterBox extends ViewBoxBaseComponent<FieldViewProps, FilterBoxDoc <div className="filterBox-select-bool"> <select className="filterBox-selection" onChange={this.changeBool}> - <option value="AND" key="AND">AND</option> - <option value="OR" key="OR">OR</option> + <option value="AND" key="AND" selected={(FilterBox.targetDoc.currentFilter as Doc).filterBoolean === "AND"}>AND</option> + <option value="OR" key="OR" selected={(FilterBox.targetDoc.currentFilter as Doc).filterBoolean === "OR"}>OR</option> </select> <div className="filterBox-select-text">filters in </div> <select className="filterBox-selection" onChange={this.changeScope}> |