diff --git a/app/kubernetes/react/components/index.ts b/app/kubernetes/react/components/index.ts index 0ced94eda..ef5b20eab 100644 --- a/app/kubernetes/react/components/index.ts +++ b/app/kubernetes/react/components/index.ts @@ -66,6 +66,7 @@ import { applicationsModule } from './applications'; import { volumesModule } from './volumes'; import { namespacesModule } from './namespaces'; import { clusterManagementModule } from './clusterManagement'; +import { registriesModule } from './registries'; export const ngModule = angular .module('portainer.kubernetes.react.components', [ @@ -73,6 +74,7 @@ export const ngModule = angular volumesModule, namespacesModule, clusterManagementModule, + registriesModule, ]) .component( 'ingressClassDatatable', diff --git a/app/kubernetes/react/components/registries.tsx b/app/kubernetes/react/components/registries.tsx new file mode 100644 index 000000000..4b28686ca --- /dev/null +++ b/app/kubernetes/react/components/registries.tsx @@ -0,0 +1,11 @@ +import angular from 'angular'; + +import { r2a } from '@/react-tools/react2angular'; +import { AccessTable } from '@/react/kubernetes/cluster/RegistryAccessView/AccessTable'; + +export const registriesModule = angular + .module('portainer.kubernetes.react.components.registries', []) + .component( + 'kubeRegistryAccessTable', + r2a(AccessTable, ['dataset', 'onRemove']) + ).name; diff --git a/app/kubernetes/registries/kube-registry-access-view/kube-registry-access-view.controller.js b/app/kubernetes/registries/kube-registry-access-view/kube-registry-access-view.controller.js index facae44f0..6a80fa5c8 100644 --- a/app/kubernetes/registries/kube-registry-access-view/kube-registry-access-view.controller.js +++ b/app/kubernetes/registries/kube-registry-access-view/kube-registry-access-view.controller.js @@ -1,5 +1,4 @@ import KubernetesNamespaceHelper from 'Kubernetes/helpers/namespaceHelper'; -import { confirmDeleteAccess } from '@/react/kubernetes/cluster/RegistryAccessView/ConfirmDeleteAccess'; export default class KubernetesRegistryAccessController { /* @ngInject */ @@ -32,11 +31,7 @@ export default class KubernetesRegistryAccessController { const removeNamespaces = namespaces.map(({ value }) => value); const nsToUpdate = this.savedResourcePools.map(({ value }) => value).filter((value) => !removeNamespaces.includes(value)); - confirmDeleteAccess().then((confirmed) => { - if (confirmed) { - return this.updateNamespaces(nsToUpdate); - } - }); + return this.updateNamespaces(nsToUpdate); } updateNamespaces(namespaces) { diff --git a/app/kubernetes/registries/kube-registry-access-view/kube-registry-access-view.html b/app/kubernetes/registries/kube-registry-access-view/kube-registry-access-view.html index df999b9db..11184ae0f 100644 --- a/app/kubernetes/registries/kube-registry-access-view/kube-registry-access-view.html +++ b/app/kubernetes/registries/kube-registry-access-view/kube-registry-access-view.html @@ -48,17 +48,5 @@ -
-
-
-
-
-
-
- |
-
---|
- - - - - {{ item.value }} - | -
{{ $ctrl.emptyDatasetMessage }} | -
+ This registry might be used by one or more applications inside + this environment. Removing the registry access could lead to a + service interruption for these applications. +
+Are you sure you wish to continue?
+ > + } + onConfirmed={() => onRemove(selectedItems)} + /> + )} + /> + ); +} diff --git a/app/react/kubernetes/cluster/RegistryAccessView/ConfirmDeleteAccess.tsx b/app/react/kubernetes/cluster/RegistryAccessView/ConfirmDeleteAccess.tsx deleted file mode 100644 index 96e1e03e1..000000000 --- a/app/react/kubernetes/cluster/RegistryAccessView/ConfirmDeleteAccess.tsx +++ /dev/null @@ -1,19 +0,0 @@ -import { confirmDestructive } from '@@/modals/confirm'; -import { buildConfirmButton } from '@@/modals/utils'; - -export function confirmDeleteAccess() { - return confirmDestructive({ - title: 'Are you sure?', - message: ( - <> -- This registry might be used by one or more applications inside this - environment. Removing the registry access could lead to a service - interruption for these applications. -
-Are you sure you wish to continue?
- > - ), - confirmButton: buildConfirmButton('Remove', 'danger'), - }); -}