refactor: move SelectedContextType enum to enums folder

Altinn · Mar 4, 2025 · 6aab29d · 6aab29d
1 parent af73bd9
commit 6aab29d
Show file tree

Hide file tree

Showing 25 changed files with 35 additions and 38 deletions.
diff --git a/frontend/dashboard/components/NewApplicationForm/NewApplicationForm.tsx b/frontend/dashboard/components/NewApplicationForm/NewApplicationForm.tsx
@@ -7,7 +7,7 @@ import { RepoNameInput } from '../RepoNameInput';
 import { type User } from 'app-shared/types/Repository';
 import { type Organization } from 'app-shared/types/Organization';
 import { useSelectedContext } from '../../hooks/useSelectedContext';
-import { SelectedContextType } from 'dashboard/context/HeaderContext';
+import { SelectedContextType } from '../../enums/SelectedContextType';
 import { type NewAppForm } from '../../types/NewAppForm';
 import { useCreateAppFormValidation } from './hooks/useCreateAppFormValidation';
 import { Link } from 'react-router-dom';

diff --git a/frontend/dashboard/context/HeaderContext/HeaderContext.tsx b/frontend/dashboard/context/HeaderContext/HeaderContext.tsx
@@ -3,12 +3,6 @@ import { type Organization } from 'app-shared/types/Organization';
 import { type User } from 'app-shared/types/Repository';
 import { APP_DASHBOARD_BASENAME, ORG_LIBRARY_BASENAME } from 'app-shared/constants';
 
-export enum SelectedContextType {
-  All = 'all',
-  Self = 'self',
-  None = 'none',
-}
-
 export enum Subroute {
   AppDashboard = APP_DASHBOARD_BASENAME,
   OrgLibrary = ORG_LIBRARY_BASENAME,

diff --git a/frontend/dashboard/context/HeaderContext/index.ts b/frontend/dashboard/context/HeaderContext/index.ts
@@ -1,6 +1 @@
-export {
-  HeaderContext,
-  type HeaderContextType,
-  SelectedContextType,
-  Subroute,
-} from './HeaderContext';
+export { HeaderContext, type HeaderContextType, Subroute } from './HeaderContext';
diff --git a/frontend/dashboard/enums/SelectedContextType.ts b/frontend/dashboard/enums/SelectedContextType.ts
@@ -0,0 +1,5 @@
+export enum SelectedContextType {
+  All = 'all',
+  Self = 'self',
+  None = 'none',
+}
diff --git a/frontend/dashboard/hooks/guards/useContextRedirectionGuard.ts b/frontend/dashboard/hooks/guards/useContextRedirectionGuard.ts
@@ -3,7 +3,7 @@ import { useEffect, useState } from 'react';
 import { useSelectedContext } from '../useSelectedContext';
 import type { NavigateFunction } from 'react-router-dom';
 import { useNavigate } from 'react-router-dom';
-import { SelectedContextType } from 'dashboard/context/HeaderContext';
+import { SelectedContextType } from '../../enums/SelectedContextType';
 import { typedSessionStorage } from '@studio/pure-functions';
 import { userHasAccessToSelectedContext } from 'dashboard/utils/userUtils';
 import { useSubroute } from '../useSubRoute';

diff --git a/frontend/dashboard/hooks/usePageHeaderTitle/usePageHeaderTitle.test.tsx b/frontend/dashboard/hooks/usePageHeaderTitle/usePageHeaderTitle.test.tsx
@@ -3,7 +3,7 @@ import { usePageHeaderTitle } from './usePageHeaderTitle';
 import { HeaderContext, type HeaderContextType } from 'dashboard/context/HeaderContext';
 import { useSelectedContext } from 'dashboard/hooks/useSelectedContext';
 import { headerContextValueMock } from 'dashboard/testing/headerContextMock';
-import { SelectedContextType } from 'dashboard/context/HeaderContext';
+import { SelectedContextType } from '../../enums/SelectedContextType';
 import { mockOrg1 } from 'dashboard/testing/organizationMock';
 import { renderHookWithProviders } from 'dashboard/testing/mocks';
 

diff --git a/frontend/dashboard/hooks/usePageHeaderTitle/usePageHeaderTitle.tsx b/frontend/dashboard/hooks/usePageHeaderTitle/usePageHeaderTitle.tsx
@@ -1,5 +1,6 @@
 import { useContext } from 'react';
-import { HeaderContext, SelectedContextType } from 'dashboard/context/HeaderContext';
+import { HeaderContext } from 'dashboard/context/HeaderContext';
+import { SelectedContextType } from '../../enums/SelectedContextType';
 import { getOrgNameByUsername } from 'dashboard/utils/userUtils';
 import { useSelectedContext } from '../useSelectedContext';
 

diff --git a/.../dashboard/hooks/useProfileMenuTriggerButtonText/useProfileMenuTriggerButtonText.test.tsx b/.../dashboard/hooks/useProfileMenuTriggerButtonText/useProfileMenuTriggerButtonText.test.tsx
@@ -1,10 +1,7 @@
 import React from 'react';
 import { useProfileMenuTriggerButtonText } from './useProfileMenuTriggerButtonText';
-import {
-  HeaderContext,
-  type HeaderContextType,
-  SelectedContextType,
-} from 'dashboard/context/HeaderContext';
+import { HeaderContext, type HeaderContextType } from 'dashboard/context/HeaderContext';
+import { SelectedContextType } from '../../enums/SelectedContextType';
 import { useSelectedContext } from '../useSelectedContext';
 import { userMock } from 'dashboard/testing/userMock';
 import { headerContextValueMock } from 'dashboard/testing/headerContextMock';

diff --git a/frontend/dashboard/hooks/useProfileMenuTriggerButtonText/useProfileMenuTriggerButtonText.tsx b/frontend/dashboard/hooks/useProfileMenuTriggerButtonText/useProfileMenuTriggerButtonText.tsx
@@ -1,5 +1,6 @@
 import { useContext } from 'react';
-import { HeaderContext, SelectedContextType } from 'dashboard/context/HeaderContext';
+import { HeaderContext } from 'dashboard/context/HeaderContext';
+import { SelectedContextType } from '../../enums/SelectedContextType';
 import { getOrgNameByUsername } from 'dashboard/utils/userUtils';
 import { useTranslation } from 'react-i18next';
 import { useSelectedContext } from '../useSelectedContext';

diff --git a/frontend/dashboard/hooks/useSelectedContext/useSelectedContext.ts b/frontend/dashboard/hooks/useSelectedContext/useSelectedContext.ts
@@ -1,5 +1,5 @@
 import { useParams } from 'react-router-dom';
-import { SelectedContextType } from 'dashboard/context/HeaderContext';
+import { SelectedContextType } from '../../enums/SelectedContextType';
 
 export const useSelectedContext = () => {
   const { selectedContext = SelectedContextType.None } = useParams();

diff --git a/frontend/dashboard/pages/CreateService/CreateService.test.tsx b/frontend/dashboard/pages/CreateService/CreateService.test.tsx
@@ -9,7 +9,8 @@ import { textMock } from '@studio/testing/mocks/i18nMock';
 import type { ServicesContextProps } from 'app-shared/contexts/ServicesContext';
 import { repository, user as userMock } from 'app-shared/mocks/mocks';
 import { useParams } from 'react-router-dom';
-import { SelectedContextType, Subroute } from 'dashboard/context/HeaderContext';
+import { Subroute } from 'dashboard/context/HeaderContext';
+import { SelectedContextType } from '../../enums/SelectedContextType';
 
 const orgMock: Organization = {
   avatar_url: '',

diff --git a/frontend/dashboard/pages/Dashboard/Dashboard.test.tsx b/frontend/dashboard/pages/Dashboard/Dashboard.test.tsx
@@ -3,7 +3,7 @@ import { screen, waitForElementToBeRemoved, within } from '@testing-library/reac
 import { Dashboard } from './Dashboard';
 import { textMock } from '@studio/testing/mocks/i18nMock';
 import type { User } from 'app-shared/types/Repository';
-import { SelectedContextType } from 'dashboard/context/HeaderContext';
+import { SelectedContextType } from '../../enums/SelectedContextType';
 import type { ServicesContextProps } from 'app-shared/contexts/ServicesContext';
 import { repository, searchRepositoryResponse } from 'app-shared/mocks/mocks';
 import type { SearchRepositoryResponse } from 'app-shared/types/api';

diff --git a/frontend/dashboard/pages/Dashboard/Dashboard.tsx b/frontend/dashboard/pages/Dashboard/Dashboard.tsx
@@ -17,7 +17,7 @@ import type { User } from 'app-shared/types/Repository';
 import type { Organization } from 'app-shared/types/Organization';
 import { useSelectedContext } from 'dashboard/hooks/useSelectedContext';
 import { ResourcesRepoList } from 'dashboard/components/ResourcesRepoList/ResourcesRepoList';
-import { SelectedContextType } from 'dashboard/context/HeaderContext';
+import { SelectedContextType } from '../../enums/SelectedContextType';
 import { SafeErrorView } from '../../components/SafeErrorView';
 import { DASHBOARD_BASENAME } from 'app-shared/constants';
 import { useSubroute } from '../../hooks/useSubRoute';

diff --git a/frontend/dashboard/pages/OrgContentLibrary/OrgContentLibrary.test.tsx b/frontend/dashboard/pages/OrgContentLibrary/OrgContentLibrary.test.tsx
@@ -13,7 +13,7 @@ import { org } from '@studio/testing/testids';
 import type { CodeListData } from '@studio/content-library';
 import type { CodeList } from '@studio/components';
 import { queriesMock } from 'app-shared/mocks/queriesMock';
-import { SelectedContextType } from '../../context/HeaderContext';
+import { SelectedContextType } from '../../enums/SelectedContextType';
 import { Route, Routes } from 'react-router-dom';
 
 const updateCodeListButtonTextMock: string = 'Update Code List';

diff --git a/frontend/dashboard/pages/OrgContentLibrary/utils.test.ts b/frontend/dashboard/pages/OrgContentLibrary/utils.test.ts
@@ -1,5 +1,5 @@
 import { isOrg } from './utils';
-import { SelectedContextType } from '../../context/HeaderContext';
+import { SelectedContextType } from '../../enums/SelectedContextType';
 
 describe('utils', () => {
   describe('isOrg', () => {

diff --git a/frontend/dashboard/pages/OrgContentLibrary/utils.ts b/frontend/dashboard/pages/OrgContentLibrary/utils.ts
@@ -1,4 +1,4 @@
-import { SelectedContextType } from '../../context/HeaderContext';
+import { SelectedContextType } from '../../enums/SelectedContextType';
 
 export function isOrg(contextType: string): boolean {
   const notOrgContexts: string[] = [

diff --git a/frontend/dashboard/pages/PageLayout/DashboardHeader/DashboardHeader.test.tsx b/frontend/dashboard/pages/PageLayout/DashboardHeader/DashboardHeader.test.tsx
@@ -2,7 +2,8 @@ import React from 'react';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { DashboardHeader } from './DashboardHeader';
-import { HeaderContext, SelectedContextType, Subroute } from 'dashboard/context/HeaderContext';
+import { HeaderContext, Subroute } from 'dashboard/context/HeaderContext';
+import { SelectedContextType } from '../../../enums/SelectedContextType';
 import { useParams } from 'react-router-dom';
 import { textMock } from '@studio/testing/mocks/i18nMock';
 import { type User } from 'app-shared/types/Repository';

diff --git a/frontend/dashboard/pages/PageLayout/DashboardHeader/DashboardHeader.tsx b/frontend/dashboard/pages/PageLayout/DashboardHeader/DashboardHeader.tsx
@@ -13,7 +13,8 @@ import {
 import { useSelectedContext } from 'dashboard/hooks/useSelectedContext';
 import { type Organization } from 'app-shared/types/Organization';
 import { MEDIA_QUERY_MAX_WIDTH } from 'app-shared/constants';
-import { HeaderContext, SelectedContextType } from 'dashboard/context/HeaderContext';
+import { HeaderContext } from 'dashboard/context/HeaderContext';
+import { SelectedContextType } from '../../../enums/SelectedContextType';
 import { useLogoutMutation } from 'app-shared/hooks/mutations/useLogoutMutation';
 import { useProfileMenuTriggerButtonText } from 'dashboard/hooks/useProfileMenuTriggerButtonText';
 import { useRepoPath } from 'dashboard/hooks/useRepoPath';

diff --git a/frontend/dashboard/pages/PageLayout/PageLayout.test.tsx b/frontend/dashboard/pages/PageLayout/PageLayout.test.tsx
@@ -7,7 +7,8 @@ import { PageLayout } from './PageLayout';
 import { createQueryClientMock } from 'app-shared/mocks/queryClientMock';
 import { QueryKey } from 'app-shared/types/QueryKey';
 import { useParams } from 'react-router-dom';
-import { SelectedContextType, Subroute } from 'dashboard/context/HeaderContext';
+import { Subroute } from 'dashboard/context/HeaderContext';
+import { SelectedContextType } from '../../enums/SelectedContextType';
 import { StringUtils } from '@studio/pure-functions';
 
 const mockedNavigate = jest.fn();

diff --git a/frontend/dashboard/utils/filterUtils/filterUtils.test.ts b/frontend/dashboard/utils/filterUtils/filterUtils.test.ts
@@ -1,4 +1,4 @@
-import { SelectedContextType } from 'dashboard/context/HeaderContext';
+import { SelectedContextType } from '../../enums/SelectedContextType';
 import { getUidFilter } from './filterUtils';
 
 describe('getUidFilter', () => {

diff --git a/frontend/dashboard/utils/filterUtils/filterUtils.ts b/frontend/dashboard/utils/filterUtils/filterUtils.ts
@@ -1,4 +1,4 @@
-import { SelectedContextType } from 'dashboard/context/HeaderContext';
+import { SelectedContextType } from '../../enums/SelectedContextType';
 import type { Organization } from 'app-shared/types/Organization';
 
 type GetUidFilter = {

diff --git a/frontend/dashboard/utils/repoUtils/repoUtils.test.ts b/frontend/dashboard/utils/repoUtils/repoUtils.test.ts
@@ -1,4 +1,4 @@
-import { SelectedContextType } from 'dashboard/context/HeaderContext';
+import { SelectedContextType } from '../../enums/SelectedContextType';
 import { getReposLabel, validateRepoName } from './repoUtils';
 import { textMock } from '@studio/testing/mocks/i18nMock';
 import type { Organization } from 'app-shared/types/Organization';

diff --git a/frontend/dashboard/utils/repoUtils/repoUtils.ts b/frontend/dashboard/utils/repoUtils/repoUtils.ts
@@ -1,4 +1,4 @@
-import { SelectedContextType } from 'dashboard/context/HeaderContext';
+import { SelectedContextType } from '../../enums/SelectedContextType';
 import type { Repository } from 'app-shared/types/Repository';
 import type { Organization } from 'app-shared/types/Organization';
 import type i18next from 'i18next';

diff --git a/frontend/dashboard/utils/userUtils/userUtils.test.ts b/frontend/dashboard/utils/userUtils/userUtils.test.ts
@@ -1,4 +1,4 @@
-import { SelectedContextType } from 'dashboard/context/HeaderContext';
+import { SelectedContextType } from '../../enums/SelectedContextType';
 import {
   getOrgNameByUsername,
   getOrgUsernameByUsername,

diff --git a/frontend/dashboard/utils/userUtils/userUtils.ts b/frontend/dashboard/utils/userUtils/userUtils.ts
@@ -1,4 +1,4 @@
-import { SelectedContextType } from 'dashboard/context/HeaderContext';
+import { SelectedContextType } from '../../enums/SelectedContextType';
 import type { Organization } from 'app-shared/types/Organization';
 
 export const userHasAccessToSelectedContext = ({