Skip to content

Commit 044f492

Browse files
krithika369Krithika Sundararajan
andauthored
Fix minor UI bugs (#134)
Co-authored-by: Krithika Sundararajan <krithika.sundararajan@go-jek.com>
1 parent b212a24 commit 044f492

File tree

4 files changed

+24
-12
lines changed

4 files changed

+24
-12
lines changed

ui/src/router/components/configuration/components/EnsemblerConfigSection.js

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@ import React, { Fragment } from "react";
22
import { EuiPanel } from "@elastic/eui";
33
import { DockerConfigViewGroup } from "./docker_config_section/DockerConfigViewGroup";
44
import { TreatmentMappingConfigSection } from "./TreatmentMappingConfigSection";
5+
import { ExperimentEngineContextProvider } from "../../../../providers/experiments/ExperimentEngineContextProvider";
56

67
export const EnsemblerConfigSection = ({
78
config: {
89
ensembler,
9-
experiment_engine: { config: experimentConfig },
10+
experiment_engine: { type, config: experimentConfig },
1011
},
1112
}) => {
1213
return !ensembler ? (
@@ -20,11 +21,13 @@ export const EnsemblerConfigSection = ({
2021
/>
2122
)}
2223
{ensembler.type === "standard" && (
23-
<TreatmentMappingConfigSection
24-
engineProps={(experimentConfig || {}).engine || {}}
25-
experiments={(experimentConfig || {}).experiments || []}
26-
mappings={ensembler.standard_config.experiment_mappings}
27-
/>
24+
<ExperimentEngineContextProvider>
25+
<TreatmentMappingConfigSection
26+
engine={type}
27+
experiments={(experimentConfig || {}).experiments || []}
28+
mappings={ensembler.standard_config.experiment_mappings}
29+
/>
30+
</ExperimentEngineContextProvider>
2831
)}
2932
</Fragment>
3033
);

ui/src/router/components/configuration/components/TreatmentMappingConfigSection.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React from "react";
1+
import React, { useContext } from "react";
22
import {
33
EuiFlexGroup,
44
EuiFlexItem,
@@ -9,6 +9,7 @@ import {
99
} from "@elastic/eui";
1010
import { ConfigSectionPanel } from "../../../../components/config_section";
1111
import { getExperimentUrl } from "./config";
12+
import ExperimentEngineContext from "../../../../providers/experiments/context";
1213

1314
const TreatmentMappingConfigTable = ({ items }) => {
1415
const columns = [
@@ -30,14 +31,16 @@ const TreatmentMappingConfigTable = ({ items }) => {
3031
};
3132

3233
export const TreatmentMappingConfigSection = ({
33-
engineProps,
34+
engine,
3435
experiments = [],
3536
mappings = [],
3637
}) => {
38+
const { getEngineProperties } = useContext(ExperimentEngineContext);
39+
const engineProps = getEngineProperties(engine);
40+
3741
const experimentNames = [
3842
...new Set(mappings.map((mapObj) => mapObj.experiment)),
3943
];
40-
4144
const experimentInfo = experiments.reduce((acc, exp) => {
4245
acc[exp.name] = exp;
4346
return acc;
@@ -52,7 +55,8 @@ export const TreatmentMappingConfigSection = ({
5255
<EuiTextColor color="secondary">
5356
<EuiLink
5457
href={getExperimentUrl(
55-
engineProps,
58+
engineProps?.standard_experiment_manager_config
59+
?.home_page_url,
5660
experimentInfo[exp] || {}
5761
)}
5862
target="_blank"

ui/src/router/details/components/RouterActions.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export const RouterActions = ({
2929
name: "Undeploy Router",
3030
icon: "exportAction",
3131
disabled: status === Status.PENDING,
32-
hidden: status === Status.UNDEPLOYED,
32+
hidden: [Status.UNDEPLOYED, Status.FAILED].includes(status),
3333
onClick: () => undeployRouterRef.current(router),
3434
},
3535
{

ui/src/router/versions/details/config/RouterVersionConfigView.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import React, { useEffect } from "react";
22
import { replaceBreadcrumbs } from "@gojek/mlp-ui";
33
import { RouterConfigDetails } from "../../../components/configuration/RouterConfigDetails";
44
import { get } from "../../../../components/form/utils";
5+
import { ExperimentEngineContextProvider } from "../../../../providers/experiments/ExperimentEngineContextProvider";
56

67
export const RouterVersionConfigView = ({ projectId, config }) => {
78
useEffect(() => {
@@ -25,5 +26,9 @@ export const RouterVersionConfigView = ({ projectId, config }) => {
2526
]);
2627
}, [config]);
2728

28-
return <RouterConfigDetails projectId={projectId} config={config} />;
29+
return (
30+
<ExperimentEngineContextProvider>
31+
<RouterConfigDetails projectId={projectId} config={config} />
32+
</ExperimentEngineContextProvider>
33+
);
2934
};

0 commit comments

Comments
 (0)