Merge branch 'main' into gh-eng-3458-update-signIn-paths-to-pass-to-query-param

Author: nicholas-codecov

src/App.tsx

@@ -12,7 +12,7 @@ import BaseLayout from 'layouts/BaseLayout'
 import EnterpriseLoginLayout from 'layouts/EnterpriseLoginLayout'
 import LoginLayout from 'layouts/LoginLayout'
 import { useLocationParams } from 'services/navigation/useLocationParams'
-import { ToastNotificationProvider } from 'services/toastNotification'
+import { ToastNotificationProvider } from 'services/toastNotification/context'
 import { useInternalUser, useUser } from 'services/user'
 import { isProvider } from 'shared/api/helpers'
 import 'ui/Table/Table.css'

src/layouts/BaseLayout/BaseLayout.tsx

@@ -14,7 +14,7 @@ import { RepoBreadcrumbProvider } from 'pages/RepoPage/context'
 import TermsOfService from 'pages/TermsOfService'
 import { useEventContext } from 'services/events/hooks'
 import { useImpersonate } from 'services/impersonate/useImpersonate'
-import { useTracking } from 'services/tracking'
+import { useTracking } from 'services/tracking/useTracking'
 import GlobalBanners from 'shared/GlobalBanners'
 import GlobalTopBanners from 'shared/GlobalTopBanners'
 import LoadingLogo from 'ui/LoadingLogo'

src/layouts/ToastNotifications/NotificationItem.jsx

@@ -2,7 +2,7 @@ import PropType from 'prop-types'
 import { useCallback, useEffect } from 'react'
 
 import Message from 'old_ui/Message'
-import { notificationPropType } from 'services/toastNotification'
+import { notificationPropType } from 'services/toastNotification/propTypes'
 
 function NotificationItem({ notification, removeNotification }) {
   const close = useCallback(() => {

src/layouts/ToastNotifications/ToastNotifications.jsx

@@ -1,7 +1,7 @@
 import {
   useNotifications,
   useRemoveNotification,
-} from 'services/toastNotification'
+} from 'services/toastNotification/context'
 
 import NotificationItem from './NotificationItem'
 

src/layouts/ToastNotifications/ToastNotifications.test.jsx

@@ -4,7 +4,7 @@ import { vi } from 'vitest'
 import {
   useNotifications,
   useRemoveNotification,
-} from 'services/toastNotification'
+} from 'services/toastNotification/context'
 
 import ToastNotifications from './ToastNotifications'
 
@@ -23,7 +23,7 @@ const notifications = [
   },
 ]
 
-vi.mock('services/toastNotification')
+vi.mock('services/toastNotification/context')
 
 describe('ToastNotifications', () => {
   const removeNotification = vi.fn()

src/pages/AccountSettings/tabs/Admin/DetailsSection/DetailsSection.jsx

@@ -5,7 +5,7 @@ import { useForm } from 'react-hook-form'
 import { useParams } from 'react-router-dom'
 import { z } from 'zod'
 
-import { useAddNotification } from 'services/toastNotification'
+import { useAddNotification } from 'services/toastNotification/context'
 import { useUpdateProfile } from 'services/user'
 import Button from 'ui/Button'
 import TextInput from 'ui/TextInput'

src/pages/AccountSettings/tabs/Admin/DetailsSection/DetailsSection.test.jsx

@@ -5,11 +5,11 @@ import { graphql, HttpResponse } from 'msw'
 import { setupServer } from 'msw/node'
 import { MemoryRouter, Route } from 'react-router-dom'
 
-import { useAddNotification } from 'services/toastNotification'
+import { useAddNotification } from 'services/toastNotification/context'
 
 import DetailsSection from './DetailsSection'
 
-vi.mock('services/toastNotification')
+vi.mock('services/toastNotification/context')
 
 const queryClient = new QueryClient({
   defaultOptions: { queries: { retry: false } },

src/pages/AccountSettings/tabs/OktaAccess/hooks/useUpdateOktaConfig.test.tsx

@@ -8,14 +8,14 @@ import { setupServer } from 'msw/node'
 import { MemoryRouter, Route } from 'react-router-dom'
 import { type Mock } from 'vitest'
 
-import { useAddNotification } from 'services/toastNotification'
+import { useAddNotification } from 'services/toastNotification/context'
 
 import {
   SaveOktaConfigMessage,
   useUpdateOktaConfig,
 } from './useUpdateOktaConfig'
 
-vi.mock('services/toastNotification')
+vi.mock('services/toastNotification/context')
 const mockedToastNotification = useAddNotification as Mock
 
 const queryClientV5 = new QueryClientV5({

src/pages/AccountSettings/tabs/OktaAccess/hooks/useUpdateOktaConfig.tsx

@@ -4,7 +4,7 @@ import {
 } from '@tanstack/react-queryV5'
 import z from 'zod'
 
-import { useAddNotification } from 'services/toastNotification'
+import { useAddNotification } from 'services/toastNotification/context'
 import Api from 'shared/api'
 import { Provider } from 'shared/api/helpers'
 import { rejectNetworkError } from 'shared/api/rejectNetworkError'

src/pages/AccountSettings/tabs/OrgUploadToken/OrgUploadToken.test.tsx

@@ -6,12 +6,12 @@ import { setupServer } from 'msw/node'
 import { Suspense } from 'react'
 import { MemoryRouter, Route } from 'react-router-dom'
 
-import { useAddNotification } from 'services/toastNotification'
+import { useAddNotification } from 'services/toastNotification/context'
 import { useFlags } from 'shared/featureFlags'
 
 import OrgUploadToken from './OrgUploadToken'
 
-vi.mock('services/toastNotification')
+vi.mock('services/toastNotification/context')
 vi.mock('shared/featureFlags')
 vi.mock('./TokenlessSection', () => ({ default: () => 'TokenlessSection' }))
 

src/pages/AccountSettings/tabs/OrgUploadToken/TokenlessSection/TokenlessSection.test.tsx

@@ -16,8 +16,8 @@ const mocks = vi.hoisted(() => ({
   useFlags: vi.fn(),
 }))
 
-vi.mock('services/toastNotification', async () => {
-  const actual = await vi.importActual('services/toastNotification')
+vi.mock('services/toastNotification/context', async () => {
+  const actual = await vi.importActual('services/toastNotification/context')
   return {
     ...actual,
     useAddNotification: mocks.useAddNotification,

src/pages/AccountSettings/tabs/OrgUploadToken/TokenlessSection/useSetUploadTokenRequired.test.tsx

@@ -13,8 +13,8 @@ const mocks = vi.hoisted(() => ({
   useAddNotification: vi.fn(),
 }))
 
-vi.mock('services/toastNotification', async () => {
-  const actual = await vi.importActual('services/toastNotification')
+vi.mock('services/toastNotification/context', async () => {
+  const actual = await vi.importActual('services/toastNotification/context')
   return {
     ...actual,
     useAddNotification: mocks.useAddNotification,

src/pages/AccountSettings/tabs/OrgUploadToken/TokenlessSection/useSetUploadTokenRequired.tsx

@@ -2,7 +2,7 @@ import { useQueryClient } from '@tanstack/react-query'
 import { useMutation as useMutationV5 } from '@tanstack/react-queryV5'
 import { z } from 'zod'
 
-import { useAddNotification } from 'services/toastNotification'
+import { useAddNotification } from 'services/toastNotification/context'
 import Api from 'shared/api'
 import { Provider } from 'shared/api/helpers'
 import { rejectNetworkError } from 'shared/api/rejectNetworkError'

src/pages/AccountSettings/tabs/OrgUploadToken/useGenerateOrgUploadToken.ts

@@ -1,5 +1,5 @@
 import { useRegenerateOrgUploadToken } from 'services/orgUploadToken/useRegenerateOrgUploadToken'
-import { useAddNotification } from 'services/toastNotification'
+import { useAddNotification } from 'services/toastNotification/context'
 
 export default function useGenerateOrgUploadToken() {
   const addToast = useAddNotification()

src/pages/AccountSettings/tabs/Profile/NameEmailCard/NameEmailCard.jsx

@@ -4,7 +4,7 @@ import { useForm } from 'react-hook-form'
 import { z } from 'zod'
 
 import Card from 'old_ui/Card'
-import { useAddNotification } from 'services/toastNotification'
+import { useAddNotification } from 'services/toastNotification/context'
 import { useUpdateProfile } from 'services/user'
 import Button from 'ui/Button'
 import TextInput from 'ui/TextInput'

src/pages/AccountSettings/tabs/Profile/NameEmailCard/NameEmailCard.test.jsx

@@ -4,11 +4,11 @@ import userEvent from '@testing-library/user-event'
 import { graphql, HttpResponse } from 'msw'
 import { setupServer } from 'msw/node'
 
-import { useAddNotification } from 'services/toastNotification'
+import { useAddNotification } from 'services/toastNotification/context'
 
 import NameEmailCard from './NameEmailCard'
 
-vi.mock('services/toastNotification')
+vi.mock('services/toastNotification/context')
 
 const currentUser = {
   name: 'donald duck',

src/pages/OwnerPage/OwnerPage.jsx

@@ -7,7 +7,7 @@ import { useOwnerPageData } from 'pages/OwnerPage/hooks'
 import { useAccountDetails } from 'services/account/useAccountDetails'
 import { useSentryToken } from 'services/account/useSentryToken'
 import { useLocationParams } from 'services/navigation/useLocationParams'
-import { renderToast } from 'services/toast'
+import { renderToast } from 'services/toast/renderToast'
 import { ActiveContext } from 'shared/context'
 import ListRepo from 'shared/ListRepo'
 

src/pages/OwnerPage/OwnerPage.test.jsx

@@ -11,8 +11,8 @@ const mocks = vi.hoisted(() => ({
   renderToast: vi.fn(),
 }))
 
-vi.mock('services/toast', async () => {
-  const actual = await vi.importActual('services/toast')
+vi.mock('services/toast/renderToast', async () => {
+  const actual = await vi.importActual('services/toast/renderToast')
   return {
     ...actual,
     renderToast: mocks.renderToast,

src/pages/PlanPage/subRoutes/CancelPlanPage/subRoutes/DowngradePlan/CancelButton/CancelButton.test.jsx

@@ -36,8 +36,8 @@ vi.mock('services/account/useCancelPlan', async () => {
   }
 })
 
-vi.mock('services/toastNotification', async () => {
-  const actual = await vi.importActual('services/toastNotification')
+vi.mock('services/toastNotification/context', async () => {
+  const actual = await vi.importActual('services/toastNotification/context')
   return {
     ...actual,
     useAddNotification: mocks.useAddNotification,

src/pages/PlanPage/subRoutes/CancelPlanPage/subRoutes/DowngradePlan/CancelButton/hooks.js

@@ -1,7 +1,7 @@
 import { useHistory, useParams } from 'react-router-dom'
 
 import { useCancelPlan } from 'services/account/useCancelPlan'
-import { useAddNotification } from 'services/toastNotification'
+import { useAddNotification } from 'services/toastNotification/context'
 
 import { useBarecancel } from './useBarecancel'
 

src/pages/PlanPage/subRoutes/CancelPlanPage/subRoutes/DowngradePlan/CancelButton/useBarecancel.test.jsx

@@ -9,7 +9,7 @@ const mocks = vi.hoisted(() => ({
   useParams: vi.fn(),
 }))
 
-vi.mock('services/toastNotification')
+vi.mock('services/toastNotification/context')
 
 vi.mock('react-router-dom', async () => {
   const actual = await vi.requireActual('react-router-dom')

src/pages/PlanPage/subRoutes/CancelPlanPage/subRoutes/SpecialOffer/SpecialOffer.jsx

@@ -4,7 +4,7 @@ import { useHistory, useParams } from 'react-router-dom'
 
 import { useSetCrumbs } from 'pages/PlanPage/context'
 import { useNavLinks } from 'services/navigation/useNavLinks'
-import { useAddNotification } from 'services/toastNotification'
+import { useAddNotification } from 'services/toastNotification/context'
 import Api from 'shared/api'
 import A from 'ui/A'
 import Button from 'ui/Button'

src/pages/PlanPage/subRoutes/CancelPlanPage/subRoutes/SpecialOffer/SpecialOffer.test.jsx

@@ -10,7 +10,7 @@ import SpecialOffer from './SpecialOffer'
 const mockBody = vi.fn()
 const mockToast = vi.fn()
 
-vi.mock('services/toastNotification', () => ({
+vi.mock('services/toastNotification/context', () => ({
   useAddNotification: () => (data) => mockToast(data),
 }))
 

src/pages/PlanPage/subRoutes/UpgradePlanPage/UpgradeForm/Controllers/ProPlanController/ProPlanController.test.tsx

@@ -17,8 +17,8 @@ const mocks = vi.hoisted(() => ({
 }))
 
 vi.mock('@stripe/react-stripe-js')
-vi.mock('services/toastNotification', async () => {
-  const actual = await vi.importActual('services/toastNotification')
+vi.mock('services/toastNotification/context', async () => {
+  const actual = await vi.importActual('services/toastNotification/context')
   return {
     ...actual,
     useAddNotification: mocks.useAddNotification,

src/pages/PlanPage/subRoutes/UpgradePlanPage/UpgradeForm/Controllers/SentryPlanController/SentryPlanController.test.tsx

@@ -15,8 +15,8 @@ const mocks = vi.hoisted(() => ({
   useAddNotification: vi.fn(),
 }))
 
-vi.mock('services/toastNotification', async () => {
-  const actual = await vi.importActual('services/toastNotification')
+vi.mock('services/toastNotification/context', async () => {
+  const actual = await vi.importActual('services/toastNotification/context')
   return {
     ...actual,
     useAddNotification: mocks.useAddNotification,

src/pages/PlanPage/subRoutes/UpgradePlanPage/UpgradeForm/Controllers/TeamPlanController/TeamPlanController.test.tsx

@@ -16,8 +16,8 @@ const mocks = vi.hoisted(() => ({
   useAddNotification: vi.fn(),
 }))
 
-vi.mock('services/toastNotification', async () => {
-  const actual = await vi.importActual('services/toastNotification')
+vi.mock('services/toastNotification/context', async () => {
+  const actual = await vi.importActual('services/toastNotification/context')
   return {
     ...actual,
     useAddNotification: mocks.useAddNotification,

src/pages/PlanPage/subRoutes/UpgradePlanPage/UpgradeForm/UpgradeForm.test.tsx

@@ -21,8 +21,8 @@ const mocks = vi.hoisted(() => ({
   useAddNotification: vi.fn(),
 }))
 
-vi.mock('services/toastNotification', async () => {
-  const actual = await vi.importActual('services/toastNotification')
+vi.mock('services/toastNotification/context', async () => {
+  const actual = await vi.importActual('services/toastNotification/context')
   return {
     ...actual,
     useAddNotification: mocks.useAddNotification,

src/pages/PlanPage/subRoutes/UpgradePlanPage/UpgradeForm/hooks/useUpgradeControls.ts

@@ -3,7 +3,7 @@ import { useHistory, useParams } from 'react-router-dom'
 
 import { useSetPlanUpdatedNotification } from 'pages/PlanPage/context'
 import { useUpgradePlan } from 'services/account/useUpgradePlan'
-import { useAddNotification } from 'services/toastNotification'
+import { useAddNotification } from 'services/toastNotification/context'
 import { Provider } from 'shared/api/helpers'
 
 import { UpgradeFormFields } from '../UpgradeForm'

src/pages/RepoPage/ConfigTab/tabs/GeneralTab/DangerZone/EraseRepo/EraseRepo.test.jsx

@@ -12,8 +12,8 @@ const mocks = vi.hoisted(() => ({
   useAddNotification: vi.fn(),
 }))
 
-vi.mock('services/toastNotification', async () => {
-  const actual = await vi.importActual('services/toastNotification')
+vi.mock('services/toastNotification/context', async () => {
+  const actual = await vi.importActual('services/toastNotification/context')
   return {
     ...actual,
     useAddNotification: mocks.useAddNotification,

src/pages/RepoPage/ConfigTab/tabs/GeneralTab/DangerZone/RepoState/RepoState.test.jsx

@@ -11,8 +11,8 @@ const mocks = vi.hoisted(() => ({
   useAddNotification: vi.fn(),
 }))
 
-vi.mock('services/toastNotification', async () => {
-  const actual = await vi.importActual('services/toastNotification')
+vi.mock('services/toastNotification/context', async () => {
+  const actual = await vi.importActual('services/toastNotification/context')
   return {
     ...actual,
     useAddNotification: mocks.useAddNotification,

src/pages/RepoPage/ConfigTab/tabs/GeneralTab/DangerZone/RepoState/hooks/useRepoActivation.js

@@ -1,5 +1,5 @@
 import { useUpdateRepo } from 'services/repo'
-import { useAddNotification } from 'services/toastNotification'
+import { useAddNotification } from 'services/toastNotification/context'
 
 export function useRepoActivation() {
   const addToast = useAddNotification()

src/pages/RepoPage/ConfigTab/tabs/GeneralTab/DangerZone/RepoState/hooks/useRepoActivation.test.jsx

@@ -10,8 +10,8 @@ const mocks = vi.hoisted(() => ({
   useAddNotification: vi.fn(),
 }))
 
-vi.mock('services/toastNotification', async () => {
-  const actual = await vi.importActual('services/toastNotification')
+vi.mock('services/toastNotification/context', async () => {
+  const actual = await vi.importActual('services/toastNotification/context')
   return {
     ...actual,
     useAddNotification: mocks.useAddNotification,

src/pages/RepoPage/ConfigTab/tabs/GeneralTab/DefaultBranch/DefaultBranch.jsx

@@ -4,7 +4,7 @@ import { useParams } from 'react-router-dom'
 
 import { useBranches } from 'services/branches/useBranches'
 import { useUpdateRepo } from 'services/repo'
-import { useAddNotification } from 'services/toastNotification'
+import { useAddNotification } from 'services/toastNotification/context'
 import Icon from 'ui/Icon'
 import Select from 'ui/Select'
 import SettingsDescriptor from 'ui/SettingsDescriptor'

src/pages/RepoPage/ConfigTab/tabs/GeneralTab/DefaultBranch/DefaultBranch.test.jsx

@@ -12,8 +12,8 @@ const mocks = vi.hoisted(() => ({
   useIntersection: vi.fn(),
 }))
 
-vi.mock('services/toastNotification', async () => {
-  const actual = await vi.importActual('services/toastNotification')
+vi.mock('services/toastNotification/context', async () => {
+  const actual = await vi.importActual('services/toastNotification/context')
   return {
     ...actual,
     useAddNotification: mocks.useAddNotification,

src/pages/RepoPage/ConfigTab/tabs/GeneralTab/Tokens/RepoUploadToken/RepoUploadToken.jsx

@@ -2,7 +2,7 @@ import PropTypes from 'prop-types'
 import { useState } from 'react'
 import { useParams } from 'react-router'
 
-import { useRegenerateRepoUploadToken } from 'services/repoUploadToken'
+import { useRegenerateRepoUploadToken } from 'services/repoUploadToken/useRegenerateRepoUploadToken'
 import { useUploadTokenRequired } from 'services/uploadTokenRequired'
 import A from 'ui/A'
 import Button from 'ui/Button'

src/pages/RepoPage/ConfigTab/tabs/GeneralTab/Tokens/RepoUploadToken/RepoUploadToken.test.jsx

@@ -12,8 +12,8 @@ const mocks = vi.hoisted(() => ({
   useAddNotification: vi.fn(),
 }))
 
-vi.mock('services/toastNotification', async () => {
-  const actual = await vi.importActual('services/toastNotification')
+vi.mock('services/toastNotification/context', async () => {
+  const actual = await vi.importActual('services/toastNotification/context')
   return {
     ...actual,
     useAddNotification: mocks.useAddNotification,

src/pages/RepoPage/ConfigTab/tabs/GeneralTab/Tokens/StaticAnalysisToken/RegenerateStaticTokenModal.jsx

@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types'
 
-import { useRegenerateRepositoryToken } from 'services/repositoryToken'
+import { useRegenerateRepositoryToken } from 'services/repositoryToken/useRegenerateRepositoryToken'
 import Button from 'ui/Button'
 import Modal from 'ui/Modal'
 

src/pages/RepoPage/ConfigTab/tabs/GeneralTab/Tokens/StaticAnalysisToken/StaticAnalysisToken.test.jsx

@@ -12,8 +12,8 @@ const mocks = vi.hoisted(() => ({
   useAddNotification: vi.fn(),
 }))
 
-vi.mock('services/toastNotification', async () => {
-  const actual = await vi.importActual('services/toastNotification')
+vi.mock('services/toastNotification/context', async () => {
+  const actual = await vi.importActual('services/toastNotification/context')
   return {
     ...actual,
     useAddNotification: mocks.useAddNotification,