From a5599ff112362c822a669d965c6a9fc85d633e37 Mon Sep 17 00:00:00 2001 From: Viktor Vorona Date: Tue, 23 Apr 2024 14:47:22 +0200 Subject: SONAR-22049 Align branch-like helper --- .../crossComponentSourceViewer/ComponentSourceSnippetGroupViewer.tsx | 2 +- .../issues/crossComponentSourceViewer/CrossComponentSourceViewer.tsx | 2 +- .../apps/issues/crossComponentSourceViewer/IssueSourceViewerHeader.tsx | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'server/sonar-web/src/main/js/apps/issues/crossComponentSourceViewer') diff --git a/server/sonar-web/src/main/js/apps/issues/crossComponentSourceViewer/ComponentSourceSnippetGroupViewer.tsx b/server/sonar-web/src/main/js/apps/issues/crossComponentSourceViewer/ComponentSourceSnippetGroupViewer.tsx index be83012b577..a51ee3debec 100644 --- a/server/sonar-web/src/main/js/apps/issues/crossComponentSourceViewer/ComponentSourceSnippetGroupViewer.tsx +++ b/server/sonar-web/src/main/js/apps/issues/crossComponentSourceViewer/ComponentSourceSnippetGroupViewer.tsx @@ -25,8 +25,8 @@ import { FormattedMessage } from 'react-intl'; import { getSources } from '../../../api/components'; import getCoverageStatus from '../../../components/SourceViewer/helpers/getCoverageStatus'; import { locationsByLine } from '../../../components/SourceViewer/helpers/indexing'; -import { getBranchLikeQuery } from '../../../helpers/branch-like'; import { translate } from '../../../helpers/l10n'; +import { getBranchLikeQuery } from '../../../sonar-aligned/helpers/branch-like'; import { BranchLike } from '../../../types/branch-like'; import { isFile } from '../../../types/component'; import { IssueDeprecatedStatus } from '../../../types/issues'; diff --git a/server/sonar-web/src/main/js/apps/issues/crossComponentSourceViewer/CrossComponentSourceViewer.tsx b/server/sonar-web/src/main/js/apps/issues/crossComponentSourceViewer/CrossComponentSourceViewer.tsx index 3e44f7a4be5..f212424c609 100644 --- a/server/sonar-web/src/main/js/apps/issues/crossComponentSourceViewer/CrossComponentSourceViewer.tsx +++ b/server/sonar-web/src/main/js/apps/issues/crossComponentSourceViewer/CrossComponentSourceViewer.tsx @@ -36,9 +36,9 @@ import { issuesByComponentAndLine, } from '../../../components/SourceViewer/helpers/indexing'; import { WorkspaceContext } from '../../../components/workspace/context'; -import { getBranchLikeQuery } from '../../../helpers/branch-like'; import { translate } from '../../../helpers/l10n'; import { HttpStatus } from '../../../helpers/request'; +import { getBranchLikeQuery } from '../../../sonar-aligned/helpers/branch-like'; import { throwGlobalError } from '../../../sonar-aligned/helpers/error'; import { BranchLike } from '../../../types/branch-like'; import { isFile } from '../../../types/component'; diff --git a/server/sonar-web/src/main/js/apps/issues/crossComponentSourceViewer/IssueSourceViewerHeader.tsx b/server/sonar-web/src/main/js/apps/issues/crossComponentSourceViewer/IssueSourceViewerHeader.tsx index 9b2b3c398bb..04e71337c92 100644 --- a/server/sonar-web/src/main/js/apps/issues/crossComponentSourceViewer/IssueSourceViewerHeader.tsx +++ b/server/sonar-web/src/main/js/apps/issues/crossComponentSourceViewer/IssueSourceViewerHeader.tsx @@ -35,11 +35,12 @@ import * as React from 'react'; import { ComponentContext } from '../../../app/components/componentContext/ComponentContext'; import { useCurrentUser } from '../../../app/components/current-user/CurrentUserContext'; import { DEFAULT_ISSUES_QUERY } from '../../../components/shared/utils'; -import { getBranchLikeQuery, isBranch, isPullRequest } from '../../../helpers/branch-like'; +import { isPullRequest } from '../../../helpers/branch-like'; import { translate } from '../../../helpers/l10n'; import { collapsedDirFromPath, fileFromPath } from '../../../helpers/path'; import { getBranchLikeUrl, getComponentIssuesUrl } from '../../../helpers/urls'; import { useBranchesQuery } from '../../../queries/branch'; +import { getBranchLikeQuery, isBranch } from '../../../sonar-aligned/helpers/branch-like'; import { ComponentQualifier } from '../../../types/component'; import { SourceViewerFile } from '../../../types/types'; import { isLoggedIn } from '../../../types/users'; -- cgit v1.2.3