diff options
author | philippe-perrin-sonarsource <philippe.perrin@sonarsource.com> | 2022-01-27 11:06:59 +0100 |
---|---|---|
committer | sonartech <sonartech@sonarsource.com> | 2022-01-27 20:03:05 +0000 |
commit | dca8354af94e9feb46ea2312857e000aaa232372 (patch) | |
tree | 336b645749ab1fb1b1abdac19a69c70257e98b68 /server/sonar-web/src/main/js/apps/projectBaseline | |
parent | 85f744be340d8f404978341186dd77cc05584f31 (diff) | |
download | sonarqube-dca8354af94e9feb46ea2312857e000aaa232372.tar.gz sonarqube-dca8354af94e9feb46ea2312857e000aaa232372.zip |
SONAR-15945 Get rid of T namespace in sonar-web
Diffstat (limited to 'server/sonar-web/src/main/js/apps/projectBaseline')
12 files changed, 61 insertions, 43 deletions
diff --git a/server/sonar-web/src/main/js/apps/projectBaseline/components/App.tsx b/server/sonar-web/src/main/js/apps/projectBaseline/components/App.tsx index 3a751aecc1f..4f957e4b686 100644 --- a/server/sonar-web/src/main/js/apps/projectBaseline/components/App.tsx +++ b/server/sonar-web/src/main/js/apps/projectBaseline/components/App.tsx @@ -27,6 +27,12 @@ import DeferredSpinner from '../../../components/ui/DeferredSpinner'; import { isBranch, sortBranches } from '../../../helpers/branch-like'; import { translate } from '../../../helpers/l10n'; import { Branch, BranchLike } from '../../../types/branch-like'; +import { + Component, + NewCodePeriod, + NewCodePeriodSettingType, + ParsedAnalysis +} from '../../../types/types'; import '../styles.css'; import { getSettingValue } from '../utils'; import AppHeader from './AppHeader'; @@ -38,27 +44,27 @@ interface Props { branchLikes: BranchLike[]; branchesEnabled?: boolean; canAdmin?: boolean; - component: T.Component; + component: Component; } interface State { analysis?: string; branchList: Branch[]; - currentSetting?: T.NewCodePeriodSettingType; + currentSetting?: NewCodePeriodSettingType; currentSettingValue?: string; days: string; - generalSetting?: T.NewCodePeriod; + generalSetting?: NewCodePeriod; loading: boolean; overrideGeneralSetting?: boolean; referenceBranch?: string; saving: boolean; - selected?: T.NewCodePeriodSettingType; + selected?: NewCodePeriodSettingType; success?: boolean; } const DEFAULT_NUMBER_OF_DAYS = '30'; -const DEFAULT_GENERAL_SETTING: { type: T.NewCodePeriodSettingType } = { +const DEFAULT_GENERAL_SETTING: { type: NewCodePeriodSettingType } = { type: 'PREVIOUS_VERSION' }; @@ -91,9 +97,9 @@ export default class App extends React.PureComponent<Props, State> { } getUpdatedState(params: { - currentSetting?: T.NewCodePeriodSettingType; + currentSetting?: NewCodePeriodSettingType; currentSettingValue?: string; - generalSetting: T.NewCodePeriod; + generalSetting: NewCodePeriod; }) { const { currentSetting, currentSettingValue, generalSetting } = params; const { referenceBranch } = this.state; @@ -173,7 +179,7 @@ export default class App extends React.PureComponent<Props, State> { ); }; - handleSelectAnalysis = (analysis: T.ParsedAnalysis) => this.setState({ analysis: analysis.key }); + handleSelectAnalysis = (analysis: ParsedAnalysis) => this.setState({ analysis: analysis.key }); handleSelectDays = (days: string) => this.setState({ days }); @@ -187,7 +193,7 @@ export default class App extends React.PureComponent<Props, State> { this.getUpdatedState({ generalSetting, currentSetting, currentSettingValue }) ); - handleSelectSetting = (selected?: T.NewCodePeriodSettingType) => this.setState({ selected }); + handleSelectSetting = (selected?: NewCodePeriodSettingType) => this.setState({ selected }); handleToggleSpecificSetting = (overrideGeneralSetting: boolean) => this.setState({ overrideGeneralSetting }); diff --git a/server/sonar-web/src/main/js/apps/projectBaseline/components/BaselineSettingAnalysis.tsx b/server/sonar-web/src/main/js/apps/projectBaseline/components/BaselineSettingAnalysis.tsx index 0dd4a639f45..cba5518a9f4 100644 --- a/server/sonar-web/src/main/js/apps/projectBaseline/components/BaselineSettingAnalysis.tsx +++ b/server/sonar-web/src/main/js/apps/projectBaseline/components/BaselineSettingAnalysis.tsx @@ -20,10 +20,11 @@ import * as React from 'react'; import RadioCard from '../../../components/controls/RadioCard'; import { translate } from '../../../helpers/l10n'; +import { NewCodePeriodSettingType } from '../../../types/types'; export interface Props { disabled?: boolean; - onSelect: (selection: T.NewCodePeriodSettingType) => void; + onSelect: (selection: NewCodePeriodSettingType) => void; selected: boolean; } diff --git a/server/sonar-web/src/main/js/apps/projectBaseline/components/BaselineSettingDays.tsx b/server/sonar-web/src/main/js/apps/projectBaseline/components/BaselineSettingDays.tsx index a0f88c0fc16..d555d6338e8 100644 --- a/server/sonar-web/src/main/js/apps/projectBaseline/components/BaselineSettingDays.tsx +++ b/server/sonar-web/src/main/js/apps/projectBaseline/components/BaselineSettingDays.tsx @@ -22,6 +22,7 @@ import RadioCard from '../../../components/controls/RadioCard'; import ValidationInput from '../../../components/controls/ValidationInput'; import MandatoryFieldsExplanation from '../../../components/ui/MandatoryFieldsExplanation'; import { translate } from '../../../helpers/l10n'; +import { NewCodePeriodSettingType } from '../../../types/types'; export interface Props { className?: string; @@ -30,7 +31,7 @@ export interface Props { isChanged: boolean; isValid: boolean; onChangeDays: (value: string) => void; - onSelect: (selection: T.NewCodePeriodSettingType) => void; + onSelect: (selection: NewCodePeriodSettingType) => void; selected: boolean; } diff --git a/server/sonar-web/src/main/js/apps/projectBaseline/components/BaselineSettingPreviousVersion.tsx b/server/sonar-web/src/main/js/apps/projectBaseline/components/BaselineSettingPreviousVersion.tsx index 9a24385d5ee..2b1ee54ad8d 100644 --- a/server/sonar-web/src/main/js/apps/projectBaseline/components/BaselineSettingPreviousVersion.tsx +++ b/server/sonar-web/src/main/js/apps/projectBaseline/components/BaselineSettingPreviousVersion.tsx @@ -20,11 +20,12 @@ import * as React from 'react'; import RadioCard from '../../../components/controls/RadioCard'; import { translate } from '../../../helpers/l10n'; +import { NewCodePeriodSettingType } from '../../../types/types'; export interface Props { disabled?: boolean; isDefault?: boolean; - onSelect: (selection: T.NewCodePeriodSettingType) => void; + onSelect: (selection: NewCodePeriodSettingType) => void; selected: boolean; } diff --git a/server/sonar-web/src/main/js/apps/projectBaseline/components/BaselineSettingReferenceBranch.tsx b/server/sonar-web/src/main/js/apps/projectBaseline/components/BaselineSettingReferenceBranch.tsx index 9e932cd4996..e31c3caf12d 100644 --- a/server/sonar-web/src/main/js/apps/projectBaseline/components/BaselineSettingReferenceBranch.tsx +++ b/server/sonar-web/src/main/js/apps/projectBaseline/components/BaselineSettingReferenceBranch.tsx @@ -25,6 +25,7 @@ import AlertErrorIcon from '../../../components/icons/AlertErrorIcon'; import MandatoryFieldMarker from '../../../components/ui/MandatoryFieldMarker'; import MandatoryFieldsExplanation from '../../../components/ui/MandatoryFieldsExplanation'; import { translate, translateWithParameters } from '../../../helpers/l10n'; +import { NewCodePeriodSettingType } from '../../../types/types'; export interface BaselineSettingReferenceBranchProps { branchList: BranchOption[]; @@ -32,7 +33,7 @@ export interface BaselineSettingReferenceBranchProps { configuredBranchName?: string; disabled?: boolean; onChangeReferenceBranch: (value: string) => void; - onSelect: (selection: T.NewCodePeriodSettingType) => void; + onSelect: (selection: NewCodePeriodSettingType) => void; referenceBranch: string; selected: boolean; settingLevel: 'project' | 'branch'; diff --git a/server/sonar-web/src/main/js/apps/projectBaseline/components/BranchAnalysisList.tsx b/server/sonar-web/src/main/js/apps/projectBaseline/components/BranchAnalysisList.tsx index dcf12cd846b..8ae05b89402 100644 --- a/server/sonar-web/src/main/js/apps/projectBaseline/components/BranchAnalysisList.tsx +++ b/server/sonar-web/src/main/js/apps/projectBaseline/components/BranchAnalysisList.tsx @@ -23,17 +23,18 @@ import * as React from 'react'; import { getProjectActivity } from '../../../api/projectActivity'; import { parseDate, toShortNotSoISOString } from '../../../helpers/dates'; import { scrollToElement } from '../../../helpers/scrolling'; +import { Analysis, Dict, ParsedAnalysis } from '../../../types/types'; import BranchAnalysisListRenderer from './BranchAnalysisListRenderer'; interface Props { analysis: string; branch: string; component: string; - onSelectAnalysis: (analysis: T.ParsedAnalysis) => void; + onSelectAnalysis: (analysis: ParsedAnalysis) => void; } interface State { - analyses: T.ParsedAnalysis[]; + analyses: ParsedAnalysis[]; loading: boolean; range: number; scroll: number; @@ -43,7 +44,7 @@ const STICKY_BADGE_SCROLL_OFFSET = 10; export default class BranchAnalysisList extends React.PureComponent<Props, State> { mounted = false; - badges: T.Dict<HTMLDivElement> = {}; + badges: Dict<HTMLDivElement> = {}; scrollableNode?: HTMLDivElement; state: State = { analyses: [], @@ -82,7 +83,7 @@ export default class BranchAnalysisList extends React.PureComponent<Props, State branch, project: component, from: range ? toShortNotSoISOString(subDays(new Date(), range)) : undefined - }).then((result: { analyses: T.Analysis[] }) => { + }).then((result: { analyses: Analysis[] }) => { // If the selected analysis wasn't found in the default 30 days range, redo the search if (initial && analysis && !result.analyses.find(a => a.key === analysis)) { this.handleRangeChange({ value: 0 }); @@ -94,7 +95,7 @@ export default class BranchAnalysisList extends React.PureComponent<Props, State analyses: result.analyses.map(analysis => ({ ...analysis, date: parseDate(analysis.date) - })) as T.ParsedAnalysis[], + })) as ParsedAnalysis[], loading: false }, () => { diff --git a/server/sonar-web/src/main/js/apps/projectBaseline/components/BranchAnalysisListRenderer.tsx b/server/sonar-web/src/main/js/apps/projectBaseline/components/BranchAnalysisListRenderer.tsx index 7ebb4cf9fc8..c81b95fa6be 100644 --- a/server/sonar-web/src/main/js/apps/projectBaseline/components/BranchAnalysisListRenderer.tsx +++ b/server/sonar-web/src/main/js/apps/projectBaseline/components/BranchAnalysisListRenderer.tsx @@ -27,15 +27,16 @@ import TimeFormatter from '../../../components/intl/TimeFormatter'; import DeferredSpinner from '../../../components/ui/DeferredSpinner'; import { parseDate, toShortNotSoISOString } from '../../../helpers/dates'; import { translate } from '../../../helpers/l10n'; +import { ParsedAnalysis } from '../../../types/types'; import Events from '../../projectActivity/components/Events'; import { getAnalysesByVersionByDay } from '../../projectActivity/utils'; export interface BranchAnalysisListRendererProps { - analyses: T.ParsedAnalysis[]; + analyses: ParsedAnalysis[]; handleRangeChange: ({ value }: { value: number }) => void; handleScroll: (e: React.SyntheticEvent<HTMLDivElement>) => void; loading: boolean; - onSelectAnalysis: (analysis: T.ParsedAnalysis) => void; + onSelectAnalysis: (analysis: ParsedAnalysis) => void; range: number; registerBadgeNode: (version: string) => (el: HTMLDivElement) => void; registerScrollableNode: (el: HTMLDivElement) => void; @@ -44,9 +45,9 @@ export interface BranchAnalysisListRendererProps { } function renderAnalysis(args: { - analysis: T.ParsedAnalysis; + analysis: ParsedAnalysis; isFirst: boolean; - onSelectAnalysis: (analysis: T.ParsedAnalysis) => void; + onSelectAnalysis: (analysis: ParsedAnalysis) => void; selectedAnalysisKey: string; }) { const { analysis, isFirst, onSelectAnalysis, selectedAnalysisKey } = args; diff --git a/server/sonar-web/src/main/js/apps/projectBaseline/components/BranchBaselineSettingModal.tsx b/server/sonar-web/src/main/js/apps/projectBaseline/components/BranchBaselineSettingModal.tsx index 2fb28321fe1..37629eeb5c3 100644 --- a/server/sonar-web/src/main/js/apps/projectBaseline/components/BranchBaselineSettingModal.tsx +++ b/server/sonar-web/src/main/js/apps/projectBaseline/components/BranchBaselineSettingModal.tsx @@ -25,6 +25,7 @@ import DeferredSpinner from '../../../components/ui/DeferredSpinner'; import { toNotSoISOString } from '../../../helpers/dates'; import { translate, translateWithParameters } from '../../../helpers/l10n'; import { Branch, BranchWithNewCodePeriod } from '../../../types/branch-like'; +import { NewCodePeriod, NewCodePeriodSettingType, ParsedAnalysis } from '../../../types/types'; import { getSettingValue, validateSetting } from '../utils'; import BaselineSettingAnalysis from './BaselineSettingAnalysis'; import BaselineSettingDays from './BaselineSettingDays'; @@ -36,7 +37,7 @@ interface Props { branch: BranchWithNewCodePeriod; branchList: Branch[]; component: string; - onClose: (branch?: string, newSetting?: T.NewCodePeriod) => void; + onClose: (branch?: string, newSetting?: NewCodePeriod) => void; } interface State { @@ -45,7 +46,7 @@ interface State { days: string; referenceBranch: string; saving: boolean; - selected?: T.NewCodePeriodSettingType; + selected?: NewCodePeriodSettingType; } export default class BranchBaselineSettingModal extends React.PureComponent<Props, State> { @@ -74,7 +75,7 @@ export default class BranchBaselineSettingModal extends React.PureComponent<Prop this.mounted = false; } - getValueFromProps(type: T.NewCodePeriodSettingType) { + getValueFromProps(type: NewCodePeriodSettingType) { return this.props.branch.newCodePeriod && this.props.branch.newCodePeriod.type === type ? this.props.branch.newCodePeriod.value : null; @@ -123,14 +124,14 @@ export default class BranchBaselineSettingModal extends React.PureComponent<Prop requestClose = () => this.props.onClose(); - handleSelectAnalysis = (analysis: T.ParsedAnalysis) => + handleSelectAnalysis = (analysis: ParsedAnalysis) => this.setState({ analysis: analysis.key, analysisDate: analysis.date }); handleSelectDays = (days: string) => this.setState({ days }); handleSelectReferenceBranch = (referenceBranch: string) => this.setState({ referenceBranch }); - handleSelectSetting = (selected: T.NewCodePeriodSettingType) => this.setState({ selected }); + handleSelectSetting = (selected: NewCodePeriodSettingType) => this.setState({ selected }); render() { const { branch, branchList } = this.props; diff --git a/server/sonar-web/src/main/js/apps/projectBaseline/components/BranchList.tsx b/server/sonar-web/src/main/js/apps/projectBaseline/components/BranchList.tsx index f91052b6517..201152ddd38 100644 --- a/server/sonar-web/src/main/js/apps/projectBaseline/components/BranchList.tsx +++ b/server/sonar-web/src/main/js/apps/projectBaseline/components/BranchList.tsx @@ -23,13 +23,14 @@ import DeferredSpinner from '../../../components/ui/DeferredSpinner'; import { isBranch, sortBranches } from '../../../helpers/branch-like'; import { translate } from '../../../helpers/l10n'; import { Branch, BranchLike, BranchWithNewCodePeriod } from '../../../types/branch-like'; +import { Component, NewCodePeriod } from '../../../types/types'; import BranchBaselineSettingModal from './BranchBaselineSettingModal'; import BranchListRow from './BranchListRow'; interface Props { branchList: Branch[]; - component: T.Component; - inheritedSetting: T.NewCodePeriod; + component: Component; + inheritedSetting: NewCodePeriod; } interface State { @@ -88,7 +89,7 @@ export default class BranchList extends React.PureComponent<Props, State> { ); } - updateBranchNewCodePeriod = (branch: string, newSetting: T.NewCodePeriod | undefined) => { + updateBranchNewCodePeriod = (branch: string, newSetting: NewCodePeriod | undefined) => { const { branches } = this.state; const updated = branches.find(b => b.name === branch); @@ -102,7 +103,7 @@ export default class BranchList extends React.PureComponent<Props, State> { this.setState({ editedBranch: branch }); }; - closeEditModal = (branch?: string, newSetting?: T.NewCodePeriod) => { + closeEditModal = (branch?: string, newSetting?: NewCodePeriod) => { if (branch) { this.setState({ branches: this.updateBranchNewCodePeriod(branch, newSetting), diff --git a/server/sonar-web/src/main/js/apps/projectBaseline/components/BranchListRow.tsx b/server/sonar-web/src/main/js/apps/projectBaseline/components/BranchListRow.tsx index 0b45d2f1c48..0cb9e14f733 100644 --- a/server/sonar-web/src/main/js/apps/projectBaseline/components/BranchListRow.tsx +++ b/server/sonar-web/src/main/js/apps/projectBaseline/components/BranchListRow.tsx @@ -25,16 +25,17 @@ import WarningIcon from '../../../components/icons/WarningIcon'; import DateTimeFormatter from '../../../components/intl/DateTimeFormatter'; import { translate, translateWithParameters } from '../../../helpers/l10n'; import { BranchWithNewCodePeriod } from '../../../types/branch-like'; +import { NewCodePeriod } from '../../../types/types'; export interface BranchListRowProps { branch: BranchWithNewCodePeriod; existingBranches: Array<string>; - inheritedSetting: T.NewCodePeriod; + inheritedSetting: NewCodePeriod; onOpenEditModal: (branch: BranchWithNewCodePeriod) => void; onResetToDefault: (branchName: string) => void; } -function renderNewCodePeriodSetting(newCodePeriod: T.NewCodePeriod) { +function renderNewCodePeriodSetting(newCodePeriod: NewCodePeriod) { switch (newCodePeriod.type) { case 'SPECIFIC_ANALYSIS': return ( @@ -60,7 +61,7 @@ function renderNewCodePeriodSetting(newCodePeriod: T.NewCodePeriod) { function branchInheritsItselfAsReference( branch: BranchWithNewCodePeriod, - inheritedSetting: T.NewCodePeriod + inheritedSetting: NewCodePeriod ) { return ( !branch.newCodePeriod && diff --git a/server/sonar-web/src/main/js/apps/projectBaseline/components/ProjectBaselineSelector.tsx b/server/sonar-web/src/main/js/apps/projectBaseline/components/ProjectBaselineSelector.tsx index c001b46f4c1..fdf84f077fa 100644 --- a/server/sonar-web/src/main/js/apps/projectBaseline/components/ProjectBaselineSelector.tsx +++ b/server/sonar-web/src/main/js/apps/projectBaseline/components/ProjectBaselineSelector.tsx @@ -25,6 +25,7 @@ import { Alert } from '../../../components/ui/Alert'; import DeferredSpinner from '../../../components/ui/DeferredSpinner'; import { translate, translateWithParameters } from '../../../helpers/l10n'; import { Branch } from '../../../types/branch-like'; +import { NewCodePeriod, NewCodePeriodSettingType, ParsedAnalysis } from '../../../types/types'; import { validateSetting } from '../utils'; import BaselineSettingAnalysis from './BaselineSettingAnalysis'; import BaselineSettingDays from './BaselineSettingDays'; @@ -38,24 +39,24 @@ export interface ProjectBaselineSelectorProps { branchList: Branch[]; branchesEnabled?: boolean; component: string; - currentSetting?: T.NewCodePeriodSettingType; + currentSetting?: NewCodePeriodSettingType; currentSettingValue?: string; days: string; - generalSetting: T.NewCodePeriod; + generalSetting: NewCodePeriod; onCancel: () => void; - onSelectAnalysis: (analysis: T.ParsedAnalysis) => void; + onSelectAnalysis: (analysis: ParsedAnalysis) => void; onSelectDays: (value: string) => void; onSelectReferenceBranch: (value: string) => void; - onSelectSetting: (value?: T.NewCodePeriodSettingType) => void; + onSelectSetting: (value?: NewCodePeriodSettingType) => void; onSubmit: (e: React.SyntheticEvent<HTMLFormElement>) => void; onToggleSpecificSetting: (selection: boolean) => void; referenceBranch?: string; saving: boolean; - selected?: T.NewCodePeriodSettingType; + selected?: NewCodePeriodSettingType; overrideGeneralSetting: boolean; } -function renderGeneralSetting(generalSetting: T.NewCodePeriod) { +function renderGeneralSetting(generalSetting: NewCodePeriod) { let setting: string; let description: string; if (generalSetting.type === 'NUMBER_OF_DAYS') { diff --git a/server/sonar-web/src/main/js/apps/projectBaseline/utils.ts b/server/sonar-web/src/main/js/apps/projectBaseline/utils.ts index 3828c93cf5c..358d7dae269 100644 --- a/server/sonar-web/src/main/js/apps/projectBaseline/utils.ts +++ b/server/sonar-web/src/main/js/apps/projectBaseline/utils.ts @@ -1,3 +1,5 @@ +import { NewCodePeriodSettingType } from '../../types/types'; + /* * SonarQube * Copyright (C) 2009-2021 SonarSource SA @@ -32,7 +34,7 @@ export function getSettingValue({ analysis?: string; days?: string; referenceBranch?: string; - type?: T.NewCodePeriodSettingType; + type?: NewCodePeriodSettingType; }) { switch (type) { case 'NUMBER_OF_DAYS': @@ -48,12 +50,12 @@ export function getSettingValue({ export function validateSetting(state: { analysis?: string; - currentSetting?: T.NewCodePeriodSettingType; + currentSetting?: NewCodePeriodSettingType; currentSettingValue?: string; days: string; overrideGeneralSetting?: boolean; referenceBranch?: string; - selected?: T.NewCodePeriodSettingType; + selected?: NewCodePeriodSettingType; }) { const { analysis = '', |