Skip to content

Commit 9edc5e2

Browse files
committed
Fix contexts request
1 parent 67a6641 commit 9edc5e2

File tree

2 files changed

+30
-8
lines changed

2 files changed

+30
-8
lines changed

src/QueryEditor.tsx

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,13 @@ type Props = QueryEditorProps<DataSource, MyQuery, MyDataSourceOptions>;
1717

1818
const { FormField } = LegacyForms;
1919

20-
const QueryEditor: React.FC<Props> = ({ datasource, query, onChange, onRunQuery }) => {
20+
const QueryEditor: React.FC<Props> = ({ datasource, query, range, onChange, onRunQuery }) => {
2121
const { baseUrl } = datasource;
22+
const from = range!.from.valueOf();
23+
const to = range!.to.valueOf();
24+
const after = Math.floor(from / 1000);
25+
const before = Math.floor(to / 1000);
26+
2227
const [selectedSpace, setSelectedSpace] = React.useState<Dropdown>();
2328
const [selectedRoom, setSelectedRoom] = React.useState<Dropdown>();
2429
const [selectedFilter, setSelectedFilter] = React.useState<Dropdown>();
@@ -88,7 +93,7 @@ const QueryEditor: React.FC<Props> = ({ datasource, query, onChange, onRunQuery
8893
const room = rooms.find((r) => r.value === roomId);
8994
setSelectedRoom({ label: room?.label, value: room?.value });
9095
fetchNodes(spaceId || '', roomId);
91-
fetchContexts(spaceId || '', roomId);
96+
fetchContexts(spaceId || '', roomId, after, before);
9297
}
9398
}, [roomId, rooms, fetchContexts, fetchNodes, spaceId]);
9499

@@ -171,7 +176,7 @@ const QueryEditor: React.FC<Props> = ({ datasource, query, onChange, onRunQuery
171176
setSelectedMethod(Methods[0]);
172177
setSelectedAggregations(Aggreagations[0]);
173178

174-
fetchContexts(selectedSpace?.value || '', v.value || '');
179+
fetchContexts(selectedSpace?.value || '', v.value || '', after, before);
175180
fetchNodes(selectedSpace?.value || '', v.value || '');
176181
onChange({ ...query, spaceId: spaceId, roomId: v.value });
177182
onRunQuery();

src/shared/hooks/useFetchContexts.ts

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,26 @@
11
import { Dropdown } from './../types/dropdown.interface';
22
import React from 'react';
3-
import { Get } from 'shared/utils/request';
3+
import { Post } from 'shared/utils/request';
44

5-
export const getContexts = async (spaceId: string, roomId: string, baseUrl: string) => {
6-
const response = await Get({ path: `/v3/spaces/${spaceId}/rooms/${roomId}/contexts`, baseUrl });
5+
export const getContexts = async (spaceId: string, roomId: string, after: number, before: number, baseUrl: string) => {
6+
const response = await Post({
7+
path: `/v3/spaces/${spaceId}/rooms/${roomId}/contexts`,
8+
baseUrl,
9+
data: {
10+
scope: {
11+
contexts: ['*'],
12+
nodes: [],
13+
},
14+
selectors: {
15+
contexts: [],
16+
nodes: [],
17+
},
18+
window: {
19+
after,
20+
before,
21+
},
22+
},
23+
});
724
const { contexts = {} } = response?.data || {};
825
return Object.keys(contexts) as string[];
926
};
@@ -13,11 +30,11 @@ export const useFetchContexts = (baseUrl: string) => {
1330
const [contexts, setContexts] = React.useState<Dropdown[]>([]);
1431

1532
const fetchContexts = React.useCallback(
16-
async (spaceId: string, roomId: string) => {
33+
async (spaceId: string, roomId: string, after: number, before: number) => {
1734
setIsError(false);
1835

1936
try {
20-
const result = await getContexts(spaceId, roomId, baseUrl);
37+
const result = await getContexts(spaceId, roomId, after, before, baseUrl);
2138
setContexts(result.map((c) => ({ label: c, value: c })));
2239
} catch (error) {
2340
setIsError(true);

0 commit comments

Comments
 (0)