diff --git a/app/kubernetes/components/kube-services/kube-services.controller.js b/app/kubernetes/components/kube-services/kube-services.controller.js index 10d21d79a..462f57d4c 100644 --- a/app/kubernetes/components/kube-services/kube-services.controller.js +++ b/app/kubernetes/components/kube-services/kube-services.controller.js @@ -1,7 +1,7 @@ -import { KubernetesService, KubernetesServicePort, KubernetesServiceTypes } from 'Kubernetes/models/service/models'; -import { KubernetesApplicationPublishingTypes } from 'Kubernetes/models/application/models/constants'; -import { getServices } from 'Kubernetes/react/views/networks/services/service'; +import { KubernetesService, KubernetesServicePort, KubernetesServiceTypes } from '@/kubernetes/models/service/models'; +import { KubernetesApplicationPublishingTypes } from '@/kubernetes/models/application/models/constants'; import { notifyError } from '@/portainer/services/notifications'; +import { getServices } from '@/react/kubernetes/networks/services/service'; export default class KubeServicesViewController { /* @ngInject */ diff --git a/app/kubernetes/react/views/index.ts b/app/kubernetes/react/views/index.ts index 2082872c7..89e9b14c3 100644 --- a/app/kubernetes/react/views/index.ts +++ b/app/kubernetes/react/views/index.ts @@ -1,11 +1,11 @@ import angular from 'angular'; import { r2a } from '@/react-tools/react2angular'; -import { IngressesDatatableView } from '@/kubernetes/react/views/networks/ingresses/IngressDatatable'; -import { CreateIngressView } from '@/kubernetes/react/views/networks/ingresses/CreateIngressView'; import { withCurrentUser } from '@/react-tools/withCurrentUser'; import { withReactQuery } from '@/react-tools/withReactQuery'; import { withUIRouter } from '@/react-tools/withUIRouter'; +import { IngressesDatatableView } from '@/react/kubernetes/ingresses/IngressDatatable'; +import { CreateIngressView } from '@/react/kubernetes/ingresses/CreateIngressView'; export const viewsModule = angular .module('portainer.kubernetes.react.views', []) diff --git a/app/kubernetes/views/applications/create/createApplicationController.js b/app/kubernetes/views/applications/create/createApplicationController.js index 90d5e4e5f..d3b1178ed 100644 --- a/app/kubernetes/views/applications/create/createApplicationController.js +++ b/app/kubernetes/views/applications/create/createApplicationController.js @@ -32,7 +32,7 @@ import KubernetesApplicationHelper from 'Kubernetes/helpers/application/index'; import KubernetesVolumeHelper from 'Kubernetes/helpers/volumeHelper'; import KubernetesNamespaceHelper from 'Kubernetes/helpers/namespaceHelper'; import { KubernetesNodeHelper } from 'Kubernetes/node/helper'; -import { updateIngress, getIngresses } from '@/kubernetes/react/views/networks/ingresses/service'; +import { updateIngress, getIngresses } from '@/react/kubernetes/ingresses/service'; import { confirmUpdateAppIngress } from '@/portainer/services/modal.service/prompt'; class KubernetesCreateApplicationController { diff --git a/app/portainer/home/EnvironmentList/KubeconfigButton/KubeconfigPrompt.tsx b/app/portainer/home/EnvironmentList/KubeconfigButton/KubeconfigPrompt.tsx index 5349ad733..0411d9f7f 100644 --- a/app/portainer/home/EnvironmentList/KubeconfigButton/KubeconfigPrompt.tsx +++ b/app/portainer/home/EnvironmentList/KubeconfigButton/KubeconfigPrompt.tsx @@ -3,7 +3,7 @@ import clsx from 'clsx'; import { useState } from 'react'; import { DialogOverlay } from '@reach/dialog'; -import * as kcService from '@/kubernetes/services/kubeconfig.service'; +import { downloadKubeconfigFile } from '@/react/kubernetes/services/kubeconfig.service'; import * as notifications from '@/portainer/services/notifications'; import { EnvironmentType } from '@/react/portainer/environments/types'; import { usePaginationLimitState } from '@/portainer/hooks/usePaginationLimitState'; @@ -144,9 +144,7 @@ export function KubeconfigPrompt({ return; } try { - await kcService.downloadKubeconfigFile( - Object.keys(selection).map(Number) - ); + await downloadKubeconfigFile(Object.keys(selection).map(Number)); onClose(); } catch (e) { notifications.error('Failed downloading kubeconfig file', e as Error); diff --git a/app/react/kubernetes/cluster/ingressClass/ingressClass.service.ts b/app/react/kubernetes/cluster/ingressClass/ingressClass.service.ts index dc1d5e6bb..b39f793d7 100644 --- a/app/react/kubernetes/cluster/ingressClass/ingressClass.service.ts +++ b/app/react/kubernetes/cluster/ingressClass/ingressClass.service.ts @@ -3,7 +3,7 @@ import { EnvironmentId } from '@/react/portainer/environments/types'; import { KubernetesApiListResponse, V1IngressClass, -} from '@/react/kubernetes/services/kubernetes/types'; +} from '@/react/kubernetes/services/types'; export async function getAllIngressClasses(environmentId: EnvironmentId) { try { diff --git a/app/kubernetes/react/views/networks/ingresses/components/annotations/index.tsx b/app/react/kubernetes/ingresses/CreateIngressView/Annotations/index.tsx similarity index 100% rename from app/kubernetes/react/views/networks/ingresses/components/annotations/index.tsx rename to app/react/kubernetes/ingresses/CreateIngressView/Annotations/index.tsx diff --git a/app/kubernetes/react/views/networks/ingresses/components/annotations/types.ts b/app/react/kubernetes/ingresses/CreateIngressView/Annotations/types.ts similarity index 100% rename from app/kubernetes/react/views/networks/ingresses/components/annotations/types.ts rename to app/react/kubernetes/ingresses/CreateIngressView/Annotations/types.ts diff --git a/app/kubernetes/react/views/networks/ingresses/CreateIngressView/CreateIngressView.tsx b/app/react/kubernetes/ingresses/CreateIngressView/CreateIngressView.tsx similarity index 99% rename from app/kubernetes/react/views/networks/ingresses/CreateIngressView/CreateIngressView.tsx rename to app/react/kubernetes/ingresses/CreateIngressView/CreateIngressView.tsx index 23ee4aca7..90622d189 100644 --- a/app/kubernetes/react/views/networks/ingresses/CreateIngressView/CreateIngressView.tsx +++ b/app/react/kubernetes/ingresses/CreateIngressView/CreateIngressView.tsx @@ -5,8 +5,7 @@ import { v4 as uuidv4 } from 'uuid'; import { useEnvironmentId } from '@/portainer/hooks/useEnvironmentId'; import { useConfigurations } from '@/react/kubernetes/configs/queries'; import { useNamespaces } from '@/react/kubernetes/namespaces/queries'; -import { Annotation } from '@/kubernetes/react/views/networks/ingresses/components/annotations/types'; -import { useServices } from '@/kubernetes/react/views/networks/services/queries'; +import { useServices } from '@/react/kubernetes/networks/services/queries'; import { notifySuccess } from '@/portainer/services/notifications'; import { Link } from '@@/Link'; @@ -22,6 +21,7 @@ import { useIngressControllers, } from '../queries'; +import { Annotation } from './Annotations/types'; import { Rule, Path, Host } from './types'; import { IngressForm } from './IngressForm'; import { diff --git a/app/kubernetes/react/views/networks/ingresses/CreateIngressView/IngressForm.tsx b/app/react/kubernetes/ingresses/CreateIngressView/IngressForm.tsx similarity index 99% rename from app/kubernetes/react/views/networks/ingresses/CreateIngressView/IngressForm.tsx rename to app/react/kubernetes/ingresses/CreateIngressView/IngressForm.tsx index 87e49c645..c09ecbf73 100644 --- a/app/kubernetes/react/views/networks/ingresses/CreateIngressView/IngressForm.tsx +++ b/app/react/kubernetes/ingresses/CreateIngressView/IngressForm.tsx @@ -1,8 +1,6 @@ import { ChangeEvent, ReactNode } from 'react'; import { Plus, RefreshCw, Trash2 } from 'react-feather'; -import { Annotations } from '@/kubernetes/react/views/networks/ingresses/components/annotations'; - import { Link } from '@@/Link'; import { Icon } from '@@/Icon'; import { Select, Option } from '@@/form-components/Input/Select'; @@ -11,6 +9,7 @@ import { Widget, WidgetBody, WidgetTitle } from '@@/Widget'; import { Tooltip } from '@@/Tip/Tooltip'; import { Button } from '@@/buttons'; +import { Annotations } from './Annotations'; import { Rule, ServicePorts } from './types'; import '../style.css'; diff --git a/app/kubernetes/react/views/networks/ingresses/CreateIngressView/index.tsx b/app/react/kubernetes/ingresses/CreateIngressView/index.tsx similarity index 100% rename from app/kubernetes/react/views/networks/ingresses/CreateIngressView/index.tsx rename to app/react/kubernetes/ingresses/CreateIngressView/index.tsx diff --git a/app/kubernetes/react/views/networks/ingresses/CreateIngressView/types.ts b/app/react/kubernetes/ingresses/CreateIngressView/types.ts similarity index 84% rename from app/kubernetes/react/views/networks/ingresses/CreateIngressView/types.ts rename to app/react/kubernetes/ingresses/CreateIngressView/types.ts index 5329df929..f8850c2e3 100644 --- a/app/kubernetes/react/views/networks/ingresses/CreateIngressView/types.ts +++ b/app/react/kubernetes/ingresses/CreateIngressView/types.ts @@ -1,7 +1,7 @@ -import { Annotation } from '@/kubernetes/react/views/networks/ingresses/components/annotations/types'; - import { Option } from '@@/form-components/Input/Select'; +import { Annotation } from './Annotations/types'; + export interface Path { Key: string; Route: string; diff --git a/app/kubernetes/react/views/networks/ingresses/CreateIngressView/utils.ts b/app/react/kubernetes/ingresses/CreateIngressView/utils.ts similarity index 96% rename from app/kubernetes/react/views/networks/ingresses/CreateIngressView/utils.ts rename to app/react/kubernetes/ingresses/CreateIngressView/utils.ts index 79204e78e..b6dab20da 100644 --- a/app/kubernetes/react/views/networks/ingresses/CreateIngressView/utils.ts +++ b/app/react/kubernetes/ingresses/CreateIngressView/utils.ts @@ -1,10 +1,10 @@ import { v4 as uuidv4 } from 'uuid'; -import { Annotation } from '@/kubernetes/react/views/networks/ingresses/components/annotations/types'; import { SupportedIngControllerTypes } from '@/react/kubernetes/cluster/ingressClass/types'; import { TLS, Ingress } from '../types'; +import { Annotation } from './Annotations/types'; import { Host, Rule } from './types'; const ignoreAnnotationsForEdit = [ diff --git a/app/kubernetes/react/views/networks/ingresses/IngressDatatable/IngressDataTable.tsx b/app/react/kubernetes/ingresses/IngressDatatable/IngressDataTable.tsx similarity index 100% rename from app/kubernetes/react/views/networks/ingresses/IngressDatatable/IngressDataTable.tsx rename to app/react/kubernetes/ingresses/IngressDatatable/IngressDataTable.tsx diff --git a/app/kubernetes/react/views/networks/ingresses/IngressDatatable/columns/className.tsx b/app/react/kubernetes/ingresses/IngressDatatable/columns/className.tsx similarity index 100% rename from app/kubernetes/react/views/networks/ingresses/IngressDatatable/columns/className.tsx rename to app/react/kubernetes/ingresses/IngressDatatable/columns/className.tsx diff --git a/app/kubernetes/react/views/networks/ingresses/IngressDatatable/columns/index.tsx b/app/react/kubernetes/ingresses/IngressDatatable/columns/index.tsx similarity index 100% rename from app/kubernetes/react/views/networks/ingresses/IngressDatatable/columns/index.tsx rename to app/react/kubernetes/ingresses/IngressDatatable/columns/index.tsx diff --git a/app/kubernetes/react/views/networks/ingresses/IngressDatatable/columns/ingressRules.tsx b/app/react/kubernetes/ingresses/IngressDatatable/columns/ingressRules.tsx similarity index 100% rename from app/kubernetes/react/views/networks/ingresses/IngressDatatable/columns/ingressRules.tsx rename to app/react/kubernetes/ingresses/IngressDatatable/columns/ingressRules.tsx diff --git a/app/kubernetes/react/views/networks/ingresses/IngressDatatable/columns/name.tsx b/app/react/kubernetes/ingresses/IngressDatatable/columns/name.tsx similarity index 100% rename from app/kubernetes/react/views/networks/ingresses/IngressDatatable/columns/name.tsx rename to app/react/kubernetes/ingresses/IngressDatatable/columns/name.tsx diff --git a/app/kubernetes/react/views/networks/ingresses/IngressDatatable/columns/namespace.tsx b/app/react/kubernetes/ingresses/IngressDatatable/columns/namespace.tsx similarity index 100% rename from app/kubernetes/react/views/networks/ingresses/IngressDatatable/columns/namespace.tsx rename to app/react/kubernetes/ingresses/IngressDatatable/columns/namespace.tsx diff --git a/app/kubernetes/react/views/networks/ingresses/IngressDatatable/columns/type.tsx b/app/react/kubernetes/ingresses/IngressDatatable/columns/type.tsx similarity index 100% rename from app/kubernetes/react/views/networks/ingresses/IngressDatatable/columns/type.tsx rename to app/react/kubernetes/ingresses/IngressDatatable/columns/type.tsx diff --git a/app/kubernetes/react/views/networks/ingresses/IngressDatatable/datatable-store.ts b/app/react/kubernetes/ingresses/IngressDatatable/datatable-store.ts similarity index 100% rename from app/kubernetes/react/views/networks/ingresses/IngressDatatable/datatable-store.ts rename to app/react/kubernetes/ingresses/IngressDatatable/datatable-store.ts diff --git a/app/kubernetes/react/views/networks/ingresses/IngressDatatable/index.tsx b/app/react/kubernetes/ingresses/IngressDatatable/index.tsx similarity index 100% rename from app/kubernetes/react/views/networks/ingresses/IngressDatatable/index.tsx rename to app/react/kubernetes/ingresses/IngressDatatable/index.tsx diff --git a/app/kubernetes/react/views/networks/ingresses/queries.ts b/app/react/kubernetes/ingresses/queries.ts similarity index 98% rename from app/kubernetes/react/views/networks/ingresses/queries.ts rename to app/react/kubernetes/ingresses/queries.ts index f46551770..08d70b077 100644 --- a/app/kubernetes/react/views/networks/ingresses/queries.ts +++ b/app/react/kubernetes/ingresses/queries.ts @@ -6,8 +6,7 @@ import { withError, withInvalidate, } from '@/react-tools/react-query'; - -import { getServices } from '../services/service'; +import { getServices } from '@/react/kubernetes/networks/services/service'; import { getIngresses, diff --git a/app/kubernetes/react/views/networks/ingresses/service.ts b/app/react/kubernetes/ingresses/service.ts similarity index 100% rename from app/kubernetes/react/views/networks/ingresses/service.ts rename to app/react/kubernetes/ingresses/service.ts diff --git a/app/kubernetes/react/views/networks/ingresses/style.css b/app/react/kubernetes/ingresses/style.css similarity index 100% rename from app/kubernetes/react/views/networks/ingresses/style.css rename to app/react/kubernetes/ingresses/style.css diff --git a/app/kubernetes/react/views/networks/ingresses/types.ts b/app/react/kubernetes/ingresses/types.ts similarity index 100% rename from app/kubernetes/react/views/networks/ingresses/types.ts rename to app/react/kubernetes/ingresses/types.ts diff --git a/app/react/kubernetes/namespaces/queries.ts b/app/react/kubernetes/namespaces/queries.ts index f79a6c555..057134698 100644 --- a/app/react/kubernetes/namespaces/queries.ts +++ b/app/react/kubernetes/namespaces/queries.ts @@ -2,7 +2,8 @@ import { useQuery } from 'react-query'; import { EnvironmentId } from '@/react/portainer/environments/types'; import { error as notifyError } from '@/portainer/services/notifications'; -import { getIngresses } from '@/kubernetes/react/views/networks/ingresses/service'; + +import { getIngresses } from '../ingresses/service'; import { getNamespaces, getNamespace } from './service'; import { Namespaces } from './types'; diff --git a/app/kubernetes/react/views/networks/services/queries.ts b/app/react/kubernetes/networks/services/queries.ts similarity index 100% rename from app/kubernetes/react/views/networks/services/queries.ts rename to app/react/kubernetes/networks/services/queries.ts diff --git a/app/kubernetes/react/views/networks/services/service.ts b/app/react/kubernetes/networks/services/service.ts similarity index 100% rename from app/kubernetes/react/views/networks/services/service.ts rename to app/react/kubernetes/networks/services/service.ts diff --git a/app/kubernetes/react/views/networks/services/types.ts b/app/react/kubernetes/networks/services/types.ts similarity index 100% rename from app/kubernetes/react/views/networks/services/types.ts rename to app/react/kubernetes/networks/services/types.ts diff --git a/app/kubernetes/services/kubeconfig.service.ts b/app/react/kubernetes/services/kubeconfig.service.ts similarity index 100% rename from app/kubernetes/services/kubeconfig.service.ts rename to app/react/kubernetes/services/kubeconfig.service.ts diff --git a/app/react/kubernetes/services/kubernetes/types/index.ts b/app/react/kubernetes/services/types/index.ts similarity index 100% rename from app/react/kubernetes/services/kubernetes/types/index.ts rename to app/react/kubernetes/services/types/index.ts diff --git a/app/react/kubernetes/services/kubernetes/types/v1IngressClass.ts b/app/react/kubernetes/services/types/v1IngressClass.ts similarity index 100% rename from app/react/kubernetes/services/kubernetes/types/v1IngressClass.ts rename to app/react/kubernetes/services/types/v1IngressClass.ts diff --git a/app/react/kubernetes/services/kubernetes/types/v1ObjectMeta.ts b/app/react/kubernetes/services/types/v1ObjectMeta.ts similarity index 100% rename from app/react/kubernetes/services/kubernetes/types/v1ObjectMeta.ts rename to app/react/kubernetes/services/types/v1ObjectMeta.ts