Quellcode durchsuchen

Add routing to metrics

Feroze Mohideen vor 2 Jahren
Ursprung
Commit
9bb4197d5a

+ 1 - 1
dashboard/src/main/home/app-dashboard/expanded-app/ExpandedApp.tsx

@@ -692,7 +692,7 @@ const ExpandedApp: React.FC<Props> = ({ ...props }) => {
           filterOpts={queryParamOpts}
         />;
       case "metrics":
-        return <MetricsSection currentChart={appData.chart} appName={appData.app.name} />;
+        return <MetricsSection currentChart={appData.chart} appName={appData.app.name} serviceName={queryParamOpts.service} />;
       case "debug":
         return <StatusSectionFC currentChart={appData.chart} />;
       case "environment":

+ 1 - 1
dashboard/src/main/home/app-dashboard/expanded-app/activity-feed/events/cards/ServiceStatusDetail.tsx

@@ -61,7 +61,7 @@ const ServiceStatusDetail: React.FC<Props> = ({
                                         </Link>
                                         <Spacer inline x={0.5} />
                                         <Link
-                                            to={`/apps/${appName}/logs?version=${revision}&service=${key}`}
+                                            to={`/apps/${appName}/metrics?service=${key}`}
                                             hasunderline
                                             hoverColor="#949eff"
                                         >

+ 10 - 1
dashboard/src/main/home/app-dashboard/expanded-app/metrics/MetricsSection.tsx

@@ -12,6 +12,7 @@ import { getServiceNameFromControllerName } from "./utils";
 type PropsType = {
   currentChart: ChartTypeWithExtendedConfig;
   appName: string;
+  serviceName?: string;
 };
 
 export const resolutions: { [range: string]: string } = {
@@ -31,6 +32,7 @@ export const secondsBeforeNow: { [range: string]: number } = {
 const MetricsSection: React.FunctionComponent<PropsType> = ({
   currentChart,
   appName,
+  serviceName,
 }) => {
   const [pods, setPods] = useState([]);
   const [controllerOptions, setControllerOptions] = useState([]);
@@ -95,7 +97,14 @@ const MetricsSection: React.FunctionComponent<PropsType> = ({
         });
 
         setControllerOptions(controllerOptions);
-        setSelectedController(controllerOptions[0]?.value);
+        const controllerOption = controllerOptions.find(
+          (option: any) => option.label === serviceName
+        );
+        if (controllerOption) {
+          setSelectedController(controllerOption.value);
+        } else {
+          setSelectedController(controllerOptions[0]?.value);
+        }
       })
       .catch((err) => {
         setCurrentError(JSON.stringify(err));