Browse Source

SONAR-11793 Rename GA tracking property to 'sonar.analytics.ga.trackingId'

tags/7.8
Wouter Admiraal 5 years ago
parent
commit
47721c94b0

+ 1
- 1
server/sonar-process/src/main/java/org/sonar/process/ProcessProperties.java View File

@@ -110,7 +110,7 @@ public class ProcessProperties {
SONARCLOUD_ENABLED("sonar.sonarcloud.enabled", "false"),
SONARCLOUD_HOMEPAGE_URL("sonar.homepage.url", ""),
SONAR_PRISMIC_ACCESS_TOKEN("sonar.prismic.accessToken", ""),
SONAR_ANALYTICS_TRACKING_ID("sonar.analytics.trackingId", ""),
SONAR_ANALYTICS_TRACKING_ID("sonar.analytics.ga.trackingId", ""),
ONBOARDING_TUTORIAL_SHOW_TO_NEW_USERS("sonar.onboardingTutorial.showToNewUsers", "true"),

BITBUCKETCLOUD_APP_KEY("sonar.bitbucketcloud.appKey", "sonarcloud"),

+ 2
- 2
server/sonar-server/src/test/java/org/sonar/server/ui/ws/GlobalActionTest.java View File

@@ -130,14 +130,14 @@ public class GlobalActionTest {
public void return_sonarcloud_settings() {
settings.setProperty("sonar.sonarcloud.enabled", true);
settings.setProperty("sonar.prismic.accessToken", "secret");
settings.setProperty("sonar.analytics.trackingId", "ga_id");
settings.setProperty("sonar.analytics.ga.trackingId", "ga_id");
settings.setProperty("sonar.homepage.url", "https://s3/homepage.json");
init();

assertJson(call()).isSimilarTo("{" +
" \"settings\": {" +
" \"sonar.prismic.accessToken\": \"secret\"," +
" \"sonar.analytics.trackingId\": \"ga_id\"," +
" \"sonar.analytics.ga.trackingId\": \"ga_id\"," +
" \"sonar.homepage.url\": \"https://s3/homepage.json\"" +
" }" +
"}");

+ 1
- 1
server/sonar-web/src/main/js/app/components/PageTracker.tsx View File

@@ -60,7 +60,7 @@ export class PageTracker extends React.PureComponent<Props> {
}

const mapStateToProps = (state: Store): StateProps => {
const trackingId = getGlobalSettingValue(state, 'sonar.analytics.trackingId');
const trackingId = getGlobalSettingValue(state, 'sonar.analytics.ga.trackingId');
return {
trackingId: trackingId && trackingId.value
};

Loading…
Cancel
Save