refactor(environments): move environments ts code to react [EE-3443] (#7747)

app/azure/index.ts

@@ -1,7 +1,7 @@
 import angular from 'angular';
 import { StateRegistry, StateService } from '@uirouter/angularjs';
 
-import { Environment } from '@/portainer/environments/types';
+import { Environment } from '@/react/portainer/environments/types';
 import { notifyError } from '@/portainer/services/notifications';
 import { EndpointProvider, StateManager } from '@/portainer/services/types';
 

app/docker/__module.js

@@ -1,6 +1,6 @@
 import angular from 'angular';
 
-import { EnvironmentStatus } from '@/portainer/environments/types';
+import { EnvironmentStatus } from '@/react/portainer/environments/types';
 
 import { reactModule } from './react';
 

app/docker/services/system.service.ts

@@ -1,6 +1,6 @@
 import { useQuery } from 'react-query';
 
-import { EnvironmentId } from '@/portainer/environments/types';
+import { EnvironmentId } from '@/react/portainer/environments/types';
 import axios, { parseAxiosError } from '@/portainer/services/axios';
 
 export interface VersionResponse {

app/edge/EdgeDevices/EdgeDevicesView/AMTDevicesDatatable/AMTDevicesDatatable.tsx

@@ -3,7 +3,7 @@ import { usePagination, useTable } from 'react-table';
 import { Device } from '@/portainer/hostmanagement/open-amt/model';
 import { useAMTDevices } from '@/edge/EdgeDevices/EdgeDevicesView/AMTDevicesDatatable/useAMTDevices';
 import { RowProvider } from '@/edge/EdgeDevices/EdgeDevicesView/AMTDevicesDatatable/columns/RowContext';
-import { EnvironmentId } from '@/portainer/environments/types';
+import { EnvironmentId } from '@/react/portainer/environments/types';
 import PortainerError from '@/portainer/error';
 
 import { InnerDatatable } from '@@/datatables/InnerDatatable';

app/edge/EdgeDevices/EdgeDevicesView/AMTDevicesDatatable/columns/RowContext.tsx

@@ -1,6 +1,6 @@
 import { PropsWithChildren, useMemo, useReducer } from 'react';
 
-import { EnvironmentId } from '@/portainer/environments/types';
+import { EnvironmentId } from '@/react/portainer/environments/types';
 
 import { createRowContext } from '@@/datatables/RowContext';
 

app/edge/EdgeDevices/EdgeDevicesView/AMTDevicesDatatable/useAMTDevices.tsx

@@ -2,7 +2,7 @@ import { useEffect, useMemo } from 'react';
 import { useQuery } from 'react-query';
 
 import { getDevices } from '@/portainer/hostmanagement/open-amt/open-amt.service';
-import { EnvironmentId } from '@/portainer/environments/types';
+import { EnvironmentId } from '@/react/portainer/environments/types';
 import PortainerError from '@/portainer/error';
 import * as notifications from '@/portainer/services/notifications';
 

app/edge/EdgeDevices/EdgeDevicesView/EdgeDevicesDatatable/EdgeDevicesDatatable.tsx

@@ -2,7 +2,7 @@ import { useTable, useExpanded, useSortBy, useFilters } from 'react-table';
 import { useRowSelectColumn } from '@lineup-lite/hooks';
 import _ from 'lodash';
 
-import { Environment } from '@/portainer/environments/types';
+import { Environment } from '@/react/portainer/environments/types';
 import { AMTDevicesDatatable } from '@/edge/EdgeDevices/EdgeDevicesView/AMTDevicesDatatable/AMTDevicesDatatable';
 import { EnvironmentGroup } from '@/portainer/environment-groups/types';
 

app/edge/EdgeDevices/EdgeDevicesView/EdgeDevicesDatatable/EdgeDevicesDatatableActions.tsx

@@ -1,6 +1,6 @@
 import { useRouter } from '@uirouter/react';
 
-import type { Environment } from '@/portainer/environments/types';
+import type { Environment } from '@/react/portainer/environments/types';
 import {
   confirmAsync,
   confirmDestructiveAsync,
@@ -8,7 +8,7 @@ import {
 import { promptAsync } from '@/portainer/services/modal.service/prompt';
 import * as notifications from '@/portainer/services/notifications';
 import { activateDevice } from '@/portainer/hostmanagement/open-amt/open-amt.service';
-import { deleteEndpoint } from '@/portainer/environments/environment.service';
+import { deleteEndpoint } from '@/react/portainer/environments/environment.service';
 
 import { Button } from '@@/buttons';
 import { Link } from '@@/Link';

app/edge/EdgeDevices/EdgeDevicesView/EdgeDevicesDatatable/EdgeDevicesDatatableContainer.tsx

@@ -1,7 +1,7 @@
 import { useState } from 'react';
 
-import { useEnvironmentList } from '@/portainer/environments/queries/useEnvironmentList';
+import { useEnvironmentList } from '@/react/portainer/environments/queries/useEnvironmentList';
-import { EdgeTypes, Environment } from '@/portainer/environments/types';
+import { EdgeTypes, Environment } from '@/react/portainer/environments/types';
 import { useDebounce } from '@/portainer/hooks/useDebounce';
 
 import { useSearchBarState } from '@@/datatables/SearchBar';

app/edge/EdgeDevices/EdgeDevicesView/EdgeDevicesDatatable/columns/actions.tsx

@@ -2,10 +2,10 @@ import { CellProps, Column } from 'react-table';
 import { MenuItem, MenuLink } from '@reach/menu-button';
 import { useRouter, useSref } from '@uirouter/react';
 
-import { Environment } from '@/portainer/environments/types';
+import { Environment } from '@/react/portainer/environments/types';
-import { snapshotEndpoint } from '@/portainer/environments/environment.service';
+import { snapshotEndpoint } from '@/react/portainer/environments/environment.service';
 import * as notifications from '@/portainer/services/notifications';
-import { getRoute } from '@/portainer/environments/utils';
+import { getRoute } from '@/react/portainer/environments/utils';
 
 import { ActionsMenu } from '@@/datatables/ActionsMenu';
 

app/edge/EdgeDevices/EdgeDevicesView/EdgeDevicesDatatable/columns/group.tsx

@@ -1,6 +1,6 @@
 import { Column } from 'react-table';
 
-import { Environment } from '@/portainer/environments/types';
+import { Environment } from '@/react/portainer/environments/types';
 
 import { DefaultFilter } from '@@/datatables/Filter';
 

app/edge/EdgeDevices/EdgeDevicesView/EdgeDevicesDatatable/columns/heartbeat.tsx

@@ -1,6 +1,6 @@
 import { CellProps, Column } from 'react-table';
 
-import { Environment } from '@/portainer/environments/types';
+import { Environment } from '@/react/portainer/environments/types';
 import { EdgeIndicator } from '@/portainer/home/EnvironmentList/EnvironmentItem/EdgeIndicator';
 
 export const heartbeat: Column<Environment> = {

app/edge/EdgeDevices/EdgeDevicesView/EdgeDevicesDatatable/columns/name.tsx

@@ -1,6 +1,6 @@
 import { CellProps, Column } from 'react-table';
 
-import { Environment } from '@/portainer/environments/types';
+import { Environment } from '@/react/portainer/environments/types';
 
 import { Link } from '@@/Link';
 import { ExpandingCell } from '@@/datatables/ExpandingCell';

app/edge/EdgeDevices/WaitingRoomView/Datatable/Datatable.tsx

@@ -8,7 +8,7 @@ import {
 } from 'react-table';
 import { useRowSelectColumn } from '@lineup-lite/hooks';
 
-import { Environment } from '@/portainer/environments/types';
+import { Environment } from '@/react/portainer/environments/types';
 import { notifySuccess } from '@/portainer/services/notifications';
 
 import { Button } from '@@/buttons';

app/edge/EdgeDevices/WaitingRoomView/WaitingRoomView.tsx

@@ -1,7 +1,7 @@
 import { useRouter } from '@uirouter/react';
 
-import { useEnvironmentList } from '@/portainer/environments/queries/useEnvironmentList';
+import { useEnvironmentList } from '@/react/portainer/environments/queries/useEnvironmentList';
-import { EdgeTypes } from '@/portainer/environments/types';
+import { EdgeTypes } from '@/react/portainer/environments/types';
 
 import { InformationPanel } from '@@/InformationPanel';
 import { TextTip } from '@@/Tip/TextTip';

app/edge/EdgeDevices/WaitingRoomView/queries.ts

@@ -1,6 +1,6 @@
 import { useMutation, useQueryClient } from 'react-query';
 
-import { EnvironmentId } from '@/portainer/environments/types';
+import { EnvironmentId } from '@/react/portainer/environments/types';
 import axios, { parseAxiosError } from '@/portainer/services/axios';
 import { promiseSequence } from '@/portainer/helpers/promise-utils';
 

app/edge/components/group-form/groupFormController.js

@@ -1,7 +1,7 @@
 import _ from 'lodash-es';
 import { confirmDestructiveAsync } from '@/portainer/services/modal.service/confirm';
-import { EdgeTypes } from '@/portainer/environments/types';
+import { EdgeTypes } from '@/react/portainer/environments/types';
-import { getEnvironments } from '@/portainer/environments/environment.service';
+import { getEnvironments } from '@/react/portainer/environments/environment.service';
 
 export class EdgeGroupFormController {
   /* @ngInject */

app/edge/views/edge-jobs/edgeJob/edgeJobController.js

@@ -1,5 +1,5 @@
 import _ from 'lodash-es';
-import { getEnvironments } from '@/portainer/environments/environment.service';
+import { getEnvironments } from '@/react/portainer/environments/environment.service';
 
 export class EdgeJobController {
   /* @ngInject */

app/edge/views/edge-stacks/editEdgeStackView/editEdgeStackViewController.js

@@ -1,5 +1,5 @@
 import _ from 'lodash-es';
-import { getEnvironments } from '@/portainer/environments/environment.service';
+import { getEnvironments } from '@/react/portainer/environments/environment.service';
 
 export class EditEdgeStackViewController {
   /* @ngInject */

app/kubernetes/react/views/networks/ingresses/queries.ts

@@ -1,6 +1,6 @@
 import { useQuery, useMutation, useQueryClient } from 'react-query';
 
-import { EnvironmentId } from '@/portainer/environments/types';
+import { EnvironmentId } from '@/react/portainer/environments/types';
 import {
   mutationOptions,
   withError,

app/kubernetes/react/views/networks/ingresses/service.ts

@@ -1,5 +1,5 @@
 import axios, { parseAxiosError } from '@/portainer/services/axios';
-import { EnvironmentId } from '@/portainer/environments/types';
+import { EnvironmentId } from '@/react/portainer/environments/types';
 
 import { Ingress, DeleteIngressesRequest, IngressController } from './types';
 

app/kubernetes/react/views/networks/services/queries.ts

@@ -1,6 +1,6 @@
 import { useQuery } from 'react-query';
 
-import { EnvironmentId } from '@/portainer/environments/types';
+import { EnvironmentId } from '@/react/portainer/environments/types';
 import { error as notifyError } from '@/portainer/services/notifications';
 
 import { getServices } from './service';

app/kubernetes/react/views/networks/services/service.ts

@@ -1,5 +1,5 @@
 import axios, { parseAxiosError } from '@/portainer/services/axios';
-import { EnvironmentId } from '@/portainer/environments/types';
+import { EnvironmentId } from '@/react/portainer/environments/types';
 
 import { Service } from './types';
 

app/kubernetes/services/kubeconfig.service.ts

@@ -1,7 +1,7 @@
 import { saveAs } from 'file-saver';
 
 import axios, { parseAxiosError } from '@/portainer/services/axios';
-import { EnvironmentId } from '@/portainer/environments/types';
+import { EnvironmentId } from '@/react/portainer/environments/types';
 
 const baseUrl = 'kubernetes';
 

app/portainer/components/associated-endpoints-selector/associatedEndpointsSelectorController.js

@@ -1,8 +1,8 @@
 import angular from 'angular';
 import _ from 'lodash-es';
 
-import { EdgeTypes } from '@/portainer/environments/types';
+import { EdgeTypes } from '@/react/portainer/environments/types';
-import { getEnvironments } from '@/portainer/environments/environment.service';
+import { getEnvironments } from '@/react/portainer/environments/environment.service';
 import { getTags } from '@/portainer/tags/tags.service';
 
 class AssoicatedEndpointsSelectorController {

app/portainer/components/forms/group-form/groupFormController.js

@@ -1,6 +1,6 @@
 import _ from 'lodash-es';
 import angular from 'angular';
-import { endpointsByGroup } from '@/portainer/environments/environment.service';
+import { endpointsByGroup } from '@/react/portainer/environments/environment.service';
 import { notifyError } from '@/portainer/services/notifications';
 
 class GroupFormController {

app/portainer/home/EnvironmentList/EnvironmentItem/AgentVersionTag.tsx

@@ -1,10 +1,10 @@
 import { Zap } from 'react-feather';
 
-import { EnvironmentType } from '@/portainer/environments/types';
+import { EnvironmentType } from '@/react/portainer/environments/types';
 import {
   isAgentEnvironment,
   isEdgeEnvironment,
-} from '@/portainer/environments/utils';
+} from '@/react/portainer/environments/utils';
 
 interface Props {
   type: EnvironmentType;

app/portainer/home/EnvironmentList/EnvironmentItem/EdgeIndicator.tsx

@@ -1,7 +1,7 @@
 import clsx from 'clsx';
 
 import { isoDateFromTimestamp } from '@/portainer/filters/filters';
-import { Environment } from '@/portainer/environments/types';
+import { Environment } from '@/react/portainer/environments/types';
 import { usePublicSettings } from '@/react/portainer/settings/queries';
 import { PublicSettingsViewModel } from '@/portainer/models/settings';
 

app/portainer/home/EnvironmentList/EnvironmentItem/EnvironmentIcon.tsx

@@ -4,7 +4,7 @@ import { environmentTypeIcon } from '@/portainer/filters/filters';
 import dockerEdge from '@/assets/images/edge_endpoint.png';
 import kube from '@/assets/images/kubernetes_endpoint.png';
 import kubeEdge from '@/assets/images/kubernetes_edge_endpoint.png';
-import { EnvironmentType } from '@/portainer/environments/types';
+import { EnvironmentType } from '@/react/portainer/environments/types';
 import azure from '@/assets/ico/vendor/azure.svg';
 import docker from '@/assets/ico/vendor/docker.svg';
 

app/portainer/home/EnvironmentList/EnvironmentItem/EnvironmentItem.stories.tsx

@@ -4,7 +4,7 @@ import {
   Environment,
   EnvironmentStatus,
   EnvironmentType,
-} from '@/portainer/environments/types';
+} from '@/react/portainer/environments/types';
 import { createMockEnvironment } from '@/react-tools/test-mocks';
 
 import { EnvironmentItem } from './EnvironmentItem';

app/portainer/home/EnvironmentList/EnvironmentItem/EnvironmentItem.test.tsx

@@ -2,7 +2,7 @@ import {
   EnvironmentGroup,
   EnvironmentGroupId,
 } from '@/portainer/environment-groups/types';
-import { Environment } from '@/portainer/environments/types';
+import { Environment } from '@/react/portainer/environments/types';
 import { UserContext } from '@/portainer/hooks/useUser';
 import { UserViewModel } from '@/portainer/models/user';
 import { Tag } from '@/portainer/tags/types';

app/portainer/home/EnvironmentList/EnvironmentItem/EnvironmentItem.tsx

@@ -7,12 +7,15 @@ import {
   humanize,
   stripProtocol,
 } from '@/portainer/filters/filters';
-import { type Environment, PlatformType } from '@/portainer/environments/types';
+import {
+  type Environment,
+  PlatformType,
+} from '@/react/portainer/environments/types';
 import {
   getPlatformType,
   isDockerEnvironment,
   isEdgeEnvironment,
-} from '@/portainer/environments/utils';
+} from '@/react/portainer/environments/utils';
 import type { TagId } from '@/portainer/tags/types';
 import { useTags } from '@/portainer/tags/queries';
 import { useUser } from '@/portainer/hooks/useUser';

app/portainer/home/EnvironmentList/EnvironmentItem/EnvironmentStats.tsx

@@ -1,5 +1,8 @@
-import { Environment, PlatformType } from '@/portainer/environments/types';
+import {
-import { getPlatformType } from '@/portainer/environments/utils';
+  Environment,
+  PlatformType,
+} from '@/react/portainer/environments/types';
+import { getPlatformType } from '@/react/portainer/environments/utils';
 
 import { EnvironmentStatsDocker } from './EnvironmentStatsDocker';
 import { EnvironmentStatsKubernetes } from './EnvironmentStatsKubernetes';

app/portainer/home/EnvironmentList/EnvironmentItem/EnvironmentStatsDocker.tsx

@@ -1,7 +1,7 @@
 import {
   DockerSnapshot,
   EnvironmentType,
-} from '@/portainer/environments/types';
+} from '@/react/portainer/environments/types';
 import { addPlural } from '@/portainer/helpers/strings';
 
 import { AgentVersionTag } from './AgentVersionTag';

app/portainer/home/EnvironmentList/EnvironmentItem/EnvironmentStatsKubernetes.tsx

@@ -1,7 +1,7 @@
 import {
   EnvironmentType,
   KubernetesSnapshot,
-} from '@/portainer/environments/types';
+} from '@/react/portainer/environments/types';
 import { humanize } from '@/portainer/filters/filters';
 import { addPlural } from '@/portainer/helpers/strings';
 

app/portainer/home/EnvironmentList/EnvironmentItem/EnvironmentStatusBadge.tsx

@@ -1,6 +1,6 @@
 import clsx from 'clsx';
 
-import { EnvironmentStatus } from '@/portainer/environments/types';
+import { EnvironmentStatus } from '@/react/portainer/environments/types';
 
 interface Props {
   status: EnvironmentStatus;

app/portainer/home/EnvironmentList/EnvironmentList.test.tsx

@@ -1,4 +1,4 @@
-import { Environment } from '@/portainer/environments/types';
+import { Environment } from '@/react/portainer/environments/types';
 import { UserContext } from '@/portainer/hooks/useUser';
 import { UserViewModel } from '@/portainer/models/user';
 import { renderWithQueryClient } from '@/react-tools/test-utils';

app/portainer/home/EnvironmentList/EnvironmentList.tsx

@@ -10,7 +10,7 @@ import {
   EnvironmentStatus,
   PlatformType,
   EdgeTypes,
-} from '@/portainer/environments/types';
+} from '@/react/portainer/environments/types';
 import { EnvironmentGroupId } from '@/portainer/environment-groups/types';
 import {
   HomepageFilter,
@@ -20,12 +20,12 @@ import { useDebounce } from '@/portainer/hooks/useDebounce';
 import {
   refetchIfAnyOffline,
   useEnvironmentList,
-} from '@/portainer/environments/queries/useEnvironmentList';
+} from '@/react/portainer/environments/queries/useEnvironmentList';
 import { useGroups } from '@/portainer/environment-groups/queries';
 import { useTags } from '@/portainer/tags/queries';
 import { Filter } from '@/portainer/home/types';
-import { useAgentVersionsList } from '@/portainer/environments/queries/useAgentVersionsList';
+import { useAgentVersionsList } from '@/react/portainer/environments/queries/useAgentVersionsList';
-import { EnvironmentsQueryParams } from '@/portainer/environments/environment.service';
+import { EnvironmentsQueryParams } from '@/react/portainer/environments/environment.service';
 import { useUser } from '@/portainer/hooks/useUser';
 
 import { TableFooter } from '@@/datatables/TableFooter';

app/portainer/home/EnvironmentList/KubeconfigButton/KubeconfigButton.tsx

@@ -1,10 +1,10 @@
 import { useState } from 'react';
 import { Download } from 'react-feather';
 
-import { Environment } from '@/portainer/environments/types';
+import { Environment } from '@/react/portainer/environments/types';
-import { isKubernetesEnvironment } from '@/portainer/environments/utils';
+import { isKubernetesEnvironment } from '@/react/portainer/environments/utils';
 import { trackEvent } from '@/angulartics.matomo/analytics-services';
-import { Query } from '@/portainer/environments/queries/useEnvironmentList';
+import { Query } from '@/react/portainer/environments/queries/useEnvironmentList';
 
 import { Button } from '@@/buttons';
 

app/portainer/home/EnvironmentList/KubeconfigButton/KubeconfigPrompt.tsx

@@ -5,13 +5,13 @@ import { DialogOverlay } from '@reach/dialog';
 
 import * as kcService from '@/kubernetes/services/kubeconfig.service';
 import * as notifications from '@/portainer/services/notifications';
-import { EnvironmentType } from '@/portainer/environments/types';
+import { EnvironmentType } from '@/react/portainer/environments/types';
 import { usePaginationLimitState } from '@/portainer/hooks/usePaginationLimitState';
 import { usePublicSettings } from '@/react/portainer/settings/queries';
 import {
   Query,
   useEnvironmentList,
-} from '@/portainer/environments/queries/useEnvironmentList';
+} from '@/react/portainer/environments/queries/useEnvironmentList';
 
 import { PaginationControls } from '@@/PaginationControls';
 import { Checkbox } from '@@/form-components/Checkbox';

app/portainer/home/EnvironmentList/KubeconfigButton/KubeconfigSelection.ts

@@ -1,6 +1,6 @@
 import { useState } from 'react';
 
-import { EnvironmentId } from '@/portainer/environments/types';
+import { EnvironmentId } from '@/react/portainer/environments/types';
 
 export function useSelection() {
   const [selection, setSelection] = useState<Record<EnvironmentId, boolean>>(

app/portainer/home/HomeView.tsx

@@ -1,12 +1,13 @@
 import { useRouter } from '@uirouter/react';
 import { useState } from 'react';
 
+import { Environment } from '@/react/portainer/environments/types';
+import { snapshotEndpoints } from '@/react/portainer/environments/environment.service';
+import { isEdgeEnvironment } from '@/react/portainer/environments/utils';
+
 import { PageHeader } from '@@/PageHeader';
 
 import * as notifications from '../services/notifications';
-import { Environment } from '../environments/types';
-import { snapshotEndpoints } from '../environments/environment.service';
-import { isEdgeEnvironment } from '../environments/utils';
 import { confirmAsync } from '../services/modal.service/confirm';
 import { buildTitle } from '../services/modal.service/utils';
 

app/portainer/hooks/useCurrentEnvironment.ts

@@ -1,4 +1,4 @@
-import { useEnvironment } from '../environments/queries/useEnvironment';
+import { useEnvironment } from '@/react/portainer/environments/queries/useEnvironment';
 
 import { useEnvironmentId } from './useEnvironmentId';
 

app/portainer/hooks/useUser.tsx

@@ -11,10 +11,10 @@ import {
 } from 'react';
 
 import { isAdmin } from '@/portainer/users/user.helpers';
+import { EnvironmentId } from '@/react/portainer/environments/types';
 
 import { getUser } from '../users/user.service';
 import { User, UserId } from '../users/types';
-import { EnvironmentId } from '../environments/types';
 
 import { useLocalStorage } from './useLocalStorage';
 

app/portainer/hostmanagement/open-amt/open-amt.service.ts

@@ -1,5 +1,5 @@
 import axios, { parseAxiosError } from '@/portainer/services/axios';
-import { EnvironmentId } from '@/portainer/environments/types';
+import { EnvironmentId } from '@/react/portainer/environments/types';
 
 import {
   OpenAMTConfiguration,

app/portainer/rbac/components/access-viewer/access-viewer.controller.js

@@ -1,7 +1,7 @@
 import _ from 'lodash-es';
 import { isLimitedToBE } from '@/portainer/feature-flags/feature-flags.service';
 
-import { getEnvironments } from '@/portainer/environments/environment.service';
+import { getEnvironments } from '@/react/portainer/environments/environment.service';
 import AccessViewerPolicyModel from '../../models/access';
 
 export default class AccessViewerController {

app/portainer/services/nameValidator.js

@@ -1,5 +1,5 @@
 import angular from 'angular';
-import { getEnvironments } from '../environments/environment.service';
+import { getEnvironments } from '@/react/portainer/environments/environment.service';
 
 angular.module('portainer.app').factory('NameValidator', NameValidatorFactory);
 /* @ngInject */

app/portainer/services/types.ts

@@ -1,4 +1,4 @@
-import { Environment } from '../environments/types';
+import { Environment } from '@/react/portainer/environments/types';
 
 export interface EndpointProvider {
   setEndpointID(id: Environment['Id']): void;

app/portainer/users/types.ts

@@ -1,4 +1,4 @@
-import { EnvironmentId } from '../environments/types';
+import { EnvironmentId } from '@/react/portainer/environments/types';
 
 export type UserId = number;
 

app/portainer/views/auth/authController.js

@@ -1,6 +1,6 @@
 import angular from 'angular';
 import uuidv4 from 'uuid/v4';
-import { getEnvironments } from '@/portainer/environments/environment.service';
+import { getEnvironments } from '@/react/portainer/environments/environment.service';
 
 class AuthenticationController {
   /* @ngInject */

app/portainer/views/endpoints/edit/endpointController.js

@@ -6,7 +6,7 @@ import { EndpointSecurityFormData } from '@/portainer/components/endpointSecurit
 import EndpointHelper from '@/portainer/helpers/endpointHelper';
 import { getAMTInfo } from 'Portainer/hostmanagement/open-amt/open-amt.service';
 import { confirmDestructiveAsync } from '@/portainer/services/modal.service/confirm';
-import { isEdgeEnvironment } from '@/portainer/environments/utils';
+import { isEdgeEnvironment } from '@/react/portainer/environments/utils';
 
 import { commandsTabs } from '@/react/edge/components/EdgeScriptForm/scripts';
 import { GpusListAngular } from '@/react/portainer/environments/wizard/EnvironmentsCreationView/shared/Hardware/GpusList';

app/portainer/views/endpoints/endpointsController.js

@@ -1,6 +1,6 @@
 import { map } from 'lodash';
 import EndpointHelper from '@/portainer/helpers/endpointHelper';
-import { getEnvironments } from '@/portainer/environments/environment.service';
+import { getEnvironments } from '@/react/portainer/environments/environment.service';
 
 export class EndpointsController {
   /* @ngInject */

app/portainer/views/init/admin/initAdminController.js

@@ -1,4 +1,4 @@
-import { getEnvironments } from '@/portainer/environments/environment.service';
+import { getEnvironments } from '@/react/portainer/environments/environment.service';
 
 angular.module('portainer.app').controller('InitAdminController', [
   '$scope',

app/portainer/views/stacks/edit/stackController.js

@@ -1,7 +1,7 @@
 import { ResourceControlType } from '@/react/portainer/access-control/types';
 import { AccessControlFormData } from 'Portainer/components/accessControlForm/porAccessControlFormModel';
 import { FeatureId } from 'Portainer/feature-flags/enums';
-import { getEnvironments } from '@/portainer/environments/environment.service';
+import { getEnvironments } from '@/react/portainer/environments/environment.service';
 import { StackStatus, StackType } from '@/react/docker/stacks/types';
 
 angular.module('portainer.app').controller('StackController', [

app/react-tools/test-mocks.ts

@@ -2,7 +2,7 @@ import _ from 'lodash';
 
 import { Team } from '@/react/portainer/users/teams/types';
 import { Role, User, UserId } from '@/portainer/users/types';
-import { Environment } from '@/portainer/environments/types';
+import { Environment } from '@/react/portainer/environments/types';
 
 export function createMockUsers(
   count: number,

app/react/azure/container-instances/CreateView/useCreateInstanceMutation.tsx

@@ -2,7 +2,7 @@ import { useMutation, useQueryClient } from 'react-query';
 
 import { createContainerGroup } from '@/react/azure/services/container-groups.service';
 import { queryKeys } from '@/react/azure/queries/query-keys';
-import { EnvironmentId } from '@/portainer/environments/types';
+import { EnvironmentId } from '@/react/portainer/environments/types';
 import PortainerError from '@/portainer/error';
 import {
   ContainerGroup,

app/react/azure/container-instances/CreateView/useLoadFormState.ts

@@ -1,4 +1,4 @@
-import { EnvironmentId } from '@/portainer/environments/types';
+import { EnvironmentId } from '@/react/portainer/environments/types';
 import {
   ContainerInstanceFormValues,
   ProviderViewModel,

app/react/azure/container-instances/ListView/ListView.tsx

@@ -3,7 +3,7 @@ import { useMutation, useQueryClient } from 'react-query';
 import { deleteContainerGroup } from '@/react/azure/services/container-groups.service';
 import { useEnvironmentId } from '@/portainer/hooks/useEnvironmentId';
 import { notifyError, notifySuccess } from '@/portainer/services/notifications';
-import { EnvironmentId } from '@/portainer/environments/types';
+import { EnvironmentId } from '@/react/portainer/environments/types';
 import { promiseSequence } from '@/portainer/helpers/promise-utils';
 import { useContainerGroups } from '@/react/azure/queries/useContainerGroups';
 import { useSubscriptions } from '@/react/azure/queries/useSubscriptions';

app/react/azure/queries/query-keys.ts

@@ -1,4 +1,4 @@
-import { EnvironmentId } from '@/portainer/environments/types';
+import { EnvironmentId } from '@/react/portainer/environments/types';
 
 export const queryKeys = {
   subscriptions: (environmentId: EnvironmentId) =>

app/react/azure/queries/useContainerGroup.ts

@@ -1,6 +1,6 @@
 import { useQuery } from 'react-query';
 
-import { EnvironmentId } from '@/portainer/environments/types';
+import { EnvironmentId } from '@/react/portainer/environments/types';
 import { withError } from '@/react-tools/react-query';
 import axios, { parseAxiosError } from '@/portainer/services/axios';
 

app/react/azure/queries/useContainerGroups.ts

@@ -4,7 +4,7 @@ import { useQueries } from 'react-query';
 
 import { withError } from '@/react-tools/react-query';
 import axios, { parseAxiosError } from '@/portainer/services/axios';
-import { EnvironmentId } from '@/portainer/environments/types';
+import { EnvironmentId } from '@/react/portainer/environments/types';
 
 import { Subscription, ContainerGroup } from '../types';
 

app/react/azure/queries/useProvider.ts

@@ -1,7 +1,7 @@
 import _ from 'lodash';
 import { useQueries } from 'react-query';
 
-import { EnvironmentId } from '@/portainer/environments/types';
+import { EnvironmentId } from '@/react/portainer/environments/types';
 import axios, { parseAxiosError } from '@/portainer/services/axios';
 import { withError } from '@/react-tools/react-query';
 

app/react/azure/queries/useResourceGroup.ts

@@ -1,6 +1,6 @@
 import { useQuery } from 'react-query';
 
-import { EnvironmentId } from '@/portainer/environments/types';
+import { EnvironmentId } from '@/react/portainer/environments/types';
 import axios, { parseAxiosError } from '@/portainer/services/axios';
 import { withError } from '@/react-tools/react-query';
 

app/react/azure/queries/useResourceGroups.ts

@@ -1,7 +1,7 @@
 import _ from 'lodash';
 import { useQueries } from 'react-query';
 
-import { EnvironmentId } from '@/portainer/environments/types';
+import { EnvironmentId } from '@/react/portainer/environments/types';
 import axios, { parseAxiosError } from '@/portainer/services/axios';
 import { withError } from '@/react-tools/react-query';
 

app/react/azure/queries/useSubscription.ts

@@ -1,6 +1,6 @@
 import { useQuery } from 'react-query';
 
-import { EnvironmentId } from '@/portainer/environments/types';
+import { EnvironmentId } from '@/react/portainer/environments/types';
 import axios, { parseAxiosError } from '@/portainer/services/axios';
 import { withError } from '@/react-tools/react-query';
 

app/react/azure/queries/useSubscriptions.ts

@@ -1,7 +1,7 @@
 import { useQuery } from 'react-query';
 
 import axios, { parseAxiosError } from '@/portainer/services/axios';
-import { EnvironmentId } from '@/portainer/environments/types';
+import { EnvironmentId } from '@/react/portainer/environments/types';
 import { withError } from '@/react-tools/react-query';
 
 import { azureErrorParser } from '../services/utils';

app/react/azure/queries/utils.ts

@@ -1,4 +1,4 @@
-import { EnvironmentId } from '@/portainer/environments/types';
+import { EnvironmentId } from '@/react/portainer/environments/types';
 
 export function buildSubscriptionsUrl(
   environmentId: EnvironmentId,

app/react/azure/services/container-groups.service.ts

@@ -1,4 +1,4 @@
-import { EnvironmentId } from '@/portainer/environments/types';
+import { EnvironmentId } from '@/react/portainer/environments/types';
 import axios, { parseAxiosError } from '@/portainer/services/axios';
 
 import { buildContainerGroupUrl } from '../queries/utils';

app/react/docker/containers/ListView/ContainersDatatable/ContainersDatatable.tsx

@@ -1,6 +1,6 @@
 import _ from 'lodash';
 
-import { Environment } from '@/portainer/environments/types';
+import { Environment } from '@/react/portainer/environments/types';
 import type { DockerContainer } from '@/react/docker/containers/types';
 import { useShowGPUsColumn } from '@/react/docker/containers/utils';
 

app/react/docker/containers/ListView/ContainersDatatable/ContainersDatatableActions.tsx

@@ -27,7 +27,7 @@ import {
   startContainer,
   stopContainer,
 } from '@/react/docker/containers/containers.service';
-import type { EnvironmentId } from '@/portainer/environments/types';
+import type { EnvironmentId } from '@/react/portainer/environments/types';
 
 import { Link } from '@@/Link';
 import { ButtonGroup, Button } from '@@/buttons';

app/react/docker/containers/ListView/ContainersDatatable/RowContext.ts

@@ -1,4 +1,4 @@
-import { Environment } from '@/portainer/environments/types';
+import { Environment } from '@/react/portainer/environments/types';
 
 import { createRowContext } from '@@/datatables/RowContext';
 

app/react/docker/containers/ListView/ListView.tsx

@@ -1,6 +1,6 @@
 import { useInfo } from '@/docker/services/system.service';
-import { Environment } from '@/portainer/environments/types';
+import { Environment } from '@/react/portainer/environments/types';
-import { isAgentEnvironment } from '@/portainer/environments/utils';
+import { isAgentEnvironment } from '@/react/portainer/environments/utils';
 
 import { PageHeader } from '@@/PageHeader';
 

app/react/docker/containers/containers.service.ts

@@ -1,4 +1,4 @@
-import { EnvironmentId } from '@/portainer/environments/types';
+import { EnvironmentId } from '@/react/portainer/environments/types';
 import PortainerError from '@/portainer/error';
 import axios from '@/portainer/services/axios';
 import { genericHandler } from '@/docker/rest/response/handlers';

app/react/docker/containers/queries/containers.ts

@@ -1,6 +1,6 @@
 import { useQuery } from 'react-query';
 
-import { EnvironmentId } from '@/portainer/environments/types';
+import { EnvironmentId } from '@/react/portainer/environments/types';
 import axios, { parseAxiosError } from '@/portainer/services/axios';
 
 import { urlBuilder } from '../containers.service';

app/react/docker/containers/queries/gpus.tsx

@@ -1,6 +1,6 @@
 import { useQuery } from 'react-query';
 
-import { EnvironmentId } from '@/portainer/environments/types';
+import { EnvironmentId } from '@/react/portainer/environments/types';
 import axios, { parseAxiosError } from '@/portainer/services/axios';
 
 import { queryKeys } from './query-keys';

app/react/docker/containers/queries/query-keys.ts

@@ -1,4 +1,4 @@
-import { EnvironmentId } from '@/portainer/environments/types';
+import { EnvironmentId } from '@/react/portainer/environments/types';
 
 import { queryKeys as dockerQueryKeys } from '../../queries/utils';
 

app/react/docker/containers/utils.ts

@@ -1,7 +1,7 @@
 import _ from 'lodash';
 
 import { useInfo } from '@/docker/services/system.service';
-import { EnvironmentId } from '@/portainer/environments/types';
+import { EnvironmentId } from '@/react/portainer/environments/types';
 import { ResourceControlViewModel } from '@/react/portainer/access-control/models/ResourceControlViewModel';
 
 import { DockerContainer, ContainerStatus } from './types';

app/react/docker/networks/ItemView/NetworkContainersTable.tsx

@@ -1,5 +1,5 @@
 import { Authorized } from '@/portainer/hooks/useUser';
-import { EnvironmentId } from '@/portainer/environments/types';
+import { EnvironmentId } from '@/react/portainer/environments/types';
 import { Icon } from '@/react/components/Icon';
 
 import { Table, TableContainer, TableTitle } from '@@/datatables';

app/react/docker/networks/network.service.ts

@@ -1,6 +1,6 @@
 import { ContainerId } from '@/react/docker/containers/types';
 import axios, { parseAxiosError } from '@/portainer/services/axios';
-import { EnvironmentId } from '@/portainer/environments/types';
+import { EnvironmentId } from '@/react/portainer/environments/types';
 
 import { NetworkId, DockerNetwork } from './types';
 

app/react/docker/networks/queries.ts

@@ -1,6 +1,6 @@
 import { useQuery, useMutation, useQueryClient } from 'react-query';
 
-import { EnvironmentId } from '@/portainer/environments/types';
+import { EnvironmentId } from '@/react/portainer/environments/types';
 import {
   error as notifyError,
   success as notifySuccess,

app/react/docker/queries/utils.ts

@@ -1,4 +1,4 @@
-import { EnvironmentId } from '@/portainer/environments/types';
+import { EnvironmentId } from '@/react/portainer/environments/types';
 
 export const queryKeys = {
   root: (environmentId: EnvironmentId) => ['docker', environmentId] as const,

app/react/docker/stacks/ItemView/StackContainersDatatable.tsx

@@ -1,7 +1,7 @@
 import _ from 'lodash';
 
 import { DockerContainer } from '@/react/docker/containers/types';
-import { Environment } from '@/portainer/environments/types';
+import { Environment } from '@/react/portainer/environments/types';
 import { createStore } from '@/react/docker/containers/ListView/ContainersDatatable/datatable-store';
 import { useColumns } from '@/react/docker/containers/ListView/ContainersDatatable/columns';
 import { ContainersDatatableActions } from '@/react/docker/containers/ListView/ContainersDatatable/ContainersDatatableActions';

app/react/edge/components/EdgeScriptForm/ScriptTabs.tsx

@@ -1,6 +1,6 @@
 import { useEffect } from 'react';
 
-import { useAgentDetails } from '@/portainer/environments/queries/useAgentDetails';
+import { useAgentDetails } from '@/react/portainer/environments/queries/useAgentDetails';
 
 import { Code } from '@@/Code';
 import { CopyButton } from '@@/buttons/CopyButton';

app/react/edge/edge-groups/types.ts

@@ -1,4 +1,4 @@
-import { EnvironmentId } from '@/portainer/environments/types';
+import { EnvironmentId } from '@/react/portainer/environments/types';
 import { TagId } from '@/portainer/tags/types';
 
 export interface EdgeGroup {

app/react/kubernetes/cluster/ingressClass/IngressClassDatatable/RowContext.tsx

@@ -1,4 +1,4 @@
-import { Environment } from '@/portainer/environments/types';
+import { Environment } from '@/react/portainer/environments/types';
 
 import { createRowContext } from '@@/datatables/RowContext';
 

app/react/kubernetes/cluster/ingressClass/ingressClass.service.ts

@@ -1,5 +1,5 @@
 import axios, { parseAxiosError } from '@/portainer/services/axios';
-import { EnvironmentId } from '@/portainer/environments/types';
+import { EnvironmentId } from '@/react/portainer/environments/types';
 import {
   KubernetesApiListResponse,
   V1IngressClass,

app/react/kubernetes/cluster/ingressClass/utils/index.ts

@@ -1,4 +1,4 @@
-import { EnvironmentId } from '@/portainer/environments/types';
+import { EnvironmentId } from '@/react/portainer/environments/types';
 import PortainerError from '@/portainer/error';
 import axios from '@/portainer/services/axios';
 

app/react/kubernetes/configs/queries.ts

@@ -1,6 +1,6 @@
 import { useQuery } from 'react-query';
 
-import { EnvironmentId } from '@/portainer/environments/types';
+import { EnvironmentId } from '@/react/portainer/environments/types';
 import { error as notifyError } from '@/portainer/services/notifications';
 
 import { getConfigMaps } from './service';

app/react/kubernetes/configs/service.ts

@@ -1,5 +1,5 @@
 import axios, { parseAxiosError } from '@/portainer/services/axios';
-import { EnvironmentId } from '@/portainer/environments/types';
+import { EnvironmentId } from '@/react/portainer/environments/types';
 
 import { Configuration } from './types';
 

app/react/kubernetes/namespaces/CreateView/CreateNamespaceRegistriesSelector.tsx

@@ -1,4 +1,4 @@
-import { Registry } from '@/portainer/environments/environment.service/registries';
+import { Registry } from '@/react/portainer/environments/environment.service/registries';
 
 import { Select } from '@@/form-components/ReactSelect';
 

app/react/kubernetes/namespaces/queries.ts

@@ -1,6 +1,6 @@
 import { useQuery } from 'react-query';
 
-import { EnvironmentId } from '@/portainer/environments/types';
+import { EnvironmentId } from '@/react/portainer/environments/types';
 import { error as notifyError } from '@/portainer/services/notifications';
 
 import { getNamespaces, getNamespace } from './service';

app/react/kubernetes/namespaces/service.ts

@@ -1,5 +1,5 @@
 import axios, { parseAxiosError } from '@/portainer/services/axios';
-import { EnvironmentId } from '@/portainer/environments/types';
+import { EnvironmentId } from '@/react/portainer/environments/types';
 
 import { Namespaces } from './types';
 

app/react/portainer/access-control/AccessControlPanel/AccessControlPanel.tsx

@@ -4,7 +4,7 @@ import { useUser } from '@/portainer/hooks/useUser';
 import { Icon } from '@/react/components/Icon';
 import { TeamMembership, TeamRole } from '@/react/portainer/users/teams/types';
 import { useUserMembership } from '@/portainer/users/queries';
-import { EnvironmentId } from '@/portainer/environments/types';
+import { EnvironmentId } from '@/react/portainer/environments/types';
 
 import { TableContainer, TableTitle } from '@@/datatables';
 import { Button } from '@@/buttons';

app/react/portainer/access-control/AccessControlPanel/AccessControlPanelForm.tsx

@@ -6,7 +6,7 @@ import { object } from 'yup';
 import { useUser } from '@/portainer/hooks/useUser';
 import { confirmAsync } from '@/portainer/services/modal.service/confirm';
 import { notifySuccess } from '@/portainer/services/notifications';
-import { EnvironmentId } from '@/portainer/environments/types';
+import { EnvironmentId } from '@/react/portainer/environments/types';
 
 import { Button } from '@@/buttons';
 import { LoadingButton } from '@@/buttons/LoadingButton';

app/react/portainer/access-control/EditDetails/EditDetails.tsx

@@ -2,7 +2,7 @@ import { useCallback } from 'react';
 import { FormikErrors } from 'formik';
 
 import { useUser } from '@/portainer/hooks/useUser';
-import { EnvironmentId } from '@/portainer/environments/types';
+import { EnvironmentId } from '@/react/portainer/environments/types';
 
 import { BoxSelector } from '@@/BoxSelector';
 import { FormError } from '@@/form-components/FormError';

app/react/portainer/access-control/EditDetails/useLoadState.ts

@@ -1,6 +1,6 @@
 import { useTeams } from '@/react/portainer/users/teams/queries';
 import { useUsers } from '@/portainer/users/queries';
-import { EnvironmentId } from '@/portainer/environments/types';
+import { EnvironmentId } from '@/react/portainer/environments/types';
 
 export function useLoadState(environmentId?: EnvironmentId) {
   const teams = useTeams(false, environmentId);