SONAR-15945 Get rid of T namespace in sonar-web

13 files changed, 73 insertions, 58 deletions

diff --git a/server/sonar-web/src/main/js/apps/code/__tests__/buckets-test.tsx b/server/sonar-web/src/main/js/apps/code/__tests__/buckets-test.tsx
index f72e9d0a9b0..65e6a09fc8d 100644
--- a/server/sonar-web/src/main/js/apps/code/__tests__/buckets-test.tsx
+++ b/server/sonar-web/src/main/js/apps/code/__tests__/buckets-test.tsx
@@ -17,16 +17,17 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
+import { ComponentMeasure } from '../../../types/types';
 import { addComponent, addComponentChildren, getComponent, getComponentChildren } from '../bucket';
 
-const component: T.ComponentMeasure = { key: 'frodo', name: 'frodo', qualifier: 'frodo' };
+const component: ComponentMeasure = { key: 'frodo', name: 'frodo', qualifier: 'frodo' };
 
 const componentKey: string = 'foo';
-const childrenA: T.ComponentMeasure[] = [
+const childrenA: ComponentMeasure[] = [
   { key: 'foo', name: 'foo', qualifier: 'foo' },
   { key: 'bar', name: 'bar', qualifier: 'bar' }
 ];
-const childrenB: T.ComponentMeasure[] = [
+const childrenB: ComponentMeasure[] = [
   { key: 'bart', name: 'bart', qualifier: 'bart' },
   { key: 'simpson', name: 'simpson', qualifier: 'simpson' }
 ];
diff --git a/server/sonar-web/src/main/js/apps/code/bucket.ts b/server/sonar-web/src/main/js/apps/code/bucket.ts
index 9c385131cf4..d6f6945ac8f 100644
--- a/server/sonar-web/src/main/js/apps/code/bucket.ts
+++ b/server/sonar-web/src/main/js/apps/code/bucket.ts
@@ -17,25 +17,28 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-let bucket: T.Dict<T.ComponentMeasure> = {};
-let childrenBucket: T.Dict<{
-  children: T.ComponentMeasure[];
+
+import { Breadcrumb, ComponentMeasure, Dict } from '../../types/types';
+
+let bucket: Dict<ComponentMeasure> = {};
+let childrenBucket: Dict<{
+  children: ComponentMeasure[];
   page: number;
   total: number;
 }> = {};
-let breadcrumbsBucket: T.Dict<T.Breadcrumb[]> = {};
+let breadcrumbsBucket: Dict<Breadcrumb[]> = {};
 
-export function addComponent(component: T.ComponentMeasure): void {
+export function addComponent(component: ComponentMeasure): void {
   bucket[component.key] = component;
 }
 
-export function getComponent(componentKey: string): T.ComponentMeasure {
+export function getComponent(componentKey: string): ComponentMeasure {
   return bucket[componentKey];
 }
 
 export function addComponentChildren(
   componentKey: string,
-  children: T.ComponentMeasure[],
+  children: ComponentMeasure[],
   total: number,
   page: number
 ): void {
@@ -49,18 +52,18 @@ export function addComponentChildren(
 export function getComponentChildren(
   componentKey: string
 ): {
-  children: T.ComponentMeasure[];
+  children: ComponentMeasure[];
   page: number;
   total: number;
 } {
   return childrenBucket[componentKey];
 }
 
-export function addComponentBreadcrumbs(componentKey: string, breadcrumbs: T.Breadcrumb[]): void {
+export function addComponentBreadcrumbs(componentKey: string, breadcrumbs: Breadcrumb[]): void {
   breadcrumbsBucket[componentKey] = breadcrumbs;
 }
 
-export function getComponentBreadcrumbs(componentKey: string): T.Breadcrumb[] {
+export function getComponentBreadcrumbs(componentKey: string): Breadcrumb[] {
   return breadcrumbsBucket[componentKey];
 }
 
diff --git a/server/sonar-web/src/main/js/apps/code/components/Breadcrumbs.tsx b/server/sonar-web/src/main/js/apps/code/components/Breadcrumbs.tsx
index 782af6e1793..59fa5120973 100644
--- a/server/sonar-web/src/main/js/apps/code/components/Breadcrumbs.tsx
+++ b/server/sonar-web/src/main/js/apps/code/components/Breadcrumbs.tsx
@@ -19,12 +19,13 @@
  */
 import * as React from 'react';
 import { BranchLike } from '../../../types/branch-like';
+import { Breadcrumb, ComponentMeasure } from '../../../types/types';
 import ComponentName from './ComponentName';
 
 interface Props {
   branchLike?: BranchLike;
-  breadcrumbs: T.Breadcrumb[];
-  rootComponent: T.ComponentMeasure;
+  breadcrumbs: Breadcrumb[];
+  rootComponent: ComponentMeasure;
 }
 
 export default function Breadcrumbs({ branchLike, breadcrumbs, rootComponent }: Props) {
diff --git a/server/sonar-web/src/main/js/apps/code/components/CodeApp.tsx b/server/sonar-web/src/main/js/apps/code/components/CodeApp.tsx
index 9ad1391425d..a66a95fc915 100644
--- a/server/sonar-web/src/main/js/apps/code/components/CodeApp.tsx
+++ b/server/sonar-web/src/main/js/apps/code/components/CodeApp.tsx
@@ -37,6 +37,7 @@ import { fetchBranchStatus, fetchMetrics } from '../../../store/rootActions';
 import { getMetrics } from '../../../store/rootReducer';
 import { BranchLike } from '../../../types/branch-like';
 import { isPortfolioLike } from '../../../types/component';
+import { Breadcrumb, Component, ComponentMeasure, Dict, Issue, Metric } from '../../../types/types';
 import { addComponent, addComponentBreadcrumbs, clearBucket } from '../bucket';
 import '../code.css';
 import {
@@ -51,7 +52,7 @@ import Search from './Search';
 import SourceViewerWrapper from './SourceViewerWrapper';
 
 interface StateToProps {
-  metrics: T.Dict<T.Metric>;
+  metrics: Dict<Metric>;
 }
 
 interface DispatchToProps {
@@ -61,7 +62,7 @@ interface DispatchToProps {
 
 interface OwnProps {
   branchLike?: BranchLike;
-  component: T.Component;
+  component: Component;
   location: Pick<Location, 'query'>;
   router: Pick<InjectedRouter, 'push'>;
 }
@@ -69,14 +70,14 @@ interface OwnProps {
 type Props = StateToProps & DispatchToProps & OwnProps;
 
 interface State {
-  baseComponent?: T.ComponentMeasure;
-  breadcrumbs: T.Breadcrumb[];
-  components?: T.ComponentMeasure[];
-  highlighted?: T.ComponentMeasure;
+  baseComponent?: ComponentMeasure;
+  breadcrumbs: Breadcrumb[];
+  components?: ComponentMeasure[];
+  highlighted?: ComponentMeasure;
   loading: boolean;
   page: number;
-  searchResults?: T.ComponentMeasure[];
-  sourceViewer?: T.ComponentMeasure;
+  searchResults?: ComponentMeasure[];
+  sourceViewer?: ComponentMeasure;
   total: number;
   newCodeSelected: boolean;
 }
@@ -208,11 +209,11 @@ export class CodeApp extends React.Component<Props, State> {
     }
   };
 
-  handleHighlight = (highlighted: T.ComponentMeasure) => {
+  handleHighlight = (highlighted: ComponentMeasure) => {
     this.setState({ highlighted });
   };
 
-  handleIssueChange = (_: T.Issue) => {
+  handleIssueChange = (_: Issue) => {
     this.refreshBranchStatus();
   };
 
@@ -220,11 +221,11 @@ export class CodeApp extends React.Component<Props, State> {
     this.setState({ searchResults: undefined });
   };
 
-  handleSearchResults = (searchResults: T.ComponentMeasure[] = []) => {
+  handleSearchResults = (searchResults: ComponentMeasure[] = []) => {
     this.setState({ searchResults });
   };
 
-  handleSelect = (component: T.ComponentMeasure) => {
+  handleSelect = (component: ComponentMeasure) => {
     const { branchLike, component: rootComponent } = this.props;
 
     if (component.refKey) {
diff --git a/server/sonar-web/src/main/js/apps/code/components/Component.tsx b/server/sonar-web/src/main/js/apps/code/components/Component.tsx
index 61e9f2d02a9..24361a70a49 100644
--- a/server/sonar-web/src/main/js/apps/code/components/Component.tsx
+++ b/server/sonar-web/src/main/js/apps/code/components/Component.tsx
@@ -24,6 +24,7 @@ import { WorkspaceContext } from '../../../components/workspace/context';
 import { BranchLike } from '../../../types/branch-like';
 import { ComponentQualifier } from '../../../types/component';
 import { MetricType } from '../../../types/metrics';
+import { ComponentMeasure as TypeComponentMeasure, Metric } from '../../../types/types';
 import ComponentMeasure from './ComponentMeasure';
 import ComponentName from './ComponentName';
 import ComponentPin from './ComponentPin';
@@ -32,12 +33,12 @@ interface Props {
   branchLike?: BranchLike;
   canBePinned?: boolean;
   canBrowse?: boolean;
-  component: T.ComponentMeasure;
+  component: TypeComponentMeasure;
   hasBaseComponent: boolean;
   isBaseComponent?: boolean;
-  metrics: T.Metric[];
-  previous?: T.ComponentMeasure;
-  rootComponent: T.ComponentMeasure;
+  metrics: Metric[];
+  previous?: TypeComponentMeasure;
+  rootComponent: TypeComponentMeasure;
   selected?: boolean;
 }
 
diff --git a/server/sonar-web/src/main/js/apps/code/components/ComponentMeasure.tsx b/server/sonar-web/src/main/js/apps/code/components/ComponentMeasure.tsx
index 0b68c399fd8..bc41026f1f9 100644
--- a/server/sonar-web/src/main/js/apps/code/components/ComponentMeasure.tsx
+++ b/server/sonar-web/src/main/js/apps/code/components/ComponentMeasure.tsx
@@ -21,10 +21,11 @@ import * as React from 'react';
 import Measure from '../../../components/measure/Measure';
 import { getLeakValue } from '../../../components/measure/utils';
 import { isDiffMetric } from '../../../helpers/measures';
+import { ComponentMeasure as TypeComponentMeasure, Metric } from '../../../types/types';
 
 interface Props {
-  component: T.ComponentMeasure;
-  metric: T.Metric;
+  component: TypeComponentMeasure;
+  metric: Metric;
 }
 
 export default class ComponentMeasure extends React.PureComponent<Props> {
diff --git a/server/sonar-web/src/main/js/apps/code/components/ComponentName.tsx b/server/sonar-web/src/main/js/apps/code/components/ComponentName.tsx
index cd67da0d00e..3dc3d132c71 100644
--- a/server/sonar-web/src/main/js/apps/code/components/ComponentName.tsx
+++ b/server/sonar-web/src/main/js/apps/code/components/ComponentName.tsx
@@ -32,8 +32,9 @@ import {
   isPortfolioLike,
   isProject
 } from '../../../types/component';
+import { ComponentMeasure } from '../../../types/types';
 
-export function getTooltip(component: T.ComponentMeasure) {
+export function getTooltip(component: ComponentMeasure) {
   const isFile = component.qualifier === 'FIL' || component.qualifier === 'UTS';
 
   if (isFile && component.path) {
@@ -61,9 +62,9 @@ export function mostCommonPrefix(strings: string[]) {
 export interface Props {
   branchLike?: BranchLike;
   canBrowse?: boolean;
-  component: T.ComponentMeasure;
-  previous?: T.ComponentMeasure;
-  rootComponent: T.ComponentMeasure;
+  component: ComponentMeasure;
+  previous?: ComponentMeasure;
+  rootComponent: ComponentMeasure;
   unclickable?: boolean;
 }
 
diff --git a/server/sonar-web/src/main/js/apps/code/components/ComponentPin.tsx b/server/sonar-web/src/main/js/apps/code/components/ComponentPin.tsx
index 34ac5a6e654..cd77ea623f6 100644
--- a/server/sonar-web/src/main/js/apps/code/components/ComponentPin.tsx
+++ b/server/sonar-web/src/main/js/apps/code/components/ComponentPin.tsx
@@ -22,10 +22,11 @@ import PinIcon from '../../../components/icons/PinIcon';
 import { WorkspaceContextShape } from '../../../components/workspace/context';
 import { translate } from '../../../helpers/l10n';
 import { BranchLike } from '../../../types/branch-like';
+import { ComponentMeasure } from '../../../types/types';
 
 interface Props {
   branchLike?: BranchLike;
-  component: T.ComponentMeasure;
+  component: ComponentMeasure;
   openComponent: WorkspaceContextShape['openComponent'];
 }
 
diff --git a/server/sonar-web/src/main/js/apps/code/components/Components.tsx b/server/sonar-web/src/main/js/apps/code/components/Components.tsx
index 0946b2275b9..449a4020f22 100644
--- a/server/sonar-web/src/main/js/apps/code/components/Components.tsx
+++ b/server/sonar-web/src/main/js/apps/code/components/Components.tsx
@@ -22,17 +22,18 @@ import * as React from 'react';
 import withKeyboardNavigation from '../../../components/hoc/withKeyboardNavigation';
 import { getComponentMeasureUniqueKey } from '../../../helpers/component';
 import { BranchLike } from '../../../types/branch-like';
+import { ComponentMeasure, Metric } from '../../../types/types';
 import Component from './Component';
 import ComponentsEmpty from './ComponentsEmpty';
 import ComponentsHeader from './ComponentsHeader';
 
 interface Props {
-  baseComponent?: T.ComponentMeasure;
+  baseComponent?: ComponentMeasure;
   branchLike?: BranchLike;
-  components: T.ComponentMeasure[];
-  metrics: T.Metric[];
-  rootComponent: T.ComponentMeasure;
-  selected?: T.ComponentMeasure;
+  components: ComponentMeasure[];
+  metrics: Metric[];
+  rootComponent: ComponentMeasure;
+  selected?: ComponentMeasure;
 }
 
 const BASE_COLUMN_COUNT = 4;
diff --git a/server/sonar-web/src/main/js/apps/code/components/ComponentsHeader.tsx b/server/sonar-web/src/main/js/apps/code/components/ComponentsHeader.tsx
index f458cc98484..8c9067457a7 100644
--- a/server/sonar-web/src/main/js/apps/code/components/ComponentsHeader.tsx
+++ b/server/sonar-web/src/main/js/apps/code/components/ComponentsHeader.tsx
@@ -20,12 +20,13 @@
 import classNames from 'classnames';
 import * as React from 'react';
 import { translate } from '../../../helpers/l10n';
+import { ComponentMeasure } from '../../../types/types';
 
 interface Props {
-  baseComponent?: T.ComponentMeasure;
+  baseComponent?: ComponentMeasure;
   canBePinned?: boolean;
   metrics: string[];
-  rootComponent: T.ComponentMeasure;
+  rootComponent: ComponentMeasure;
 }
 
 const SHORT_NAME_METRICS = [
diff --git a/server/sonar-web/src/main/js/apps/code/components/Search.tsx b/server/sonar-web/src/main/js/apps/code/components/Search.tsx
index 740504eabd9..ce9b0da5407 100644
--- a/server/sonar-web/src/main/js/apps/code/components/Search.tsx
+++ b/server/sonar-web/src/main/js/apps/code/components/Search.tsx
@@ -27,16 +27,17 @@ import { getBranchLikeQuery } from '../../../helpers/branch-like';
 import { KeyboardCodes } from '../../../helpers/keycodes';
 import { translate } from '../../../helpers/l10n';
 import { BranchLike } from '../../../types/branch-like';
+import { ComponentMeasure } from '../../../types/types';
 import PortfolioNewCodeToggle from './PortfolioNewCodeToggle';
 
 interface Props {
   branchLike?: BranchLike;
-  component: T.ComponentMeasure;
+  component: ComponentMeasure;
   location: Location;
   newCodeSelected: boolean;
   onSearchClear: () => void;
   onNewCodeToggle: (newCode: boolean) => void;
-  onSearchResults: (results?: T.ComponentMeasure[]) => void;
+  onSearchResults: (results?: ComponentMeasure[]) => void;
   router: Router;
 }
 
diff --git a/server/sonar-web/src/main/js/apps/code/components/SourceViewerWrapper.tsx b/server/sonar-web/src/main/js/apps/code/components/SourceViewerWrapper.tsx
index 874c5b3379f..73fb535bf69 100644
--- a/server/sonar-web/src/main/js/apps/code/components/SourceViewerWrapper.tsx
+++ b/server/sonar-web/src/main/js/apps/code/components/SourceViewerWrapper.tsx
@@ -23,13 +23,14 @@ import withKeyboardNavigation from '../../../components/hoc/withKeyboardNavigati
 import SourceViewer from '../../../components/SourceViewer/SourceViewer';
 import { scrollToElement } from '../../../helpers/scrolling';
 import { BranchLike } from '../../../types/branch-like';
+import { Issue, Measure } from '../../../types/types';
 
 interface Props {
   branchLike?: BranchLike;
   component: string;
-  componentMeasures: T.Measure[] | undefined;
+  componentMeasures: Measure[] | undefined;
   location: Pick<Location, 'query'>;
-  onIssueChange?: (issue: T.Issue) => void;
+  onIssueChange?: (issue: Issue) => void;
 }
 
 export class SourceViewerWrapper extends React.PureComponent<Props> {
diff --git a/server/sonar-web/src/main/js/apps/code/utils.ts b/server/sonar-web/src/main/js/apps/code/utils.ts
index 3f957269065..99e094128a1 100644
--- a/server/sonar-web/src/main/js/apps/code/utils.ts
+++ b/server/sonar-web/src/main/js/apps/code/utils.ts
@@ -22,6 +22,7 @@ import { getBranchLikeQuery, isPullRequest } from '../../helpers/branch-like';
 import { BranchLike } from '../../types/branch-like';
 import { isPortfolioLike } from '../../types/component';
 import { MetricKey } from '../../types/metrics';
+import { Breadcrumb, ComponentMeasure } from '../../types/types';
 import {
   addComponent,
   addComponentBreadcrumbs,
@@ -74,7 +75,7 @@ const LEAK_METRICS = [
 const PAGE_SIZE = 100;
 
 interface Children {
-  components: T.ComponentMeasure[];
+  components: ComponentMeasure[];
   page: number;
   total: number;
 }
@@ -91,17 +92,17 @@ export function showLeakMeasure(branchLike?: BranchLike) {
   return isPullRequest(branchLike);
 }
 
-function skipRootDir(breadcrumbs: T.ComponentMeasure[]) {
+function skipRootDir(breadcrumbs: ComponentMeasure[]) {
   return breadcrumbs.filter(component => {
     return !(component.qualifier === 'DIR' && component.name === '/');
   });
 }
 
-function storeChildrenBase(children: T.ComponentMeasure[]) {
+function storeChildrenBase(children: ComponentMeasure[]) {
   children.forEach(addComponent);
 }
 
-function storeChildrenBreadcrumbs(parentComponentKey: string, children: T.Breadcrumb[]) {
+function storeChildrenBreadcrumbs(parentComponentKey: string, children: Breadcrumb[]) {
   const parentBreadcrumbs = getComponentBreadcrumbs(parentComponentKey);
   if (parentBreadcrumbs) {
     children.forEach(child => {
@@ -166,7 +167,7 @@ export function retrieveComponentChildren(
   qualifier: string,
   instance: { mounted: boolean },
   branchLike?: BranchLike
-): Promise<{ components: T.ComponentMeasure[]; page: number; total: number }> {
+): Promise<{ components: ComponentMeasure[]; page: number; total: number }> {
   const existing = getComponentChildren(componentKey);
   if (existing) {
     return Promise.resolve({
@@ -200,7 +201,7 @@ function retrieveComponentBreadcrumbs(
   component: string,
   instance: { mounted: boolean },
   branchLike?: BranchLike
-): Promise<T.Breadcrumb[]> {
+): Promise<Breadcrumb[]> {
   const existing = getComponentBreadcrumbs(component);
   if (existing) {
     return Promise.resolve(existing);
@@ -222,9 +223,9 @@ export function retrieveComponent(
   instance: { mounted: boolean },
   branchLike?: BranchLike
 ): Promise<{
-  breadcrumbs: T.Breadcrumb[];
-  component: T.ComponentMeasure;
-  components: T.ComponentMeasure[];
+  breadcrumbs: Breadcrumb[];
+  component: ComponentMeasure;
+  components: ComponentMeasure[];
   page: number;
   total: number;
 }> {