Skip to content

ref(hybrid-cloud): use monitor urls with org slug frontend #42728

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 1 commit into from
Jan 3, 2023
Merged

ref(hybrid-cloud): use monitor urls with org slug frontend #42728

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
12 changes: 9 additions & 3 deletions static/app/views/monitors/details.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,13 @@ class MonitorDetails extends AsyncView<Props, State> {

getEndpoints(): ReturnType<AsyncView['getEndpoints']> {
const {params, location} = this.props;
return [['monitor', `/monitors/${params.monitorId}/`, {query: location.query}]];
return [
[
'monitor',
`/monitors/${this.orgSlug}/${params.monitorId}/`,
{query: location.query},
],
];
}

getTitle() {
Expand Down Expand Up @@ -68,14 +74,14 @@ class MonitorDetails extends AsyncView<Props, State> {
<DatePageFilter alignDropdown="left" />
</StyledPageFilterBar>

<MonitorStats monitor={monitor} />
<MonitorStats monitor={monitor} orgId={this.orgSlug} />

<MonitorIssues monitor={monitor} orgId={this.orgSlug} />

<Panel>
<PanelHeader>{t('Recent Check-ins')}</PanelHeader>

<MonitorCheckIns monitor={monitor} />
<MonitorCheckIns monitor={monitor} orgId={this.orgSlug} />
</Panel>
</Fragment>
)}
Expand Down
9 changes: 7 additions & 2 deletions static/app/views/monitors/monitorCheckIns.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,21 @@ type CheckIn = {

type Props = {
monitor: Monitor;
orgId: string;
};

type State = {
checkInList: CheckIn[];
};

const MonitorCheckIns = ({monitor}: Props) => {
const MonitorCheckIns = ({monitor, orgId}: Props) => {
const {data, hasError, renderComponent} = useApiRequests<State>({
endpoints: [
['checkInList', `/monitors/${monitor.id}/checkins/`, {query: {per_page: '10'}}],
[
'checkInList',
`/monitors/${orgId}/${monitor.id}/checkins/`,
{query: {per_page: '10'}},
],
],
});

Expand Down
5 changes: 3 additions & 2 deletions static/app/views/monitors/monitorStats.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,14 @@ import {Monitor, MonitorStat} from './types';

type Props = {
monitor: Monitor;
orgId: string;
};

type State = {
stats: MonitorStat[] | null;
};

const MonitorStats = ({monitor}: Props) => {
const MonitorStats = ({monitor, orgId}: Props) => {
const {selection} = usePageFilters();
const {start, end, period} = selection.datetime;

Expand All @@ -41,7 +42,7 @@ const MonitorStats = ({monitor}: Props) => {
endpoints: [
[
'stats',
`/monitors/${monitor.id}/stats/`,
`/monitors/${orgId}/${monitor.id}/stats/`,
{
query: {
since: since.toString(),
Expand Down