+ {/*Class one-line-scroll and other codemirror styles are declared in index.css*/}
+
+
+
;
};
export default QueryEditor;
\ No newline at end of file
diff --git a/app/vmui/packages/vmui/src/components/Home/Configurator/Query/ServerConfigurator.tsx b/app/vmui/packages/vmui/src/components/Home/Configurator/Query/ServerConfigurator.tsx
index bcdf0161a7..aa9f4e8322 100644
--- a/app/vmui/packages/vmui/src/components/Home/Configurator/Query/ServerConfigurator.tsx
+++ b/app/vmui/packages/vmui/src/components/Home/Configurator/Query/ServerConfigurator.tsx
@@ -3,9 +3,13 @@ import {Box, TextField, Tooltip, IconButton} from "@mui/material";
import SecurityIcon from "@mui/icons-material/Security";
import {useAppDispatch, useAppState} from "../../../../state/common/StateContext";
import {AuthDialog} from "../Auth/AuthDialog";
+import {ErrorTypes} from "../../../../types";
+export interface ServerConfiguratorProps {
+ error?: ErrorTypes | string;
+}
-const ServerConfigurator: FC = () => {
+const ServerConfigurator: FC
= ({error}) => {
const {serverUrl} = useAppState();
const dispatch = useAppDispatch();
@@ -18,6 +22,7 @@ const ServerConfigurator: FC = () => {
return <>
diff --git a/app/vmui/packages/vmui/src/components/Home/Configurator/Query/useFetchQuery.ts b/app/vmui/packages/vmui/src/components/Home/Configurator/Query/useFetchQuery.ts
index 54b37aa5d1..7a919302dd 100644
--- a/app/vmui/packages/vmui/src/components/Home/Configurator/Query/useFetchQuery.ts
+++ b/app/vmui/packages/vmui/src/components/Home/Configurator/Query/useFetchQuery.ts
@@ -4,14 +4,14 @@ import {useAppState} from "../../../../state/common/StateContext";
import {InstantMetricResult, MetricBase, MetricResult} from "../../../../api/types";
import {isValidHttpUrl} from "../../../../utils/url";
import {useAuthState} from "../../../../state/auth/AuthStateContext";
-import {TimeParams} from "../../../../types";
+import {ErrorTypes, TimeParams} from "../../../../types";
export const useFetchQuery = (): {
fetchUrl?: string[],
isLoading: boolean,
graphData?: MetricResult[],
liveData?: InstantMetricResult[],
- error?: string,
+ error?: ErrorTypes | string,
} => {
const {query, displayType, serverUrl, time: {period}, queryControls: {nocache}} = useAppState();
@@ -20,7 +20,7 @@ export const useFetchQuery = (): {
const [isLoading, setIsLoading] = useState(false);
const [graphData, setGraphData] = useState();
const [liveData, setLiveData] = useState();
- const [error, setError] = useState();
+ const [error, setError] = useState();
const [prevPeriod, setPrevPeriod] = useState();
useEffect(() => {
@@ -80,9 +80,9 @@ export const useFetchQuery = (): {
const fetchUrl = useMemo(() => {
if (!period) return;
if (!serverUrl) {
- setError("Please enter Server URL");
+ setError(ErrorTypes.emptyServer);
} else if (query.every(q => !q.trim())) {
- setError("Please enter a valid Query and execute it");
+ setError(ErrorTypes.validQuery);
} else if (isValidHttpUrl(serverUrl)) {
const duration = (period.end - period.start) / 2;
const bufferPeriod = {...period, start: period.start - duration, end: period.end + duration};
@@ -90,7 +90,7 @@ export const useFetchQuery = (): {
? getQueryRangeUrl(serverUrl, q, bufferPeriod, nocache)
: getQueryUrl(serverUrl, q, period));
} else {
- setError("Please provide a valid URL");
+ setError(ErrorTypes.validServer);
}
},
[serverUrl, period, displayType]);
diff --git a/app/vmui/packages/vmui/src/components/Home/HomeLayout.tsx b/app/vmui/packages/vmui/src/components/Home/HomeLayout.tsx
index 7839afe424..ea900501df 100644
--- a/app/vmui/packages/vmui/src/components/Home/HomeLayout.tsx
+++ b/app/vmui/packages/vmui/src/components/Home/HomeLayout.tsx
@@ -49,7 +49,7 @@ const HomeLayout: FC = () => {
-
+
{isLoading &&