SONAR-17362 Add getValue and refactor use of getValues for settings

3 files changed, 16 insertions, 9 deletions

diff --git a/server/sonar-web/src/main/js/api/mocks/AuditLogsServiceMock.ts b/server/sonar-web/src/main/js/api/mocks/AuditLogsServiceMock.ts
index 10f6f36fdc0..8d52440034d 100644
--- a/server/sonar-web/src/main/js/api/mocks/AuditLogsServiceMock.ts
+++ b/server/sonar-web/src/main/js/api/mocks/AuditLogsServiceMock.ts
@@ -20,15 +20,15 @@
 import { cloneDeep } from 'lodash';
 import { HousekeepingPolicy } from '../../apps/audit-logs/utils';
 import { SettingValue } from '../../types/settings';
-import { getValues } from '../settings';
+import { getValue } from '../settings';
 
 export default class AuditLogsServiceMock {
-  settingValue: SettingValue[];
-  defaultValues: SettingValue[] = [{ key: 'test', value: HousekeepingPolicy.Weekly }];
+  settingValue: SettingValue;
+  defaultValues: SettingValue = { key: 'test', value: HousekeepingPolicy.Weekly };
 
   constructor() {
     this.settingValue = cloneDeep(this.defaultValues);
-    (getValues as jest.Mock).mockImplementation(this.getValuesHandler);
+    (getValue as jest.Mock).mockImplementation(this.getValuesHandler);
   }
 
   getValuesHandler = () => {
diff --git a/server/sonar-web/src/main/js/api/mocks/AuthenticationServiceMock.ts b/server/sonar-web/src/main/js/api/mocks/AuthenticationServiceMock.ts
index 17dda673074..c5a5287e6c2 100644
--- a/server/sonar-web/src/main/js/api/mocks/AuthenticationServiceMock.ts
+++ b/server/sonar-web/src/main/js/api/mocks/AuthenticationServiceMock.ts
@@ -41,9 +41,7 @@ export default class AuthenticationServiceMock {
 
   getValuesHandler = (data: { keys: string; component?: string } & BranchParameters) => {
     if (data.keys) {
-      return Promise.resolve(
-        this.settingValues.filter(set => data.keys.split(',').includes(set.key))
-      );
+      return Promise.resolve(this.settingValues.filter(set => data.keys.includes(set.key)));
     }
     return Promise.resolve(this.settingValues);
   };
diff --git a/server/sonar-web/src/main/js/api/settings.ts b/server/sonar-web/src/main/js/api/settings.ts
index c00cc81078b..6fd866a2a30 100644
--- a/server/sonar-web/src/main/js/api/settings.ts
+++ b/server/sonar-web/src/main/js/api/settings.ts
@@ -36,10 +36,19 @@ export function getDefinitions(component?: string): Promise<ExtendedSettingDefin
   );
 }
 
+export function getValue(
+  data: { key: string; component?: string } & BranchParameters
+): Promise<SettingValue> {
+  return getValues({ keys: [data.key], component: data.component }).then(([result]) => result);
+}
+
 export function getValues(
-  data: { keys: string; component?: string } & BranchParameters
+  data: { keys: string[]; component?: string } & BranchParameters
 ): Promise<SettingValue[]> {
-  return getJSON('/api/settings/values', data).then((r: SettingValueResponse) => [
+  return getJSON('/api/settings/values', {
+    keys: data.keys.join(','),
+    component: data.component
+  }).then((r: SettingValueResponse) => [
     ...r.settings,
     ...r.setSecuredSettings.map(key => ({ key }))
   ]);