Skip to content

fix(dashboards): Wrap customMeasurementsProvider fetchCustomMeasurements in feature flag #36673

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
edwardgou-sentry merged 2 commits into from
Jul 14, 2022
Merged

fix(dashboards): Wrap customMeasurementsProvider fetchCustomMeasurements in feature flag #36673

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
88983c6
wraps fetch in feature flag
edwardgou-sentry Jul 14, 2022
105f940
fix test
edwardgou-sentry Jul 14, 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
53 changes: 28 additions & 25 deletions static/app/utils/customMeasurements/customMeasurementsProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,34 +57,37 @@ export function CustomMeasurementsProvider({
useEffect(() => {
let shouldCancelRequest = false;

fetchCustomMeasurements(api, organization, selection)
.then(response => {
if (shouldCancelRequest) {
return;
}
if (organization.features.includes('dashboard-custom-measurement-widgets')) {
fetchCustomMeasurements(api, organization, selection)
.then(response => {
if (shouldCancelRequest) {
return;
}

const newCustomMeasurements = Object.keys(
response
).reduce<CustomMeasurementCollection>((acc, customMeasurement) => {
acc[customMeasurement] = {
key: customMeasurement,
name: customMeasurement,
functions: response[customMeasurement].functions,
};
return acc;
}, {});
const newCustomMeasurements = Object.keys(
response
).reduce<CustomMeasurementCollection>((acc, customMeasurement) => {
acc[customMeasurement] = {
key: customMeasurement,
name: customMeasurement,
functions: response[customMeasurement].functions,
};
return acc;
}, {});

setState({customMeasurements: newCustomMeasurements});
})
.catch(e => {
if (shouldCancelRequest) {
return;
}
setState({customMeasurements: newCustomMeasurements});
})
.catch(e => {
if (shouldCancelRequest) {
return;
}

const errorResponse = e?.responseJSON ?? t('Unable to fetch custom measurements');
addErrorMessage(errorResponse);
handleXhrErrorResponse(errorResponse)(e);
});
const errorResponse =
e?.responseJSON ?? t('Unable to fetch custom measurements');
addErrorMessage(errorResponse);
handleXhrErrorResponse(errorResponse)(e);
});
}

return () => {
shouldCancelRequest = true;
Expand Down
7 changes: 6 additions & 1 deletion tests/js/spec/utils/useCustomMeasurements.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,12 @@ function mockMeasurementsMeta() {

describe('useCustomMeasurements', function () {
it('provides customMeasurements from the custom measurements context', async function () {
const {organization} = initializeOrg();
const {organization} = initializeOrg({
organization: {features: ['dashboard-custom-measurement-widgets']},
project: undefined,
projects: [],
router: {},
});
const measurementsMetaMock = mockMeasurementsMeta();
render(
<CustomMeasurementsProvider organization={organization}>
Expand Down