Skip to content

Commit 4453499

Browse files
committed
Hide query.
1 parent 5179d03 commit 4453499

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

src/QueryEditor.tsx

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ const QueryEditor: React.FC<Props> = ({ datasource, query, onChange, onRunQuery
3333
value: query.contextId,
3434
});
3535
const [selectedDimensions, setSelectedDimensions] = React.useState<Dropdown[]>();
36-
const [selectedGroupBy, setSelectedGroupBy] = React.useState<Dropdown>();
36+
const [selectedGroupBy, setSelectedGroupBy] = React.useState<Dropdown>(GroupByList[0]);
3737
const [selectedMethod, setSelectedMethod] = React.useState<Dropdown>(Methods[0]);
38-
const [selectedAggreagations, setSelectedAggreagations] = React.useState<Dropdown>(Aggreagations[0]);
38+
const [selectedAggregations, setSelectedAggregations] = React.useState<Dropdown>(Aggreagations[0]);
3939
const [filterByValues, setFilterByValues] = React.useState<Dropdown[]>([]);
4040

4141
const { spaces } = useFetchSpaces(baseUrl);
@@ -147,11 +147,11 @@ const QueryEditor: React.FC<Props> = ({ datasource, query, onChange, onRunQuery
147147
setSelectedNodes([]);
148148
setSelectedContext({});
149149
setSelectedDimensions([]);
150-
setSelectedGroupBy();
151-
setSelectedFilter({ label: 'No filter', value: 'No filter' });
150+
setSelectedGroupBy(GroupByList[0]);
151+
setSelectedFilter({});
152152
setSelectedFilterValue({});
153153
setSelectedMethod(Methods[0]);
154-
setSelectedAggreagations(Aggreagations[0]);
154+
setSelectedAggregations(Aggreagations[0]);
155155

156156
fetchRooms(v.value || '');
157157
onChange({ ...query, spaceId: v.value });
@@ -165,11 +165,11 @@ const QueryEditor: React.FC<Props> = ({ datasource, query, onChange, onRunQuery
165165
setSelectedNodes([]);
166166
setSelectedContext({});
167167
setSelectedDimensions([]);
168-
setSelectedGroupBy();
169-
setSelectedFilter({ label: 'No filter', value: 'No filter' });
168+
setSelectedGroupBy(GroupByList[0]);
169+
setSelectedFilter({});
170170
setSelectedFilterValue({});
171171
setSelectedMethod(Methods[0]);
172-
setSelectedAggreagations(Aggreagations[0]);
172+
setSelectedAggregations(Aggreagations[0]);
173173

174174
fetchContexts(selectedSpace?.value || '', v.value || '');
175175
fetchNodes(selectedSpace?.value || '', v.value || '');
@@ -182,11 +182,11 @@ const QueryEditor: React.FC<Props> = ({ datasource, query, onChange, onRunQuery
182182

183183
// reset the rest of inputs
184184
setSelectedDimensions([]);
185-
setSelectedGroupBy();
186-
setSelectedFilter({ label: 'No filter', value: 'No filter' });
185+
setSelectedGroupBy(GroupByList[0]);
186+
setSelectedFilter({});
187187
setSelectedFilterValue({});
188188
setSelectedMethod(Methods[0]);
189-
setSelectedAggreagations(Aggreagations[0]);
189+
setSelectedAggregations(Aggreagations[0]);
190190

191191
fetchDimensions({ spaceId, roomId, contextId: v.value, nodeIDs: selectedNodes?.map((n: any) => n.value) || [] });
192192
onChange({ ...query, contextId: v.value });
@@ -198,11 +198,11 @@ const QueryEditor: React.FC<Props> = ({ datasource, query, onChange, onRunQuery
198198

199199
// reset the rest of inputs
200200
setSelectedDimensions([]);
201-
setSelectedGroupBy();
202-
setSelectedFilter({ label: 'No filter', value: 'No filter' });
201+
setSelectedGroupBy(GroupByList[0]);
202+
setSelectedFilter({});
203203
setSelectedFilterValue({});
204204
setSelectedMethod(Methods[0]);
205-
setSelectedAggreagations(Aggreagations[0]);
205+
setSelectedAggregations(Aggreagations[0]);
206206

207207
fetchDimensions({ spaceId, roomId, contextId, nodeIDs: data });
208208
setSelectedNodes(data);
@@ -248,7 +248,7 @@ const QueryEditor: React.FC<Props> = ({ datasource, query, onChange, onRunQuery
248248
};
249249

250250
const onAggreagationChange = (v: SelectableValue<string>) => {
251-
setSelectedAggreagations(v);
251+
setSelectedAggregations(v);
252252
onChange({ ...query, group: v.value });
253253
onRunQuery();
254254
};
@@ -351,7 +351,7 @@ const QueryEditor: React.FC<Props> = ({ datasource, query, onChange, onRunQuery
351351
inputEl={
352352
<Select
353353
options={Aggreagations}
354-
value={selectedAggreagations}
354+
value={selectedAggregations}
355355
onChange={onAggreagationChange}
356356
allowCustomValue
357357
isSearchable

src/datasource.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ export class DataSource extends DataSourceApi<MyQuery, MyDataSourceOptions> {
2626

2727
const promises = options.targets.map(
2828
({ spaceId, roomId, contextId, nodes, groupBy, method, refId, dimensions, filterBy, filterValue, hide }) => {
29-
if (target.hide) {
30-
continue;
29+
if (hide) {
30+
return;
3131
}
3232

3333
if (!spaceId || !roomId || !contextId) {

0 commit comments

Comments
 (0)