Skip to content

[FEATURE/BREAKINGCHANGE] DataQueriesProvider: use full queryDefinitions + remove QueryCountProvider + add edit query name in QueryEditorContainer #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Gladorme wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[FEATURE/BREAKINGCHANGE] DataQueriesProvider: use full queryDefinitions + remove QueryCountProvider + add edit query name in QueryEditorContainer #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions components/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"@codemirror/lang-json": "^6.0.1",
"@fontsource/lato": "^4.5.10",
"@mui/x-date-pickers": "^7.23.1",
"@perses-dev/core": "0.53.0-rc.0",
"@perses-dev/core": "file:../../perses/ui/core",
"@tanstack/react-table": "^8.20.5",
"@uiw/react-codemirror": "^4.19.1",
"date-fns": "^4.1.0",
Expand Down Expand Up @@ -61,4 +61,4 @@
"files": [
"dist"
]
}
}
7 changes: 3 additions & 4 deletions dashboards/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
},
"dependencies": {
"@perses-dev/components": "0.53.0-rc.2",
"@perses-dev/core": "0.53.0-rc.0",
"@perses-dev/core": "file:../../perses/ui/core",
"@perses-dev/plugin-system": "0.53.0-rc.2",
"@types/react-grid-layout": "^1.3.2",
"date-fns": "^4.1.0",
Expand All @@ -46,8 +46,7 @@
"zustand": "^4.3.3"
},
"devDependencies": {
"history": "^5.3.0",
"intersection-observer": "^0.12.2"
"history": "^5.3.0"
},
"peerDependencies": {
"@mui/material": "^6.1.10",
Expand All @@ -58,4 +57,4 @@
"files": [
"dist"
]
}
}
12 changes: 2 additions & 10 deletions dashboards/src/components/GridLayout/GridItemContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,6 @@ export function GridItemContent(props: GridItemContentProps): ReactElement {

const { data: plugin } = usePlugin('Panel', panelDefinition.spec.plugin.kind);

const queryDefinitions = queries ?? [];
const definitions = queryDefinitions.map((query) => {
return {
kind: query.spec.plugin.kind,
spec: query.spec.plugin.spec,
};
});

const pluginQueryOptions =
typeof plugin?.queryOptions === 'function'
? plugin?.queryOptions(panelDefinition.spec.plugin.spec)
Expand All @@ -106,7 +98,7 @@ export function GridItemContent(props: GridItemContentProps): ReactElement {
}}
>
<DataQueriesProvider
definitions={definitions}
definitions={queries ?? []}
options={{ suggestedStepMs, ...pluginQueryOptions }}
queryOptions={{ enabled: inView }}
>
Expand All @@ -123,7 +115,7 @@ export function GridItemContent(props: GridItemContentProps): ReactElement {
</DataQueriesProvider>
<QueryViewerDialog
open={openQueryViewer}
queryDefinitions={queryDefinitions}
queryDefinitions={queries ?? []}
onClose={() => setOpenQueryViewer(false)}
/>
</Box>
Expand Down
16 changes: 3 additions & 13 deletions dashboards/src/components/PanelDrawer/PanelQueriesSharedControls.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,23 +51,13 @@ export function PanelQueriesSharedControls({
[panelDefinition.spec.plugin.spec, pluginPreview]
);

const [previewDefinition, setPreviewDefinition] = useState(
() =>
panelDefinition.spec.queries?.map((query) => {
return {
kind: query.spec.plugin.kind,
spec: query.spec.plugin.spec,
};
}) ?? []
);
const [previewDefinition, setPreviewDefinition] = useState(panelDefinition.spec.queries ?? []);

const handleRunQuery = useCallback((index: number, newDef: QueryDefinition) => {
setPreviewDefinition((prev) => {
const newDefinitions = [...prev];
newDefinitions[index] = {
kind: newDef.spec.plugin.kind,
spec: newDef.spec.plugin.spec,
};
newDefinitions[index] = newDef;

return newDefinitions;
});
}, []);
Expand Down
5 changes: 2 additions & 3 deletions explore/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"dependencies": {
"@nexucis/fuzzy": "^0.5.1",
"@perses-dev/components": "0.53.0-rc.2",
"@perses-dev/core": "0.53.0-rc.0",
"@perses-dev/core": "file:../../perses/ui/core",
"@perses-dev/dashboards": "0.53.0-rc.2",
"@perses-dev/plugin-system": "0.53.0-rc.2",
"@types/react-grid-layout": "^1.3.2",
Expand All @@ -50,7 +50,6 @@
"devDependencies": {
"@types/qs": "^6.14.0",
"history": "^5.3.0",
"intersection-observer": "^0.12.2",
"react-router-dom": "^6.30.1"
},
"peerDependencies": {
Expand All @@ -62,4 +61,4 @@
"files": [
"dist"
]
}
}
68 changes: 22 additions & 46 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions plugin-system/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"dependencies": {
"@module-federation/enhanced": "^0.21.4",
"@perses-dev/components": "0.53.0-rc.2",
"@perses-dev/core": "0.53.0-rc.0",
"@perses-dev/core": "file:../../perses/ui/core",
"date-fns": "^4.1.0",
"date-fns-tz": "^3.2.0",
"immer": "^10.1.1",
Expand All @@ -49,4 +49,4 @@
"files": [
"dist"
]
}
}
Loading