SONAR-12679 Drop short & long living branch concept

6 files changed, 22 insertions, 25 deletions

diff --git a/server/sonar-web/src/main/js/store/__tests__/branches-test.ts b/server/sonar-web/src/main/js/store/__tests__/branches-test.ts
index 875736d7a63..8d1067858d6 100644
--- a/server/sonar-web/src/main/js/store/__tests__/branches-test.ts
+++ b/server/sonar-web/src/main/js/store/__tests__/branches-test.ts
@@ -17,26 +17,23 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-import { getBranchLikeKey } from '../../helpers/branches';
-import {
-  mockLongLivingBranch,
-  mockPullRequest,
-  mockQualityGateStatusCondition,
-  mockShortLivingBranch
-} from '../../helpers/testMocks';
+import { getBranchLikeKey } from '../../helpers/branch-like';
+import { mockBranch, mockPullRequest } from '../../helpers/mocks/branch-like';
+import { mockQualityGateStatusCondition } from '../../helpers/testMocks';
+import { BranchLike } from '../../types/branch-like';
 import reducer, {
   getBranchStatusByBranchLike,
   registerBranchStatusAction,
   State
 } from '../branches';
 
-type TestArgs = [T.BranchLike, string, T.Status, T.QualityGateStatusCondition[], boolean?];
+type TestArgs = [BranchLike, string, T.Status, T.QualityGateStatusCondition[], boolean?];
 
 const FAILING_CONDITION = mockQualityGateStatusCondition();
 const COMPONENT = 'foo';
 const BRANCH_STATUS_1: TestArgs = [mockPullRequest(), COMPONENT, 'ERROR', [FAILING_CONDITION]];
-const BRANCH_STATUS_2: TestArgs = [mockLongLivingBranch(), 'bar', 'OK', [], true];
-const BRANCH_STATUS_3: TestArgs = [mockShortLivingBranch(), COMPONENT, 'OK', []];
+const BRANCH_STATUS_2: TestArgs = [mockBranch(), 'bar', 'OK', [], true];
+const BRANCH_STATUS_3: TestArgs = [mockBranch(), COMPONENT, 'OK', []];
 
 it('should allow to register new branche statuses', () => {
   const initialState: State = convertToState();
@@ -51,7 +48,7 @@ it('should allow to register new branche statuses', () => {
 
 it('should allow to update branche statuses', () => {
   const initialState: State = convertToState([BRANCH_STATUS_1, BRANCH_STATUS_2, BRANCH_STATUS_3]);
-  const branchLike: T.BranchLike = { ...BRANCH_STATUS_1[0], status: { qualityGateStatus: 'OK' } };
+  const branchLike: BranchLike = { ...BRANCH_STATUS_1[0], status: { qualityGateStatus: 'OK' } };
   const branchStatus: TestArgs = [branchLike, COMPONENT, 'OK', []];
 
   const newState = reducer(initialState, registerBranchStatusAction(...branchStatus));
diff --git a/server/sonar-web/src/main/js/store/__tests__/rootActions-test.tsx b/server/sonar-web/src/main/js/store/__tests__/rootActions-test.tsx
index d4f9c887b64..10e24925393 100644
--- a/server/sonar-web/src/main/js/store/__tests__/rootActions-test.tsx
+++ b/server/sonar-web/src/main/js/store/__tests__/rootActions-test.tsx
@@ -17,7 +17,8 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-import { mockLongLivingBranch, mockQualityGateStatusCondition } from '../../helpers/testMocks';
+import { mockBranch } from '../../helpers/mocks/branch-like';
+import { mockQualityGateStatusCondition } from '../../helpers/testMocks';
 import { registerBranchStatusAction } from '../branches';
 import { fetchBranchStatus, registerBranchStatus } from '../rootActions';
 
@@ -47,7 +48,7 @@ jest.mock('../../api/quality-gates', () => {
 });
 
 describe('branch store actions', () => {
-  const branchLike = mockLongLivingBranch();
+  const branchLike = mockBranch();
   const component = 'foo';
   const status = 'OK';
 
diff --git a/server/sonar-web/src/main/js/store/__tests__/rootReducers-test.tsx b/server/sonar-web/src/main/js/store/__tests__/rootReducers-test.tsx
index e55d671c55e..216cc9ce204 100644
--- a/server/sonar-web/src/main/js/store/__tests__/rootReducers-test.tsx
+++ b/server/sonar-web/src/main/js/store/__tests__/rootReducers-test.tsx
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-import { mockPullRequest } from '../../helpers/testMocks';
+import { mockPullRequest } from '../../helpers/mocks/branch-like';
 import * as fromBranches from '../branches';
 import { getBranchStatusByBranchLike, Store } from '../rootReducer';
 
diff --git a/server/sonar-web/src/main/js/store/branches.ts b/server/sonar-web/src/main/js/store/branches.ts
index fee3975287b..cfeb3dba46f 100644
--- a/server/sonar-web/src/main/js/store/branches.ts
+++ b/server/sonar-web/src/main/js/store/branches.ts
@@ -17,7 +17,8 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-import { getBranchLikeKey } from '../helpers/branches';
+import { getBranchLikeKey } from '../helpers/branch-like';
+import { BranchLike } from '../types/branch-like';
 import { ActionType } from './utils/actions';
 
 export interface BranchStatusData {
@@ -37,7 +38,7 @@ const enum Actions {
 type Action = ActionType<typeof registerBranchStatusAction, Actions.RegisterBranchStatus>;
 
 export function registerBranchStatusAction(
-  branchLike: T.BranchLike,
+  branchLike: BranchLike,
   component: string,
   status: T.Status,
   conditions?: T.QualityGateStatusCondition[],
@@ -78,7 +79,7 @@ export default function(state: State = { byComponent: {} }, action: Action): Sta
 export function getBranchStatusByBranchLike(
   state: State,
   component: string,
-  branchLike: T.BranchLike
+  branchLike: BranchLike
 ): BranchStatusData {
   const branchLikeKey = getBranchLikeKey(branchLike);
   return state.byComponent[component] && state.byComponent[component][branchLikeKey];
diff --git a/server/sonar-web/src/main/js/store/rootActions.ts b/server/sonar-web/src/main/js/store/rootActions.ts
index f77391118cb..1d18796935f 100644
--- a/server/sonar-web/src/main/js/store/rootActions.ts
+++ b/server/sonar-web/src/main/js/store/rootActions.ts
@@ -24,8 +24,9 @@ import { getLanguages } from '../api/languages';
 import { getAllMetrics } from '../api/metrics';
 import { getOrganization, getOrganizationNavigation, getOrganizations } from '../api/organizations';
 import { getQualityGateProjectStatus } from '../api/quality-gates';
-import { getBranchLikeQuery } from '../helpers/branches';
+import { getBranchLikeQuery } from '../helpers/branch-like';
 import { extractStatusConditionsFromProjectStatus } from '../helpers/qualityGates';
+import { BranchLike } from '../types/branch-like';
 import { requireAuthorization as requireAuthorizationAction } from './appState';
 import { registerBranchStatusAction } from './branches';
 import { addGlobalErrorMessage } from './globalMessages';
@@ -65,7 +66,7 @@ export const fetchOrganization = (key: string) => (dispatch: Dispatch) => {
   );
 };
 
-export function fetchBranchStatus(branchLike: T.BranchLike, projectKey: string) {
+export function fetchBranchStatus(branchLike: BranchLike, projectKey: string) {
   return (dispatch: Dispatch<any>) => {
     getQualityGateProjectStatus({ projectKey, ...getBranchLikeQuery(branchLike) }).then(
       projectStatus => {
@@ -114,11 +115,7 @@ export function requireAuthorization(router: Pick<InjectedRouter, 'replace'>) {
   return requireAuthorizationAction();
 }
 
-export function registerBranchStatus(
-  branchLike: T.BranchLike,
-  component: string,
-  status: T.Status
-) {
+export function registerBranchStatus(branchLike: BranchLike, component: string, status: T.Status) {
   return (dispatch: Dispatch) => {
     dispatch(registerBranchStatusAction(branchLike, component, status));
   };
diff --git a/server/sonar-web/src/main/js/store/rootReducer.ts b/server/sonar-web/src/main/js/store/rootReducer.ts
index e489bc707e1..3a6d8ab2c90 100644
--- a/server/sonar-web/src/main/js/store/rootReducer.ts
+++ b/server/sonar-web/src/main/js/store/rootReducer.ts
@@ -19,6 +19,7 @@
  */
 import { combineReducers } from 'redux';
 import settingsApp, * as fromSettingsApp from '../apps/settings/store/rootReducer';
+import { BranchLike } from '../types/branch-like';
 import appState from './appState';
 import branches, * as fromBranches from './branches';
 import globalMessages, * as fromGlobalMessages from './globalMessages';
@@ -136,7 +137,7 @@ export function getSettingsAppValidationMessage(state: Store, key: string) {
 export function getBranchStatusByBranchLike(
   state: Store,
   component: string,
-  branchLike: T.BranchLike
+  branchLike: BranchLike
 ) {
   return fromBranches.getBranchStatusByBranchLike(state.branches, component, branchLike);
 }