diff options
3 files changed, 35 insertions, 30 deletions
diff --git a/server/sonar-web/src/main/js/api/mocks/IssuesServiceMock.ts b/server/sonar-web/src/main/js/api/mocks/IssuesServiceMock.ts index 6c3ef1cd3bd..3d1ed2a6a22 100644 --- a/server/sonar-web/src/main/js/api/mocks/IssuesServiceMock.ts +++ b/server/sonar-web/src/main/js/api/mocks/IssuesServiceMock.ts @@ -34,7 +34,7 @@ function mockReferenceComponent(override?: Partial<ReferencedComponent>) { }; } -export default class IssueServiceMock { +export default class IssuesServiceMock { isAdmin = false; standards?: Standards; diff --git a/server/sonar-web/src/main/js/app/components/GlobalFooter.tsx b/server/sonar-web/src/main/js/app/components/GlobalFooter.tsx index fae270252e2..9da659e6004 100644 --- a/server/sonar-web/src/main/js/app/components/GlobalFooter.tsx +++ b/server/sonar-web/src/main/js/app/components/GlobalFooter.tsx @@ -24,7 +24,6 @@ import { Alert } from '../../components/ui/Alert'; import { getEdition } from '../../helpers/editions'; import { translate, translateWithParameters } from '../../helpers/l10n'; import { AppState } from '../../types/appstate'; -import { EditionKey } from '../../types/editions'; import withAppStateContext from './app-state/withAppStateContext'; import GlobalFooterBranding from './GlobalFooterBranding'; @@ -34,7 +33,7 @@ export interface GlobalFooterProps { } export function GlobalFooter({ hideLoggedInInfo, appState }: GlobalFooterProps) { - const currentEdition = appState?.edition && getEdition(appState.edition as EditionKey); + const currentEdition = appState?.edition && getEdition(appState.edition); return ( <div className="page-footer page-container" id="footer"> diff --git a/server/sonar-web/src/main/js/apps/component-measures/components/MeasureContent.tsx b/server/sonar-web/src/main/js/apps/component-measures/components/MeasureContent.tsx index defa1340c6f..130abf96800 100644 --- a/server/sonar-web/src/main/js/apps/component-measures/components/MeasureContent.tsx +++ b/server/sonar-web/src/main/js/apps/component-measures/components/MeasureContent.tsx @@ -128,34 +128,40 @@ export default class MeasureContent extends React.PureComponent<Props, State> { metricKeys: baseComponentMetrics.join(), ...getBranchLikeQuery(branchLike) }) - ]).then(([tree, measures]) => { - if (this.mounted) { - const metric = tree.metrics.find(m => m.key === requestedMetric.key); - const components = tree.components.map(component => - enhanceComponent(component, metric, metrics) - ); - - const measure = measures.find(measure => measure.metric === requestedMetric.key); - const secondaryMeasure = measures.find(measure => measure.metric !== requestedMetric.key); - - this.setState(({ selectedComponent }) => ({ - baseComponent: tree.baseComponent, - components, - measure, - metric, - paging: tree.paging, - secondaryMeasure, - selectedComponent: - components.length > 0 && - components.find( - c => - getComponentMeasureUniqueKey(c) === getComponentMeasureUniqueKey(selectedComponent) - ) - ? selectedComponent - : undefined - })); + ]).then( + ([tree, measures]) => { + if (this.mounted) { + const metric = tree.metrics.find(m => m.key === requestedMetric.key); + const components = tree.components.map(component => + enhanceComponent(component, metric, metrics) + ); + + const measure = measures.find(m => m.metric === requestedMetric.key); + const secondaryMeasure = measures.find(m => m.metric !== requestedMetric.key); + + this.setState(({ selectedComponent }) => ({ + baseComponent: tree.baseComponent, + components, + measure, + metric, + paging: tree.paging, + secondaryMeasure, + selectedComponent: + components.length > 0 && + components.find( + c => + getComponentMeasureUniqueKey(c) === + getComponentMeasureUniqueKey(selectedComponent) + ) + ? selectedComponent + : undefined + })); + } + }, + () => { + /* noop */ } - }); + ); }; fetchMoreComponents = () => { |