diff options
Diffstat (limited to 'server/sonar-web/src/main/js/apps/projects')
12 files changed, 15 insertions, 12 deletions
diff --git a/server/sonar-web/src/main/js/apps/projects/components/AllProjects.tsx b/server/sonar-web/src/main/js/apps/projects/components/AllProjects.tsx index 738c3cbaf5f..4858fda67d6 100644 --- a/server/sonar-web/src/main/js/apps/projects/components/AllProjects.tsx +++ b/server/sonar-web/src/main/js/apps/projects/components/AllProjects.tsx @@ -32,6 +32,7 @@ import * as React from 'react'; import { Helmet } from 'react-helmet-async'; import { useSearchParams } from 'react-router-dom'; import { withRouter } from '~sonar-aligned/components/hoc/withRouter'; +import { ComponentQualifier } from '~sonar-aligned/types/component'; import { Location, RawQuery, Router } from '~sonar-aligned/types/router'; import { searchProjects } from '../../../api/components'; import withAppStateContext from '../../../app/components/app-state/withAppStateContext'; @@ -45,7 +46,6 @@ import { translate } from '../../../helpers/l10n'; import { get, save } from '../../../helpers/storage'; import { isDefined } from '../../../helpers/types'; import { AppState } from '../../../types/appstate'; -import { ComponentQualifier } from '../../../types/component'; import { MetricKey } from '../../../types/metrics'; import { CurrentUser, isLoggedIn } from '../../../types/users'; import { Query, hasFilterParams, parseUrlQuery } from '../query'; diff --git a/server/sonar-web/src/main/js/apps/projects/components/ApplicationCreation.tsx b/server/sonar-web/src/main/js/apps/projects/components/ApplicationCreation.tsx index a2ad67b9f0c..5990e6544f2 100644 --- a/server/sonar-web/src/main/js/apps/projects/components/ApplicationCreation.tsx +++ b/server/sonar-web/src/main/js/apps/projects/components/ApplicationCreation.tsx @@ -21,6 +21,7 @@ import { ButtonSecondary } from 'design-system'; import * as React from 'react'; import { withRouter } from '~sonar-aligned/components/hoc/withRouter'; import { throwGlobalError } from '~sonar-aligned/helpers/error'; +import { ComponentQualifier } from '~sonar-aligned/types/component'; import { Router } from '~sonar-aligned/types/router'; import { getComponentNavigation } from '../../../api/navigation'; import withAppStateContext from '../../../app/components/app-state/withAppStateContext'; @@ -30,7 +31,6 @@ import { translate } from '../../../helpers/l10n'; import { getComponentAdminUrl, getComponentOverviewUrl } from '../../../helpers/urls'; import { hasGlobalPermission } from '../../../helpers/users'; import { AppState } from '../../../types/appstate'; -import { ComponentQualifier } from '../../../types/component'; import { Permissions } from '../../../types/permissions'; import { LoggedInUser } from '../../../types/users'; diff --git a/server/sonar-web/src/main/js/apps/projects/components/__tests__/AllProjects-test.tsx b/server/sonar-web/src/main/js/apps/projects/components/__tests__/AllProjects-test.tsx index 9c70f662718..764553be846 100644 --- a/server/sonar-web/src/main/js/apps/projects/components/__tests__/AllProjects-test.tsx +++ b/server/sonar-web/src/main/js/apps/projects/components/__tests__/AllProjects-test.tsx @@ -21,12 +21,12 @@ import { screen, within } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import * as React from 'react'; import { AutoSizerProps } from 'react-virtualized'; +import { ComponentQualifier } from '~sonar-aligned/types/component'; import { ProjectsServiceMock } from '../../../../api/mocks/ProjectsServiceMock'; import { save } from '../../../../helpers/storage'; import { mockAppState, mockLoggedInUser } from '../../../../helpers/testMocks'; import { renderAppRoutes } from '../../../../helpers/testReactTestingUtils'; import { byLabelText, byRole, byText } from '../../../../helpers/testSelector'; -import { ComponentQualifier } from '../../../../types/component'; import { MetricKey } from '../../../../types/metrics'; import { Dict } from '../../../../types/types'; import projectRoutes from '../../routes'; diff --git a/server/sonar-web/src/main/js/apps/projects/components/__tests__/CreateApplication-test.tsx b/server/sonar-web/src/main/js/apps/projects/components/__tests__/CreateApplication-test.tsx index b27d521398a..c5702b57466 100644 --- a/server/sonar-web/src/main/js/apps/projects/components/__tests__/CreateApplication-test.tsx +++ b/server/sonar-web/src/main/js/apps/projects/components/__tests__/CreateApplication-test.tsx @@ -20,12 +20,13 @@ import userEvent from '@testing-library/user-event'; import * as React from 'react'; import { queryToSearch } from '~sonar-aligned/helpers/urls'; +import { ComponentQualifier } from '~sonar-aligned/types/component'; import { createApplication } from '../../../../api/application'; import { getComponentNavigation } from '../../../../api/navigation'; import { mockAppState, mockLoggedInUser, mockRouter } from '../../../../helpers/testMocks'; import { renderComponent } from '../../../../helpers/testReactTestingUtils'; import { byRole, byText } from '../../../../helpers/testSelector'; -import { ComponentQualifier, Visibility } from '../../../../types/component'; +import { Visibility } from '../../../../types/component'; import { FCProps } from '../../../../types/misc'; import { LoggedInUser } from '../../../../types/users'; import { ApplicationCreation } from '../ApplicationCreation'; diff --git a/server/sonar-web/src/main/js/apps/projects/components/__tests__/PageHeader-test.tsx b/server/sonar-web/src/main/js/apps/projects/components/__tests__/PageHeader-test.tsx index ddc1f48f1e6..9913d211aea 100644 --- a/server/sonar-web/src/main/js/apps/projects/components/__tests__/PageHeader-test.tsx +++ b/server/sonar-web/src/main/js/apps/projects/components/__tests__/PageHeader-test.tsx @@ -19,13 +19,13 @@ */ import userEvent from '@testing-library/user-event'; import * as React from 'react'; +import { ComponentQualifier } from '~sonar-aligned/types/component'; import { getAlmSettings } from '../../../../api/alm-settings'; import CurrentUserContextProvider from '../../../../app/components/current-user/CurrentUserContextProvider'; import { mockAppState, mockCurrentUser, mockLoggedInUser } from '../../../../helpers/testMocks'; import { renderComponent } from '../../../../helpers/testReactTestingUtils'; import { byLabelText, byRole, byText } from '../../../../helpers/testSelector'; import { AlmKeys } from '../../../../types/alm-settings'; -import { ComponentQualifier } from '../../../../types/component'; import { FCProps } from '../../../../types/misc'; import { CurrentUser } from '../../../../types/users'; import PageHeader from '../PageHeader'; diff --git a/server/sonar-web/src/main/js/apps/projects/components/project-card/ProjectCard.tsx b/server/sonar-web/src/main/js/apps/projects/components/project-card/ProjectCard.tsx index cb188571bf0..b2e6a415f25 100644 --- a/server/sonar-web/src/main/js/apps/projects/components/project-card/ProjectCard.tsx +++ b/server/sonar-web/src/main/js/apps/projects/components/project-card/ProjectCard.tsx @@ -38,6 +38,7 @@ import { isEmpty } from 'lodash'; import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { formatMeasure } from '~sonar-aligned/helpers/measures'; +import { ComponentQualifier } from '~sonar-aligned/types/component'; import Favorite from '../../../../components/controls/Favorite'; import Tooltip from '../../../../components/controls/Tooltip'; import DateFromNow from '../../../../components/intl/DateFromNow'; @@ -46,7 +47,6 @@ import Measure from '../../../../components/measure/Measure'; import { translate, translateWithParameters } from '../../../../helpers/l10n'; import { isDefined } from '../../../../helpers/types'; import { getProjectUrl } from '../../../../helpers/urls'; -import { ComponentQualifier } from '../../../../types/component'; import { MetricKey, MetricType } from '../../../../types/metrics'; import { Status } from '../../../../types/types'; import { CurrentUser, isLoggedIn } from '../../../../types/users'; diff --git a/server/sonar-web/src/main/js/apps/projects/components/project-card/ProjectCardMeasures.tsx b/server/sonar-web/src/main/js/apps/projects/components/project-card/ProjectCardMeasures.tsx index 352418538c0..420e38cd77b 100644 --- a/server/sonar-web/src/main/js/apps/projects/components/project-card/ProjectCardMeasures.tsx +++ b/server/sonar-web/src/main/js/apps/projects/components/project-card/ProjectCardMeasures.tsx @@ -26,12 +26,12 @@ import { RatingLabel, } from 'design-system'; import * as React from 'react'; +import { ComponentQualifier } from '~sonar-aligned/types/component'; import Measure from '../../../../components/measure/Measure'; import { duplicationRatingConverter } from '../../../../components/measure/utils'; import { translate } from '../../../../helpers/l10n'; import { formatRating } from '../../../../helpers/measures'; import { isDefined } from '../../../../helpers/types'; -import { ComponentQualifier } from '../../../../types/component'; import { MetricKey, MetricType } from '../../../../types/metrics'; import { Dict } from '../../../../types/types'; import ProjectCardMeasure from './ProjectCardMeasure'; diff --git a/server/sonar-web/src/main/js/apps/projects/components/project-card/__tests__/ProjectCard-test.tsx b/server/sonar-web/src/main/js/apps/projects/components/project-card/__tests__/ProjectCard-test.tsx index a81aab52c17..fdcdaf6af55 100644 --- a/server/sonar-web/src/main/js/apps/projects/components/project-card/__tests__/ProjectCard-test.tsx +++ b/server/sonar-web/src/main/js/apps/projects/components/project-card/__tests__/ProjectCard-test.tsx @@ -19,9 +19,10 @@ */ import { screen } from '@testing-library/react'; import React from 'react'; +import { ComponentQualifier } from '~sonar-aligned/types/component'; import { mockCurrentUser, mockLoggedInUser } from '../../../../../helpers/testMocks'; import { renderComponent } from '../../../../../helpers/testReactTestingUtils'; -import { ComponentQualifier, Visibility } from '../../../../../types/component'; +import { Visibility } from '../../../../../types/component'; import { MetricKey } from '../../../../../types/metrics'; import { CurrentUser } from '../../../../../types/users'; import { Project } from '../../../types'; diff --git a/server/sonar-web/src/main/js/apps/projects/components/project-card/__tests__/ProjectCardMeasures-test.tsx b/server/sonar-web/src/main/js/apps/projects/components/project-card/__tests__/ProjectCardMeasures-test.tsx index 7efa8f2e5f3..10513b0e743 100644 --- a/server/sonar-web/src/main/js/apps/projects/components/project-card/__tests__/ProjectCardMeasures-test.tsx +++ b/server/sonar-web/src/main/js/apps/projects/components/project-card/__tests__/ProjectCardMeasures-test.tsx @@ -20,8 +20,8 @@ import { screen } from '@testing-library/react'; import * as React from 'react'; +import { ComponentQualifier } from '~sonar-aligned/types/component'; import { renderComponent } from '../../../../../helpers/testReactTestingUtils'; -import { ComponentQualifier } from '../../../../../types/component'; import { MetricKey } from '../../../../../types/metrics'; import { Dict } from '../../../../../types/types'; import ProjectCardMeasures, { ProjectCardMeasuresProps } from '../ProjectCardMeasures'; diff --git a/server/sonar-web/src/main/js/apps/projects/filters/QualifierFilter.tsx b/server/sonar-web/src/main/js/apps/projects/filters/QualifierFilter.tsx index 561806853bb..85bf80a8c35 100644 --- a/server/sonar-web/src/main/js/apps/projects/filters/QualifierFilter.tsx +++ b/server/sonar-web/src/main/js/apps/projects/filters/QualifierFilter.tsx @@ -19,10 +19,10 @@ */ import { FacetBox, FacetItem } from 'design-system'; import * as React from 'react'; +import { ComponentQualifier } from '~sonar-aligned/types/component'; import { RawQuery } from '~sonar-aligned/types/router'; import { translate } from '../../../helpers/l10n'; import { isDefined } from '../../../helpers/types'; -import { ComponentQualifier } from '../../../types/component'; import { FacetItemsList } from '../../issues/sidebar/FacetItemsList'; import { formatFacetStat } from '../../issues/utils'; import { Facet } from '../types'; diff --git a/server/sonar-web/src/main/js/apps/projects/query.ts b/server/sonar-web/src/main/js/apps/projects/query.ts index 978b0991430..2635b966faf 100644 --- a/server/sonar-web/src/main/js/apps/projects/query.ts +++ b/server/sonar-web/src/main/js/apps/projects/query.ts @@ -17,8 +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 { ComponentQualifier } from '~sonar-aligned/types/component'; import { RawQuery } from '~sonar-aligned/types/router'; -import { ComponentQualifier } from '../../types/component'; import { Dict } from '../../types/types'; type Level = 'ERROR' | 'WARN' | 'OK'; diff --git a/server/sonar-web/src/main/js/apps/projects/types.ts b/server/sonar-web/src/main/js/apps/projects/types.ts index b621422b6a8..437faeb5870 100644 --- a/server/sonar-web/src/main/js/apps/projects/types.ts +++ b/server/sonar-web/src/main/js/apps/projects/types.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 { ComponentQualifier, Visibility } from '../../types/component'; +import { ComponentQualifier } from '~sonar-aligned/types/component'; +import { Visibility } from '../../types/component'; import { Dict } from '../../types/types'; export interface Project { |