Skip to content

Fix UI runtime config #7

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

Merged
merged 2 commits into from
Jun 14, 2022
Merged

Fix UI runtime config #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0cc7359
Add missing context providers
terryyylim Jun 13, 2022
9359c35
Shift runtime sentry config tags
terryyylim Jun 13, 2022
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 ui/src/bootstrap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ import { ConfigProvider, useConfig } from "./config";

const SentryApp = ({ children }) => {
const {
sentryConfig: { dsn, environment },
sentryConfig: { dsn, environment, tags },
} = useConfig();

Sentry.init({ dsn, environment });
Sentry.setTag("app", "xp-ui");
Sentry.setTags(tags);
Copy link
Contributor

@leonlnj leonlnj Jun 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changing setTag to setTags is intentionally i suppose?

Copy link
Contributor Author

@terryyylim terryyylim Jun 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes intentional, since we can now set multiple tags.


return children;
};
Expand Down
3 changes: 3 additions & 0 deletions ui/src/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ export const appConfig = {
const sentryConfig = {
dsn: process.env.REACT_APP_SENTRY_DSN,
environment: appConfig.environment,
tags: {
app: "xp-ui",
},
};

const buildTimeConfig = {
Expand Down
31 changes: 17 additions & 14 deletions ui/src/turing/components/configuration/ExperimentEngineConfigDetails.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,29 @@ import React from "react";
import { EuiFlexGroup, EuiFlexItem } from "@elastic/eui";

import { ConfigSectionPanel } from "components/config_section/ConfigSectionPanel";
import { ConfigProvider } from "config";

import { ExperimentsConfigGroup } from "./experiments_config/ExperimentsConfigGroup";
import { VariablesConfigGroup } from "./variables_config/VariablesConfigGroup";

const ExperimentEngineConfigDetails = ({ projectId, config }) => (
<EuiFlexGroup direction="row" wrap>
<EuiFlexItem grow={1} className="euiFlexItem--smallPanel">
<ConfigSectionPanel title="Summary" className="experimentSummaryPanel">
<ExperimentsConfigGroup projectId={projectId} />
</ConfigSectionPanel>
</EuiFlexItem>
<ConfigProvider>
<EuiFlexGroup direction="row" wrap>
<EuiFlexItem grow={1} className="euiFlexItem--smallPanel">
<ConfigSectionPanel title="Summary" className="experimentSummaryPanel">
<ExperimentsConfigGroup projectId={projectId} />
</ConfigSectionPanel>
</EuiFlexItem>

<EuiFlexItem grow={2} className="euiFlexItem--smallPanel">
<ConfigSectionPanel
title="Variables"
className="experimentVariablesPanel">
<VariablesConfigGroup variables={config.variables} />
</ConfigSectionPanel>
</EuiFlexItem>
</EuiFlexGroup>
<EuiFlexItem grow={2} className="euiFlexItem--smallPanel">
<ConfigSectionPanel
title="Variables"
className="experimentVariablesPanel">
<VariablesConfigGroup variables={config.variables} />
</ConfigSectionPanel>
</EuiFlexItem>
</EuiFlexGroup>
</ConfigProvider>
);

export default ExperimentEngineConfigDetails;
9 changes: 6 additions & 3 deletions ui/src/turing/components/form/EditExperimentEngineConfig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { EuiCallOut, EuiFlexItem, EuiLoadingChart } from "@elastic/eui";
import { OverlayMask, get, useOnChangeHandler } from "@gojek/mlp-ui";

import { Panel } from "components/panel/Panel";
import { ConfigProvider } from "config";
import ProjectContext, {
ProjectContextProvider,
} from "providers/project/context";
Expand Down Expand Up @@ -70,9 +71,11 @@ const EditExperimentEngineConfigComponent = ({
};

const EditExperimentEngineConfig = (props) => (
<ProjectContextProvider>
<EditExperimentEngineConfigComponent {...props} />
</ProjectContextProvider>
<ConfigProvider>
<ProjectContextProvider>
<EditExperimentEngineConfigComponent {...props} />
</ProjectContextProvider>
</ConfigProvider>
);

export default EditExperimentEngineConfig;