diff --git a/app/docker/__module.js b/app/docker/__module.js index c23534330..4255ff355 100644 --- a/app/docker/__module.js +++ b/app/docker/__module.js @@ -3,11 +3,8 @@ import angular from 'angular'; import { EnvironmentStatus } from '@/portainer/environments/types'; import { reactModule } from './react'; -import containersModule from './containers'; -import { componentsModule } from './components'; -import { networksModule } from './networks'; -angular.module('portainer.docker', ['portainer.app', containersModule, componentsModule, networksModule, reactModule]).config([ +angular.module('portainer.docker', ['portainer.app', reactModule]).config([ '$stateRegistryProvider', function ($stateRegistryProvider) { 'use strict'; diff --git a/app/docker/components/index.ts b/app/docker/components/index.ts deleted file mode 100644 index 14fdcbea8..000000000 --- a/app/docker/components/index.ts +++ /dev/null @@ -1,7 +0,0 @@ -import angular from 'angular'; - -import { ContainerQuickActionsAngular } from './container-quick-actions'; - -export const componentsModule = angular - .module('portainer.docker.components', []) - .component('containerQuickActions', ContainerQuickActionsAngular).name; diff --git a/app/docker/containers/index.ts b/app/docker/containers/index.ts deleted file mode 100644 index ae78ebc14..000000000 --- a/app/docker/containers/index.ts +++ /dev/null @@ -1,7 +0,0 @@ -import angular from 'angular'; - -import { ContainersDatatableAngular } from './components/ContainersDatatable/ContainersDatatableContainer'; - -export default angular - .module('portainer.docker.containers', []) - .component('containersDatatable', ContainersDatatableAngular).name; diff --git a/app/docker/networks/edit/index.ts b/app/docker/networks/edit/index.ts deleted file mode 100644 index 8a0482978..000000000 --- a/app/docker/networks/edit/index.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { react2angular } from '@/react-tools/react2angular'; - -import { NetworkDetailsView } from './NetworkDetailsView'; - -export const NetworkDetailsViewAngular = react2angular(NetworkDetailsView, []); diff --git a/app/docker/networks/index.ts b/app/docker/networks/index.ts deleted file mode 100644 index 9a9b3a9bc..000000000 --- a/app/docker/networks/index.ts +++ /dev/null @@ -1,7 +0,0 @@ -import angular from 'angular'; - -import { NetworkDetailsViewAngular } from './edit'; - -export const networksModule = angular - .module('portainer.docker.networks', []) - .component('networkDetailsView', NetworkDetailsViewAngular).name; diff --git a/app/docker/react/components/index.ts b/app/docker/react/components/index.ts index b92ea789a..c0627cf82 100644 --- a/app/docker/react/components/index.ts +++ b/app/docker/react/components/index.ts @@ -1,6 +1,29 @@ import angular from 'angular'; -export const componentsModule = angular.module( - 'portainer.docker.react.components', - [] -).name; +import { r2a } from '@/react-tools/react2angular'; +import { ContainersDatatableContainer } from '@/react/docker/containers/ListView/ContainersDatatable/ContainersDatatableContainer'; +import { ContainerQuickActions } from '@/react/docker/containers/components/ContainerQuickActions'; + +export const componentsModule = angular + .module('portainer.docker.react.components', []) + .component( + 'containersDatatable', + r2a(ContainersDatatableContainer, [ + 'endpoint', + 'isAddActionVisible', + 'dataset', + 'onRefresh', + 'isHostColumnVisible', + 'tableKey', + ]) + ) + .component( + 'containerQuickActions', + r2a(ContainerQuickActions, [ + 'containerId', + 'nodeName', + 'state', + 'status', + 'taskId', + ]) + ).name; diff --git a/app/docker/react/views/index.ts b/app/docker/react/views/index.ts index 077cbe10b..38cf0e44e 100644 --- a/app/docker/react/views/index.ts +++ b/app/docker/react/views/index.ts @@ -1,6 +1,8 @@ import angular from 'angular'; -export const viewsModule = angular.module( - 'portainer.docker.react.views', - [] -).name; +import { ItemView } from '@/react/docker/networks/ItemView'; +import { r2a } from '@/react-tools/react2angular'; + +export const viewsModule = angular + .module('portainer.docker.react.views', []) + .component('networkDetailsView', r2a(ItemView, [])).name; diff --git a/app/docker/services/containerService.js b/app/docker/services/containerService.js index 5b3db0527..84b1ed6fd 100644 --- a/app/docker/services/containerService.js +++ b/app/docker/services/containerService.js @@ -8,7 +8,7 @@ import { resumeContainer, startContainer, stopContainer, -} from '@/docker/containers/containers.service'; +} from '@/react/docker/containers/containers.service'; import { ContainerDetailsViewModel, ContainerStatsViewModel, ContainerViewModel } from '../models/container'; angular.module('portainer.docker').factory('ContainerService', ContainerServiceFactory); diff --git a/app/docker/containers/components/ContainersDatatable/ContainersDatatable.tsx b/app/react/docker/containers/ListView/ContainersDatatable/ContainersDatatable.tsx similarity index 99% rename from app/docker/containers/components/ContainersDatatable/ContainersDatatable.tsx rename to app/react/docker/containers/ListView/ContainersDatatable/ContainersDatatable.tsx index aee2153cb..60af5f007 100644 --- a/app/docker/containers/components/ContainersDatatable/ContainersDatatable.tsx +++ b/app/react/docker/containers/ListView/ContainersDatatable/ContainersDatatable.tsx @@ -13,7 +13,7 @@ import { useDebounce } from '@/portainer/hooks/useDebounce'; import type { ContainersTableSettings, DockerContainer, -} from '@/docker/containers/types'; +} from '@/react/docker/containers/types'; import { useEnvironment } from '@/portainer/environments/useEnvironment'; import { PaginationControls } from '@@/PaginationControls'; diff --git a/app/docker/containers/components/ContainersDatatable/ContainersDatatableActions.tsx b/app/react/docker/containers/ListView/ContainersDatatable/ContainersDatatableActions.tsx similarity index 98% rename from app/docker/containers/components/ContainersDatatable/ContainersDatatableActions.tsx rename to app/react/docker/containers/ListView/ContainersDatatable/ContainersDatatableActions.tsx index 59e7fb00e..90dd1b660 100644 --- a/app/docker/containers/components/ContainersDatatable/ContainersDatatableActions.tsx +++ b/app/react/docker/containers/ListView/ContainersDatatable/ContainersDatatableActions.tsx @@ -4,7 +4,10 @@ import * as notifications from '@/portainer/services/notifications'; import { useAuthorizations, Authorized } from '@/portainer/hooks/useUser'; import { confirmContainerDeletion } from '@/portainer/services/modal.service/prompt'; import { setPortainerAgentTargetHeader } from '@/portainer/services/http-request.helper'; -import type { ContainerId, DockerContainer } from '@/docker/containers/types'; +import type { + ContainerId, + DockerContainer, +} from '@/react/docker/containers/types'; import { killContainer, pauseContainer, @@ -13,7 +16,7 @@ import { resumeContainer, startContainer, stopContainer, -} from '@/docker/containers/containers.service'; +} from '@/react/docker/containers/containers.service'; import type { EnvironmentId } from '@/portainer/environments/types'; import { Link } from '@@/Link'; diff --git a/app/docker/containers/components/ContainersDatatable/ContainersDatatableContainer.tsx b/app/react/docker/containers/ListView/ContainersDatatable/ContainersDatatableContainer.tsx similarity index 78% rename from app/docker/containers/components/ContainersDatatable/ContainersDatatableContainer.tsx rename to app/react/docker/containers/ListView/ContainersDatatable/ContainersDatatableContainer.tsx index 97e8562e0..9b485fb02 100644 --- a/app/docker/containers/components/ContainersDatatable/ContainersDatatableContainer.tsx +++ b/app/react/docker/containers/ListView/ContainersDatatable/ContainersDatatableContainer.tsx @@ -1,4 +1,3 @@ -import { react2angular } from '@/react-tools/react2angular'; import { EnvironmentProvider } from '@/portainer/environments/useEnvironment'; import type { Environment } from '@/portainer/environments/types'; @@ -36,15 +35,3 @@ export function ContainersDatatableContainer({ ); } - -export const ContainersDatatableAngular = react2angular( - ContainersDatatableContainer, - [ - 'endpoint', - 'isAddActionVisible', - 'dataset', - 'onRefresh', - 'isHostColumnVisible', - 'tableKey', - ] -); diff --git a/app/docker/containers/components/ContainersDatatable/ContainersDatatableSettings.tsx b/app/react/docker/containers/ListView/ContainersDatatable/ContainersDatatableSettings.tsx similarity index 93% rename from app/docker/containers/components/ContainersDatatable/ContainersDatatableSettings.tsx rename to app/react/docker/containers/ListView/ContainersDatatable/ContainersDatatableSettings.tsx index 0e551b394..7bd3c4dc7 100644 --- a/app/docker/containers/components/ContainersDatatable/ContainersDatatableSettings.tsx +++ b/app/react/docker/containers/ListView/ContainersDatatable/ContainersDatatableSettings.tsx @@ -1,4 +1,4 @@ -import type { ContainersTableSettings } from '@/docker/containers/types'; +import type { ContainersTableSettings } from '@/react/docker/containers/types'; import { TableSettingsMenuAutoRefresh } from '@@/datatables/TableSettingsMenuAutoRefresh'; import { useTableSettings } from '@@/datatables/useTableSettings'; diff --git a/app/docker/containers/components/ContainersDatatable/columns/created.tsx b/app/react/docker/containers/ListView/ContainersDatatable/columns/created.tsx similarity index 82% rename from app/docker/containers/components/ContainersDatatable/columns/created.tsx rename to app/react/docker/containers/ListView/ContainersDatatable/columns/created.tsx index 15469be36..efe6a75d1 100644 --- a/app/docker/containers/components/ContainersDatatable/columns/created.tsx +++ b/app/react/docker/containers/ListView/ContainersDatatable/columns/created.tsx @@ -1,7 +1,7 @@ import { Column } from 'react-table'; import { isoDateFromTimestamp } from '@/portainer/filters/filters'; -import type { DockerContainer } from '@/docker/containers/types'; +import type { DockerContainer } from '@/react/docker/containers/types'; export const created: Column = { Header: 'Created', diff --git a/app/docker/containers/components/ContainersDatatable/columns/host.tsx b/app/react/docker/containers/ListView/ContainersDatatable/columns/host.tsx similarity index 77% rename from app/docker/containers/components/ContainersDatatable/columns/host.tsx rename to app/react/docker/containers/ListView/ContainersDatatable/columns/host.tsx index c2ac71d34..1baa034eb 100644 --- a/app/docker/containers/components/ContainersDatatable/columns/host.tsx +++ b/app/react/docker/containers/ListView/ContainersDatatable/columns/host.tsx @@ -1,6 +1,6 @@ import { Column } from 'react-table'; -import type { DockerContainer } from '@/docker/containers/types'; +import type { DockerContainer } from '@/react/docker/containers/types'; export const host: Column = { Header: 'Host', diff --git a/app/docker/containers/components/ContainersDatatable/columns/image.tsx b/app/react/docker/containers/ListView/ContainersDatatable/columns/image.tsx similarity index 94% rename from app/docker/containers/components/ContainersDatatable/columns/image.tsx rename to app/react/docker/containers/ListView/ContainersDatatable/columns/image.tsx index f2c2a1622..398505c5f 100644 --- a/app/docker/containers/components/ContainersDatatable/columns/image.tsx +++ b/app/react/docker/containers/ListView/ContainersDatatable/columns/image.tsx @@ -3,7 +3,7 @@ import { useSref } from '@uirouter/react'; import { useEnvironment } from '@/portainer/environments/useEnvironment'; import { EnvironmentStatus } from '@/portainer/environments/types'; -import type { DockerContainer } from '@/docker/containers/types'; +import type { DockerContainer } from '@/react/docker/containers/types'; export const image: Column = { Header: 'Image', diff --git a/app/docker/containers/components/ContainersDatatable/columns/index.tsx b/app/react/docker/containers/ListView/ContainersDatatable/columns/index.tsx similarity index 100% rename from app/docker/containers/components/ContainersDatatable/columns/index.tsx rename to app/react/docker/containers/ListView/ContainersDatatable/columns/index.tsx diff --git a/app/docker/containers/components/ContainersDatatable/columns/ip.tsx b/app/react/docker/containers/ListView/ContainersDatatable/columns/ip.tsx similarity index 75% rename from app/docker/containers/components/ContainersDatatable/columns/ip.tsx rename to app/react/docker/containers/ListView/ContainersDatatable/columns/ip.tsx index 76371546f..93bbb9ec5 100644 --- a/app/docker/containers/components/ContainersDatatable/columns/ip.tsx +++ b/app/react/docker/containers/ListView/ContainersDatatable/columns/ip.tsx @@ -1,6 +1,6 @@ import { Column } from 'react-table'; -import type { DockerContainer } from '@/docker/containers/types'; +import type { DockerContainer } from '@/react/docker/containers/types'; export const ip: Column = { Header: 'IP Address', diff --git a/app/docker/containers/components/ContainersDatatable/columns/name.tsx b/app/react/docker/containers/ListView/ContainersDatatable/columns/name.tsx similarity index 96% rename from app/docker/containers/components/ContainersDatatable/columns/name.tsx rename to app/react/docker/containers/ListView/ContainersDatatable/columns/name.tsx index beb7d3791..39637060a 100644 --- a/app/docker/containers/components/ContainersDatatable/columns/name.tsx +++ b/app/react/docker/containers/ListView/ContainersDatatable/columns/name.tsx @@ -6,7 +6,7 @@ import { useEnvironment } from '@/portainer/environments/useEnvironment'; import type { ContainersTableSettings, DockerContainer, -} from '@/docker/containers/types'; +} from '@/react/docker/containers/types'; import { useTableSettings } from '@@/datatables/useTableSettings'; diff --git a/app/docker/containers/components/ContainersDatatable/columns/ownership.tsx b/app/react/docker/containers/ListView/ContainersDatatable/columns/ownership.tsx similarity index 92% rename from app/docker/containers/components/ContainersDatatable/columns/ownership.tsx rename to app/react/docker/containers/ListView/ContainersDatatable/columns/ownership.tsx index 6aca8f19b..bb3267f2e 100644 --- a/app/docker/containers/components/ContainersDatatable/columns/ownership.tsx +++ b/app/react/docker/containers/ListView/ContainersDatatable/columns/ownership.tsx @@ -2,7 +2,7 @@ import { Column } from 'react-table'; import clsx from 'clsx'; import { ownershipIcon } from '@/portainer/filters/filters'; -import type { DockerContainer } from '@/docker/containers/types'; +import type { DockerContainer } from '@/react/docker/containers/types'; import { ResourceControlOwnership } from '@/portainer/access-control/types'; export const ownership: Column = { diff --git a/app/docker/containers/components/ContainersDatatable/columns/ports.tsx b/app/react/docker/containers/ListView/ContainersDatatable/columns/ports.tsx similarity index 92% rename from app/docker/containers/components/ContainersDatatable/columns/ports.tsx rename to app/react/docker/containers/ListView/ContainersDatatable/columns/ports.tsx index 81de649e9..6cecdd213 100644 --- a/app/docker/containers/components/ContainersDatatable/columns/ports.tsx +++ b/app/react/docker/containers/ListView/ContainersDatatable/columns/ports.tsx @@ -2,7 +2,7 @@ import { Column } from 'react-table'; import _ from 'lodash'; import { useEnvironment } from '@/portainer/environments/useEnvironment'; -import type { DockerContainer, Port } from '@/docker/containers/types'; +import type { DockerContainer, Port } from '@/react/docker/containers/types'; export const ports: Column = { Header: 'Published Ports', diff --git a/app/docker/containers/components/ContainersDatatable/columns/quick-actions.tsx b/app/react/docker/containers/ListView/ContainersDatatable/columns/quick-actions.tsx similarity index 92% rename from app/docker/containers/components/ContainersDatatable/columns/quick-actions.tsx rename to app/react/docker/containers/ListView/ContainersDatatable/columns/quick-actions.tsx index 5304178aa..ec402d32b 100644 --- a/app/docker/containers/components/ContainersDatatable/columns/quick-actions.tsx +++ b/app/react/docker/containers/ListView/ContainersDatatable/columns/quick-actions.tsx @@ -2,11 +2,11 @@ import { CellProps, Column } from 'react-table'; import { useEnvironment } from '@/portainer/environments/useEnvironment'; import { useAuthorizations } from '@/portainer/hooks/useUser'; -import { ContainerQuickActions } from '@/docker/components/container-quick-actions/ContainerQuickActions'; +import { ContainerQuickActions } from '@/react/docker/containers/components/ContainerQuickActions/ContainerQuickActions'; import type { ContainersTableSettings, DockerContainer, -} from '@/docker/containers/types'; +} from '@/react/docker/containers/types'; import { EnvironmentStatus } from '@/portainer/environments/types'; import { useTableSettings } from '@@/datatables/useTableSettings'; diff --git a/app/docker/containers/components/ContainersDatatable/columns/stack.tsx b/app/react/docker/containers/ListView/ContainersDatatable/columns/stack.tsx similarity index 77% rename from app/docker/containers/components/ContainersDatatable/columns/stack.tsx rename to app/react/docker/containers/ListView/ContainersDatatable/columns/stack.tsx index e16a8b817..b4e1b5238 100644 --- a/app/docker/containers/components/ContainersDatatable/columns/stack.tsx +++ b/app/react/docker/containers/ListView/ContainersDatatable/columns/stack.tsx @@ -1,6 +1,6 @@ import { Column } from 'react-table'; -import type { DockerContainer } from '@/docker/containers/types'; +import type { DockerContainer } from '@/react/docker/containers/types'; export const stack: Column = { Header: 'Stack', diff --git a/app/docker/containers/components/ContainersDatatable/columns/state.tsx b/app/react/docker/containers/ListView/ContainersDatatable/columns/state.tsx similarity index 96% rename from app/docker/containers/components/ContainersDatatable/columns/state.tsx rename to app/react/docker/containers/ListView/ContainersDatatable/columns/state.tsx index b6219d151..8447bea64 100644 --- a/app/docker/containers/components/ContainersDatatable/columns/state.tsx +++ b/app/react/docker/containers/ListView/ContainersDatatable/columns/state.tsx @@ -5,7 +5,7 @@ import _ from 'lodash'; import type { DockerContainer, DockerContainerStatus, -} from '@/docker/containers/types'; +} from '@/react/docker/containers/types'; import { DefaultFilter } from '@@/datatables/Filter'; diff --git a/app/docker/components/container-quick-actions/ContainerQuickActions.module.css b/app/react/docker/containers/components/ContainerQuickActions/ContainerQuickActions.module.css similarity index 100% rename from app/docker/components/container-quick-actions/ContainerQuickActions.module.css rename to app/react/docker/containers/components/ContainerQuickActions/ContainerQuickActions.module.css diff --git a/app/docker/components/container-quick-actions/ContainerQuickActions.tsx b/app/react/docker/containers/components/ContainerQuickActions/ContainerQuickActions.tsx similarity index 98% rename from app/docker/components/container-quick-actions/ContainerQuickActions.tsx rename to app/react/docker/containers/components/ContainerQuickActions/ContainerQuickActions.tsx index 654de6263..fdc802d94 100644 --- a/app/docker/components/container-quick-actions/ContainerQuickActions.tsx +++ b/app/react/docker/containers/components/ContainerQuickActions/ContainerQuickActions.tsx @@ -1,8 +1,8 @@ import clsx from 'clsx'; +import { DockerContainerStatus } from '@/react/docker/containers/types'; import { Authorized } from '@/portainer/hooks/useUser'; import { react2angular } from '@/react-tools/react2angular'; -import { DockerContainerStatus } from '@/docker/containers/types'; import { Link } from '@@/Link'; diff --git a/app/docker/components/container-quick-actions/index.ts b/app/react/docker/containers/components/ContainerQuickActions/index.ts similarity index 100% rename from app/docker/components/container-quick-actions/index.ts rename to app/react/docker/containers/components/ContainerQuickActions/index.ts diff --git a/app/docker/containers/containers.service.ts b/app/react/docker/containers/containers.service.ts similarity index 97% rename from app/docker/containers/containers.service.ts rename to app/react/docker/containers/containers.service.ts index 8d84d047d..c0aa777bc 100644 --- a/app/docker/containers/containers.service.ts +++ b/app/react/docker/containers/containers.service.ts @@ -1,9 +1,9 @@ import { EnvironmentId } from '@/portainer/environments/types'; import PortainerError from '@/portainer/error'; import axios from '@/portainer/services/axios'; +import { genericHandler } from '@/docker/rest/response/handlers'; import { NetworkId } from '../networks/types'; -import { genericHandler } from '../rest/response/handlers'; import { ContainerId, DockerContainer } from './types'; diff --git a/app/docker/containers/queries.ts b/app/react/docker/containers/queries.ts similarity index 100% rename from app/docker/containers/queries.ts rename to app/react/docker/containers/queries.ts diff --git a/app/docker/containers/types.ts b/app/react/docker/containers/types.ts similarity index 100% rename from app/docker/containers/types.ts rename to app/react/docker/containers/types.ts diff --git a/app/docker/networks/edit/NetworkDetailsView.tsx b/app/react/docker/networks/ItemView/ItemView.tsx similarity index 97% rename from app/docker/networks/edit/NetworkDetailsView.tsx rename to app/react/docker/networks/ItemView/ItemView.tsx index f0e93f12f..4cb695139 100644 --- a/app/docker/networks/edit/NetworkDetailsView.tsx +++ b/app/react/docker/networks/ItemView/ItemView.tsx @@ -7,21 +7,21 @@ import { useEnvironmentId } from '@/portainer/hooks/useEnvironmentId'; import { confirmDeletionAsync } from '@/portainer/services/modal.service/confirm'; import { AccessControlPanel } from '@/portainer/access-control/AccessControlPanel/AccessControlPanel'; import { ResourceControlType } from '@/portainer/access-control/types'; -import { DockerContainer } from '@/docker/containers/types'; +import { DockerContainer } from '@/react/docker/containers/types'; import { ResourceControlViewModel } from '@/portainer/access-control/models/ResourceControlViewModel'; import { PageHeader } from '@@/PageHeader'; import { useNetwork, useDeleteNetwork } from '../queries'; import { isSystemNetwork } from '../network.helper'; -import { useContainers } from '../../containers/queries'; import { DockerNetwork, NetworkContainer } from '../types'; +import { useContainers } from '../../containers/queries'; import { NetworkDetailsTable } from './NetworkDetailsTable'; import { NetworkOptionsTable } from './NetworkOptionsTable'; import { NetworkContainersTable } from './NetworkContainersTable'; -export function NetworkDetailsView() { +export function ItemView() { const router = useRouter(); const queryClient = useQueryClient(); diff --git a/app/docker/networks/edit/NetworkContainersTable.test.tsx b/app/react/docker/networks/ItemView/NetworkContainersTable.test.tsx similarity index 100% rename from app/docker/networks/edit/NetworkContainersTable.test.tsx rename to app/react/docker/networks/ItemView/NetworkContainersTable.test.tsx diff --git a/app/docker/networks/edit/NetworkContainersTable.tsx b/app/react/docker/networks/ItemView/NetworkContainersTable.tsx similarity index 100% rename from app/docker/networks/edit/NetworkContainersTable.tsx rename to app/react/docker/networks/ItemView/NetworkContainersTable.tsx diff --git a/app/docker/networks/edit/NetworkDetailsTable.test.tsx b/app/react/docker/networks/ItemView/NetworkDetailsTable.test.tsx similarity index 100% rename from app/docker/networks/edit/NetworkDetailsTable.test.tsx rename to app/react/docker/networks/ItemView/NetworkDetailsTable.test.tsx diff --git a/app/docker/networks/edit/NetworkDetailsTable.tsx b/app/react/docker/networks/ItemView/NetworkDetailsTable.tsx similarity index 100% rename from app/docker/networks/edit/NetworkDetailsTable.tsx rename to app/react/docker/networks/ItemView/NetworkDetailsTable.tsx diff --git a/app/docker/networks/edit/NetworkOptionsTable.test.tsx b/app/react/docker/networks/ItemView/NetworkOptionsTable.test.tsx similarity index 100% rename from app/docker/networks/edit/NetworkOptionsTable.test.tsx rename to app/react/docker/networks/ItemView/NetworkOptionsTable.test.tsx diff --git a/app/docker/networks/edit/NetworkOptionsTable.tsx b/app/react/docker/networks/ItemView/NetworkOptionsTable.tsx similarity index 100% rename from app/docker/networks/edit/NetworkOptionsTable.tsx rename to app/react/docker/networks/ItemView/NetworkOptionsTable.tsx diff --git a/app/react/docker/networks/ItemView/index.ts b/app/react/docker/networks/ItemView/index.ts new file mode 100644 index 000000000..a09ab2dde --- /dev/null +++ b/app/react/docker/networks/ItemView/index.ts @@ -0,0 +1 @@ +export { ItemView } from './ItemView'; diff --git a/app/docker/networks/network.helper.ts b/app/react/docker/networks/network.helper.ts similarity index 100% rename from app/docker/networks/network.helper.ts rename to app/react/docker/networks/network.helper.ts diff --git a/app/docker/networks/network.service.ts b/app/react/docker/networks/network.service.ts similarity index 96% rename from app/docker/networks/network.service.ts rename to app/react/docker/networks/network.service.ts index a7a848d49..a1b53645c 100644 --- a/app/docker/networks/network.service.ts +++ b/app/react/docker/networks/network.service.ts @@ -1,8 +1,7 @@ +import { ContainerId } from '@/react/docker/containers/types'; import axios, { parseAxiosError } from '@/portainer/services/axios'; import { EnvironmentId } from '@/portainer/environments/types'; -import { ContainerId } from '../containers/types'; - import { NetworkId, DockerNetwork } from './types'; type NetworkAction = 'connect' | 'disconnect' | 'create'; diff --git a/app/docker/networks/queries.ts b/app/react/docker/networks/queries.ts similarity index 96% rename from app/docker/networks/queries.ts rename to app/react/docker/networks/queries.ts index 201069012..d9b11e29f 100644 --- a/app/docker/networks/queries.ts +++ b/app/react/docker/networks/queries.ts @@ -5,8 +5,7 @@ import { error as notifyError, success as notifySuccess, } from '@/portainer/services/notifications'; - -import { ContainerId } from '../containers/types'; +import { ContainerId } from '@/react/docker/containers/types'; import { getNetwork, diff --git a/app/docker/networks/types.ts b/app/react/docker/networks/types.ts similarity index 100% rename from app/docker/networks/types.ts rename to app/react/docker/networks/types.ts