IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-12-30 10:47:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

LokiContext: Fix wrong queries being run when reopened (#62353)

Browse Source 
* fix wrong query being run when reopened

* fix typo

Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>

* and test for `onClose`

* rename functions

---------

Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
This commit is contained in:
Sven Grossmann 2023-01-30 09:26:27 +01:00 committed by GitHub
parent 2ff715cb7a
commit da7065d3dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
public/app/plugins/datasource/loki/components/LokiContextUi.test.tsx
View File

@ -55,6 +55,7 @@ describe('LokiContextUi', () => {
label3: 'value3',
},
} as unknown as LogRowModel,
onClose: jest.fn(),
};
return defaults;
@ -113,4 +114,14 @@ describe('LokiContextUi', () => {
jest.useRealTimers();
});
it('unmounts and calls onClose', async () => {
const props = setupProps();
const comp = render(<LokiContextUi {...props} />);
comp.unmount();
await waitFor(() => {
expect(props.onClose).toHaveBeenCalled();
});
});
});

10
public/app/plugins/datasource/loki/components/LokiContextUi.tsx
View File

@ -13,6 +13,7 @@ export interface LokiContextUiProps {
languageProvider: LokiLanguageProvider;
row: LogRowModel;
updateFilter: (value: ContextFilter[]) => void;
onClose: () => void;
}
function getStyles(theme: GrafanaTheme2) {
@ -43,7 +44,7 @@ const formatOptionLabel = memoizeOne(({ label, description }: SelectableValue<st
));
export function LokiContextUi(props: LokiContextUiProps) {
const { row, languageProvider, updateFilter } = props;
const { row, languageProvider, updateFilter, onClose } = props;
const styles = useStyles2(getStyles);
const [contextFilters, setContextFilters] = useState<ContextFilter[]>([]);
@ -74,6 +75,13 @@ export function LokiContextUi(props: LokiContextUiProps) {
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [contextFilters, initialized]);
useEffect(() => {
return () => {
clearTimeout(timerHandle.current);
onClose();
};
}, [onClose]);
useAsync(async () => {
await languageProvider.start();
const allLabels = languageProvider.getLabelKeys();

9
public/app/plugins/datasource/loki/datasource.ts
View File

@ -758,7 +758,7 @@ export class LokiDatasource
};
};
async prepareContextExpr(row: LogRowModel, origQuery?: DataQuery): Promise<string> {
async prepareContextExprWithoutParsedLabels(row: LogRowModel, origQuery?: DataQuery): Promise<string> {
await this.languageProvider.start();
const labels = this.languageProvider.getLabelKeys();
const expr = Object.keys(row.labels)
@ -775,10 +775,17 @@ export class LokiDatasource
return `{${expr}}`;
}
async prepareContextExpr(row: LogRowModel, origQuery?: DataQuery): Promise<string> {
return await this.prepareContextExprWithoutParsedLabels(row, origQuery);
}
getLogRowContextUi(row: LogRowModel, runContextQuery: () => void): React.ReactNode {
return LokiContextUi({
row,
languageProvider: this.languageProvider,
onClose: () => {
this.prepareContextExpr = this.prepareContextExprWithoutParsedLabels;
},
updateFilter: (contextFilters: ContextFilter[]) => {
this.prepareContextExpr = async (row: LogRowModel, origQuery?: DataQuery) => {
await this.languageProvider.start();