diff --git a/app/config.js b/app/config.js index 9772a1ea8..f94e29f8f 100644 --- a/app/config.js +++ b/app/config.js @@ -1,5 +1,5 @@ import { csrfInterceptor, csrfTokenReaderInterceptorAngular } from './portainer/services/csrf'; -import { agentInterceptor } from './portainer/services/axios'; +import { agentInterceptor } from './portainer/services/axios/axios'; import { dispatchCacheRefreshEventIfNeeded } from './portainer/services/http-request.helper'; /* @ngInject */ diff --git a/app/docker/services/imageService.js b/app/docker/services/imageService.js index 94ffe5c73..88cfc9c41 100644 --- a/app/docker/services/imageService.js +++ b/app/docker/services/imageService.js @@ -2,7 +2,7 @@ import { groupBy } from 'lodash'; import { getUniqueTagListFromImages } from '@/react/docker/images/utils'; import { getImage } from '@/react/docker/proxy/queries/images/useImage'; -import { parseAxiosError } from '@/portainer/services/axios'; +import { parseAxiosError } from 'Portainer/services/axios/axios'; import { getImages } from '@/react/docker/proxy/queries/images/useImages'; import { getContainers } from '@/react/docker/containers/queries/useContainers'; import { getImageHistory } from '@/react/docker/proxy/queries/images/useImageHistory'; diff --git a/app/kubernetes/__module.js b/app/kubernetes/__module.js index 3c3a91b6f..5227e596f 100644 --- a/app/kubernetes/__module.js +++ b/app/kubernetes/__module.js @@ -1,9 +1,9 @@ import { EnvironmentStatus } from '@/react/portainer/environments/types'; -import { updateAxiosAdapter } from '@/portainer/services/axios'; +import { updateAxiosAdapter } from 'Portainer/services/axios/axios'; import { PortainerEndpointTypes } from 'Portainer/models/endpoint/models'; +import { cache } from 'Portainer/services/axios/axios'; import { CACHE_REFRESH_EVENT, CACHE_DURATION } from '../portainer/services/http-request.helper'; -import { cache } from '../portainer/services/axios'; import registriesModule from './registries'; import customTemplateModule from './custom-templates'; diff --git a/app/kubernetes/rest/serviceAccount.js b/app/kubernetes/rest/serviceAccount.js index 0b26c7f3f..4685e8079 100644 --- a/app/kubernetes/rest/serviceAccount.js +++ b/app/kubernetes/rest/serviceAccount.js @@ -1,4 +1,4 @@ -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; export async function getServiceAccounts(environmentId, namespaceId) { try { diff --git a/app/portainer/hostmanagement/open-amt/open-amt.service.ts b/app/portainer/hostmanagement/open-amt/open-amt.service.ts index 64591b46f..1fba7cae4 100644 --- a/app/portainer/hostmanagement/open-amt/open-amt.service.ts +++ b/app/portainer/hostmanagement/open-amt/open-amt.service.ts @@ -1,4 +1,4 @@ -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { OpenAMTConfiguration, diff --git a/app/portainer/services/api/backup.service.ts b/app/portainer/services/api/backup.service.ts index bceeb228f..d45c9ff9d 100644 --- a/app/portainer/services/api/backup.service.ts +++ b/app/portainer/services/api/backup.service.ts @@ -1,4 +1,4 @@ -import axios, { parseAxiosError } from '../axios'; +import axios, { parseAxiosError } from '../axios/axios'; interface StatusResponse { Failed: boolean; diff --git a/app/portainer/services/axios.test.ts b/app/portainer/services/axios/axios.test.ts similarity index 100% rename from app/portainer/services/axios.test.ts rename to app/portainer/services/axios/axios.test.ts diff --git a/app/portainer/services/axios.ts b/app/portainer/services/axios/axios.ts similarity index 97% rename from app/portainer/services/axios.ts rename to app/portainer/services/axios/axios.ts index 6d7362fb5..1070ca91e 100644 --- a/app/portainer/services/axios.ts +++ b/app/portainer/services/axios/axios.ts @@ -15,16 +15,16 @@ import { loadProgressBar } from 'axios-progress-bar'; import 'axios-progress-bar/dist/nprogress.css'; import qs from 'qs'; -import PortainerError from '@/portainer/error'; +import PortainerError from 'Portainer/error'; import { CACHE_DURATION, dispatchCacheRefreshEventIfNeeded, portainerAgentManagerOperation, portainerAgentTargetHeader, -} from './http-request.helper'; -import { dockerMaxAPIVersionInterceptor } from './dockerMaxApiVersionInterceptor'; -import { MAX_DOCKER_API_VERSION } from './dockerMaxApiVersion'; +} from '../http-request.helper'; +import { dockerMaxAPIVersionInterceptor } from '../dockerMaxApiVersionInterceptor'; +import { MAX_DOCKER_API_VERSION } from '../dockerMaxApiVersion'; const portainerCacheHeader = 'X-Portainer-Cache'; diff --git a/app/portainer/services/csrf.ts b/app/portainer/services/csrf.ts index 61e275f37..07c8be7ad 100644 --- a/app/portainer/services/csrf.ts +++ b/app/portainer/services/csrf.ts @@ -2,7 +2,7 @@ import { AxiosResponse, InternalAxiosRequestConfig } from 'axios'; import { CacheAxiosResponse } from 'axios-cache-interceptor'; import { IHttpResponse } from 'angular'; -import axios from './axios'; +import axios from './axios/axios'; axios.interceptors.response.use(csrfTokenReaderInterceptor); axios.interceptors.request.use(csrfInterceptor); diff --git a/app/portainer/tags/tags.service.ts b/app/portainer/tags/tags.service.ts index 74ba6b1ca..f5efaf475 100644 --- a/app/portainer/tags/tags.service.ts +++ b/app/portainer/tags/tags.service.ts @@ -1,4 +1,4 @@ -import axios, { parseAxiosError } from '../services/axios'; +import axios, { parseAxiosError } from '../services/axios/axios'; import { Tag, TagId } from './types'; diff --git a/app/portainer/users/queries/useLoadCurrentUser.ts b/app/portainer/users/queries/useLoadCurrentUser.ts index bd47fbee9..30adfdcd2 100644 --- a/app/portainer/users/queries/useLoadCurrentUser.ts +++ b/app/portainer/users/queries/useLoadCurrentUser.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { withError } from '@/react-tools/react-query'; import { buildUrl } from '../user.service'; diff --git a/app/portainer/users/queries/useUser.ts b/app/portainer/users/queries/useUser.ts index 01e069829..fc6694455 100644 --- a/app/portainer/users/queries/useUser.ts +++ b/app/portainer/users/queries/useUser.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { withError } from '@/react-tools/react-query'; import { buildUrl } from '../user.service'; diff --git a/app/portainer/users/user.service.ts b/app/portainer/users/user.service.ts index de64058dd..d42d4317c 100644 --- a/app/portainer/users/user.service.ts +++ b/app/portainer/users/user.service.ts @@ -1,4 +1,4 @@ -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { TeamMembership } from '@/react/portainer/users/teams/types'; import { User, UserId } from './types'; diff --git a/app/react/azure/queries/useContainerGroup.ts b/app/react/azure/queries/useContainerGroup.ts index 7b82fa6e0..976716289 100644 --- a/app/react/azure/queries/useContainerGroup.ts +++ b/app/react/azure/queries/useContainerGroup.ts @@ -2,7 +2,7 @@ import { useQuery } from '@tanstack/react-query'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { withError } from '@/react-tools/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { ContainerGroup } from '../types'; diff --git a/app/react/azure/queries/useContainerGroups.ts b/app/react/azure/queries/useContainerGroups.ts index 2c5ed4c00..5e9e33586 100644 --- a/app/react/azure/queries/useContainerGroups.ts +++ b/app/react/azure/queries/useContainerGroups.ts @@ -3,7 +3,7 @@ import { useMemo } from 'react'; import { useQueries } from '@tanstack/react-query'; import { withError } from '@/react-tools/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { Subscription, ContainerGroup } from '../types'; diff --git a/app/react/azure/queries/useProvider.ts b/app/react/azure/queries/useProvider.ts index 27d34966b..45cba673a 100644 --- a/app/react/azure/queries/useProvider.ts +++ b/app/react/azure/queries/useProvider.ts @@ -2,7 +2,7 @@ import _ from 'lodash'; import { useQueries } from '@tanstack/react-query'; import { EnvironmentId } from '@/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { withError } from '@/react-tools/react-query'; import { ProviderViewModel, Subscription } from '../types'; diff --git a/app/react/azure/queries/useResourceGroup.ts b/app/react/azure/queries/useResourceGroup.ts index 80c9c2ec7..9849d9f02 100644 --- a/app/react/azure/queries/useResourceGroup.ts +++ b/app/react/azure/queries/useResourceGroup.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; import { EnvironmentId } from '@/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { withError } from '@/react-tools/react-query'; import { azureErrorParser } from '../services/utils'; diff --git a/app/react/azure/queries/useResourceGroups.ts b/app/react/azure/queries/useResourceGroups.ts index b37ddb202..a913dfb0d 100644 --- a/app/react/azure/queries/useResourceGroups.ts +++ b/app/react/azure/queries/useResourceGroups.ts @@ -2,7 +2,7 @@ import _ from 'lodash'; import { useQueries } from '@tanstack/react-query'; import { EnvironmentId } from '@/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { withError } from '@/react-tools/react-query'; import { azureErrorParser } from '../services/utils'; diff --git a/app/react/azure/queries/useSubscription.ts b/app/react/azure/queries/useSubscription.ts index 7b8d7571e..336d32cb7 100644 --- a/app/react/azure/queries/useSubscription.ts +++ b/app/react/azure/queries/useSubscription.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; import { EnvironmentId } from '@/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { withError } from '@/react-tools/react-query'; import { Subscription } from '../types'; diff --git a/app/react/azure/queries/useSubscriptions.ts b/app/react/azure/queries/useSubscriptions.ts index e0124c09d..9c6674430 100644 --- a/app/react/azure/queries/useSubscriptions.ts +++ b/app/react/azure/queries/useSubscriptions.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { withError } from '@/react-tools/react-query'; diff --git a/app/react/azure/services/container-groups.service.ts b/app/react/azure/services/container-groups.service.ts index a52c5124e..58bfd5767 100644 --- a/app/react/azure/services/container-groups.service.ts +++ b/app/react/azure/services/container-groups.service.ts @@ -1,5 +1,5 @@ import { EnvironmentId } from '@/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { buildContainerGroupUrl } from '../queries/utils'; import { ContainerGroup, ContainerInstanceFormValues } from '../types'; diff --git a/app/react/common/stacks/queries/useCreateStack/createKubernetesStackFromFileContent.ts b/app/react/common/stacks/queries/useCreateStack/createKubernetesStackFromFileContent.ts index 68122e097..e7e68ecad 100644 --- a/app/react/common/stacks/queries/useCreateStack/createKubernetesStackFromFileContent.ts +++ b/app/react/common/stacks/queries/useCreateStack/createKubernetesStackFromFileContent.ts @@ -1,4 +1,4 @@ -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { Stack } from '../../types'; diff --git a/app/react/common/stacks/queries/useCreateStack/createKubernetesStackFromGit.ts b/app/react/common/stacks/queries/useCreateStack/createKubernetesStackFromGit.ts index 7662e9e35..d8b7e8bf2 100644 --- a/app/react/common/stacks/queries/useCreateStack/createKubernetesStackFromGit.ts +++ b/app/react/common/stacks/queries/useCreateStack/createKubernetesStackFromGit.ts @@ -1,4 +1,4 @@ -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { AutoUpdateResponse } from '@/react/portainer/gitops/types'; import { EnvironmentId } from '@/react/portainer/environments/types'; diff --git a/app/react/common/stacks/queries/useCreateStack/createKubernetesStackFromUrl.ts b/app/react/common/stacks/queries/useCreateStack/createKubernetesStackFromUrl.ts index 0df3baf65..7b832eff8 100644 --- a/app/react/common/stacks/queries/useCreateStack/createKubernetesStackFromUrl.ts +++ b/app/react/common/stacks/queries/useCreateStack/createKubernetesStackFromUrl.ts @@ -1,4 +1,4 @@ -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { Stack } from '../../types'; diff --git a/app/react/common/stacks/queries/useCreateStack/createStandaloneStackFromFile.ts b/app/react/common/stacks/queries/useCreateStack/createStandaloneStackFromFile.ts index c16b0ea9f..54c04761c 100644 --- a/app/react/common/stacks/queries/useCreateStack/createStandaloneStackFromFile.ts +++ b/app/react/common/stacks/queries/useCreateStack/createStandaloneStackFromFile.ts @@ -1,7 +1,7 @@ import axios, { json2formData, parseAxiosError, -} from '@/portainer/services/axios'; +} from 'Portainer/services/axios/axios'; import { Pair } from '@/react/portainer/settings/types'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { RegistryId } from '@/react/portainer/registries/types/registry'; diff --git a/app/react/common/stacks/queries/useCreateStack/createStandaloneStackFromFileContent.ts b/app/react/common/stacks/queries/useCreateStack/createStandaloneStackFromFileContent.ts index 4f3331756..85da724c6 100644 --- a/app/react/common/stacks/queries/useCreateStack/createStandaloneStackFromFileContent.ts +++ b/app/react/common/stacks/queries/useCreateStack/createStandaloneStackFromFileContent.ts @@ -1,4 +1,4 @@ -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { Pair } from '@/react/portainer/settings/types'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { RegistryId } from '@/react/portainer/registries/types/registry'; diff --git a/app/react/common/stacks/queries/useCreateStack/createStandaloneStackFromGit.ts b/app/react/common/stacks/queries/useCreateStack/createStandaloneStackFromGit.ts index 10b5622f3..f55412a9a 100644 --- a/app/react/common/stacks/queries/useCreateStack/createStandaloneStackFromGit.ts +++ b/app/react/common/stacks/queries/useCreateStack/createStandaloneStackFromGit.ts @@ -1,4 +1,4 @@ -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { Pair } from '@/react/portainer/settings/types'; import { AutoUpdateResponse } from '@/react/portainer/gitops/types'; import { EnvironmentId } from '@/react/portainer/environments/types'; diff --git a/app/react/common/stacks/queries/useCreateStack/createSwarmStackFromFile.ts b/app/react/common/stacks/queries/useCreateStack/createSwarmStackFromFile.ts index 4c5fa92c2..50a135a39 100644 --- a/app/react/common/stacks/queries/useCreateStack/createSwarmStackFromFile.ts +++ b/app/react/common/stacks/queries/useCreateStack/createSwarmStackFromFile.ts @@ -1,7 +1,7 @@ import axios, { json2formData, parseAxiosError, -} from '@/portainer/services/axios'; +} from 'Portainer/services/axios/axios'; import { Pair } from '@/react/portainer/settings/types'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { RegistryId } from '@/react/portainer/registries/types/registry'; diff --git a/app/react/common/stacks/queries/useCreateStack/createSwarmStackFromFileContent.ts b/app/react/common/stacks/queries/useCreateStack/createSwarmStackFromFileContent.ts index fadeeb594..d74dc87b0 100644 --- a/app/react/common/stacks/queries/useCreateStack/createSwarmStackFromFileContent.ts +++ b/app/react/common/stacks/queries/useCreateStack/createSwarmStackFromFileContent.ts @@ -1,4 +1,4 @@ -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { Pair } from '@/react/portainer/settings/types'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { RegistryId } from '@/react/portainer/registries/types/registry'; diff --git a/app/react/common/stacks/queries/useCreateStack/createSwarmStackFromGit.ts b/app/react/common/stacks/queries/useCreateStack/createSwarmStackFromGit.ts index 74f559991..bc9394e83 100644 --- a/app/react/common/stacks/queries/useCreateStack/createSwarmStackFromGit.ts +++ b/app/react/common/stacks/queries/useCreateStack/createSwarmStackFromGit.ts @@ -1,4 +1,4 @@ -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { Pair } from '@/react/portainer/settings/types'; import { AutoUpdateResponse } from '@/react/portainer/gitops/types'; import { EnvironmentId } from '@/react/portainer/environments/types'; diff --git a/app/react/common/stacks/queries/useDeleteStackByNameMutation.ts b/app/react/common/stacks/queries/useDeleteStackByNameMutation.ts index a8a7066e1..76252597b 100644 --- a/app/react/common/stacks/queries/useDeleteStackByNameMutation.ts +++ b/app/react/common/stacks/queries/useDeleteStackByNameMutation.ts @@ -1,7 +1,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; import { EnvironmentId } from '@/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { withGlobalError } from '@/react-tools/react-query'; import { StackId } from '../types'; diff --git a/app/react/common/stacks/queries/useDeleteStackMutation.ts b/app/react/common/stacks/queries/useDeleteStackMutation.ts index 8e4eb5b56..0d84b0c77 100644 --- a/app/react/common/stacks/queries/useDeleteStackMutation.ts +++ b/app/react/common/stacks/queries/useDeleteStackMutation.ts @@ -1,7 +1,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; import { EnvironmentId } from '@/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { withGlobalError } from '@/react-tools/react-query'; import { StackId } from '../types'; diff --git a/app/react/common/stacks/queries/useStack.ts b/app/react/common/stacks/queries/useStack.ts index ac7b3d89c..6accff985 100644 --- a/app/react/common/stacks/queries/useStack.ts +++ b/app/react/common/stacks/queries/useStack.ts @@ -1,6 +1,6 @@ import { useQuery, UseQueryOptions } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { withGlobalError } from '@/react-tools/react-query'; import { Stack, StackId } from '../types'; diff --git a/app/react/common/stacks/queries/useStackFile.ts b/app/react/common/stacks/queries/useStackFile.ts index 1c1be4cfe..2e7acfc70 100644 --- a/app/react/common/stacks/queries/useStackFile.ts +++ b/app/react/common/stacks/queries/useStackFile.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { withGlobalError } from '@/react-tools/react-query'; import { StackFile, StackId } from '../types'; diff --git a/app/react/common/stacks/queries/useStacks.ts b/app/react/common/stacks/queries/useStacks.ts index b72791ead..172260e57 100644 --- a/app/react/common/stacks/queries/useStacks.ts +++ b/app/react/common/stacks/queries/useStacks.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; import { withError } from '@/react-tools/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { Stack } from '@/react/common/stacks/types'; import { buildStackUrl } from './buildUrl'; diff --git a/app/react/components/ImageConfigFieldset/RateLimits.tsx b/app/react/components/ImageConfigFieldset/RateLimits.tsx index d8d3875a5..e3f69c5aa 100644 --- a/app/react/components/ImageConfigFieldset/RateLimits.tsx +++ b/app/react/components/ImageConfigFieldset/RateLimits.tsx @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; import { useEffect } from 'react'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { useCurrentEnvironment } from '@/react/hooks/useCurrentEnvironment'; import { useCurrentUser } from '@/react/hooks/useUser'; import { buildUrl } from '@/react/portainer/environments/environment.service/utils'; diff --git a/app/react/docker/DashboardView/useDashboard.ts b/app/react/docker/DashboardView/useDashboard.ts index dd5719e1f..8d7ab6fe3 100644 --- a/app/react/docker/DashboardView/useDashboard.ts +++ b/app/react/docker/DashboardView/useDashboard.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { queryKeys } from '../queries/utils'; diff --git a/app/react/docker/agent/queries/useAgentNodes.ts b/app/react/docker/agent/queries/useAgentNodes.ts index 4acae6a98..b324c07d8 100644 --- a/app/react/docker/agent/queries/useAgentNodes.ts +++ b/app/react/docker/agent/queries/useAgentNodes.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildAgentUrl } from './build-url'; diff --git a/app/react/docker/agent/queries/useApiVersion.ts b/app/react/docker/agent/queries/useApiVersion.ts index 0c971e40a..3840b4e4e 100644 --- a/app/react/docker/agent/queries/useApiVersion.ts +++ b/app/react/docker/agent/queries/useApiVersion.ts @@ -3,7 +3,7 @@ import { useQuery } from '@tanstack/react-query'; import axios, { isAxiosError, parseAxiosError, -} from '@/portainer/services/axios'; +} from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerProxyUrl } from '../../proxy/queries/buildDockerProxyUrl'; diff --git a/app/react/docker/components/ImageStatus/useImageNotification.ts b/app/react/docker/components/ImageStatus/useImageNotification.ts index b432ddbca..202df93df 100644 --- a/app/react/docker/components/ImageStatus/useImageNotification.ts +++ b/app/react/docker/components/ImageStatus/useImageNotification.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; import { EnvironmentId } from '@/react/portainer/environments/types'; -import axios from '@/portainer/services/axios'; +import axios from 'Portainer/services/axios/axios'; import { ServiceId } from '@/react/docker/services/types'; import { ContainerId } from '@/react/docker/containers/types'; diff --git a/app/react/docker/configs/queries/useConfig.ts b/app/react/docker/configs/queries/useConfig.ts index 2aebb29e8..d9efd54e2 100644 --- a/app/react/docker/configs/queries/useConfig.ts +++ b/app/react/docker/configs/queries/useConfig.ts @@ -1,6 +1,6 @@ import { Config } from 'docker-types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { PortainerResponse } from '../../types'; diff --git a/app/react/docker/configs/queries/useConfigs.ts b/app/react/docker/configs/queries/useConfigs.ts index 208f7f792..b8fac1262 100644 --- a/app/react/docker/configs/queries/useConfigs.ts +++ b/app/react/docker/configs/queries/useConfigs.ts @@ -1,7 +1,7 @@ import { Config } from 'docker-types'; import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { withGlobalError } from '@/react-tools/react-query'; diff --git a/app/react/docker/configs/queries/useCreateConfigMutation.ts b/app/react/docker/configs/queries/useCreateConfigMutation.ts index c17454210..d273a470a 100644 --- a/app/react/docker/configs/queries/useCreateConfigMutation.ts +++ b/app/react/docker/configs/queries/useCreateConfigMutation.ts @@ -1,6 +1,6 @@ import { ConfigSpec } from 'docker-types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerProxyUrl } from '../../proxy/queries/buildDockerProxyUrl'; diff --git a/app/react/docker/configs/queries/useDeleteConfigMutation.ts b/app/react/docker/configs/queries/useDeleteConfigMutation.ts index 582415b63..24bc7909b 100644 --- a/app/react/docker/configs/queries/useDeleteConfigMutation.ts +++ b/app/react/docker/configs/queries/useDeleteConfigMutation.ts @@ -1,7 +1,7 @@ import { useMutation } from '@tanstack/react-query'; import { EnvironmentId } from '@/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { buildUrl } from './build-url'; diff --git a/app/react/docker/containers/CreateView/useCreateMutation.tsx b/app/react/docker/containers/CreateView/useCreateMutation.tsx index c5610a1b4..3128442fa 100644 --- a/app/react/docker/containers/CreateView/useCreateMutation.tsx +++ b/app/react/docker/containers/CreateView/useCreateMutation.tsx @@ -1,6 +1,6 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { Environment, EnvironmentId, diff --git a/app/react/docker/containers/containers.service.ts b/app/react/docker/containers/containers.service.ts index 4fb2b3f96..62d9d2a20 100644 --- a/app/react/docker/containers/containers.service.ts +++ b/app/react/docker/containers/containers.service.ts @@ -2,7 +2,7 @@ import _ from 'lodash'; import { EnvironmentId } from '@/react/portainer/environments/types'; import PortainerError from '@/portainer/error'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { withAgentTargetHeader } from '../proxy/queries/utils'; import { buildDockerProxyUrl } from '../proxy/queries/buildDockerProxyUrl'; diff --git a/app/react/docker/containers/queries/gpus.tsx b/app/react/docker/containers/queries/gpus.tsx index c342a688b..a45db1b3c 100644 --- a/app/react/docker/containers/queries/gpus.tsx +++ b/app/react/docker/containers/queries/gpus.tsx @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; import { EnvironmentId } from '@/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { queryKeys } from './query-keys'; diff --git a/app/react/docker/containers/queries/useContainer.ts b/app/react/docker/containers/queries/useContainer.ts index e2824b589..da20e1756 100644 --- a/app/react/docker/containers/queries/useContainer.ts +++ b/app/react/docker/containers/queries/useContainer.ts @@ -9,7 +9,7 @@ import { } from 'docker-types'; import { PortainerResponse } from '@/react/docker/types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { ContainerId } from '@/react/docker/containers/types'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { queryClient, withGlobalError } from '@/react-tools/react-query'; diff --git a/app/react/docker/containers/queries/useContainerInspect.ts b/app/react/docker/containers/queries/useContainerInspect.ts index 820194d49..a51c30f73 100644 --- a/app/react/docker/containers/queries/useContainerInspect.ts +++ b/app/react/docker/containers/queries/useContainerInspect.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; import { EnvironmentId } from '@/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { ContainerId } from '../types'; import { withAgentTargetHeader } from '../../proxy/queries/utils'; diff --git a/app/react/docker/containers/queries/useContainerResizeTTYMutation.ts b/app/react/docker/containers/queries/useContainerResizeTTYMutation.ts index d3bf67477..79080d4f4 100644 --- a/app/react/docker/containers/queries/useContainerResizeTTYMutation.ts +++ b/app/react/docker/containers/queries/useContainerResizeTTYMutation.ts @@ -1,4 +1,4 @@ -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerProxyUrl } from '../../proxy/queries/buildDockerProxyUrl'; diff --git a/app/react/docker/containers/queries/useContainerStats.ts b/app/react/docker/containers/queries/useContainerStats.ts index de117a101..cf27a9a56 100644 --- a/app/react/docker/containers/queries/useContainerStats.ts +++ b/app/react/docker/containers/queries/useContainerStats.ts @@ -1,5 +1,5 @@ import { EnvironmentId } from '@/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { buildDockerProxyUrl } from '../../proxy/queries/buildDockerProxyUrl'; import { ContainerId } from '../types'; diff --git a/app/react/docker/containers/queries/useContainerTop.ts b/app/react/docker/containers/queries/useContainerTop.ts index f07f1a7fe..ef406b657 100644 --- a/app/react/docker/containers/queries/useContainerTop.ts +++ b/app/react/docker/containers/queries/useContainerTop.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; import { EnvironmentId } from '@/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { ContainerId } from '../types'; import { buildDockerProxyUrl } from '../../proxy/queries/buildDockerProxyUrl'; diff --git a/app/react/docker/containers/queries/useContainers.ts b/app/react/docker/containers/queries/useContainers.ts index 8d7adcfe2..dcbf11371 100644 --- a/app/react/docker/containers/queries/useContainers.ts +++ b/app/react/docker/containers/queries/useContainers.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; import { EnvironmentId } from '@/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { withGlobalError } from '@/react-tools/react-query'; import { DockerContainerResponse } from '../types/response'; diff --git a/app/react/docker/containers/queries/useCreateExecMutation.ts b/app/react/docker/containers/queries/useCreateExecMutation.ts index 44b044272..8afbe70df 100644 --- a/app/react/docker/containers/queries/useCreateExecMutation.ts +++ b/app/react/docker/containers/queries/useCreateExecMutation.ts @@ -1,4 +1,4 @@ -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerProxyUrl } from '../../proxy/queries/buildDockerProxyUrl'; diff --git a/app/react/docker/containers/queries/useUpdateContainer.ts b/app/react/docker/containers/queries/useUpdateContainer.ts index 681006fce..46e96cdbb 100644 --- a/app/react/docker/containers/queries/useUpdateContainer.ts +++ b/app/react/docker/containers/queries/useUpdateContainer.ts @@ -1,6 +1,6 @@ import { Resources, RestartPolicy } from 'docker-types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { withAgentTargetHeader } from '../../proxy/queries/utils'; diff --git a/app/react/docker/images/queries/useBuildImageMutation.ts b/app/react/docker/images/queries/useBuildImageMutation.ts index ee9eca5df..1d3c97fb0 100644 --- a/app/react/docker/images/queries/useBuildImageMutation.ts +++ b/app/react/docker/images/queries/useBuildImageMutation.ts @@ -1,7 +1,7 @@ import axios, { jsonObjectsToArrayHandler, parseAxiosError, -} from '@/portainer/services/axios'; +} from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerProxyUrl } from '../../proxy/queries/buildDockerProxyUrl'; diff --git a/app/react/docker/images/queries/useDeleteImageMutation.ts b/app/react/docker/images/queries/useDeleteImageMutation.ts index 2fc84fd12..4bb76f924 100644 --- a/app/react/docker/images/queries/useDeleteImageMutation.ts +++ b/app/react/docker/images/queries/useDeleteImageMutation.ts @@ -2,7 +2,7 @@ import { RawAxiosRequestHeaders } from 'axios'; import { useMutation, useQueryClient } from '@tanstack/react-query'; import { withInvalidate } from '@/react-tools/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerProxyUrl } from '../../proxy/queries/buildDockerProxyUrl'; diff --git a/app/react/docker/images/queries/useExportImageMutation.ts b/app/react/docker/images/queries/useExportImageMutation.ts index 938be4b05..44437ab37 100644 --- a/app/react/docker/images/queries/useExportImageMutation.ts +++ b/app/react/docker/images/queries/useExportImageMutation.ts @@ -2,7 +2,7 @@ import { RawAxiosRequestHeaders } from 'axios'; import { useMutation } from '@tanstack/react-query'; import { saveAs } from 'file-saver'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { useEnvironmentId } from '@/react/hooks/useEnvironmentId'; diff --git a/app/react/docker/images/queries/useImages.ts b/app/react/docker/images/queries/useImages.ts index ad564b827..aa0ee38a5 100644 --- a/app/react/docker/images/queries/useImages.ts +++ b/app/react/docker/images/queries/useImages.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerUrl } from '../../queries/utils/buildDockerUrl'; diff --git a/app/react/docker/images/queries/usePullImageMutation.ts b/app/react/docker/images/queries/usePullImageMutation.ts index 549693e1f..8b5ac745d 100644 --- a/app/react/docker/images/queries/usePullImageMutation.ts +++ b/app/react/docker/images/queries/usePullImageMutation.ts @@ -1,6 +1,6 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { Registry } from '@/react/portainer/registries/types/registry'; import { useEnvironmentRegistries } from '@/react/portainer/environments/queries/useEnvironmentRegistries'; diff --git a/app/react/docker/images/queries/usePushImageMutation.ts b/app/react/docker/images/queries/usePushImageMutation.ts index f6d2af037..93f1df6a6 100644 --- a/app/react/docker/images/queries/usePushImageMutation.ts +++ b/app/react/docker/images/queries/usePushImageMutation.ts @@ -1,7 +1,7 @@ import axios, { jsonObjectsToArrayHandler, parseAxiosError, -} from '@/portainer/services/axios'; +} from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { Registry } from '@/react/portainer/registries/types/registry'; import PortainerError from '@/portainer/error'; diff --git a/app/react/docker/networks/queries/useConnectContainerMutation.ts b/app/react/docker/networks/queries/useConnectContainerMutation.ts index e6500bd88..ccae5f0fe 100644 --- a/app/react/docker/networks/queries/useConnectContainerMutation.ts +++ b/app/react/docker/networks/queries/useConnectContainerMutation.ts @@ -1,7 +1,7 @@ import { EndpointSettings } from 'docker-types'; import { useMutation, useQueryClient } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { mutationOptions, diff --git a/app/react/docker/networks/queries/useCreateNetworkMutation.ts b/app/react/docker/networks/queries/useCreateNetworkMutation.ts index 9a54e81c3..ad21c9b79 100644 --- a/app/react/docker/networks/queries/useCreateNetworkMutation.ts +++ b/app/react/docker/networks/queries/useCreateNetworkMutation.ts @@ -1,6 +1,6 @@ import { Network } from 'docker-types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerProxyUrl } from '../../proxy/queries/buildDockerProxyUrl'; diff --git a/app/react/docker/networks/queries/useDeleteNetworkMutation.ts b/app/react/docker/networks/queries/useDeleteNetworkMutation.ts index c7abd664f..1f2099420 100644 --- a/app/react/docker/networks/queries/useDeleteNetworkMutation.ts +++ b/app/react/docker/networks/queries/useDeleteNetworkMutation.ts @@ -6,7 +6,7 @@ import { withInvalidate, } from '@/react-tools/react-query'; import { EnvironmentId } from '@/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { buildDockerProxyUrl } from '../../proxy/queries/buildDockerProxyUrl'; import { withAgentTargetHeader } from '../../proxy/queries/utils'; diff --git a/app/react/docker/networks/queries/useDisconnectContainerMutation.ts b/app/react/docker/networks/queries/useDisconnectContainerMutation.ts index b4f51c81d..a356bc4ab 100644 --- a/app/react/docker/networks/queries/useDisconnectContainerMutation.ts +++ b/app/react/docker/networks/queries/useDisconnectContainerMutation.ts @@ -1,7 +1,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; import { EnvironmentId } from '@/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { mutationOptions, withGlobalError, diff --git a/app/react/docker/networks/queries/useNetwork.ts b/app/react/docker/networks/queries/useNetwork.ts index e897e43a3..8111107bc 100644 --- a/app/react/docker/networks/queries/useNetwork.ts +++ b/app/react/docker/networks/queries/useNetwork.ts @@ -2,7 +2,7 @@ import { useQuery } from '@tanstack/react-query'; import { withGlobalError } from '@/react-tools/react-query'; import { EnvironmentId } from '@/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { DockerNetwork, NetworkId } from '../types'; import { buildDockerProxyUrl } from '../../proxy/queries/buildDockerProxyUrl'; diff --git a/app/react/docker/networks/queries/useNetworks.ts b/app/react/docker/networks/queries/useNetworks.ts index f408acc00..59b9eb68b 100644 --- a/app/react/docker/networks/queries/useNetworks.ts +++ b/app/react/docker/networks/queries/useNetworks.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { DockerNetwork } from '../types'; diff --git a/app/react/docker/proxy/queries/images/useDownloadImages.ts b/app/react/docker/proxy/queries/images/useDownloadImages.ts index cfcd4c06f..c774c613b 100644 --- a/app/react/docker/proxy/queries/images/useDownloadImages.ts +++ b/app/react/docker/proxy/queries/images/useDownloadImages.ts @@ -1,4 +1,4 @@ -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerProxyUrl } from '../buildDockerProxyUrl'; diff --git a/app/react/docker/proxy/queries/images/useImage.ts b/app/react/docker/proxy/queries/images/useImage.ts index c0f547a6a..5e6827feb 100644 --- a/app/react/docker/proxy/queries/images/useImage.ts +++ b/app/react/docker/proxy/queries/images/useImage.ts @@ -1,6 +1,6 @@ import { ImageInspect } from 'docker-types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerProxyUrl } from '../buildDockerProxyUrl'; diff --git a/app/react/docker/proxy/queries/images/useImageHistory.ts b/app/react/docker/proxy/queries/images/useImageHistory.ts index 089a43b97..4988adbb8 100644 --- a/app/react/docker/proxy/queries/images/useImageHistory.ts +++ b/app/react/docker/proxy/queries/images/useImageHistory.ts @@ -1,5 +1,5 @@ import { EnvironmentId } from '@/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { buildDockerProxyUrl } from '../buildDockerProxyUrl'; diff --git a/app/react/docker/proxy/queries/images/useImages.ts b/app/react/docker/proxy/queries/images/useImages.ts index 71cdfea03..dfa602b6c 100644 --- a/app/react/docker/proxy/queries/images/useImages.ts +++ b/app/react/docker/proxy/queries/images/useImages.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; import { ImageSummary } from 'docker-types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerProxyUrl } from '../buildDockerProxyUrl'; diff --git a/app/react/docker/proxy/queries/images/useRemoveImageMutation.ts b/app/react/docker/proxy/queries/images/useRemoveImageMutation.ts index d1cd859c0..8a1854898 100644 --- a/app/react/docker/proxy/queries/images/useRemoveImageMutation.ts +++ b/app/react/docker/proxy/queries/images/useRemoveImageMutation.ts @@ -1,4 +1,4 @@ -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { ImageId, ImageName } from '@/docker/models/image'; diff --git a/app/react/docker/proxy/queries/images/useTagImageMutation.ts b/app/react/docker/proxy/queries/images/useTagImageMutation.ts index 30eb278f2..5b48447bb 100644 --- a/app/react/docker/proxy/queries/images/useTagImageMutation.ts +++ b/app/react/docker/proxy/queries/images/useTagImageMutation.ts @@ -1,5 +1,5 @@ import { EnvironmentId } from '@/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { ImageId, ImageName } from '@/docker/models/image'; import { buildDockerProxyUrl } from '../buildDockerProxyUrl'; diff --git a/app/react/docker/proxy/queries/images/useUploadImageMutation.ts b/app/react/docker/proxy/queries/images/useUploadImageMutation.ts index 5d3c6321c..9c49f384e 100644 --- a/app/react/docker/proxy/queries/images/useUploadImageMutation.ts +++ b/app/react/docker/proxy/queries/images/useUploadImageMutation.ts @@ -1,4 +1,4 @@ -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerProxyUrl } from '../buildDockerProxyUrl'; diff --git a/app/react/docker/proxy/queries/nodes/useNode.ts b/app/react/docker/proxy/queries/nodes/useNode.ts index ed4a9cbf1..4fa269020 100644 --- a/app/react/docker/proxy/queries/nodes/useNode.ts +++ b/app/react/docker/proxy/queries/nodes/useNode.ts @@ -1,6 +1,6 @@ import { Node } from 'docker-types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerProxyUrl } from '../buildDockerProxyUrl'; diff --git a/app/react/docker/proxy/queries/nodes/useNodes.ts b/app/react/docker/proxy/queries/nodes/useNodes.ts index 26726ce10..b91068e09 100644 --- a/app/react/docker/proxy/queries/nodes/useNodes.ts +++ b/app/react/docker/proxy/queries/nodes/useNodes.ts @@ -1,7 +1,7 @@ import { Node } from 'docker-types'; import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerProxyUrl } from '../buildDockerProxyUrl'; diff --git a/app/react/docker/proxy/queries/nodes/useUpdateNodeMutation.ts b/app/react/docker/proxy/queries/nodes/useUpdateNodeMutation.ts index 7e9edebae..f9df02395 100644 --- a/app/react/docker/proxy/queries/nodes/useUpdateNodeMutation.ts +++ b/app/react/docker/proxy/queries/nodes/useUpdateNodeMutation.ts @@ -1,6 +1,6 @@ import { Node, NodeSpec } from 'docker-types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerProxyUrl } from '../buildDockerProxyUrl'; diff --git a/app/react/docker/proxy/queries/secrets/useCreateSecretMutation.ts b/app/react/docker/proxy/queries/secrets/useCreateSecretMutation.ts index 43ae4f310..1350042b0 100644 --- a/app/react/docker/proxy/queries/secrets/useCreateSecretMutation.ts +++ b/app/react/docker/proxy/queries/secrets/useCreateSecretMutation.ts @@ -1,6 +1,6 @@ import { SecretSpec } from 'docker-types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerProxyUrl } from '../buildDockerProxyUrl'; diff --git a/app/react/docker/proxy/queries/secrets/useRemoveSecretMutation.ts b/app/react/docker/proxy/queries/secrets/useRemoveSecretMutation.ts index 819500d34..64271f6f3 100644 --- a/app/react/docker/proxy/queries/secrets/useRemoveSecretMutation.ts +++ b/app/react/docker/proxy/queries/secrets/useRemoveSecretMutation.ts @@ -1,6 +1,6 @@ import { Secret } from 'docker-types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerProxyUrl } from '../buildDockerProxyUrl'; diff --git a/app/react/docker/proxy/queries/secrets/useSecret.ts b/app/react/docker/proxy/queries/secrets/useSecret.ts index d6b4a9936..36a5f7a2d 100644 --- a/app/react/docker/proxy/queries/secrets/useSecret.ts +++ b/app/react/docker/proxy/queries/secrets/useSecret.ts @@ -1,6 +1,6 @@ import { Secret } from 'docker-types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { PortainerResponse } from '@/react/docker/types'; diff --git a/app/react/docker/proxy/queries/secrets/useSecrets.ts b/app/react/docker/proxy/queries/secrets/useSecrets.ts index a2ba1d5fa..d1c77a570 100644 --- a/app/react/docker/proxy/queries/secrets/useSecrets.ts +++ b/app/react/docker/proxy/queries/secrets/useSecrets.ts @@ -1,4 +1,4 @@ -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerProxyUrl } from '../buildDockerProxyUrl'; diff --git a/app/react/docker/proxy/queries/tasks/useTasks.ts b/app/react/docker/proxy/queries/tasks/useTasks.ts index 334596374..fde7cb02e 100644 --- a/app/react/docker/proxy/queries/tasks/useTasks.ts +++ b/app/react/docker/proxy/queries/tasks/useTasks.ts @@ -1,7 +1,7 @@ import { Task } from 'docker-types'; import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerProxyUrl } from '../buildDockerProxyUrl'; diff --git a/app/react/docker/proxy/queries/useCommitContainerMutation.ts b/app/react/docker/proxy/queries/useCommitContainerMutation.ts index 040fb09b2..95a0dbc84 100644 --- a/app/react/docker/proxy/queries/useCommitContainerMutation.ts +++ b/app/react/docker/proxy/queries/useCommitContainerMutation.ts @@ -1,7 +1,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; import { EnvironmentId } from '@/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { buildImageFullURIFromModel, fullURIIntoRepoAndTag, diff --git a/app/react/docker/proxy/queries/useEvents.ts b/app/react/docker/proxy/queries/useEvents.ts index 27bf02730..51cf4a060 100644 --- a/app/react/docker/proxy/queries/useEvents.ts +++ b/app/react/docker/proxy/queries/useEvents.ts @@ -4,7 +4,7 @@ import { useQuery } from '@tanstack/react-query'; import axios, { jsonObjectsToArrayHandler, parseAxiosError, -} from '@/portainer/services/axios'; +} from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerProxyUrl } from './buildDockerProxyUrl'; diff --git a/app/react/docker/proxy/queries/useExecResizeTTYMutation.ts b/app/react/docker/proxy/queries/useExecResizeTTYMutation.ts index 6022ac271..6a3ab1dac 100644 --- a/app/react/docker/proxy/queries/useExecResizeTTYMutation.ts +++ b/app/react/docker/proxy/queries/useExecResizeTTYMutation.ts @@ -1,4 +1,4 @@ -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerProxyUrl } from './buildDockerProxyUrl'; diff --git a/app/react/docker/proxy/queries/useInfo.ts b/app/react/docker/proxy/queries/useInfo.ts index 5b11530c7..f8dad4d96 100644 --- a/app/react/docker/proxy/queries/useInfo.ts +++ b/app/react/docker/proxy/queries/useInfo.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; import { SystemInfo } from 'docker-types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerProxyUrl } from './buildDockerProxyUrl'; diff --git a/app/react/docker/proxy/queries/usePing.ts b/app/react/docker/proxy/queries/usePing.ts index 3539cc259..203ecd076 100644 --- a/app/react/docker/proxy/queries/usePing.ts +++ b/app/react/docker/proxy/queries/usePing.ts @@ -1,4 +1,4 @@ -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerProxyUrl } from './buildDockerProxyUrl'; diff --git a/app/react/docker/proxy/queries/usePlugins.ts b/app/react/docker/proxy/queries/usePlugins.ts index 0badcc519..686f783cc 100644 --- a/app/react/docker/proxy/queries/usePlugins.ts +++ b/app/react/docker/proxy/queries/usePlugins.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; import { Plugin, PluginInterfaceType, PluginsInfo } from 'docker-types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { queryKeys } from '../../queries/utils/root'; diff --git a/app/react/docker/proxy/queries/useSwarm.ts b/app/react/docker/proxy/queries/useSwarm.ts index 442a46ffc..da95ee5ac 100644 --- a/app/react/docker/proxy/queries/useSwarm.ts +++ b/app/react/docker/proxy/queries/useSwarm.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; import { Swarm } from 'docker-types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { queryKeys } from './query-keys'; diff --git a/app/react/docker/proxy/queries/useVersion.ts b/app/react/docker/proxy/queries/useVersion.ts index 727729427..d26fdbddc 100644 --- a/app/react/docker/proxy/queries/useVersion.ts +++ b/app/react/docker/proxy/queries/useVersion.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; import { SystemVersion } from 'docker-types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerProxyUrl } from './buildDockerProxyUrl'; diff --git a/app/react/docker/proxy/queries/utils.ts b/app/react/docker/proxy/queries/utils.ts index fc097833f..dcaaca85d 100644 --- a/app/react/docker/proxy/queries/utils.ts +++ b/app/react/docker/proxy/queries/utils.ts @@ -1,4 +1,4 @@ -import { agentTargetHeader } from '@/portainer/services/axios'; +import { agentTargetHeader } from 'Portainer/services/axios/axios'; import { RegistryId } from '@/react/portainer/registries/types/registry'; /** diff --git a/app/react/docker/services/ListView/ServicesDatatable/useRemoveServicesMutation.ts b/app/react/docker/services/ListView/ServicesDatatable/useRemoveServicesMutation.ts index 3c635da4a..0be8e8592 100644 --- a/app/react/docker/services/ListView/ServicesDatatable/useRemoveServicesMutation.ts +++ b/app/react/docker/services/ListView/ServicesDatatable/useRemoveServicesMutation.ts @@ -1,7 +1,7 @@ import { useMutation } from '@tanstack/react-query'; import { EnvironmentId } from '@/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { promiseSequence } from '@/portainer/helpers/promise-utils'; import { withError } from '@/react-tools/react-query'; diff --git a/app/react/docker/services/queries/useCreateServiceMutation.ts b/app/react/docker/services/queries/useCreateServiceMutation.ts index 29ffd67b3..d869825df 100644 --- a/app/react/docker/services/queries/useCreateServiceMutation.ts +++ b/app/react/docker/services/queries/useCreateServiceMutation.ts @@ -1,7 +1,7 @@ import { Service } from 'docker-types'; import { useMutation, useQueryClient } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { mutationOptions, diff --git a/app/react/docker/services/queries/useService.ts b/app/react/docker/services/queries/useService.ts index 2f35da1d4..43a7395b6 100644 --- a/app/react/docker/services/queries/useService.ts +++ b/app/react/docker/services/queries/useService.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; import { Service } from 'docker-types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { withGlobalError } from '@/react-tools/react-query'; import { ServiceId } from '@/react/docker/services/types'; import { queryKeys } from '@/react/docker/services/queries/query-keys'; diff --git a/app/react/docker/services/queries/useServiceLogs.ts b/app/react/docker/services/queries/useServiceLogs.ts index 2950a2d2a..d4ab2c359 100644 --- a/app/react/docker/services/queries/useServiceLogs.ts +++ b/app/react/docker/services/queries/useServiceLogs.ts @@ -1,6 +1,6 @@ import _ from 'lodash'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildUrl } from '@/react/docker/services/queries/build-url'; import { ServiceId } from '@/react/docker/services/types'; diff --git a/app/react/docker/services/queries/useServices.ts b/app/react/docker/services/queries/useServices.ts index 2ce498f49..bd6fb4c3c 100644 --- a/app/react/docker/services/queries/useServices.ts +++ b/app/react/docker/services/queries/useServices.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; import { Service } from 'docker-types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { withGlobalError } from '@/react-tools/react-query'; import { queryKeys } from '@/react/docker/services/queries/query-keys'; import { EnvironmentId } from '@/react/portainer/environments/types'; diff --git a/app/react/docker/services/queries/useUpdateServiceMutation.ts b/app/react/docker/services/queries/useUpdateServiceMutation.ts index 92fbd4e57..6664e25b2 100644 --- a/app/react/docker/services/queries/useUpdateServiceMutation.ts +++ b/app/react/docker/services/queries/useUpdateServiceMutation.ts @@ -1,7 +1,7 @@ import { ServiceUpdateResponse } from 'docker-types'; import { useMutation, useQueryClient } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { mutationOptions, diff --git a/app/react/docker/services/webhooks/getWebhooks.ts b/app/react/docker/services/webhooks/getWebhooks.ts index c83d390ab..c0e14fa07 100644 --- a/app/react/docker/services/webhooks/getWebhooks.ts +++ b/app/react/docker/services/webhooks/getWebhooks.ts @@ -1,4 +1,4 @@ -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildUrl } from './build-url'; diff --git a/app/react/docker/services/webhooks/removeWebhook.ts b/app/react/docker/services/webhooks/removeWebhook.ts index 550c521d7..86d2563e2 100644 --- a/app/react/docker/services/webhooks/removeWebhook.ts +++ b/app/react/docker/services/webhooks/removeWebhook.ts @@ -1,4 +1,4 @@ -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { promiseSequence } from '@/portainer/helpers/promise-utils'; diff --git a/app/react/docker/stacks/ItemView/StackInfoTab/StackDuplicationForm/useMigrateStackMutation.ts b/app/react/docker/stacks/ItemView/StackInfoTab/StackDuplicationForm/useMigrateStackMutation.ts index cf7a37e9b..1065af291 100644 --- a/app/react/docker/stacks/ItemView/StackInfoTab/StackDuplicationForm/useMigrateStackMutation.ts +++ b/app/react/docker/stacks/ItemView/StackInfoTab/StackDuplicationForm/useMigrateStackMutation.ts @@ -2,7 +2,7 @@ import { useMutation } from '@tanstack/react-query'; import { getSwarm } from '@/react/docker/proxy/queries/useSwarm'; import { EnvironmentId } from '@/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { StackType } from '../../../../../common/stacks/types'; import { buildStackUrl } from '../../../../../common/stacks/queries/buildUrl'; diff --git a/app/react/docker/stacks/ItemView/StackInfoTab/useAssociateStackToEnvironmentMutation.ts b/app/react/docker/stacks/ItemView/StackInfoTab/useAssociateStackToEnvironmentMutation.ts index 2950ce35b..8fed607b4 100644 --- a/app/react/docker/stacks/ItemView/StackInfoTab/useAssociateStackToEnvironmentMutation.ts +++ b/app/react/docker/stacks/ItemView/StackInfoTab/useAssociateStackToEnvironmentMutation.ts @@ -3,7 +3,7 @@ import { useMutation } from '@tanstack/react-query'; import PortainerError from '@/portainer/error'; import { applyResourceControl } from '@/react/portainer/access-control/access-control.service'; import { AccessControlFormData } from '@/react/portainer/access-control/types'; -import axios from '@/portainer/services/axios'; +import axios from 'Portainer/services/axios/axios'; import { buildStackUrl } from '@/react/common/stacks/queries/buildUrl'; import { Stack } from '@/react/common/stacks/types'; import { withGlobalError } from '@/react-tools/react-query'; diff --git a/app/react/docker/stacks/ItemView/StackInfoTab/useStartStackMutation.ts b/app/react/docker/stacks/ItemView/StackInfoTab/useStartStackMutation.ts index de0c7674f..5860f568e 100644 --- a/app/react/docker/stacks/ItemView/StackInfoTab/useStartStackMutation.ts +++ b/app/react/docker/stacks/ItemView/StackInfoTab/useStartStackMutation.ts @@ -1,6 +1,6 @@ import { useMutation } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { buildStackUrl } from '@/react/common/stacks/queries/buildUrl'; import { Stack } from '@/react/common/stacks/types'; diff --git a/app/react/docker/stacks/ItemView/StackInfoTab/useStopStackMutation.ts b/app/react/docker/stacks/ItemView/StackInfoTab/useStopStackMutation.ts index a2c4ae39c..ff46e69df 100644 --- a/app/react/docker/stacks/ItemView/StackInfoTab/useStopStackMutation.ts +++ b/app/react/docker/stacks/ItemView/StackInfoTab/useStopStackMutation.ts @@ -1,6 +1,6 @@ import { useMutation } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { buildStackUrl } from '@/react/common/stacks/queries/buildUrl'; import { Stack } from '@/react/common/stacks/types'; diff --git a/app/react/docker/stacks/ListView/StacksDatatable/columns/getStackImagesStatus.ts b/app/react/docker/stacks/ListView/StacksDatatable/columns/getStackImagesStatus.ts index 632fa0388..1bcb0e994 100644 --- a/app/react/docker/stacks/ListView/StacksDatatable/columns/getStackImagesStatus.ts +++ b/app/react/docker/stacks/ListView/StacksDatatable/columns/getStackImagesStatus.ts @@ -1,4 +1,4 @@ -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { ImageStatus } from '@/react/docker/components/ImageStatus/types'; export async function getStackImagesStatus(id: number) { diff --git a/app/react/docker/stacks/useUpdateStack.ts b/app/react/docker/stacks/useUpdateStack.ts index 91aadb9c8..165a70a69 100644 --- a/app/react/docker/stacks/useUpdateStack.ts +++ b/app/react/docker/stacks/useUpdateStack.ts @@ -1,6 +1,6 @@ import { useMutation } from '@tanstack/react-query'; -import axios from '@/portainer/services/axios'; +import axios from 'Portainer/services/axios/axios'; import { buildStackUrl } from '@/react/common/stacks/queries/buildUrl'; import { Stack } from '@/react/common/stacks/types'; import { Registry } from '@/react/portainer/registries/types/registry'; diff --git a/app/react/docker/tasks/queries/useTask.ts b/app/react/docker/tasks/queries/useTask.ts index a011ae129..7c50d85f2 100644 --- a/app/react/docker/tasks/queries/useTask.ts +++ b/app/react/docker/tasks/queries/useTask.ts @@ -1,7 +1,7 @@ import { Task } from 'docker-types'; import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { TaskId } from '@/react/docker/tasks/types'; import { queryKeys } from '@/react/docker/tasks/queries/query-keys'; import { EnvironmentId } from '@/react/portainer/environments/types'; diff --git a/app/react/docker/tasks/queries/useTaskLogs.ts b/app/react/docker/tasks/queries/useTaskLogs.ts index 9f54105b3..59317195c 100644 --- a/app/react/docker/tasks/queries/useTaskLogs.ts +++ b/app/react/docker/tasks/queries/useTaskLogs.ts @@ -1,6 +1,6 @@ import _ from 'lodash'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { TaskId, TaskLogsParams } from '@/react/docker/tasks/types'; diff --git a/app/react/docker/volumes/queries/useCreateVolume.ts b/app/react/docker/volumes/queries/useCreateVolume.ts index fab903f1c..6ef1d1173 100644 --- a/app/react/docker/volumes/queries/useCreateVolume.ts +++ b/app/react/docker/volumes/queries/useCreateVolume.ts @@ -1,6 +1,6 @@ import { Volume, VolumeCreateOptions } from 'docker-types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildUrl } from './build-url'; diff --git a/app/react/docker/volumes/queries/useCreateVolumeMutation.ts b/app/react/docker/volumes/queries/useCreateVolumeMutation.ts index 8978dfa0e..1b3180d34 100644 --- a/app/react/docker/volumes/queries/useCreateVolumeMutation.ts +++ b/app/react/docker/volumes/queries/useCreateVolumeMutation.ts @@ -1,6 +1,6 @@ import { Volume } from 'docker-types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerProxyUrl } from '../../proxy/queries/buildDockerProxyUrl'; diff --git a/app/react/docker/volumes/queries/useRemoveVolumeMutation.ts b/app/react/docker/volumes/queries/useRemoveVolumeMutation.ts index 076ae7fca..7cddbde80 100644 --- a/app/react/docker/volumes/queries/useRemoveVolumeMutation.ts +++ b/app/react/docker/volumes/queries/useRemoveVolumeMutation.ts @@ -1,7 +1,7 @@ import { Volume } from 'docker-types'; import { EnvironmentId } from '@/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { buildDockerProxyUrl } from '../../proxy/queries/buildDockerProxyUrl'; import { withAgentTargetHeader } from '../../proxy/queries/utils'; diff --git a/app/react/docker/volumes/queries/useVolume.ts b/app/react/docker/volumes/queries/useVolume.ts index 3f091c1af..0bdbf016d 100644 --- a/app/react/docker/volumes/queries/useVolume.ts +++ b/app/react/docker/volumes/queries/useVolume.ts @@ -1,6 +1,6 @@ import { Volume } from 'docker-types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerProxyUrl } from '../../proxy/queries/buildDockerProxyUrl'; diff --git a/app/react/docker/volumes/queries/useVolumes.ts b/app/react/docker/volumes/queries/useVolumes.ts index cc6934aa4..e585f8aab 100644 --- a/app/react/docker/volumes/queries/useVolumes.ts +++ b/app/react/docker/volumes/queries/useVolumes.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; import { Volume } from 'docker-types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { buildDockerProxyUrl } from '@/react/docker/proxy/queries/buildDockerProxyUrl'; import { EnvironmentId } from '@/react/portainer/environments/types'; diff --git a/app/react/edge/edge-devices/WaitingRoomView/queries.ts b/app/react/edge/edge-devices/WaitingRoomView/queries.ts index 47dd82ee0..15a864a65 100644 --- a/app/react/edge/edge-devices/WaitingRoomView/queries.ts +++ b/app/react/edge/edge-devices/WaitingRoomView/queries.ts @@ -1,7 +1,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; import { EdgeTypes, EnvironmentId } from '@/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { promiseSequence } from '@/portainer/helpers/promise-utils'; import { useIntegratedLicenseInfo } from '@/react/portainer/licenses/use-license.service'; import { useEnvironmentList } from '@/react/portainer/environments/queries'; diff --git a/app/react/edge/edge-devices/open-amt/useAMTDevices.tsx b/app/react/edge/edge-devices/open-amt/useAMTDevices.tsx index d23e3b375..ed7890a0a 100644 --- a/app/react/edge/edge-devices/open-amt/useAMTDevices.tsx +++ b/app/react/edge/edge-devices/open-amt/useAMTDevices.tsx @@ -2,7 +2,7 @@ import { useQuery } from '@tanstack/react-query'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { withError } from '@/react-tools/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { Device } from './types'; diff --git a/app/react/edge/edge-devices/open-amt/useActivateDevicesMutation.ts b/app/react/edge/edge-devices/open-amt/useActivateDevicesMutation.ts index 4e9f94d45..2aab5747d 100644 --- a/app/react/edge/edge-devices/open-amt/useActivateDevicesMutation.ts +++ b/app/react/edge/edge-devices/open-amt/useActivateDevicesMutation.ts @@ -3,7 +3,7 @@ import { useMutation } from '@tanstack/react-query'; import { promiseSequence } from '@/portainer/helpers/promise-utils'; import { mutationOptions, withError } from '@/react-tools/react-query'; import { EnvironmentId } from '@/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; export function useActivateDevicesMutation() { return useMutation( diff --git a/app/react/edge/edge-devices/open-amt/useExecuteAMTDeviceActionMutation.tsx b/app/react/edge/edge-devices/open-amt/useExecuteAMTDeviceActionMutation.tsx index 76dd1ef2d..ce0102b18 100644 --- a/app/react/edge/edge-devices/open-amt/useExecuteAMTDeviceActionMutation.tsx +++ b/app/react/edge/edge-devices/open-amt/useExecuteAMTDeviceActionMutation.tsx @@ -1,6 +1,6 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { withError } from '@/react-tools/react-query'; import { EnvironmentId } from '@/react/portainer/environments/types'; diff --git a/app/react/edge/edge-groups/ListView/useDeleteEdgeGroupMutation.ts b/app/react/edge/edge-groups/ListView/useDeleteEdgeGroupMutation.ts index 04169b609..454f33dd7 100644 --- a/app/react/edge/edge-groups/ListView/useDeleteEdgeGroupMutation.ts +++ b/app/react/edge/edge-groups/ListView/useDeleteEdgeGroupMutation.ts @@ -1,7 +1,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; import { promiseSequence } from '@/portainer/helpers/promise-utils'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { mutationOptions, withError, diff --git a/app/react/edge/edge-groups/queries/useCreateEdgeGroupMutation.ts b/app/react/edge/edge-groups/queries/useCreateEdgeGroupMutation.ts index 225a399e6..ae708d1f1 100644 --- a/app/react/edge/edge-groups/queries/useCreateEdgeGroupMutation.ts +++ b/app/react/edge/edge-groups/queries/useCreateEdgeGroupMutation.ts @@ -1,6 +1,6 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { TagId } from '@/portainer/tags/types'; import { mutationOptions, diff --git a/app/react/edge/edge-groups/queries/useEdgeGroup.ts b/app/react/edge/edge-groups/queries/useEdgeGroup.ts index d17d2a8f6..ce755a7de 100644 --- a/app/react/edge/edge-groups/queries/useEdgeGroup.ts +++ b/app/react/edge/edge-groups/queries/useEdgeGroup.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId, EnvironmentType, diff --git a/app/react/edge/edge-groups/queries/useEdgeGroups.ts b/app/react/edge/edge-groups/queries/useEdgeGroups.ts index 8d60dbe96..3966d5699 100644 --- a/app/react/edge/edge-groups/queries/useEdgeGroups.ts +++ b/app/react/edge/edge-groups/queries/useEdgeGroups.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId, EnvironmentType, diff --git a/app/react/edge/edge-groups/queries/useUpdateEdgeGroupMutation.ts b/app/react/edge/edge-groups/queries/useUpdateEdgeGroupMutation.ts index 9ec7cac3b..ce1a51f9e 100644 --- a/app/react/edge/edge-groups/queries/useUpdateEdgeGroupMutation.ts +++ b/app/react/edge/edge-groups/queries/useUpdateEdgeGroupMutation.ts @@ -1,6 +1,6 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { TagId } from '@/portainer/tags/types'; import { mutationOptions, diff --git a/app/react/edge/edge-jobs/ListView/useDeleteEdgeJobsMutation.ts b/app/react/edge/edge-jobs/ListView/useDeleteEdgeJobsMutation.ts index 96601348b..d72ce957e 100644 --- a/app/react/edge/edge-jobs/ListView/useDeleteEdgeJobsMutation.ts +++ b/app/react/edge/edge-jobs/ListView/useDeleteEdgeJobsMutation.ts @@ -1,7 +1,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; import { promiseSequence } from '@/portainer/helpers/promise-utils'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { mutationOptions, withError, diff --git a/app/react/edge/edge-jobs/queries/jobResults/useClearLogsMutation.ts b/app/react/edge/edge-jobs/queries/jobResults/useClearLogsMutation.ts index 1d52abe02..101409b37 100644 --- a/app/react/edge/edge-jobs/queries/jobResults/useClearLogsMutation.ts +++ b/app/react/edge/edge-jobs/queries/jobResults/useClearLogsMutation.ts @@ -1,6 +1,6 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { withInvalidate } from '@/react-tools/react-query'; diff --git a/app/react/edge/edge-jobs/queries/jobResults/useCollectLogsMutation.ts b/app/react/edge/edge-jobs/queries/jobResults/useCollectLogsMutation.ts index 5c13a632e..1e6a969bd 100644 --- a/app/react/edge/edge-jobs/queries/jobResults/useCollectLogsMutation.ts +++ b/app/react/edge/edge-jobs/queries/jobResults/useCollectLogsMutation.ts @@ -1,6 +1,6 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { withInvalidate } from '@/react-tools/react-query'; diff --git a/app/react/edge/edge-jobs/queries/jobResults/useDownloadLogsMutation.ts b/app/react/edge/edge-jobs/queries/jobResults/useDownloadLogsMutation.ts index 15ad10b4d..0f20aa5aa 100644 --- a/app/react/edge/edge-jobs/queries/jobResults/useDownloadLogsMutation.ts +++ b/app/react/edge/edge-jobs/queries/jobResults/useDownloadLogsMutation.ts @@ -1,7 +1,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; import { saveAs } from 'file-saver'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { withInvalidate } from '@/react-tools/react-query'; diff --git a/app/react/edge/edge-jobs/queries/jobResults/useJobResults.ts b/app/react/edge/edge-jobs/queries/jobResults/useJobResults.ts index 9f9ecc5f9..4197283b7 100644 --- a/app/react/edge/edge-jobs/queries/jobResults/useJobResults.ts +++ b/app/react/edge/edge-jobs/queries/jobResults/useJobResults.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { PaginatedResults, withPaginationHeaders, diff --git a/app/react/edge/edge-jobs/queries/useCreateEdgeJobMutation/createJobFromFile.ts b/app/react/edge/edge-jobs/queries/useCreateEdgeJobMutation/createJobFromFile.ts index e71cfdc4c..4ef42ed91 100644 --- a/app/react/edge/edge-jobs/queries/useCreateEdgeJobMutation/createJobFromFile.ts +++ b/app/react/edge/edge-jobs/queries/useCreateEdgeJobMutation/createJobFromFile.ts @@ -1,7 +1,7 @@ import axios, { json2formData, parseAxiosError, -} from '@/portainer/services/axios'; +} from 'Portainer/services/axios/axios'; import { EdgeGroup } from '@/react/edge/edge-groups/types'; import { EnvironmentId } from '@/react/portainer/environments/types'; diff --git a/app/react/edge/edge-jobs/queries/useCreateEdgeJobMutation/createJobFromFileContent.ts b/app/react/edge/edge-jobs/queries/useCreateEdgeJobMutation/createJobFromFileContent.ts index 3d468da70..62cdd8fa8 100644 --- a/app/react/edge/edge-jobs/queries/useCreateEdgeJobMutation/createJobFromFileContent.ts +++ b/app/react/edge/edge-jobs/queries/useCreateEdgeJobMutation/createJobFromFileContent.ts @@ -1,4 +1,4 @@ -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EdgeGroup } from '@/react/edge/edge-groups/types'; import { EnvironmentId } from '@/react/portainer/environments/types'; diff --git a/app/react/edge/edge-jobs/queries/useEdgeJob.ts b/app/react/edge/edge-jobs/queries/useEdgeJob.ts index 458292e8a..71a021b96 100644 --- a/app/react/edge/edge-jobs/queries/useEdgeJob.ts +++ b/app/react/edge/edge-jobs/queries/useEdgeJob.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { EdgeJob } from '../types'; diff --git a/app/react/edge/edge-jobs/queries/useEdgeJobFile.ts b/app/react/edge/edge-jobs/queries/useEdgeJobFile.ts index bf7155dc8..d95586f1d 100644 --- a/app/react/edge/edge-jobs/queries/useEdgeJobFile.ts +++ b/app/react/edge/edge-jobs/queries/useEdgeJobFile.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { EdgeJob } from '../types'; diff --git a/app/react/edge/edge-jobs/queries/useEdgeJobs.ts b/app/react/edge/edge-jobs/queries/useEdgeJobs.ts index df6dac04b..99e6bd4c0 100644 --- a/app/react/edge/edge-jobs/queries/useEdgeJobs.ts +++ b/app/react/edge/edge-jobs/queries/useEdgeJobs.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EdgeJob } from '../types'; diff --git a/app/react/edge/edge-jobs/queries/useUpdateEdgeJobMutation.tsx b/app/react/edge/edge-jobs/queries/useUpdateEdgeJobMutation.tsx index 5061d889d..4a5e4d55f 100644 --- a/app/react/edge/edge-jobs/queries/useUpdateEdgeJobMutation.tsx +++ b/app/react/edge/edge-jobs/queries/useUpdateEdgeJobMutation.tsx @@ -1,7 +1,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; import { EnvironmentId } from '@/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { withInvalidate } from '@/react-tools/react-query'; import { EdgeGroup } from '../../edge-groups/types'; diff --git a/app/react/edge/edge-stacks/ItemView/EditEdgeStackForm/GitForm/useUpdateEdgeStackGitMutation.ts b/app/react/edge/edge-stacks/ItemView/EditEdgeStackForm/GitForm/useUpdateEdgeStackGitMutation.ts index e4da60bf2..ef7643aaa 100644 --- a/app/react/edge/edge-stacks/ItemView/EditEdgeStackForm/GitForm/useUpdateEdgeStackGitMutation.ts +++ b/app/react/edge/edge-stacks/ItemView/EditEdgeStackForm/GitForm/useUpdateEdgeStackGitMutation.ts @@ -1,6 +1,6 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { mutationOptions, withError, diff --git a/app/react/edge/edge-stacks/ItemView/EditEdgeStackForm/useStaggerUpdateStatus.ts b/app/react/edge/edge-stacks/ItemView/EditEdgeStackForm/useStaggerUpdateStatus.ts index 38cabb654..f1cb04b49 100644 --- a/app/react/edge/edge-stacks/ItemView/EditEdgeStackForm/useStaggerUpdateStatus.ts +++ b/app/react/edge/edge-stacks/ItemView/EditEdgeStackForm/useStaggerUpdateStatus.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { isBE } from '@/react/portainer/feature-flags/feature-flags.service'; import { EdgeStack } from '../../types'; diff --git a/app/react/edge/edge-stacks/ItemView/EditEdgeStackForm/useUpdateEdgeStackMutation.ts b/app/react/edge/edge-stacks/ItemView/EditEdgeStackForm/useUpdateEdgeStackMutation.ts index 5db3b4431..797819d0c 100644 --- a/app/react/edge/edge-stacks/ItemView/EditEdgeStackForm/useUpdateEdgeStackMutation.ts +++ b/app/react/edge/edge-stacks/ItemView/EditEdgeStackForm/useUpdateEdgeStackMutation.ts @@ -1,6 +1,6 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { mutationOptions, withError, diff --git a/app/react/edge/edge-stacks/ItemView/EnvironmentsDatatable/useCollectLogsMutation.ts b/app/react/edge/edge-stacks/ItemView/EnvironmentsDatatable/useCollectLogsMutation.ts index 5872e81aa..bb030b435 100644 --- a/app/react/edge/edge-stacks/ItemView/EnvironmentsDatatable/useCollectLogsMutation.ts +++ b/app/react/edge/edge-stacks/ItemView/EnvironmentsDatatable/useCollectLogsMutation.ts @@ -1,7 +1,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; import { EnvironmentId } from '@/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { withError } from '@/react-tools/react-query'; import { EdgeStack } from '../../types'; diff --git a/app/react/edge/edge-stacks/ItemView/EnvironmentsDatatable/useDeleteLogsMutation.ts b/app/react/edge/edge-stacks/ItemView/EnvironmentsDatatable/useDeleteLogsMutation.ts index 870cf5ff2..dfb24492b 100644 --- a/app/react/edge/edge-stacks/ItemView/EnvironmentsDatatable/useDeleteLogsMutation.ts +++ b/app/react/edge/edge-stacks/ItemView/EnvironmentsDatatable/useDeleteLogsMutation.ts @@ -1,7 +1,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; import { EnvironmentId } from '@/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { withError } from '@/react-tools/react-query'; import { EdgeStack } from '../../types'; diff --git a/app/react/edge/edge-stacks/ItemView/EnvironmentsDatatable/useDownloadLogsMutation.ts b/app/react/edge/edge-stacks/ItemView/EnvironmentsDatatable/useDownloadLogsMutation.ts index b0b2ccce9..ba9d3afc5 100644 --- a/app/react/edge/edge-stacks/ItemView/EnvironmentsDatatable/useDownloadLogsMutation.ts +++ b/app/react/edge/edge-stacks/ItemView/EnvironmentsDatatable/useDownloadLogsMutation.ts @@ -2,7 +2,7 @@ import { saveAs } from 'file-saver'; import { useMutation } from '@tanstack/react-query'; import { EnvironmentId } from '@/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { mutationOptions, withError } from '@/react-tools/react-query'; import { EdgeStack } from '../../types'; diff --git a/app/react/edge/edge-stacks/ItemView/EnvironmentsDatatable/useLogsStatus.ts b/app/react/edge/edge-stacks/ItemView/EnvironmentsDatatable/useLogsStatus.ts index 5e8457f87..fa0948da0 100644 --- a/app/react/edge/edge-stacks/ItemView/EnvironmentsDatatable/useLogsStatus.ts +++ b/app/react/edge/edge-stacks/ItemView/EnvironmentsDatatable/useLogsStatus.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; import { EnvironmentId } from '@/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EdgeStack } from '@/react/edge/edge-stacks/types'; import { queryKeys } from '../../queries/query-keys'; diff --git a/app/react/edge/edge-stacks/ListView/EdgeStacksDatatable/useDeleteEdgeStacksMutation.ts b/app/react/edge/edge-stacks/ListView/EdgeStacksDatatable/useDeleteEdgeStacksMutation.ts index 089848cc9..49be8950b 100644 --- a/app/react/edge/edge-stacks/ListView/EdgeStacksDatatable/useDeleteEdgeStacksMutation.ts +++ b/app/react/edge/edge-stacks/ListView/EdgeStacksDatatable/useDeleteEdgeStacksMutation.ts @@ -1,7 +1,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; import { promiseSequence } from '@/portainer/helpers/promise-utils'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { mutationOptions, withError, diff --git a/app/react/edge/edge-stacks/queries/useCreateEdgeStack/createStackFromFile.ts b/app/react/edge/edge-stacks/queries/useCreateEdgeStack/createStackFromFile.ts index 5542f02f3..bc23225cf 100644 --- a/app/react/edge/edge-stacks/queries/useCreateEdgeStack/createStackFromFile.ts +++ b/app/react/edge/edge-stacks/queries/useCreateEdgeStack/createStackFromFile.ts @@ -1,7 +1,7 @@ import axios, { json2formData, parseAxiosError, -} from '@/portainer/services/axios'; +} from 'Portainer/services/axios/axios'; import { RegistryId } from '@/react/portainer/registries/types/registry'; import { Pair } from '@/react/portainer/settings/types'; import { EdgeGroup } from '@/react/edge/edge-groups/types'; diff --git a/app/react/edge/edge-stacks/queries/useCreateEdgeStack/createStackFromFileContent.ts b/app/react/edge/edge-stacks/queries/useCreateEdgeStack/createStackFromFileContent.ts index 9266275d7..203433de3 100644 --- a/app/react/edge/edge-stacks/queries/useCreateEdgeStack/createStackFromFileContent.ts +++ b/app/react/edge/edge-stacks/queries/useCreateEdgeStack/createStackFromFileContent.ts @@ -1,4 +1,4 @@ -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { RegistryId } from '@/react/portainer/registries/types/registry'; import { Pair } from '@/react/portainer/settings/types'; import { EdgeGroup } from '@/react/edge/edge-groups/types'; diff --git a/app/react/edge/edge-stacks/queries/useCreateEdgeStack/createStackFromGit.ts b/app/react/edge/edge-stacks/queries/useCreateEdgeStack/createStackFromGit.ts index c1943edbd..4b1335c5f 100644 --- a/app/react/edge/edge-stacks/queries/useCreateEdgeStack/createStackFromGit.ts +++ b/app/react/edge/edge-stacks/queries/useCreateEdgeStack/createStackFromGit.ts @@ -1,4 +1,4 @@ -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { RegistryId } from '@/react/portainer/registries/types/registry'; import { Pair } from '@/react/portainer/settings/types'; import { EdgeGroup } from '@/react/edge/edge-groups/types'; diff --git a/app/react/edge/edge-stacks/queries/useEdgeStack.ts b/app/react/edge/edge-stacks/queries/useEdgeStack.ts index 7df568707..e6f5732c0 100644 --- a/app/react/edge/edge-stacks/queries/useEdgeStack.ts +++ b/app/react/edge/edge-stacks/queries/useEdgeStack.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; import { withError } from '@/react-tools/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EdgeStack } from '../types'; diff --git a/app/react/edge/edge-stacks/queries/useEdgeStackFile.ts b/app/react/edge/edge-stacks/queries/useEdgeStackFile.ts index 945c5bf05..9f98163a3 100644 --- a/app/react/edge/edge-stacks/queries/useEdgeStackFile.ts +++ b/app/react/edge/edge-stacks/queries/useEdgeStackFile.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EdgeStack } from '../types'; diff --git a/app/react/edge/edge-stacks/queries/useEdgeStacks.ts b/app/react/edge/edge-stacks/queries/useEdgeStacks.ts index d03e143f8..b2ecc09ba 100644 --- a/app/react/edge/edge-stacks/queries/useEdgeStacks.ts +++ b/app/react/edge/edge-stacks/queries/useEdgeStacks.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; import { withGlobalError } from '@/react-tools/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EdgeStack } from '../types'; diff --git a/app/react/edge/edge-stacks/queries/useParseRegistries.ts b/app/react/edge/edge-stacks/queries/useParseRegistries.ts index e8e251c65..797558ce1 100644 --- a/app/react/edge/edge-stacks/queries/useParseRegistries.ts +++ b/app/react/edge/edge-stacks/queries/useParseRegistries.ts @@ -4,7 +4,7 @@ import { RegistryId } from '@/react/portainer/registries/types/registry'; import axios, { json2formData, parseAxiosError, -} from '@/portainer/services/axios'; +} from 'Portainer/services/axios/axios'; import { buildUrl } from './buildUrl'; diff --git a/app/react/kubernetes/applications/queries/getPods.ts b/app/react/kubernetes/applications/queries/getPods.ts index 494b4df2d..2890f3138 100644 --- a/app/react/kubernetes/applications/queries/getPods.ts +++ b/app/react/kubernetes/applications/queries/getPods.ts @@ -1,7 +1,7 @@ import { Pod, PodList } from 'kubernetes-types/core/v1'; import { EnvironmentId } from '@/react/portainer/environments/types'; -import axios from '@/portainer/services/axios'; +import axios from 'Portainer/services/axios/axios'; import { parseKubernetesAxiosError } from '../../axiosError'; diff --git a/app/react/kubernetes/applications/queries/useApplication.ts b/app/react/kubernetes/applications/queries/useApplication.ts index 7632ac76c..2fbd0b1ad 100644 --- a/app/react/kubernetes/applications/queries/useApplication.ts +++ b/app/react/kubernetes/applications/queries/useApplication.ts @@ -5,7 +5,7 @@ import { Pod } from 'kubernetes-types/core/v1'; import { withGlobalError } from '@/react-tools/react-query'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { isFulfilled } from '@/portainer/helpers/promise-utils'; -import axios from '@/portainer/services/axios'; +import axios from 'Portainer/services/axios/axios'; import { AppKind, Application } from '../types'; import { parseKubernetesAxiosError } from '../../axiosError'; diff --git a/app/react/kubernetes/applications/queries/useApplicationHorizontalPodAutoscaler.ts b/app/react/kubernetes/applications/queries/useApplicationHorizontalPodAutoscaler.ts index c64f3b361..846ad0501 100644 --- a/app/react/kubernetes/applications/queries/useApplicationHorizontalPodAutoscaler.ts +++ b/app/react/kubernetes/applications/queries/useApplicationHorizontalPodAutoscaler.ts @@ -6,7 +6,7 @@ import { import { withGlobalError } from '@/react-tools/react-query'; import { EnvironmentId } from '@/react/portainer/environments/types'; -import axios from '@/portainer/services/axios'; +import axios from 'Portainer/services/axios/axios'; import type { Application } from '../types'; import { parseKubernetesAxiosError } from '../../axiosError'; diff --git a/app/react/kubernetes/applications/queries/useApplicationRevisionList.ts b/app/react/kubernetes/applications/queries/useApplicationRevisionList.ts index afef43301..3dde07d7f 100644 --- a/app/react/kubernetes/applications/queries/useApplicationRevisionList.ts +++ b/app/react/kubernetes/applications/queries/useApplicationRevisionList.ts @@ -6,7 +6,7 @@ import { import { withGlobalError } from '@/react-tools/react-query'; import { EnvironmentId } from '@/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { AppKind } from '../types'; import { appRevisionAnnotation } from '../constants'; diff --git a/app/react/kubernetes/applications/queries/useApplications.ts b/app/react/kubernetes/applications/queries/useApplications.ts index 6419dd853..abe7ded6f 100644 --- a/app/react/kubernetes/applications/queries/useApplications.ts +++ b/app/react/kubernetes/applications/queries/useApplications.ts @@ -2,7 +2,7 @@ import { useQuery } from '@tanstack/react-query'; import { withGlobalError } from '@/react-tools/react-query'; import { EnvironmentId } from '@/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { Application } from '../ListView/ApplicationsDatatable/types'; diff --git a/app/react/kubernetes/applications/queries/useDeleteApplicationsMutation.ts b/app/react/kubernetes/applications/queries/useDeleteApplicationsMutation.ts index 8ab241048..cca969142 100644 --- a/app/react/kubernetes/applications/queries/useDeleteApplicationsMutation.ts +++ b/app/react/kubernetes/applications/queries/useDeleteApplicationsMutation.ts @@ -2,7 +2,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; import { HorizontalPodAutoscaler } from 'kubernetes-types/autoscaling/v2'; import { EnvironmentId } from '@/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { getAllSettledItems } from '@/portainer/helpers/promise-utils'; import { withGlobalError } from '@/react-tools/react-query'; import { notifyError, notifySuccess } from '@/portainer/services/notifications'; diff --git a/app/react/kubernetes/applications/queries/useHorizontalPodAutoScaler.ts b/app/react/kubernetes/applications/queries/useHorizontalPodAutoScaler.ts index 6c3ca1669..13af854d0 100644 --- a/app/react/kubernetes/applications/queries/useHorizontalPodAutoScaler.ts +++ b/app/react/kubernetes/applications/queries/useHorizontalPodAutoScaler.ts @@ -1,7 +1,7 @@ import { HorizontalPodAutoscaler } from 'kubernetes-types/autoscaling/v1'; import { useQuery } from '@tanstack/react-query'; -import axios from '@/portainer/services/axios'; +import axios from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { withGlobalError } from '@/react-tools/react-query'; diff --git a/app/react/kubernetes/applications/queries/usePatchApplicationMutation.ts b/app/react/kubernetes/applications/queries/usePatchApplicationMutation.ts index f86847c1c..7fcf0d0dc 100644 --- a/app/react/kubernetes/applications/queries/usePatchApplicationMutation.ts +++ b/app/react/kubernetes/applications/queries/usePatchApplicationMutation.ts @@ -4,7 +4,7 @@ import { Pod } from 'kubernetes-types/core/v1'; import { queryClient } from '@/react-tools/react-query'; import { EnvironmentId } from '@/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import type { AppKind, ApplicationPatch, Application } from '../types'; import { parseKubernetesAxiosError } from '../../axiosError'; diff --git a/app/react/kubernetes/applications/queries/useRedeployApplicationMutation.ts b/app/react/kubernetes/applications/queries/useRedeployApplicationMutation.ts index 35c9c2627..e3cb09a5c 100644 --- a/app/react/kubernetes/applications/queries/useRedeployApplicationMutation.ts +++ b/app/react/kubernetes/applications/queries/useRedeployApplicationMutation.ts @@ -3,7 +3,7 @@ import { Pod } from 'kubernetes-types/core/v1'; import { queryClient, withGlobalError } from '@/react-tools/react-query'; import { EnvironmentId } from '@/react/portainer/environments/types'; -import axios from '@/portainer/services/axios'; +import axios from 'Portainer/services/axios/axios'; import { parseKubernetesAxiosError } from '../../axiosError'; diff --git a/app/react/kubernetes/applications/useCronJobs.ts b/app/react/kubernetes/applications/useCronJobs.ts index be6d371f8..cc65d9c11 100644 --- a/app/react/kubernetes/applications/useCronJobs.ts +++ b/app/react/kubernetes/applications/useCronJobs.ts @@ -3,7 +3,7 @@ import { useQuery } from '@tanstack/react-query'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { withGlobalError } from '@/react-tools/react-query'; -import axios from '@/portainer/services/axios'; +import axios from 'Portainer/services/axios/axios'; import { parseKubernetesAxiosError } from '../axiosError'; diff --git a/app/react/kubernetes/applications/useJobs.ts b/app/react/kubernetes/applications/useJobs.ts index eacd7615d..8240c43c9 100644 --- a/app/react/kubernetes/applications/useJobs.ts +++ b/app/react/kubernetes/applications/useJobs.ts @@ -3,7 +3,7 @@ import { useQuery } from '@tanstack/react-query'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { withGlobalError } from '@/react-tools/react-query'; -import axios from '@/portainer/services/axios'; +import axios from 'Portainer/services/axios/axios'; import { parseKubernetesAxiosError } from '../axiosError'; diff --git a/app/react/kubernetes/axiosError.ts b/app/react/kubernetes/axiosError.ts index d7ece792f..401339828 100644 --- a/app/react/kubernetes/axiosError.ts +++ b/app/react/kubernetes/axiosError.ts @@ -4,7 +4,7 @@ import { AxiosError } from 'axios'; import { defaultErrorParser, parseAxiosError, -} from '@/portainer/services/axios'; +} from 'Portainer/services/axios/axios'; export function kubernetesErrorParser(axiosError: AxiosError) { const responseStatus = axiosError.response?.data as Status; diff --git a/app/react/kubernetes/cluster/ConfigureView/ConfigureForm/useConfigureClusterMutation.ts b/app/react/kubernetes/cluster/ConfigureView/ConfigureForm/useConfigureClusterMutation.ts index 7a77326b7..7dccee7fa 100644 --- a/app/react/kubernetes/cluster/ConfigureView/ConfigureForm/useConfigureClusterMutation.ts +++ b/app/react/kubernetes/cluster/ConfigureView/ConfigureForm/useConfigureClusterMutation.ts @@ -8,7 +8,7 @@ import { UpdateEnvironmentPayload, updateEnvironment, } from '@/react/portainer/environments/queries/useUpdateEnvironmentMutation'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { updateIngressControllerClassMap } from '../../ingressClass/useIngressControllerClassMap'; import { IngressControllerClassMap } from '../../ingressClass/types'; diff --git a/app/react/kubernetes/cluster/ConfigureView/ConfigureForm/useStorageClasses.ts b/app/react/kubernetes/cluster/ConfigureView/ConfigureForm/useStorageClasses.ts index 87bce55cc..a0650d820 100644 --- a/app/react/kubernetes/cluster/ConfigureView/ConfigureForm/useStorageClasses.ts +++ b/app/react/kubernetes/cluster/ConfigureView/ConfigureForm/useStorageClasses.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; import { StorageClass, StorageClassList } from 'kubernetes-types/storage/v1'; -import axios from '@/portainer/services/axios'; +import axios from 'Portainer/services/axios/axios'; import { Environment, EnvironmentId, diff --git a/app/react/kubernetes/cluster/ingressClass/IngressClassDatatable/useIngressControllerClassMap.ts b/app/react/kubernetes/cluster/ingressClass/IngressClassDatatable/useIngressControllerClassMap.ts index e6d76df34..00e791422 100644 --- a/app/react/kubernetes/cluster/ingressClass/IngressClassDatatable/useIngressControllerClassMap.ts +++ b/app/react/kubernetes/cluster/ingressClass/IngressClassDatatable/useIngressControllerClassMap.ts @@ -2,7 +2,7 @@ import { useQuery } from '@tanstack/react-query'; import { EnvironmentId } from '@/react/portainer/environments/types'; import PortainerError from '@/portainer/error'; -import axios from '@/portainer/services/axios'; +import axios from 'Portainer/services/axios/axios'; import { withError } from '@/react-tools/react-query'; import { IngressControllerClassMapRowData } from './types'; diff --git a/app/react/kubernetes/cluster/ingressClass/ingressClass.service.ts b/app/react/kubernetes/cluster/ingressClass/ingressClass.service.ts index 876b197b7..613beeb62 100644 --- a/app/react/kubernetes/cluster/ingressClass/ingressClass.service.ts +++ b/app/react/kubernetes/cluster/ingressClass/ingressClass.service.ts @@ -1,6 +1,6 @@ import { IngressClassList } from 'kubernetes-types/networking/v1'; -import axios from '@/portainer/services/axios'; +import axios from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { parseKubernetesAxiosError } from '../../axiosError'; diff --git a/app/react/kubernetes/cluster/ingressClass/useIngressControllerClassMap.ts b/app/react/kubernetes/cluster/ingressClass/useIngressControllerClassMap.ts index 5049a368b..edee5542a 100644 --- a/app/react/kubernetes/cluster/ingressClass/useIngressControllerClassMap.ts +++ b/app/react/kubernetes/cluster/ingressClass/useIngressControllerClassMap.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; import { EnvironmentId } from '@/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { withError } from '@/react-tools/react-query'; import { IngressControllerClassMap } from './types'; diff --git a/app/react/kubernetes/cluster/kubernetesEndpoint.service.ts b/app/react/kubernetes/cluster/kubernetesEndpoint.service.ts index 91b311055..bcc1e98f2 100644 --- a/app/react/kubernetes/cluster/kubernetesEndpoint.service.ts +++ b/app/react/kubernetes/cluster/kubernetesEndpoint.service.ts @@ -1,7 +1,7 @@ import { EndpointsList } from 'kubernetes-types/core/v1'; import { useQuery } from '@tanstack/react-query'; -import axios from '@/portainer/services/axios'; +import axios from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { withError } from '@/react-tools/react-query'; diff --git a/app/react/kubernetes/cluster/queries/useDrainNodeMutation.ts b/app/react/kubernetes/cluster/queries/useDrainNodeMutation.ts index 62123cc13..0d370f8e4 100644 --- a/app/react/kubernetes/cluster/queries/useDrainNodeMutation.ts +++ b/app/react/kubernetes/cluster/queries/useDrainNodeMutation.ts @@ -2,7 +2,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { withInvalidate, withGlobalError } from '@/react-tools/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { queryKeys as applicationQueryKeys } from '../../applications/queries/query-keys'; diff --git a/app/react/kubernetes/cluster/queries/useNodeQuery.ts b/app/react/kubernetes/cluster/queries/useNodeQuery.ts index 981f449e6..56d4d7d2d 100644 --- a/app/react/kubernetes/cluster/queries/useNodeQuery.ts +++ b/app/react/kubernetes/cluster/queries/useNodeQuery.ts @@ -1,7 +1,7 @@ import { Node } from 'kubernetes-types/core/v1'; import { useQuery } from '@tanstack/react-query'; -import axios from '@/portainer/services/axios'; +import axios from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { withGlobalError } from '@/react-tools/react-query'; diff --git a/app/react/kubernetes/cluster/queries/useNodesQuery.ts b/app/react/kubernetes/cluster/queries/useNodesQuery.ts index 8a51646f6..a06f485d4 100644 --- a/app/react/kubernetes/cluster/queries/useNodesQuery.ts +++ b/app/react/kubernetes/cluster/queries/useNodesQuery.ts @@ -1,7 +1,7 @@ import { NodeList, Node } from 'kubernetes-types/core/v1'; import { useQuery } from '@tanstack/react-query'; -import axios from '@/portainer/services/axios'; +import axios from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { withGlobalError } from '@/react-tools/react-query'; diff --git a/app/react/kubernetes/cluster/queries/useUpdateNodeMutation.ts b/app/react/kubernetes/cluster/queries/useUpdateNodeMutation.ts index b928835a1..9b5fe4318 100644 --- a/app/react/kubernetes/cluster/queries/useUpdateNodeMutation.ts +++ b/app/react/kubernetes/cluster/queries/useUpdateNodeMutation.ts @@ -2,7 +2,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; import { Operation, compare } from 'fast-json-patch'; import { Node } from 'kubernetes-types/core/v1'; -import axios from '@/portainer/services/axios'; +import axios from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { withGlobalError, withInvalidate } from '@/react-tools/react-query'; diff --git a/app/react/kubernetes/cluster/useIsRBACEnabled.ts b/app/react/kubernetes/cluster/useIsRBACEnabled.ts index 02f604071..c15d28977 100644 --- a/app/react/kubernetes/cluster/useIsRBACEnabled.ts +++ b/app/react/kubernetes/cluster/useIsRBACEnabled.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { withGlobalError } from '@/react-tools/react-query'; diff --git a/app/react/kubernetes/configs/configmap.service.ts b/app/react/kubernetes/configs/configmap.service.ts index f40c291c2..a93aa1471 100644 --- a/app/react/kubernetes/configs/configmap.service.ts +++ b/app/react/kubernetes/configs/configmap.service.ts @@ -2,7 +2,7 @@ import { ConfigMap, ConfigMapList } from 'kubernetes-types/core/v1'; import { useMutation, useQuery } from '@tanstack/react-query'; import { queryClient, withError } from '@/react-tools/react-query'; -import axios from '@/portainer/services/axios'; +import axios from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { error as notifyError, diff --git a/app/react/kubernetes/configs/queries/useConfigMap.ts b/app/react/kubernetes/configs/queries/useConfigMap.ts index d1007f5d6..d53c20827 100644 --- a/app/react/kubernetes/configs/queries/useConfigMap.ts +++ b/app/react/kubernetes/configs/queries/useConfigMap.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { Configuration } from '../types'; diff --git a/app/react/kubernetes/configs/queries/useConfigMaps.ts b/app/react/kubernetes/configs/queries/useConfigMaps.ts index 33214f027..d50485579 100644 --- a/app/react/kubernetes/configs/queries/useConfigMaps.ts +++ b/app/react/kubernetes/configs/queries/useConfigMaps.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; import { ConfigMap, ConfigMapList } from 'kubernetes-types/core/v1'; -import axios from '@/portainer/services/axios'; +import axios from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { withGlobalError } from '@/react-tools/react-query'; diff --git a/app/react/kubernetes/configs/queries/useConfigmapsForCluster.ts b/app/react/kubernetes/configs/queries/useConfigmapsForCluster.ts index 136dd83a2..5040d801d 100644 --- a/app/react/kubernetes/configs/queries/useConfigmapsForCluster.ts +++ b/app/react/kubernetes/configs/queries/useConfigmapsForCluster.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; import { withGlobalError } from '@/react-tools/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { Configuration } from '../types'; diff --git a/app/react/kubernetes/configs/queries/useDeleteConfigMaps.ts b/app/react/kubernetes/configs/queries/useDeleteConfigMaps.ts index d8a47f4eb..eb56d5b70 100644 --- a/app/react/kubernetes/configs/queries/useDeleteConfigMaps.ts +++ b/app/react/kubernetes/configs/queries/useDeleteConfigMaps.ts @@ -1,7 +1,7 @@ import { useMutation } from '@tanstack/react-query'; import { queryClient, withGlobalError } from '@/react-tools/react-query'; -import axios from '@/portainer/services/axios'; +import axios from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { error as notifyError, diff --git a/app/react/kubernetes/configs/queries/useDeleteSecrets.ts b/app/react/kubernetes/configs/queries/useDeleteSecrets.ts index 5eb307ea4..c69357ad1 100644 --- a/app/react/kubernetes/configs/queries/useDeleteSecrets.ts +++ b/app/react/kubernetes/configs/queries/useDeleteSecrets.ts @@ -1,7 +1,7 @@ import { useMutation } from '@tanstack/react-query'; import { queryClient, withGlobalError } from '@/react-tools/react-query'; -import axios from '@/portainer/services/axios'; +import axios from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { error as notifyError, diff --git a/app/react/kubernetes/configs/queries/useK8sConfigMaps.ts b/app/react/kubernetes/configs/queries/useK8sConfigMaps.ts index 75aabc1a2..fd6dffba5 100644 --- a/app/react/kubernetes/configs/queries/useK8sConfigMaps.ts +++ b/app/react/kubernetes/configs/queries/useK8sConfigMaps.ts @@ -1,7 +1,7 @@ import { ConfigMap, ConfigMapList } from 'kubernetes-types/core/v1'; import { useQuery } from '@tanstack/react-query'; -import axios from '@/portainer/services/axios'; +import axios from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { error as notifyError } from '@/portainer/services/notifications'; diff --git a/app/react/kubernetes/configs/queries/useK8sSecrets.ts b/app/react/kubernetes/configs/queries/useK8sSecrets.ts index 71649ddb2..9b9e75c46 100644 --- a/app/react/kubernetes/configs/queries/useK8sSecrets.ts +++ b/app/react/kubernetes/configs/queries/useK8sSecrets.ts @@ -1,7 +1,7 @@ import { Secret, SecretList } from 'kubernetes-types/core/v1'; import { useQuery } from '@tanstack/react-query'; -import axios from '@/portainer/services/axios'; +import axios from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { error as notifyError } from '@/portainer/services/notifications'; diff --git a/app/react/kubernetes/configs/queries/useSecrets.ts b/app/react/kubernetes/configs/queries/useSecrets.ts index a426866fc..d71fadd68 100644 --- a/app/react/kubernetes/configs/queries/useSecrets.ts +++ b/app/react/kubernetes/configs/queries/useSecrets.ts @@ -2,7 +2,7 @@ import { useQuery } from '@tanstack/react-query'; import { Secret, SecretList } from 'kubernetes-types/core/v1'; import { withGlobalError } from '@/react-tools/react-query'; -import axios from '@/portainer/services/axios'; +import axios from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { parseKubernetesAxiosError } from '../../axiosError'; diff --git a/app/react/kubernetes/configs/queries/useSecretsForCluster.ts b/app/react/kubernetes/configs/queries/useSecretsForCluster.ts index 53225f01b..aeafb33d9 100644 --- a/app/react/kubernetes/configs/queries/useSecretsForCluster.ts +++ b/app/react/kubernetes/configs/queries/useSecretsForCluster.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; import { withGlobalError } from '@/react-tools/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { Configuration } from '../types'; diff --git a/app/react/kubernetes/configs/queries/useUpdateK8sConfigMapMutation.ts b/app/react/kubernetes/configs/queries/useUpdateK8sConfigMapMutation.ts index d91781658..297149083 100644 --- a/app/react/kubernetes/configs/queries/useUpdateK8sConfigMapMutation.ts +++ b/app/react/kubernetes/configs/queries/useUpdateK8sConfigMapMutation.ts @@ -1,7 +1,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; import { ConfigMap } from 'kubernetes-types/core/v1'; -import axios from '@/portainer/services/axios'; +import axios from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { withInvalidate } from '@/react-tools/react-query'; diff --git a/app/react/kubernetes/dashboard/queries/getApplicationsCountQuery.ts b/app/react/kubernetes/dashboard/queries/getApplicationsCountQuery.ts index a43d3058f..d5520bc70 100644 --- a/app/react/kubernetes/dashboard/queries/getApplicationsCountQuery.ts +++ b/app/react/kubernetes/dashboard/queries/getApplicationsCountQuery.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; import { withError } from '@/react-tools/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; const queryKeys = { diff --git a/app/react/kubernetes/dashboard/queries/getConfigMapsCountQuery.ts b/app/react/kubernetes/dashboard/queries/getConfigMapsCountQuery.ts index 169f04bf1..b3660eb3f 100644 --- a/app/react/kubernetes/dashboard/queries/getConfigMapsCountQuery.ts +++ b/app/react/kubernetes/dashboard/queries/getConfigMapsCountQuery.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; import { withError } from '@/react-tools/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; const queryKeys = { diff --git a/app/react/kubernetes/dashboard/queries/getIngressesCountQuery.ts b/app/react/kubernetes/dashboard/queries/getIngressesCountQuery.ts index c0690818b..7531836a0 100644 --- a/app/react/kubernetes/dashboard/queries/getIngressesCountQuery.ts +++ b/app/react/kubernetes/dashboard/queries/getIngressesCountQuery.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; import { withError } from '@/react-tools/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; const queryKeys = { diff --git a/app/react/kubernetes/dashboard/queries/getNamespacesCountQuery.ts b/app/react/kubernetes/dashboard/queries/getNamespacesCountQuery.ts index bb197c1e7..d81b65d2e 100644 --- a/app/react/kubernetes/dashboard/queries/getNamespacesCountQuery.ts +++ b/app/react/kubernetes/dashboard/queries/getNamespacesCountQuery.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; import { withError } from '@/react-tools/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; const queryKeys = { diff --git a/app/react/kubernetes/dashboard/queries/getSecretsCountQuery.ts b/app/react/kubernetes/dashboard/queries/getSecretsCountQuery.ts index eceb1bfc8..6353d49d1 100644 --- a/app/react/kubernetes/dashboard/queries/getSecretsCountQuery.ts +++ b/app/react/kubernetes/dashboard/queries/getSecretsCountQuery.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; import { withError } from '@/react-tools/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; const queryKeys = { diff --git a/app/react/kubernetes/dashboard/queries/getServicesCountQuery.ts b/app/react/kubernetes/dashboard/queries/getServicesCountQuery.ts index 4b46eafd2..478ed84fb 100644 --- a/app/react/kubernetes/dashboard/queries/getServicesCountQuery.ts +++ b/app/react/kubernetes/dashboard/queries/getServicesCountQuery.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; import { withError } from '@/react-tools/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; const queryKeys = { diff --git a/app/react/kubernetes/dashboard/queries/getVolumesCountQuery.ts b/app/react/kubernetes/dashboard/queries/getVolumesCountQuery.ts index d22ba5fae..6d4bbe4bc 100644 --- a/app/react/kubernetes/dashboard/queries/getVolumesCountQuery.ts +++ b/app/react/kubernetes/dashboard/queries/getVolumesCountQuery.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; import { withError } from '@/react-tools/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; const queryKeys = { diff --git a/app/react/kubernetes/helm/HelmApplicationView/ReleaseDetails/ResourcesTable/queries/useDescribeResource.ts b/app/react/kubernetes/helm/HelmApplicationView/ReleaseDetails/ResourcesTable/queries/useDescribeResource.ts index da09a6224..e81433373 100644 --- a/app/react/kubernetes/helm/HelmApplicationView/ReleaseDetails/ResourcesTable/queries/useDescribeResource.ts +++ b/app/react/kubernetes/helm/HelmApplicationView/ReleaseDetails/ResourcesTable/queries/useDescribeResource.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; import { useEnvironmentId } from '@/react/hooks/useEnvironmentId'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { withGlobalError } from '@/react-tools/react-query'; type DescribeAPIParams = { diff --git a/app/react/kubernetes/helm/helmChartSourceQueries/useHelmChartList.ts b/app/react/kubernetes/helm/helmChartSourceQueries/useHelmChartList.ts index 5d15d8945..491d7a026 100644 --- a/app/react/kubernetes/helm/helmChartSourceQueries/useHelmChartList.ts +++ b/app/react/kubernetes/helm/helmChartSourceQueries/useHelmChartList.ts @@ -1,7 +1,7 @@ import { compact } from 'lodash'; import { useQuery } from '@tanstack/react-query'; -import axios from '@/portainer/services/axios'; +import axios from 'Portainer/services/axios/axios'; import { withGlobalError } from '@/react-tools/react-query'; import { Chart, HelmChartsResponse } from '../types'; diff --git a/app/react/kubernetes/helm/helmChartSourceQueries/useHelmChartValues.ts b/app/react/kubernetes/helm/helmChartSourceQueries/useHelmChartValues.ts index 04fa071f6..33343ec5d 100644 --- a/app/react/kubernetes/helm/helmChartSourceQueries/useHelmChartValues.ts +++ b/app/react/kubernetes/helm/helmChartSourceQueries/useHelmChartValues.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { withGlobalError } from '@/react-tools/react-query'; import { queryKeys } from './query-keys'; diff --git a/app/react/kubernetes/helm/helmChartSourceQueries/useHelmRepoVersions.ts b/app/react/kubernetes/helm/helmChartSourceQueries/useHelmRepoVersions.ts index 6245243cd..448e81988 100644 --- a/app/react/kubernetes/helm/helmChartSourceQueries/useHelmRepoVersions.ts +++ b/app/react/kubernetes/helm/helmChartSourceQueries/useHelmRepoVersions.ts @@ -3,7 +3,7 @@ import { useMemo } from 'react'; import { compact, flatMap } from 'lodash'; import { withGlobalError } from '@/react-tools/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { queryKeys } from './query-keys'; diff --git a/app/react/kubernetes/helm/helmChartSourceQueries/useHelmRepositories.ts b/app/react/kubernetes/helm/helmChartSourceQueries/useHelmRepositories.ts index e382164cb..719873fcf 100644 --- a/app/react/kubernetes/helm/helmChartSourceQueries/useHelmRepositories.ts +++ b/app/react/kubernetes/helm/helmChartSourceQueries/useHelmRepositories.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; import { compact } from 'lodash'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { UserId } from '@/portainer/users/types'; import { withGlobalError } from '@/react-tools/react-query'; import { useCurrentUser } from '@/react/hooks/useUser'; diff --git a/app/react/kubernetes/helm/helmReleaseQueries/useHelmHistory.ts b/app/react/kubernetes/helm/helmReleaseQueries/useHelmHistory.ts index 1f69a8a5b..c562b6ebc 100644 --- a/app/react/kubernetes/helm/helmReleaseQueries/useHelmHistory.ts +++ b/app/react/kubernetes/helm/helmReleaseQueries/useHelmHistory.ts @@ -2,7 +2,7 @@ import { useQuery } from '@tanstack/react-query'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { withGlobalError } from '@/react-tools/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { HelmRelease } from '../types'; diff --git a/app/react/kubernetes/helm/helmReleaseQueries/useHelmRelease.ts b/app/react/kubernetes/helm/helmReleaseQueries/useHelmRelease.ts index 6aded9cde..187c7e98c 100644 --- a/app/react/kubernetes/helm/helmReleaseQueries/useHelmRelease.ts +++ b/app/react/kubernetes/helm/helmReleaseQueries/useHelmRelease.ts @@ -2,7 +2,7 @@ import { useQuery } from '@tanstack/react-query'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { withGlobalError } from '@/react-tools/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { HelmRelease } from '../types'; diff --git a/app/react/kubernetes/helm/helmReleaseQueries/useHelmRollbackMutation.ts b/app/react/kubernetes/helm/helmReleaseQueries/useHelmRollbackMutation.ts index 81b1bff39..6019b169a 100644 --- a/app/react/kubernetes/helm/helmReleaseQueries/useHelmRollbackMutation.ts +++ b/app/react/kubernetes/helm/helmReleaseQueries/useHelmRollbackMutation.ts @@ -6,7 +6,7 @@ import { withInvalidate, withGlobalError, } from '@/react-tools/react-query'; -import axios from '@/portainer/services/axios'; +import axios from 'Portainer/services/axios/axios'; import { queryKeys as applicationsQueryKeys } from '@/react/kubernetes/applications/queries/query-keys'; import { queryKeys } from './query-keys'; diff --git a/app/react/kubernetes/helm/helmReleaseQueries/useUninstallHelmAppMutation.ts b/app/react/kubernetes/helm/helmReleaseQueries/useUninstallHelmAppMutation.ts index 16341eb76..c711c1240 100644 --- a/app/react/kubernetes/helm/helmReleaseQueries/useUninstallHelmAppMutation.ts +++ b/app/react/kubernetes/helm/helmReleaseQueries/useUninstallHelmAppMutation.ts @@ -1,6 +1,6 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { withGlobalError, withInvalidate } from '@/react-tools/react-query'; import { queryKeys as applicationsQueryKeys } from '@/react/kubernetes/applications/queries/query-keys'; import { EnvironmentId } from '@/react/portainer/environments/types'; diff --git a/app/react/kubernetes/helm/helmReleaseQueries/useUpdateHelmReleaseMutation.ts b/app/react/kubernetes/helm/helmReleaseQueries/useUpdateHelmReleaseMutation.ts index 689ebac3a..fad0b36da 100644 --- a/app/react/kubernetes/helm/helmReleaseQueries/useUpdateHelmReleaseMutation.ts +++ b/app/react/kubernetes/helm/helmReleaseQueries/useUpdateHelmReleaseMutation.ts @@ -1,6 +1,6 @@ import { useQueryClient, useMutation } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { withGlobalError, withInvalidate } from '@/react-tools/react-query'; import { queryKeys as applicationsQueryKeys } from '@/react/kubernetes/applications/queries/query-keys'; import { EnvironmentId } from '@/react/portainer/environments/types'; diff --git a/app/react/kubernetes/ingresses/service.ts b/app/react/kubernetes/ingresses/service.ts index ea8af85e0..f27cecda2 100644 --- a/app/react/kubernetes/ingresses/service.ts +++ b/app/react/kubernetes/ingresses/service.ts @@ -1,4 +1,4 @@ -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { Ingress, DeleteIngressesRequest, IngressController } from './types'; diff --git a/app/react/kubernetes/metrics/metrics.ts b/app/react/kubernetes/metrics/metrics.ts index 8b0ffc7f2..29faaca4d 100644 --- a/app/react/kubernetes/metrics/metrics.ts +++ b/app/react/kubernetes/metrics/metrics.ts @@ -1,4 +1,4 @@ -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { NodeMetrics } from './types'; diff --git a/app/react/kubernetes/metrics/queries/useMetricsForApplications.ts b/app/react/kubernetes/metrics/queries/useMetricsForApplications.ts index f59b6ca50..68d22c1cf 100644 --- a/app/react/kubernetes/metrics/queries/useMetricsForApplications.ts +++ b/app/react/kubernetes/metrics/queries/useMetricsForApplications.ts @@ -1,6 +1,6 @@ import { useQuery, UseQueryOptions } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { ApplicationResource } from '../types'; diff --git a/app/react/kubernetes/metrics/queries/useNamespaceMetricsQuery.ts b/app/react/kubernetes/metrics/queries/useNamespaceMetricsQuery.ts index afbd79b88..751af16b1 100644 --- a/app/react/kubernetes/metrics/queries/useNamespaceMetricsQuery.ts +++ b/app/react/kubernetes/metrics/queries/useNamespaceMetricsQuery.ts @@ -1,6 +1,6 @@ import { useQuery, UseQueryOptions } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { PodMetrics } from '../types'; diff --git a/app/react/kubernetes/metrics/queries/useNodeMetricsQuery.ts b/app/react/kubernetes/metrics/queries/useNodeMetricsQuery.ts index bd49c7609..026cca699 100644 --- a/app/react/kubernetes/metrics/queries/useNodeMetricsQuery.ts +++ b/app/react/kubernetes/metrics/queries/useNodeMetricsQuery.ts @@ -1,6 +1,6 @@ import { useQuery, UseQueryOptions } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { NodeMetric } from '../types'; diff --git a/app/react/kubernetes/more-resources/ClusterRolesView/ClusterRoleBindingsDatatable/queries/useClusterRoleBindings.ts b/app/react/kubernetes/more-resources/ClusterRolesView/ClusterRoleBindingsDatatable/queries/useClusterRoleBindings.ts index 2c3d3544d..f3810fe29 100644 --- a/app/react/kubernetes/more-resources/ClusterRolesView/ClusterRoleBindingsDatatable/queries/useClusterRoleBindings.ts +++ b/app/react/kubernetes/more-resources/ClusterRolesView/ClusterRoleBindingsDatatable/queries/useClusterRoleBindings.ts @@ -2,7 +2,7 @@ import { compact } from 'lodash'; import { useQuery } from '@tanstack/react-query'; import { withGlobalError } from '@/react-tools/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { ClusterRoleBinding } from '../types'; diff --git a/app/react/kubernetes/more-resources/ClusterRolesView/ClusterRoleBindingsDatatable/queries/useDeleteClusterRoleBindingsMutation.ts b/app/react/kubernetes/more-resources/ClusterRolesView/ClusterRoleBindingsDatatable/queries/useDeleteClusterRoleBindingsMutation.ts index 9767f90e3..9b49a2e41 100644 --- a/app/react/kubernetes/more-resources/ClusterRolesView/ClusterRoleBindingsDatatable/queries/useDeleteClusterRoleBindingsMutation.ts +++ b/app/react/kubernetes/more-resources/ClusterRolesView/ClusterRoleBindingsDatatable/queries/useDeleteClusterRoleBindingsMutation.ts @@ -1,7 +1,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; import { withGlobalError, withInvalidate } from '@/react-tools/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { queryKeys } from './query-keys'; diff --git a/app/react/kubernetes/more-resources/ClusterRolesView/ClusterRolesDatatable/queries/useClusterRoles.ts b/app/react/kubernetes/more-resources/ClusterRolesView/ClusterRolesDatatable/queries/useClusterRoles.ts index f27ffe642..5d48f20bd 100644 --- a/app/react/kubernetes/more-resources/ClusterRolesView/ClusterRolesDatatable/queries/useClusterRoles.ts +++ b/app/react/kubernetes/more-resources/ClusterRolesView/ClusterRolesDatatable/queries/useClusterRoles.ts @@ -2,7 +2,7 @@ import { compact } from 'lodash'; import { useQuery } from '@tanstack/react-query'; import { withGlobalError } from '@/react-tools/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { ClusterRole } from '../types'; diff --git a/app/react/kubernetes/more-resources/ClusterRolesView/ClusterRolesDatatable/queries/useDeleteClusterRolesMutation.ts b/app/react/kubernetes/more-resources/ClusterRolesView/ClusterRolesDatatable/queries/useDeleteClusterRolesMutation.ts index 85167e651..549ffed60 100644 --- a/app/react/kubernetes/more-resources/ClusterRolesView/ClusterRolesDatatable/queries/useDeleteClusterRolesMutation.ts +++ b/app/react/kubernetes/more-resources/ClusterRolesView/ClusterRolesDatatable/queries/useDeleteClusterRolesMutation.ts @@ -1,7 +1,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; import { withGlobalError } from '@/react-tools/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { queryKeys } from './query-keys'; diff --git a/app/react/kubernetes/more-resources/JobsView/CronJobsDatatable/queries/useCronJobs.ts b/app/react/kubernetes/more-resources/JobsView/CronJobsDatatable/queries/useCronJobs.ts index 3b790e20c..753a002bd 100644 --- a/app/react/kubernetes/more-resources/JobsView/CronJobsDatatable/queries/useCronJobs.ts +++ b/app/react/kubernetes/more-resources/JobsView/CronJobsDatatable/queries/useCronJobs.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; import { withGlobalError } from '@/react-tools/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { CronJob } from '../types'; diff --git a/app/react/kubernetes/more-resources/JobsView/CronJobsDatatable/queries/useDeleteCronJobsMutation.ts b/app/react/kubernetes/more-resources/JobsView/CronJobsDatatable/queries/useDeleteCronJobsMutation.ts index 6e442482e..69cd3ac6c 100644 --- a/app/react/kubernetes/more-resources/JobsView/CronJobsDatatable/queries/useDeleteCronJobsMutation.ts +++ b/app/react/kubernetes/more-resources/JobsView/CronJobsDatatable/queries/useDeleteCronJobsMutation.ts @@ -1,7 +1,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; import { withGlobalError, withInvalidate } from '@/react-tools/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { queryKeys } from './query-keys'; diff --git a/app/react/kubernetes/more-resources/JobsView/JobsDatatable/queries/useDeleteJobsMutation.ts b/app/react/kubernetes/more-resources/JobsView/JobsDatatable/queries/useDeleteJobsMutation.ts index ecd995624..a220ccdb7 100644 --- a/app/react/kubernetes/more-resources/JobsView/JobsDatatable/queries/useDeleteJobsMutation.ts +++ b/app/react/kubernetes/more-resources/JobsView/JobsDatatable/queries/useDeleteJobsMutation.ts @@ -1,7 +1,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; import { withGlobalError, withInvalidate } from '@/react-tools/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { queryKeys } from './query-keys'; diff --git a/app/react/kubernetes/more-resources/JobsView/JobsDatatable/queries/useJobs.ts b/app/react/kubernetes/more-resources/JobsView/JobsDatatable/queries/useJobs.ts index e23492a22..573e8515d 100644 --- a/app/react/kubernetes/more-resources/JobsView/JobsDatatable/queries/useJobs.ts +++ b/app/react/kubernetes/more-resources/JobsView/JobsDatatable/queries/useJobs.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; import { withGlobalError } from '@/react-tools/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { Job } from '../types'; diff --git a/app/react/kubernetes/more-resources/RolesView/RoleBindingsDatatable/queries/useDeleteRoleBindingsMutation.ts b/app/react/kubernetes/more-resources/RolesView/RoleBindingsDatatable/queries/useDeleteRoleBindingsMutation.ts index 029ee7e4b..1a4fda2f3 100644 --- a/app/react/kubernetes/more-resources/RolesView/RoleBindingsDatatable/queries/useDeleteRoleBindingsMutation.ts +++ b/app/react/kubernetes/more-resources/RolesView/RoleBindingsDatatable/queries/useDeleteRoleBindingsMutation.ts @@ -1,7 +1,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; import { withGlobalError, withInvalidate } from '@/react-tools/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { queryKeys } from './query-keys'; diff --git a/app/react/kubernetes/more-resources/RolesView/RoleBindingsDatatable/queries/useRoleBindings.ts b/app/react/kubernetes/more-resources/RolesView/RoleBindingsDatatable/queries/useRoleBindings.ts index d2e399955..ba732bdbf 100644 --- a/app/react/kubernetes/more-resources/RolesView/RoleBindingsDatatable/queries/useRoleBindings.ts +++ b/app/react/kubernetes/more-resources/RolesView/RoleBindingsDatatable/queries/useRoleBindings.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; import { withGlobalError } from '@/react-tools/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { RoleBinding } from '../types'; diff --git a/app/react/kubernetes/more-resources/RolesView/RolesDatatable/queries/useDeleteRolesMutation.ts b/app/react/kubernetes/more-resources/RolesView/RolesDatatable/queries/useDeleteRolesMutation.ts index 211ac8a16..44bf5b540 100644 --- a/app/react/kubernetes/more-resources/RolesView/RolesDatatable/queries/useDeleteRolesMutation.ts +++ b/app/react/kubernetes/more-resources/RolesView/RolesDatatable/queries/useDeleteRolesMutation.ts @@ -1,7 +1,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; import { withGlobalError, withInvalidate } from '@/react-tools/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { queryKeys } from './query-keys'; diff --git a/app/react/kubernetes/more-resources/RolesView/RolesDatatable/queries/useRoles.ts b/app/react/kubernetes/more-resources/RolesView/RolesDatatable/queries/useRoles.ts index aa5ec8eae..83f947a55 100644 --- a/app/react/kubernetes/more-resources/RolesView/RolesDatatable/queries/useRoles.ts +++ b/app/react/kubernetes/more-resources/RolesView/RolesDatatable/queries/useRoles.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; import { withGlobalError } from '@/react-tools/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { Role } from '../types'; diff --git a/app/react/kubernetes/more-resources/ServiceAccountsView/ServiceAccountsDatatable/queries/useDeleteServiceAccountsMutation.ts b/app/react/kubernetes/more-resources/ServiceAccountsView/ServiceAccountsDatatable/queries/useDeleteServiceAccountsMutation.ts index f4dfab9be..f65d587c9 100644 --- a/app/react/kubernetes/more-resources/ServiceAccountsView/ServiceAccountsDatatable/queries/useDeleteServiceAccountsMutation.ts +++ b/app/react/kubernetes/more-resources/ServiceAccountsView/ServiceAccountsDatatable/queries/useDeleteServiceAccountsMutation.ts @@ -1,7 +1,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; import { withGlobalError } from '@/react-tools/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { queryKeys } from './query-keys'; diff --git a/app/react/kubernetes/more-resources/ServiceAccountsView/ServiceAccountsDatatable/queries/useGetAllServiceAccountsQuery.ts b/app/react/kubernetes/more-resources/ServiceAccountsView/ServiceAccountsDatatable/queries/useGetAllServiceAccountsQuery.ts index ea76c1763..6ecb01459 100644 --- a/app/react/kubernetes/more-resources/ServiceAccountsView/ServiceAccountsDatatable/queries/useGetAllServiceAccountsQuery.ts +++ b/app/react/kubernetes/more-resources/ServiceAccountsView/ServiceAccountsDatatable/queries/useGetAllServiceAccountsQuery.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; import { withGlobalError } from '@/react-tools/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { ServiceAccount } from '../../types'; diff --git a/app/react/kubernetes/namespaces/getSelfSubjectAccessReview.ts b/app/react/kubernetes/namespaces/getSelfSubjectAccessReview.ts index 3280886a8..fe3c6595c 100644 --- a/app/react/kubernetes/namespaces/getSelfSubjectAccessReview.ts +++ b/app/react/kubernetes/namespaces/getSelfSubjectAccessReview.ts @@ -1,4 +1,4 @@ -import axios from '@/portainer/services/axios'; +import axios from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { parseKubernetesAxiosError } from '../axiosError'; diff --git a/app/react/kubernetes/namespaces/queries/useCreateNamespaceMutation.ts b/app/react/kubernetes/namespaces/queries/useCreateNamespaceMutation.ts index 638d2977c..bc167735c 100644 --- a/app/react/kubernetes/namespaces/queries/useCreateNamespaceMutation.ts +++ b/app/react/kubernetes/namespaces/queries/useCreateNamespaceMutation.ts @@ -1,6 +1,6 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { withGlobalError, withInvalidate } from '@/react-tools/react-query'; import { updateEnvironmentRegistryAccess } from '@/react/portainer/environments/environment.service/registries'; import { EnvironmentId } from '@/react/portainer/environments/types'; diff --git a/app/react/kubernetes/namespaces/queries/useDeleteNamespaces.ts b/app/react/kubernetes/namespaces/queries/useDeleteNamespaces.ts index b77cfbc57..cd8c654e2 100644 --- a/app/react/kubernetes/namespaces/queries/useDeleteNamespaces.ts +++ b/app/react/kubernetes/namespaces/queries/useDeleteNamespaces.ts @@ -1,6 +1,6 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { withGlobalError, withInvalidate } from '@/react-tools/react-query'; import { queryKeys } from './queryKeys'; diff --git a/app/react/kubernetes/namespaces/queries/useNamespaceQuery.ts b/app/react/kubernetes/namespaces/queries/useNamespaceQuery.ts index 194016774..bee6be440 100644 --- a/app/react/kubernetes/namespaces/queries/useNamespaceQuery.ts +++ b/app/react/kubernetes/namespaces/queries/useNamespaceQuery.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { notifyError } from '@/portainer/services/notifications'; import { EnvironmentId } from '@/react/portainer/environments/types'; diff --git a/app/react/kubernetes/namespaces/queries/useNamespaceYAML.ts b/app/react/kubernetes/namespaces/queries/useNamespaceYAML.ts index 436b200be..9a5ace498 100644 --- a/app/react/kubernetes/namespaces/queries/useNamespaceYAML.ts +++ b/app/react/kubernetes/namespaces/queries/useNamespaceYAML.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import axios from '@/portainer/services/axios'; +import axios from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { isFulfilled } from '@/portainer/helpers/promise-utils'; diff --git a/app/react/kubernetes/namespaces/queries/useNamespacesQuery.ts b/app/react/kubernetes/namespaces/queries/useNamespacesQuery.ts index e7977db84..6a7db3817 100644 --- a/app/react/kubernetes/namespaces/queries/useNamespacesQuery.ts +++ b/app/react/kubernetes/namespaces/queries/useNamespacesQuery.ts @@ -2,7 +2,7 @@ import { useQuery } from '@tanstack/react-query'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { withGlobalError } from '@/react-tools/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { PortainerNamespace } from '../types'; diff --git a/app/react/kubernetes/namespaces/queries/useResourceLimitsQuery.ts b/app/react/kubernetes/namespaces/queries/useResourceLimitsQuery.ts index c624d952f..6a7abd01f 100644 --- a/app/react/kubernetes/namespaces/queries/useResourceLimitsQuery.ts +++ b/app/react/kubernetes/namespaces/queries/useResourceLimitsQuery.ts @@ -2,7 +2,7 @@ import { useQuery } from '@tanstack/react-query'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { notifyError } from '@/portainer/services/notifications'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; type K8sNodeLimits = { CPU: number; diff --git a/app/react/kubernetes/namespaces/queries/useToggleSystemNamespace.ts b/app/react/kubernetes/namespaces/queries/useToggleSystemNamespace.ts index eab570ef4..c9a7b46db 100644 --- a/app/react/kubernetes/namespaces/queries/useToggleSystemNamespace.ts +++ b/app/react/kubernetes/namespaces/queries/useToggleSystemNamespace.ts @@ -1,6 +1,6 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; -import axios from '@/portainer/services/axios'; +import axios from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { withGlobalError, withInvalidate } from '@/react-tools/react-query'; diff --git a/app/react/kubernetes/namespaces/queries/useUpdateNamespaceMutation.ts b/app/react/kubernetes/namespaces/queries/useUpdateNamespaceMutation.ts index a9cb3e665..1a9187cca 100644 --- a/app/react/kubernetes/namespaces/queries/useUpdateNamespaceMutation.ts +++ b/app/react/kubernetes/namespaces/queries/useUpdateNamespaceMutation.ts @@ -1,6 +1,6 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { withGlobalError, withInvalidate } from '@/react-tools/react-query'; import { updateEnvironmentRegistryAccess } from '@/react/portainer/environments/environment.service/registries'; import { EnvironmentId } from '@/react/portainer/environments/types'; diff --git a/app/react/kubernetes/queries/useEvents.ts b/app/react/kubernetes/queries/useEvents.ts index 0d28e5eaa..afa253336 100644 --- a/app/react/kubernetes/queries/useEvents.ts +++ b/app/react/kubernetes/queries/useEvents.ts @@ -2,7 +2,7 @@ import { useQuery } from '@tanstack/react-query'; import { Event } from '@/react/kubernetes/queries/types'; import { EnvironmentId } from '@/react/portainer/environments/types'; -import axios from '@/portainer/services/axios'; +import axios from 'Portainer/services/axios/axios'; import { withGlobalError } from '@/react-tools/react-query'; import { parseKubernetesAxiosError } from '../axiosError'; diff --git a/app/react/kubernetes/services/service.ts b/app/react/kubernetes/services/service.ts index a7cdbc7f2..e69e0f132 100644 --- a/app/react/kubernetes/services/service.ts +++ b/app/react/kubernetes/services/service.ts @@ -2,7 +2,7 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'; import { ServiceList } from 'kubernetes-types/core/v1'; import { withGlobalError } from '@/react-tools/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { Service } from '@/react/kubernetes/services/types'; diff --git a/app/react/kubernetes/services/useNamespaceServices.ts b/app/react/kubernetes/services/useNamespaceServices.ts index 528fb2c35..754f38387 100644 --- a/app/react/kubernetes/services/useNamespaceServices.ts +++ b/app/react/kubernetes/services/useNamespaceServices.ts @@ -2,7 +2,7 @@ import { useQuery, UseQueryOptions } from '@tanstack/react-query'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { error as notifyError } from '@/portainer/services/notifications'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { Service } from './types'; diff --git a/app/react/kubernetes/volumes/queries/useDeleteVolumes.ts b/app/react/kubernetes/volumes/queries/useDeleteVolumes.ts index 7732c2b58..aabf10b7c 100644 --- a/app/react/kubernetes/volumes/queries/useDeleteVolumes.ts +++ b/app/react/kubernetes/volumes/queries/useDeleteVolumes.ts @@ -1,7 +1,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; import { EnvironmentId } from '@/react/portainer/environments/types'; -import axios from '@/portainer/services/axios'; +import axios from 'Portainer/services/axios/axios'; import { getAllSettledItems } from '@/portainer/helpers/promise-utils'; import { withGlobalError } from '@/react-tools/react-query'; import { notifyError, notifySuccess } from '@/portainer/services/notifications'; diff --git a/app/react/kubernetes/volumes/queries/useVolumesQuery.ts b/app/react/kubernetes/volumes/queries/useVolumesQuery.ts index 646065758..e717b210d 100644 --- a/app/react/kubernetes/volumes/queries/useVolumesQuery.ts +++ b/app/react/kubernetes/volumes/queries/useVolumesQuery.ts @@ -3,7 +3,7 @@ import { useQuery } from '@tanstack/react-query'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { humanize } from '@/portainer/filters/filters'; import { withGlobalError } from '@/react-tools/react-query'; -import axios from '@/portainer/services/axios'; +import axios from 'Portainer/services/axios/axios'; import { Volume } from '@/kubernetes/models/volume/Volume'; import { parseKubernetesAxiosError } from '../../axiosError'; diff --git a/app/react/portainer/HomeView/EnvironmentList/KubeconfigButton/kubeconfig.service.ts b/app/react/portainer/HomeView/EnvironmentList/KubeconfigButton/kubeconfig.service.ts index 8347f638c..77ba4732d 100644 --- a/app/react/portainer/HomeView/EnvironmentList/KubeconfigButton/kubeconfig.service.ts +++ b/app/react/portainer/HomeView/EnvironmentList/KubeconfigButton/kubeconfig.service.ts @@ -1,6 +1,6 @@ import { saveAs } from 'file-saver'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; const baseUrl = 'kubernetes'; diff --git a/app/react/portainer/HomeView/home.service.ts b/app/react/portainer/HomeView/home.service.ts index bcb5138a0..17d2477ed 100644 --- a/app/react/portainer/HomeView/home.service.ts +++ b/app/react/portainer/HomeView/home.service.ts @@ -1,4 +1,4 @@ -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { Motd } from './types'; diff --git a/app/react/portainer/access-control/access-control.service.ts b/app/react/portainer/access-control/access-control.service.ts index 6ad2cd1f1..3f0a41097 100644 --- a/app/react/portainer/access-control/access-control.service.ts +++ b/app/react/portainer/access-control/access-control.service.ts @@ -1,4 +1,4 @@ -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { AccessControlFormData, diff --git a/app/react/portainer/account/AccountView/AccessTokensDatatable/useDeleteAccessTokensMutation.ts b/app/react/portainer/account/AccountView/AccessTokensDatatable/useDeleteAccessTokensMutation.ts index eb082864b..eb6150c62 100644 --- a/app/react/portainer/account/AccountView/AccessTokensDatatable/useDeleteAccessTokensMutation.ts +++ b/app/react/portainer/account/AccountView/AccessTokensDatatable/useDeleteAccessTokensMutation.ts @@ -3,7 +3,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; import { withError, withInvalidate } from '@/react-tools/react-query'; import { useCurrentUser } from '@/react/hooks/useUser'; import { promiseSequence } from '@/portainer/helpers/promise-utils'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { AccessToken } from '../../access-tokens/types'; import { buildUrl } from '../../access-tokens/queries/build-url'; diff --git a/app/react/portainer/account/AccountView/ApplicationSettings/ApplicationSettingsForm.tsx b/app/react/portainer/account/AccountView/ApplicationSettings/ApplicationSettingsForm.tsx index ce570f2a1..273f46538 100644 --- a/app/react/portainer/account/AccountView/ApplicationSettings/ApplicationSettingsForm.tsx +++ b/app/react/portainer/account/AccountView/ApplicationSettings/ApplicationSettingsForm.tsx @@ -2,7 +2,7 @@ import { Form, Formik } from 'formik'; import { useCurrentUser } from '@/react/hooks/useUser'; import { notifySuccess } from '@/portainer/services/notifications'; -import { updateAxiosAdapter } from '@/portainer/services/axios'; +import { updateAxiosAdapter } from 'Portainer/services/axios/axios'; import { withError } from '@/react-tools/react-query'; import { TextTip } from '@@/Tip/TextTip'; diff --git a/app/react/portainer/account/AccountView/HelmRepositoryDatatable/helm-repositories.service.ts b/app/react/portainer/account/AccountView/HelmRepositoryDatatable/helm-repositories.service.ts index 8916dfb41..8f15f1b2e 100644 --- a/app/react/portainer/account/AccountView/HelmRepositoryDatatable/helm-repositories.service.ts +++ b/app/react/portainer/account/AccountView/HelmRepositoryDatatable/helm-repositories.service.ts @@ -1,6 +1,6 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { success as notifySuccess } from '@/portainer/services/notifications'; import { withError } from '@/react-tools/react-query'; import { pluralize } from '@/portainer/helpers/strings'; diff --git a/app/react/portainer/account/CreateAccessTokenView/useCreateUserAccessTokenMutation.ts b/app/react/portainer/account/CreateAccessTokenView/useCreateUserAccessTokenMutation.ts index 624394c68..ee6348747 100644 --- a/app/react/portainer/account/CreateAccessTokenView/useCreateUserAccessTokenMutation.ts +++ b/app/react/portainer/account/CreateAccessTokenView/useCreateUserAccessTokenMutation.ts @@ -1,6 +1,6 @@ import { useMutation } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { withError } from '@/react-tools/react-query'; import { notifySuccess } from '@/portainer/services/notifications'; diff --git a/app/react/portainer/account/access-tokens/queries/useAccessTokens.ts b/app/react/portainer/account/access-tokens/queries/useAccessTokens.ts index 8e25d1492..3e1faee2c 100644 --- a/app/react/portainer/account/access-tokens/queries/useAccessTokens.ts +++ b/app/react/portainer/account/access-tokens/queries/useAccessTokens.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; import { useCurrentUser } from '@/react/hooks/useUser'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { AccessToken } from '../types'; diff --git a/app/react/portainer/account/git-credentials/git-credentials.service.ts b/app/react/portainer/account/git-credentials/git-credentials.service.ts index 370ad48ee..f339d6848 100644 --- a/app/react/portainer/account/git-credentials/git-credentials.service.ts +++ b/app/react/portainer/account/git-credentials/git-credentials.service.ts @@ -1,6 +1,6 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { success as notifySuccess } from '@/portainer/services/notifications'; import { UserId } from '@/portainer/users/types'; diff --git a/app/react/portainer/account/git-credentials/queries/useCreateGitCredentialsMutation.ts b/app/react/portainer/account/git-credentials/queries/useCreateGitCredentialsMutation.ts index 47614d2e6..aec72b246 100644 --- a/app/react/portainer/account/git-credentials/queries/useCreateGitCredentialsMutation.ts +++ b/app/react/portainer/account/git-credentials/queries/useCreateGitCredentialsMutation.ts @@ -1,6 +1,6 @@ import { useQueryClient, useMutation } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { notifyError, notifySuccess } from '@/portainer/services/notifications'; import { GitAuthModel } from '@/react/portainer/gitops/types'; import { useCurrentUser } from '@/react/hooks/useUser'; diff --git a/app/react/portainer/account/useUpdateUserMutation.tsx b/app/react/portainer/account/useUpdateUserMutation.tsx index 570258926..b36f911f5 100644 --- a/app/react/portainer/account/useUpdateUserMutation.tsx +++ b/app/react/portainer/account/useUpdateUserMutation.tsx @@ -1,6 +1,6 @@ import { useMutation } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { User } from '@/portainer/users/types'; import { mutationOptions, diff --git a/app/react/portainer/environments/ListView/useDeleteEnvironmentsMutation.ts b/app/react/portainer/environments/ListView/useDeleteEnvironmentsMutation.ts index 48f539f11..0cec64d5f 100644 --- a/app/react/portainer/environments/ListView/useDeleteEnvironmentsMutation.ts +++ b/app/react/portainer/environments/ListView/useDeleteEnvironmentsMutation.ts @@ -1,6 +1,6 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { withError } from '@/react-tools/react-query'; import { notifyError, notifySuccess } from '@/portainer/services/notifications'; import { pluralize } from '@/portainer/helpers/strings'; diff --git a/app/react/portainer/environments/environment-groups/ListView/EnvironmentGroupsDatatable/useDeleteEnvironmentGroupsMutation.ts b/app/react/portainer/environments/environment-groups/ListView/EnvironmentGroupsDatatable/useDeleteEnvironmentGroupsMutation.ts index 154f4fad1..6c45820d5 100644 --- a/app/react/portainer/environments/environment-groups/ListView/EnvironmentGroupsDatatable/useDeleteEnvironmentGroupsMutation.ts +++ b/app/react/portainer/environments/environment-groups/ListView/EnvironmentGroupsDatatable/useDeleteEnvironmentGroupsMutation.ts @@ -2,7 +2,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; import { withError, withInvalidate } from '@/react-tools/react-query'; import { promiseSequence } from '@/portainer/helpers/promise-utils'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentGroup } from '../../types'; import { buildUrl } from '../../queries/build-url'; diff --git a/app/react/portainer/environments/environment-groups/environment-groups.service.ts b/app/react/portainer/environments/environment-groups/environment-groups.service.ts index b0127b170..a594e07cf 100644 --- a/app/react/portainer/environments/environment-groups/environment-groups.service.ts +++ b/app/react/portainer/environments/environment-groups/environment-groups.service.ts @@ -1,4 +1,4 @@ -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentGroupId } from '../types'; diff --git a/app/react/portainer/environments/environment-groups/queries/useCreateGroupMutation.ts b/app/react/portainer/environments/environment-groups/queries/useCreateGroupMutation.ts index 1647823e8..3ef9dcca1 100644 --- a/app/react/portainer/environments/environment-groups/queries/useCreateGroupMutation.ts +++ b/app/react/portainer/environments/environment-groups/queries/useCreateGroupMutation.ts @@ -1,6 +1,6 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { TagId } from '@/portainer/tags/types'; import { mutationOptions, diff --git a/app/react/portainer/environments/environment-groups/queries/useEnvironmentGroups.ts b/app/react/portainer/environments/environment-groups/queries/useEnvironmentGroups.ts index e7d2ea082..00f8325c2 100644 --- a/app/react/portainer/environments/environment-groups/queries/useEnvironmentGroups.ts +++ b/app/react/portainer/environments/environment-groups/queries/useEnvironmentGroups.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentGroup } from '../types'; diff --git a/app/react/portainer/environments/environment-groups/queries/useUpdateGroupMutation.ts b/app/react/portainer/environments/environment-groups/queries/useUpdateGroupMutation.ts index b37850dad..fbc336ced 100644 --- a/app/react/portainer/environments/environment-groups/queries/useUpdateGroupMutation.ts +++ b/app/react/portainer/environments/environment-groups/queries/useUpdateGroupMutation.ts @@ -1,6 +1,6 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { TagId } from '@/portainer/tags/types'; import { withGlobalError } from '@/react-tools/react-query'; import { environmentQueryKeys } from '@/react/portainer/environments/queries/query-keys'; diff --git a/app/react/portainer/environments/environment.service/create.ts b/app/react/portainer/environments/environment.service/create.ts index 82e46fe3d..0f91a0db7 100644 --- a/app/react/portainer/environments/environment.service/create.ts +++ b/app/react/portainer/environments/environment.service/create.ts @@ -2,7 +2,7 @@ import axios, { parseAxiosError, json2formData, arrayToJson, -} from '@/portainer/services/axios'; +} from 'Portainer/services/axios/axios'; import { type EnvironmentGroupId, type Environment, diff --git a/app/react/portainer/environments/environment.service/edge.ts b/app/react/portainer/environments/environment.service/edge.ts index 01012331c..0eea36fd1 100644 --- a/app/react/portainer/environments/environment.service/edge.ts +++ b/app/react/portainer/environments/environment.service/edge.ts @@ -1,4 +1,4 @@ -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; interface GenerateUrlResponse { edgeKey: string; diff --git a/app/react/portainer/environments/environment.service/index.ts b/app/react/portainer/environments/environment.service/index.ts index affce71f0..d2fff7e11 100644 --- a/app/react/portainer/environments/environment.service/index.ts +++ b/app/react/portainer/environments/environment.service/index.ts @@ -1,4 +1,4 @@ -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { Environment, EnvironmentId, diff --git a/app/react/portainer/environments/environment.service/registries.ts b/app/react/portainer/environments/environment.service/registries.ts index b176ec955..cdb81ba36 100644 --- a/app/react/portainer/environments/environment.service/registries.ts +++ b/app/react/portainer/environments/environment.service/registries.ts @@ -1,4 +1,4 @@ -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { TeamId } from '@/react/portainer/users/teams/types'; import { UserId } from '@/portainer/users/types'; import { diff --git a/app/react/portainer/environments/queries/useEnvironmentRegistries.ts b/app/react/portainer/environments/queries/useEnvironmentRegistries.ts index c25ffa157..b9f197c16 100644 --- a/app/react/portainer/environments/queries/useEnvironmentRegistries.ts +++ b/app/react/portainer/environments/queries/useEnvironmentRegistries.ts @@ -1,4 +1,4 @@ -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { buildUrl } from '../environment.service/utils'; import { EnvironmentId } from '../types'; diff --git a/app/react/portainer/environments/queries/useUpdateEnvironmentMutation.ts b/app/react/portainer/environments/queries/useUpdateEnvironmentMutation.ts index a2747532c..97f72ba30 100644 --- a/app/react/portainer/environments/queries/useUpdateEnvironmentMutation.ts +++ b/app/react/portainer/environments/queries/useUpdateEnvironmentMutation.ts @@ -10,7 +10,7 @@ import { EndpointChangeWindow, EnvironmentGroupId, } from '@/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { TagId } from '@/portainer/tags/types'; import { buildUrl } from '../environment.service/utils'; diff --git a/app/react/portainer/environments/queries/useUpdateEnvironmentsRelationsMutation.ts b/app/react/portainer/environments/queries/useUpdateEnvironmentsRelationsMutation.ts index d3dec54a1..e4371bb59 100644 --- a/app/react/portainer/environments/queries/useUpdateEnvironmentsRelationsMutation.ts +++ b/app/react/portainer/environments/queries/useUpdateEnvironmentsRelationsMutation.ts @@ -1,6 +1,6 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { mutationOptions, withError, diff --git a/app/react/portainer/environments/update-schedules/queries/create.ts b/app/react/portainer/environments/update-schedules/queries/create.ts index 3edbc9c79..6bf75605e 100644 --- a/app/react/portainer/environments/update-schedules/queries/create.ts +++ b/app/react/portainer/environments/update-schedules/queries/create.ts @@ -1,6 +1,6 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { withError, withInvalidate } from '@/react-tools/react-query'; import { EdgeUpdateSchedule } from '../types'; diff --git a/app/react/portainer/environments/update-schedules/queries/list.ts b/app/react/portainer/environments/update-schedules/queries/list.ts index c899825c8..190ed8340 100644 --- a/app/react/portainer/environments/update-schedules/queries/list.ts +++ b/app/react/portainer/environments/update-schedules/queries/list.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EdgeUpdateResponse, StatusType } from '../types'; diff --git a/app/react/portainer/environments/update-schedules/queries/useActiveSchedules.ts b/app/react/portainer/environments/update-schedules/queries/useActiveSchedules.ts index ceb794bea..ca68e7bbd 100644 --- a/app/react/portainer/environments/update-schedules/queries/useActiveSchedules.ts +++ b/app/react/portainer/environments/update-schedules/queries/useActiveSchedules.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { EdgeUpdateSchedule, ScheduleType, StatusType } from '../types'; diff --git a/app/react/portainer/environments/update-schedules/queries/useItem.ts b/app/react/portainer/environments/update-schedules/queries/useItem.ts index 7ba80c155..c430336e7 100644 --- a/app/react/portainer/environments/update-schedules/queries/useItem.ts +++ b/app/react/portainer/environments/update-schedules/queries/useItem.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EdgeUpdateResponse, EdgeUpdateSchedule } from '../types'; diff --git a/app/react/portainer/environments/update-schedules/queries/usePreviousVersions.ts b/app/react/portainer/environments/update-schedules/queries/usePreviousVersions.ts index 3f2905b2a..27c16998b 100644 --- a/app/react/portainer/environments/update-schedules/queries/usePreviousVersions.ts +++ b/app/react/portainer/environments/update-schedules/queries/usePreviousVersions.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EdgeGroupId, EnvironmentId, diff --git a/app/react/portainer/environments/update-schedules/queries/useRemoveMutation.ts b/app/react/portainer/environments/update-schedules/queries/useRemoveMutation.ts index 306773b3e..201ee2090 100644 --- a/app/react/portainer/environments/update-schedules/queries/useRemoveMutation.ts +++ b/app/react/portainer/environments/update-schedules/queries/useRemoveMutation.ts @@ -1,7 +1,7 @@ import { useQueryClient, useMutation } from '@tanstack/react-query'; import { promiseSequence } from '@/portainer/helpers/promise-utils'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { mutationOptions, withError, diff --git a/app/react/portainer/environments/update-schedules/queries/useSupportedAgentVersions.ts b/app/react/portainer/environments/update-schedules/queries/useSupportedAgentVersions.ts index f96da5670..621054a30 100644 --- a/app/react/portainer/environments/update-schedules/queries/useSupportedAgentVersions.ts +++ b/app/react/portainer/environments/update-schedules/queries/useSupportedAgentVersions.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { withError } from '@/react-tools/react-query'; import { semverCompare } from '@/react/common/semver-utils'; diff --git a/app/react/portainer/environments/update-schedules/queries/useUpdateMutation.ts b/app/react/portainer/environments/update-schedules/queries/useUpdateMutation.ts index 4b7a45962..294f09cdb 100644 --- a/app/react/portainer/environments/update-schedules/queries/useUpdateMutation.ts +++ b/app/react/portainer/environments/update-schedules/queries/useUpdateMutation.ts @@ -1,6 +1,6 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { withError, withInvalidate } from '@/react-tools/react-query'; import { EdgeUpdateSchedule } from '../types'; diff --git a/app/react/portainer/gitops/gitops.service.ts b/app/react/portainer/gitops/gitops.service.ts index 9b7dd5b25..84452e481 100644 --- a/app/react/portainer/gitops/gitops.service.ts +++ b/app/react/portainer/gitops/gitops.service.ts @@ -1,4 +1,4 @@ -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; interface PreviewPayload { repository: string; diff --git a/app/react/portainer/gitops/queries/useCheckRepo.ts b/app/react/portainer/gitops/queries/useCheckRepo.ts index 4fa9b6416..064532d74 100644 --- a/app/react/portainer/gitops/queries/useCheckRepo.ts +++ b/app/react/portainer/gitops/queries/useCheckRepo.ts @@ -4,7 +4,7 @@ import { useQuery } from '@tanstack/react-query'; import axios, { isDefaultResponse, parseAxiosError, -} from '@/portainer/services/axios'; +} from 'Portainer/services/axios/axios'; interface Creds { username?: string; diff --git a/app/react/portainer/gitops/queries/useGitRefs.ts b/app/react/portainer/gitops/queries/useGitRefs.ts index e091da71e..fe72d63b6 100644 --- a/app/react/portainer/gitops/queries/useGitRefs.ts +++ b/app/react/portainer/gitops/queries/useGitRefs.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; interface RefsPayload { repository: string; diff --git a/app/react/portainer/gitops/queries/useSearch.ts b/app/react/portainer/gitops/queries/useSearch.ts index 0590b1e0f..fb77e6318 100644 --- a/app/react/portainer/gitops/queries/useSearch.ts +++ b/app/react/portainer/gitops/queries/useSearch.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; interface SearchPayload { repository: string; diff --git a/app/react/portainer/gitops/queries/useUpdateGitStack.ts b/app/react/portainer/gitops/queries/useUpdateGitStack.ts index 242a29884..d99812318 100644 --- a/app/react/portainer/gitops/queries/useUpdateGitStack.ts +++ b/app/react/portainer/gitops/queries/useUpdateGitStack.ts @@ -1,6 +1,6 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { GitStackPayload } from '@/react/common/stacks/types'; import { buildStackUrl } from '@/react/common/stacks/queries/buildUrl'; import { queryKeys } from '@/react/common/stacks/queries/query-keys'; diff --git a/app/react/portainer/gitops/queries/useUpdateGitStackSettings.ts b/app/react/portainer/gitops/queries/useUpdateGitStackSettings.ts index 709cfec2d..22019da33 100644 --- a/app/react/portainer/gitops/queries/useUpdateGitStackSettings.ts +++ b/app/react/portainer/gitops/queries/useUpdateGitStackSettings.ts @@ -1,6 +1,6 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { GitStackPayload } from '@/react/common/stacks/types'; import { buildStackUrl } from '@/react/common/stacks/queries/buildUrl'; import { queryKeys } from '@/react/common/stacks/queries/query-keys'; diff --git a/app/react/portainer/licenses/license.service.ts b/app/react/portainer/licenses/license.service.ts index f183377c5..a0c9e5b13 100644 --- a/app/react/portainer/licenses/license.service.ts +++ b/app/react/portainer/licenses/license.service.ts @@ -1,7 +1,7 @@ import _ from 'lodash'; import { AxiosError } from 'axios'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { License, LicenseInfo } from './types'; diff --git a/app/react/portainer/logs/ActivityLogsView/useActivityLogs.ts b/app/react/portainer/logs/ActivityLogsView/useActivityLogs.ts index a5d666697..6d8a27485 100644 --- a/app/react/portainer/logs/ActivityLogsView/useActivityLogs.ts +++ b/app/react/portainer/logs/ActivityLogsView/useActivityLogs.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { isBE } from '../../feature-flags/feature-flags.service'; diff --git a/app/react/portainer/logs/ActivityLogsView/useExportMutation.ts b/app/react/portainer/logs/ActivityLogsView/useExportMutation.ts index be79fc207..8cd4f398f 100644 --- a/app/react/portainer/logs/ActivityLogsView/useExportMutation.ts +++ b/app/react/portainer/logs/ActivityLogsView/useExportMutation.ts @@ -1,7 +1,7 @@ import { useMutation } from '@tanstack/react-query'; import { saveAs } from 'file-saver'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { Query } from './useActivityLogs'; diff --git a/app/react/portainer/registries/CreateView/TestConnection/useCheckRegistryConnectionMutation.ts b/app/react/portainer/registries/CreateView/TestConnection/useCheckRegistryConnectionMutation.ts index ba4a2108e..ce0335f69 100644 --- a/app/react/portainer/registries/CreateView/TestConnection/useCheckRegistryConnectionMutation.ts +++ b/app/react/portainer/registries/CreateView/TestConnection/useCheckRegistryConnectionMutation.ts @@ -1,6 +1,6 @@ import { useMutation } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; interface RegistryPingPayload { Username: string; diff --git a/app/react/portainer/registries/ListView/RegistriesDatatable/useDeleteRegistriesMutation.ts b/app/react/portainer/registries/ListView/RegistriesDatatable/useDeleteRegistriesMutation.ts index 8773001f0..beb85095f 100644 --- a/app/react/portainer/registries/ListView/RegistriesDatatable/useDeleteRegistriesMutation.ts +++ b/app/react/portainer/registries/ListView/RegistriesDatatable/useDeleteRegistriesMutation.ts @@ -1,7 +1,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; import { promiseSequence } from '@/portainer/helpers/promise-utils'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { mutationOptions, withError, diff --git a/app/react/portainer/registries/queries/useRegistries.ts b/app/react/portainer/registries/queries/useRegistries.ts index 4ea5aad6e..458671fd0 100644 --- a/app/react/portainer/registries/queries/useRegistries.ts +++ b/app/react/portainer/registries/queries/useRegistries.ts @@ -1,7 +1,7 @@ import { QueryKey, useQuery } from '@tanstack/react-query'; import { withError } from '@/react-tools/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { Registry, RegistryTypes } from '../types/registry'; import { usePublicSettings } from '../../settings/queries'; diff --git a/app/react/portainer/registries/queries/useRegistry.ts b/app/react/portainer/registries/queries/useRegistry.ts index 6dbe4efdc..529d6f661 100644 --- a/app/react/portainer/registries/queries/useRegistry.ts +++ b/app/react/portainer/registries/queries/useRegistry.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { useEnvironmentId } from '@/react/hooks/useEnvironmentId'; import { Registry } from '../types/registry'; diff --git a/app/react/portainer/registries/registry.service.ts b/app/react/portainer/registries/registry.service.ts index 75195cb00..5300e4001 100644 --- a/app/react/portainer/registries/registry.service.ts +++ b/app/react/portainer/registries/registry.service.ts @@ -1,4 +1,4 @@ -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { Catalog } from './types/registry'; diff --git a/app/react/portainer/registries/repositories/ListView/useRepositoryTags.ts b/app/react/portainer/registries/repositories/ListView/useRepositoryTags.ts index 1cc75475e..2f35a2459 100644 --- a/app/react/portainer/registries/repositories/ListView/useRepositoryTags.ts +++ b/app/react/portainer/registries/repositories/ListView/useRepositoryTags.ts @@ -2,7 +2,7 @@ import { useQuery } from '@tanstack/react-query'; import _ from 'lodash'; import { Environment } from '@/react/portainer/environments/types'; -import axios from '@/portainer/services/axios'; +import axios from 'Portainer/services/axios/axios'; import { Registry } from '../../types/registry'; import { buildUrl } from '../../queries/build-url'; diff --git a/app/react/portainer/registries/repositories/queries/getRegistryBlobs.ts b/app/react/portainer/registries/repositories/queries/getRegistryBlobs.ts index 26975337f..057195148 100644 --- a/app/react/portainer/registries/repositories/queries/getRegistryBlobs.ts +++ b/app/react/portainer/registries/repositories/queries/getRegistryBlobs.ts @@ -1,4 +1,4 @@ -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '../../../environments/types'; import { RegistryId } from '../../types/registry'; diff --git a/app/react/portainer/registries/repositories/queries/manifest.service.ts b/app/react/portainer/registries/repositories/queries/manifest.service.ts index 3a15f2ea4..58076f9dc 100644 --- a/app/react/portainer/registries/repositories/queries/manifest.service.ts +++ b/app/react/portainer/registries/repositories/queries/manifest.service.ts @@ -1,6 +1,6 @@ import { Sha256 } from '@aws-crypto/sha256-js'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { RegistryId } from '../../types/registry'; diff --git a/app/react/portainer/settings/SettingsView/BackupSettingsView/queries/useBackupS3Settings.ts b/app/react/portainer/settings/SettingsView/BackupSettingsView/queries/useBackupS3Settings.ts index 726af243e..0cef48d58 100644 --- a/app/react/portainer/settings/SettingsView/BackupSettingsView/queries/useBackupS3Settings.ts +++ b/app/react/portainer/settings/SettingsView/BackupSettingsView/queries/useBackupS3Settings.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { withError } from '@/react-tools/react-query'; import { BackupS3Model } from '../types'; diff --git a/app/react/portainer/settings/SettingsView/BackupSettingsView/queries/useDownloadBackupMutation.ts b/app/react/portainer/settings/SettingsView/BackupSettingsView/queries/useDownloadBackupMutation.ts index 966876546..e0ad9f66e 100644 --- a/app/react/portainer/settings/SettingsView/BackupSettingsView/queries/useDownloadBackupMutation.ts +++ b/app/react/portainer/settings/SettingsView/BackupSettingsView/queries/useDownloadBackupMutation.ts @@ -1,7 +1,7 @@ import { useMutation } from '@tanstack/react-query'; import { saveAs } from 'file-saver'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { withGlobalError } from '@/react-tools/react-query'; import { buildUrl } from './backupSettings.service'; diff --git a/app/react/portainer/settings/SettingsView/BackupSettingsView/queries/useExportS3BackupMutation.ts b/app/react/portainer/settings/SettingsView/BackupSettingsView/queries/useExportS3BackupMutation.ts index 367b42521..611a34810 100644 --- a/app/react/portainer/settings/SettingsView/BackupSettingsView/queries/useExportS3BackupMutation.ts +++ b/app/react/portainer/settings/SettingsView/BackupSettingsView/queries/useExportS3BackupMutation.ts @@ -1,6 +1,6 @@ import { useMutation } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { withGlobalError } from '@/react-tools/react-query'; import { BackupS3Model } from '../types'; diff --git a/app/react/portainer/settings/SettingsView/BackupSettingsView/queries/useUpdateBackupS3SettingsMutation.ts b/app/react/portainer/settings/SettingsView/BackupSettingsView/queries/useUpdateBackupS3SettingsMutation.ts index 00fdb7c45..14ea429a1 100644 --- a/app/react/portainer/settings/SettingsView/BackupSettingsView/queries/useUpdateBackupS3SettingsMutation.ts +++ b/app/react/portainer/settings/SettingsView/BackupSettingsView/queries/useUpdateBackupS3SettingsMutation.ts @@ -1,6 +1,6 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { withGlobalError } from '@/react-tools/react-query'; import { BackupS3Model } from '../types'; diff --git a/app/react/portainer/settings/SettingsView/useUpdateSSLConfigMutation.tsx b/app/react/portainer/settings/SettingsView/useUpdateSSLConfigMutation.tsx index e11dca457..2a498c00d 100644 --- a/app/react/portainer/settings/SettingsView/useUpdateSSLConfigMutation.tsx +++ b/app/react/portainer/settings/SettingsView/useUpdateSSLConfigMutation.tsx @@ -1,6 +1,6 @@ import { useMutation } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { mutationOptions, withError } from '@/react-tools/react-query'; export function useUpdateSSLConfigMutation() { diff --git a/app/react/portainer/settings/queries/useExperimentalSettings.ts b/app/react/portainer/settings/queries/useExperimentalSettings.ts index dda159ca1..4435d54c7 100644 --- a/app/react/portainer/settings/queries/useExperimentalSettings.ts +++ b/app/react/portainer/settings/queries/useExperimentalSettings.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { withError } from '@/react-tools/react-query'; import { ExperimentalFeatures } from '../types'; diff --git a/app/react/portainer/settings/queries/useExperimentalSettingsMutation.ts b/app/react/portainer/settings/queries/useExperimentalSettingsMutation.ts index 63ac1fdf5..efe6be9a3 100644 --- a/app/react/portainer/settings/queries/useExperimentalSettingsMutation.ts +++ b/app/react/portainer/settings/queries/useExperimentalSettingsMutation.ts @@ -1,6 +1,6 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { mutationOptions, withError, diff --git a/app/react/portainer/settings/queries/useSSLSettings.ts b/app/react/portainer/settings/queries/useSSLSettings.ts index 6692fb129..fbe7bc03b 100644 --- a/app/react/portainer/settings/queries/useSSLSettings.ts +++ b/app/react/portainer/settings/queries/useSSLSettings.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; interface SSLSettings { certPath: string; diff --git a/app/react/portainer/settings/settings.service.ts b/app/react/portainer/settings/settings.service.ts index 5915f5df6..e8287b2dd 100644 --- a/app/react/portainer/settings/settings.service.ts +++ b/app/react/portainer/settings/settings.service.ts @@ -1,4 +1,4 @@ -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { PublicSettingsResponse, DefaultRegistry, Settings } from './types'; diff --git a/app/react/portainer/system/useNodesCount.ts b/app/react/portainer/system/useNodesCount.ts index e01ec834e..1de55d9fe 100644 --- a/app/react/portainer/system/useNodesCount.ts +++ b/app/react/portainer/system/useNodesCount.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { withError } from '@/react-tools/react-query'; import { buildUrl } from './build-url'; diff --git a/app/react/portainer/system/useSystemInfo.ts b/app/react/portainer/system/useSystemInfo.ts index c6f4abe4e..38e0491d9 100644 --- a/app/react/portainer/system/useSystemInfo.ts +++ b/app/react/portainer/system/useSystemInfo.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { withError } from '@/react-tools/react-query'; import { buildUrl } from './build-url'; diff --git a/app/react/portainer/system/useSystemStatus.ts b/app/react/portainer/system/useSystemStatus.ts index 0d447397c..570b87095 100644 --- a/app/react/portainer/system/useSystemStatus.ts +++ b/app/react/portainer/system/useSystemStatus.ts @@ -1,6 +1,6 @@ import { UseQueryOptions, useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { isBE } from '../feature-flags/feature-flags.service'; diff --git a/app/react/portainer/system/useSystemVersion.ts b/app/react/portainer/system/useSystemVersion.ts index f73272341..2d67b7ca1 100644 --- a/app/react/portainer/system/useSystemVersion.ts +++ b/app/react/portainer/system/useSystemVersion.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { buildUrl } from './build-url'; import { queryKeys } from './query-keys'; diff --git a/app/react/portainer/system/useUpgradeEditionMutation.ts b/app/react/portainer/system/useUpgradeEditionMutation.ts index 9cc1694b4..7ed0b9ef7 100644 --- a/app/react/portainer/system/useUpgradeEditionMutation.ts +++ b/app/react/portainer/system/useUpgradeEditionMutation.ts @@ -3,7 +3,7 @@ import { useMutation } from '@tanstack/react-query'; import axios, { isAxiosError, parseAxiosError, -} from '@/portainer/services/axios'; +} from 'Portainer/services/axios/axios'; import { withError } from '@/react-tools/react-query'; import { buildUrl } from './build-url'; diff --git a/app/react/portainer/templates/app-templates/queries/useAppTemplateFile.ts b/app/react/portainer/templates/app-templates/queries/useAppTemplateFile.ts index f876db6e8..1d10cae37 100644 --- a/app/react/portainer/templates/app-templates/queries/useAppTemplateFile.ts +++ b/app/react/portainer/templates/app-templates/queries/useAppTemplateFile.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { AppTemplate } from '../types'; diff --git a/app/react/portainer/templates/app-templates/queries/useAppTemplates.ts b/app/react/portainer/templates/app-templates/queries/useAppTemplates.ts index 4aa42f0ed..18994121d 100644 --- a/app/react/portainer/templates/app-templates/queries/useAppTemplates.ts +++ b/app/react/portainer/templates/app-templates/queries/useAppTemplates.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { useRegistries } from '@/react/portainer/registries/queries/useRegistries'; import { DockerHubViewModel } from '@/portainer/models/dockerhub'; import { Registry } from '@/react/portainer/registries/types/registry'; diff --git a/app/react/portainer/templates/custom-templates/queries/useCreateTemplateMutation.ts b/app/react/portainer/templates/custom-templates/queries/useCreateTemplateMutation.ts index 711bc62d8..d26c182b4 100644 --- a/app/react/portainer/templates/custom-templates/queries/useCreateTemplateMutation.ts +++ b/app/react/portainer/templates/custom-templates/queries/useCreateTemplateMutation.ts @@ -3,7 +3,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; import axios, { json2formData, parseAxiosError, -} from '@/portainer/services/axios'; +} from 'Portainer/services/axios/axios'; import { mutationOptions, withGlobalError, diff --git a/app/react/portainer/templates/custom-templates/queries/useCustomTemplate.ts b/app/react/portainer/templates/custom-templates/queries/useCustomTemplate.ts index 0037035ad..16814f62e 100644 --- a/app/react/portainer/templates/custom-templates/queries/useCustomTemplate.ts +++ b/app/react/portainer/templates/custom-templates/queries/useCustomTemplate.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; import { withGlobalError } from '@/react-tools/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { CustomTemplate } from '../types'; diff --git a/app/react/portainer/templates/custom-templates/queries/useCustomTemplateFile.ts b/app/react/portainer/templates/custom-templates/queries/useCustomTemplateFile.ts index 9589c2511..4e13912fd 100644 --- a/app/react/portainer/templates/custom-templates/queries/useCustomTemplateFile.ts +++ b/app/react/portainer/templates/custom-templates/queries/useCustomTemplateFile.ts @@ -1,6 +1,6 @@ import { useMutation, useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { withGlobalError } from '@/react-tools/react-query'; import { CustomTemplate } from '../types'; diff --git a/app/react/portainer/templates/custom-templates/queries/useCustomTemplates.ts b/app/react/portainer/templates/custom-templates/queries/useCustomTemplates.ts index f9026bebf..66a9905de 100644 --- a/app/react/portainer/templates/custom-templates/queries/useCustomTemplates.ts +++ b/app/react/portainer/templates/custom-templates/queries/useCustomTemplates.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { withGlobalError } from '@/react-tools/react-query'; import { StackType } from '@/react/common/stacks/types'; diff --git a/app/react/portainer/templates/custom-templates/queries/useDeleteTemplateMutation.ts b/app/react/portainer/templates/custom-templates/queries/useDeleteTemplateMutation.ts index 3a6974c1a..737ccaf87 100644 --- a/app/react/portainer/templates/custom-templates/queries/useDeleteTemplateMutation.ts +++ b/app/react/portainer/templates/custom-templates/queries/useDeleteTemplateMutation.ts @@ -5,7 +5,7 @@ import { withGlobalError, withInvalidate, } from '@/react-tools/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { CustomTemplate } from '../types'; diff --git a/app/react/portainer/templates/custom-templates/queries/useUpdateTemplateMutation.ts b/app/react/portainer/templates/custom-templates/queries/useUpdateTemplateMutation.ts index 7347b45a9..7abd0fd36 100644 --- a/app/react/portainer/templates/custom-templates/queries/useUpdateTemplateMutation.ts +++ b/app/react/portainer/templates/custom-templates/queries/useUpdateTemplateMutation.ts @@ -1,6 +1,6 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { mutationOptions, withGlobalError, diff --git a/app/react/portainer/users/RolesView/useRbacRoles.ts b/app/react/portainer/users/RolesView/useRbacRoles.ts index b11480a00..891b5a01c 100644 --- a/app/react/portainer/users/RolesView/useRbacRoles.ts +++ b/app/react/portainer/users/RolesView/useRbacRoles.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { RbacRole } from './types'; diff --git a/app/react/portainer/users/queries/useCreateUserMutation.ts b/app/react/portainer/users/queries/useCreateUserMutation.ts index 918e38722..da8b4803c 100644 --- a/app/react/portainer/users/queries/useCreateUserMutation.ts +++ b/app/react/portainer/users/queries/useCreateUserMutation.ts @@ -1,6 +1,6 @@ import { useQueryClient, useMutation } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { withGlobalError, withInvalidate } from '@/react-tools/react-query'; import { userQueryKeys } from '@/portainer/users/queries/queryKeys'; import { buildUrl } from '@/portainer/users/user.service'; diff --git a/app/react/portainer/users/queries/useDeleteUserMutation.ts b/app/react/portainer/users/queries/useDeleteUserMutation.ts index bdfaedcc7..42410348d 100644 --- a/app/react/portainer/users/queries/useDeleteUserMutation.ts +++ b/app/react/portainer/users/queries/useDeleteUserMutation.ts @@ -1,6 +1,6 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { withGlobalError, withInvalidate } from '@/react-tools/react-query'; import { UserId } from '@/portainer/users/types'; import { buildUrl } from '@/portainer/users/user.service'; diff --git a/app/react/portainer/users/teams/queries/useAddMemberMutation.ts b/app/react/portainer/users/teams/queries/useAddMemberMutation.ts index 87dfeb296..e75f17484 100644 --- a/app/react/portainer/users/teams/queries/useAddMemberMutation.ts +++ b/app/react/portainer/users/teams/queries/useAddMemberMutation.ts @@ -2,7 +2,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; import { promiseSequence } from '@/portainer/helpers/promise-utils'; import { UserId } from '@/portainer/users/types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { withGlobalError, withInvalidate } from '@/react-tools/react-query'; import { TeamId, TeamRole } from '../types'; diff --git a/app/react/portainer/users/teams/queries/useAddTeamMutation.ts b/app/react/portainer/users/teams/queries/useAddTeamMutation.ts index 85791f74c..424769274 100644 --- a/app/react/portainer/users/teams/queries/useAddTeamMutation.ts +++ b/app/react/portainer/users/teams/queries/useAddTeamMutation.ts @@ -1,6 +1,6 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { UserId } from '@/portainer/users/types'; import { withGlobalError, withInvalidate } from '@/react-tools/react-query'; diff --git a/app/react/portainer/users/teams/queries/useDeleteTeamMutation.ts b/app/react/portainer/users/teams/queries/useDeleteTeamMutation.ts index 426b9ca2e..a4191f4b5 100644 --- a/app/react/portainer/users/teams/queries/useDeleteTeamMutation.ts +++ b/app/react/portainer/users/teams/queries/useDeleteTeamMutation.ts @@ -1,6 +1,6 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { mutationOptions, withGlobalError, diff --git a/app/react/portainer/users/teams/queries/useRemoveMemberMutation.ts b/app/react/portainer/users/teams/queries/useRemoveMemberMutation.ts index 3e63e9b83..b54f8e4df 100644 --- a/app/react/portainer/users/teams/queries/useRemoveMemberMutation.ts +++ b/app/react/portainer/users/teams/queries/useRemoveMemberMutation.ts @@ -2,7 +2,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; import { promiseSequence } from '@/portainer/helpers/promise-utils'; import { UserId } from '@/portainer/users/types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { withGlobalError, withInvalidate } from '@/react-tools/react-query'; import { TeamId, TeamMembership, TeamMembershipId } from '../types'; diff --git a/app/react/portainer/users/teams/queries/useTeam.ts b/app/react/portainer/users/teams/queries/useTeam.ts index adc8d8caa..73a24fa47 100644 --- a/app/react/portainer/users/teams/queries/useTeam.ts +++ b/app/react/portainer/users/teams/queries/useTeam.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { withGlobalError } from '@/react-tools/react-query'; import { Team, TeamId } from '../types'; diff --git a/app/react/portainer/users/teams/queries/useTeamMemberships.ts b/app/react/portainer/users/teams/queries/useTeamMemberships.ts index e690e3958..4f57cef6c 100644 --- a/app/react/portainer/users/teams/queries/useTeamMemberships.ts +++ b/app/react/portainer/users/teams/queries/useTeamMemberships.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { withGlobalError } from '@/react-tools/react-query'; import { TeamId, TeamMembership } from '../types'; diff --git a/app/react/portainer/users/teams/queries/useTeams.ts b/app/react/portainer/users/teams/queries/useTeams.ts index c81c876aa..15d717700 100644 --- a/app/react/portainer/users/teams/queries/useTeams.ts +++ b/app/react/portainer/users/teams/queries/useTeams.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { withGlobalError } from '@/react-tools/react-query'; import { Team } from '../types'; diff --git a/app/react/portainer/users/teams/queries/useUpdateRoleMutation.ts b/app/react/portainer/users/teams/queries/useUpdateRoleMutation.ts index b794cd044..61b7e36df 100644 --- a/app/react/portainer/users/teams/queries/useUpdateRoleMutation.ts +++ b/app/react/portainer/users/teams/queries/useUpdateRoleMutation.ts @@ -1,6 +1,6 @@ import { useQueryClient, useMutation } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { UserId } from '@/portainer/users/types'; import { withGlobalError, withInvalidate } from '@/react-tools/react-query'; diff --git a/app/react/portainer/webhooks/useCreateWebhook.ts b/app/react/portainer/webhooks/useCreateWebhook.ts index 60e67d475..6d1c6ad06 100644 --- a/app/react/portainer/webhooks/useCreateWebhook.ts +++ b/app/react/portainer/webhooks/useCreateWebhook.ts @@ -1,6 +1,6 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { withGlobalError } from '@/react-tools/react-query'; import { EnvironmentId } from '../environments/types'; diff --git a/app/react/portainer/webhooks/useDeleteWebhook.ts b/app/react/portainer/webhooks/useDeleteWebhook.ts index d65683a2d..7c384b824 100644 --- a/app/react/portainer/webhooks/useDeleteWebhook.ts +++ b/app/react/portainer/webhooks/useDeleteWebhook.ts @@ -1,7 +1,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; import { Webhook } from '@/react/portainer/webhooks/types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { withGlobalError } from '@/react-tools/react-query'; import { queryKeys } from './query-keys'; diff --git a/app/react/portainer/webhooks/useUpdateWebhook.ts b/app/react/portainer/webhooks/useUpdateWebhook.ts index 18f79783e..ee5379778 100644 --- a/app/react/portainer/webhooks/useUpdateWebhook.ts +++ b/app/react/portainer/webhooks/useUpdateWebhook.ts @@ -2,7 +2,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; import { RegistryId } from '@/react/portainer/registries/types/registry'; import { Webhook } from '@/react/portainer/webhooks/types'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { withGlobalError } from '@/react-tools/react-query'; import { queryKeys } from './query-keys'; diff --git a/app/react/portainer/webhooks/useWebhooks.ts b/app/react/portainer/webhooks/useWebhooks.ts index 60e4d1d9b..dc918ec43 100644 --- a/app/react/portainer/webhooks/useWebhooks.ts +++ b/app/react/portainer/webhooks/useWebhooks.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@/portainer/services/axios'; +import axios, { parseAxiosError } from 'Portainer/services/axios/axios'; import { buildUrl } from './build-url'; import { queryKeys } from './query-keys';