diff --git a/app/docker/react/components/index.ts b/app/docker/react/components/index.ts index df6aa7cd93..b6d0373f7e 100644 --- a/app/docker/react/components/index.ts +++ b/app/docker/react/components/index.ts @@ -6,11 +6,7 @@ import { withCurrentUser } from '@/react-tools/withCurrentUser'; import { withReactQuery } from '@/react-tools/withReactQuery'; import { withUIRouter } from '@/react-tools/withUIRouter'; import { DockerfileDetails } from '@/react/docker/images/ItemView/DockerfileDetails'; -import { HealthStatus } from '@/react/docker/containers/ItemView/HealthStatus'; import { GpusList } from '@/react/docker/host/SetupView/GpusList'; -import { InsightsBox } from '@/react/components/InsightsBox'; -import { BetaAlert } from '@/react/portainer/environments/update-schedules/common/BetaAlert'; -import { EventsDatatable } from '@/react/docker/events/EventsDatatables'; import { AgentHostBrowser } from '@/react/docker/host/BrowseView/AgentHostBrowser'; import { AgentVolumeBrowser } from '@/react/docker/volumes/BrowseView/AgentVolumeBrowser'; import { ProcessesDatatable } from '@/react/docker/containers/StatsView/ProcessesDatatable'; @@ -35,22 +31,10 @@ const ngModule = angular templatesModule, ]) .component('dockerfileDetails', r2a(DockerfileDetails, ['image'])) - .component('dockerHealthStatus', r2a(HealthStatus, ['health'])) .component( 'gpusList', r2a(withControlledInput(GpusList), ['value', 'onChange']) ) - .component( - 'insightsBox', - r2a(InsightsBox, [ - 'header', - 'content', - 'insightCloseId', - 'type', - 'className', - ]) - ) - .component('betaAlert', r2a(BetaAlert, ['className', 'message', 'isHtml'])) .component( 'agentHostBrowserReact', r2a(withUIRouter(withCurrentUser(AgentHostBrowser)), [ @@ -84,7 +68,6 @@ const ngModule = angular 'dockerContainerProcessesDatatable', r2a(withUIRouter(withReactQuery(withCurrentUser(ProcessesDatatable))), []) ) - .component('dockerEventsDatatable', r2a(EventsDatatable, ['dataset'])) .component( 'dockerSecretsDatatable', r2a(withUIRouter(withCurrentUser(SecretsDatatable)), [ diff --git a/app/edge/react/components/index.ts b/app/edge/react/components/index.ts index 1902af60a3..f52b3b023a 100644 --- a/app/edge/react/components/index.ts +++ b/app/edge/react/components/index.ts @@ -3,12 +3,8 @@ import angular from 'angular'; import { r2a } from '@/react-tools/react2angular'; import { withReactQuery } from '@/react-tools/withReactQuery'; import { withUIRouter } from '@/react-tools/withUIRouter'; -import { AssociatedEdgeEnvironmentsSelector } from '@/react/edge/components/AssociatedEdgeEnvironmentsSelector'; -import { EdgeAsyncIntervalsForm } from '@/react/edge/components/EdgeAsyncIntervalsForm'; -import { EdgeCheckinIntervalField } from '@/react/edge/components/EdgeCheckInIntervalField'; import { EdgeScriptForm } from '@/react/edge/components/EdgeScriptForm'; import { EdgeGroupsSelector } from '@/react/edge/edge-stacks/components/EdgeGroupsSelector'; -import { AssociatedEdgeGroupEnvironmentsSelector } from '@/react/edge/components/AssociatedEdgeGroupEnvironmentsSelector'; const ngModule = angular .module('portainer.edge.react.components', []) @@ -32,45 +28,6 @@ const ngModule = angular 'asyncMode', 'showMetaFields', ]) - ) - .component( - 'edgeCheckinIntervalField', - r2a(withReactQuery(EdgeCheckinIntervalField), [ - 'value', - 'onChange', - 'isDefaultHidden', - 'tooltip', - 'label', - 'readonly', - 'size', - ]) - ) - .component( - 'edgeAsyncIntervalsForm', - r2a(withReactQuery(EdgeAsyncIntervalsForm), [ - 'values', - 'onChange', - 'isDefaultHidden', - 'readonly', - 'fieldSettings', - ]) - ) - .component( - 'associatedEdgeEnvironmentsSelector', - r2a(withReactQuery(AssociatedEdgeEnvironmentsSelector), [ - 'onChange', - 'value', - 'error', - ]) - ) - .component( - 'associatedEdgeGroupEnvironmentsSelector', - r2a(withReactQuery(AssociatedEdgeGroupEnvironmentsSelector), [ - 'onChange', - 'value', - 'error', - 'edgeGroupId', - ]) ); export const componentsModule = ngModule.name; diff --git a/app/kubernetes/react/components/clusterManagement.ts b/app/kubernetes/react/components/clusterManagement.ts index 48c1084e3d..85f193819e 100644 --- a/app/kubernetes/react/components/clusterManagement.ts +++ b/app/kubernetes/react/components/clusterManagement.ts @@ -3,16 +3,11 @@ import angular from 'angular'; import { r2a } from '@/react-tools/react2angular'; import { withUIRouter } from '@/react-tools/withUIRouter'; import { withCurrentUser } from '@/react-tools/withCurrentUser'; -import { NodeApplicationsDatatable } from '@/react/kubernetes/cluster/NodeView/NodeApplicationsDatatable/NodeApplicationsDatatable'; import { ResourceEventsDatatable } from '@/react/kubernetes/components/EventsDatatable/ResourceEventsDatatable'; import { withReactQuery } from '@/react-tools/withReactQuery'; export const clusterManagementModule = angular .module('portainer.kubernetes.react.components.clusterManagement', []) - .component( - 'kubernetesNodeApplicationsDatatable', - r2a(withUIRouter(withCurrentUser(NodeApplicationsDatatable)), []) - ) .component( 'resourceEventsDatatable', r2a( diff --git a/app/kubernetes/react/components/index.ts b/app/kubernetes/react/components/index.ts index 7137fcbf6a..34674ae27b 100644 --- a/app/kubernetes/react/components/index.ts +++ b/app/kubernetes/react/components/index.ts @@ -1,19 +1,11 @@ import angular from 'angular'; import { r2a } from '@/react-tools/react2angular'; -import { IngressClassDatatableAngular } from '@/react/kubernetes/cluster/ingressClass/IngressClassDatatable/IngressClassDatatableAngular'; import { NamespacesSelector } from '@/react/kubernetes/cluster/RegistryAccessView/NamespacesSelector'; -import { NamespaceAccessUsersSelector } from '@/react/kubernetes/namespaces/AccessView/NamespaceAccessUsersSelector'; import { KubeServicesForm } from '@/react/kubernetes/applications/CreateView/application-services/KubeServicesForm'; import { kubeServicesValidation } from '@/react/kubernetes/applications/CreateView/application-services/kubeServicesValidation'; import { withReactQuery } from '@/react-tools/withReactQuery'; import { withUIRouter } from '@/react-tools/withUIRouter'; -import { - ApplicationSummaryWidget, - ApplicationDetailsWidget, - ApplicationEventsDatatable, -} from '@/react/kubernetes/applications/DetailsView'; -import { ApplicationContainersDatatable } from '@/react/kubernetes/applications/DetailsView/ApplicationContainersDatatable'; import { PlacementFormSection, placementValidation, @@ -22,7 +14,6 @@ import { ApplicationSummarySection } from '@/react/kubernetes/applications/compo import { withFormValidation } from '@/react-tools/withFormValidation'; import { withCurrentUser } from '@/react-tools/withCurrentUser'; import { YAMLInspector } from '@/react/kubernetes/components/YAMLInspector'; -import { NodesDatatable } from '@/react/kubernetes/cluster/HomeView/NodesDatatable'; import { StackName } from '@/react/kubernetes/DeployView/StackName/StackName'; import { StackNameLabelInsight } from '@/react/kubernetes/DeployView/StackName/StackNameLabelInsight'; import { SecretsFormSection } from '@/react/kubernetes/applications/components/ConfigurationsFormSection/SecretsFormSection'; @@ -59,33 +50,17 @@ import { EnvironmentVariablesFormSection } from '@/react/kubernetes/applications import { kubeEnvVarValidationSchema } from '@/react/kubernetes/applications/components/EnvironmentVariablesFormSection/kubeEnvVarValidationSchema'; import { IntegratedAppsDatatable } from '@/react/kubernetes/components/IntegratedAppsDatatable/IntegratedAppsDatatable'; import { K8sRegistryAccessNotice } from '@/react/kubernetes/components/K8sRegistryAccessNotice'; -import { HelmTemplates } from '@/react/kubernetes/helm/HelmTemplates/HelmTemplates'; -import { SecretDetailsTable } from '@/react/kubernetes/configs/secrets/ItemView/SecretDetailsTable'; import { KubernetesSummaryView } from '@/react/kubernetes/summary/KubernetesSummaryView'; import { SecretItemTabsWidget } from '@/react/kubernetes/configs/secrets/ItemView/SecretItemTabsWidget'; -import { namespacesModule } from './namespaces'; import { clusterManagementModule } from './clusterManagement'; import { registriesModule } from './registries'; export const ngModule = angular .module('portainer.kubernetes.react.components', [ - namespacesModule, clusterManagementModule, registriesModule, ]) - .component( - 'ingressClassDatatable', - r2a(IngressClassDatatableAngular, [ - 'onChangeControllers', - 'description', - 'ingressControllers', - 'initialIngressControllers', - 'allowNoneIngressClass', - 'isLoading', - 'view', - ]) - ) .component( 'namespacesSelector', r2a(NamespacesSelector, [ @@ -99,22 +74,6 @@ export const ngModule = angular 'allowSelectAll', ]) ) - .component( - 'namespaceAccessUsersSelector', - r2a(NamespaceAccessUsersSelector, [ - 'inputId', - 'onChange', - 'options', - 'value', - 'dataCy', - 'placeholder', - 'name', - ]) - ) - .component( - 'kubeNodesDatatable', - r2a(withUIRouter(withReactQuery(withCurrentUser(NodesDatatable))), []) - ) .component( 'accessPolicyFormSection', r2a(DataAccessPolicyFormSection, [ @@ -166,36 +125,6 @@ export const ngModule = angular 'isComposeFormat', ]) ) - .component( - 'applicationSummaryWidget', - r2a( - withUIRouter(withReactQuery(withCurrentUser(ApplicationSummaryWidget))), - [] - ) - ) - .component( - 'applicationContainersDatatable', - r2a( - withUIRouter( - withReactQuery(withCurrentUser(ApplicationContainersDatatable)) - ), - [] - ) - ) - .component( - 'applicationDetailsWidget', - r2a( - withUIRouter(withReactQuery(withCurrentUser(ApplicationDetailsWidget))), - [] - ) - ) - .component( - 'applicationEventsDatatable', - r2a( - withUIRouter(withReactQuery(withCurrentUser(ApplicationEventsDatatable))), - [] - ) - ) .component( 'applicationSummarySection', r2a( @@ -214,24 +143,6 @@ export const ngModule = angular 'dataCy', ]) ) - .component( - 'helmTemplatesView', - r2a(withUIRouter(withCurrentUser(HelmTemplates)), [ - 'onSelectHelmChart', - 'namespace', - 'name', - ]) - ) - .component( - 'secretDetailsTable', - r2a(withUIRouter(withCurrentUser(withReactQuery(SecretDetailsTable))), [ - 'name', - 'namespace', - 'secretTypeLabel', - 'isSystem', - 'registryId', - ]) - ) .component( 'secretItemTabsWidget', r2a(withUIRouter(withReactQuery(withCurrentUser(SecretItemTabsWidget))), [ diff --git a/app/kubernetes/react/components/namespaces.ts b/app/kubernetes/react/components/namespaces.ts deleted file mode 100644 index c00b7b9b1d..0000000000 --- a/app/kubernetes/react/components/namespaces.ts +++ /dev/null @@ -1,13 +0,0 @@ -import angular from 'angular'; - -import { r2a } from '@/react-tools/react2angular'; -import { withUIRouter } from '@/react-tools/withUIRouter'; -import { withCurrentUser } from '@/react-tools/withCurrentUser'; -import { NamespacesDatatable } from '@/react/kubernetes/namespaces/ListView/NamespacesDatatable'; - -export const namespacesModule = angular - .module('portainer.kubernetes.react.components.namespaces', []) - .component( - 'kubernetesNamespacesDatatable', - r2a(withUIRouter(withCurrentUser(NamespacesDatatable)), []) - ).name; diff --git a/app/portainer/components/forms/group-form/groupForm.html b/app/portainer/components/forms/group-form/groupForm.html deleted file mode 100644 index cee7bde751..0000000000 --- a/app/portainer/components/forms/group-form/groupForm.html +++ /dev/null @@ -1,69 +0,0 @@ -
diff --git a/app/portainer/components/forms/group-form/groupFormController.js b/app/portainer/components/forms/group-form/groupFormController.js deleted file mode 100644 index b7675ac6c1..0000000000 --- a/app/portainer/components/forms/group-form/groupFormController.js +++ /dev/null @@ -1,31 +0,0 @@ -import angular from 'angular'; - -class GroupFormController { - /* @ngInject */ - constructor($async, $scope, GroupService, Notifications, Authentication) { - this.$async = $async; - this.$scope = $scope; - this.GroupService = GroupService; - this.Notifications = Notifications; - this.Authentication = Authentication; - - this.state = { - allowCreateTag: this.Authentication.isAdmin(), - }; - - this.unassociatedQuery = { - groupIds: [1], - }; - - this.onChangeTags = this.onChangeTags.bind(this); - } - - onChangeTags(value) { - return this.$scope.$evalAsync(() => { - this.model.TagIds = value; - }); - } -} - -angular.module('portainer.app').controller('GroupFormController', GroupFormController); -export default GroupFormController; diff --git a/app/portainer/react/components/custom-templates/index.ts b/app/portainer/react/components/custom-templates/index.ts index 46f817249b..9e0d25e8bb 100644 --- a/app/portainer/react/components/custom-templates/index.ts +++ b/app/portainer/react/components/custom-templates/index.ts @@ -1,7 +1,6 @@ import angular from 'angular'; import { r2a } from '@/react-tools/react2angular'; -import { CustomTemplatesVariablesDefinitionField } from '@/react/portainer/custom-templates/components/CustomTemplatesVariablesDefinitionField'; import { CustomTemplatesVariablesField } from '@/react/portainer/custom-templates/components/CustomTemplatesVariablesField'; import { withControlledInput } from '@/react-tools/withControlledInput'; @@ -18,15 +17,6 @@ export const ngModule = angular 'errors', ]) ) - .component('customTemplatesVariablesField', VariablesFieldAngular) - .component( - 'customTemplatesVariablesDefinitionField', - r2a(withControlledInput(CustomTemplatesVariablesDefinitionField), [ - 'onChange', - 'value', - 'errors', - 'isVariablesNamesFromParent', - ]) - ); + .component('customTemplatesVariablesField', VariablesFieldAngular); export const customTemplatesModule = ngModule.name; diff --git a/app/portainer/react/components/index.ts b/app/portainer/react/components/index.ts index f0b30172f0..16a88e2440 100644 --- a/app/portainer/react/components/index.ts +++ b/app/portainer/react/components/index.ts @@ -11,32 +11,21 @@ import { withControlledInput } from '@/react-tools/withControlledInput'; import { EnvironmentVariablesFieldset, EnvironmentVariablesPanel, - StackEnvironmentVariablesPanel, envVarValidation, } from '@@/form-components/EnvironmentVariablesFieldset'; import { Icon } from '@@/Icon'; import { ReactQueryDevtoolsWrapper } from '@@/ReactQueryDevtoolsWrapper'; import { PageHeader } from '@@/PageHeader'; -import { TagSelector } from '@@/TagSelector'; import { Loading } from '@@/Widget/Loading'; import { PasswordCheckHint } from '@@/PasswordCheckHint'; import { Tooltip } from '@@/Tip/Tooltip'; import { TableColumnHeaderAngular } from '@@/datatables/TableHeaderCell'; -import { DashboardItem } from '@@/DashboardItem'; -import { SearchBar } from '@@/datatables/SearchBar'; -import { FallbackImage } from '@@/FallbackImage'; -import { BadgeIcon } from '@@/BadgeIcon'; -import { TeamsSelector } from '@@/TeamsSelector'; import { TerminalTooltip } from '@@/TerminalTooltip'; import { Terminal } from '@@/Terminal/Terminal'; import { PortainerSelect } from '@@/form-components/PortainerSelect'; -import { Slider } from '@@/form-components/Slider'; -import { TagButton } from '@@/TagButton'; import { BETeaserButton } from '@@/BETeaserButton'; import { CodeEditor } from '@@/CodeEditor'; -import { HelpLink } from '@@/HelpLink'; import { TextTip } from '@@/Tip/TextTip'; -import { InlineLoader } from '@@/InlineLoader/InlineLoader'; import { fileUploadField } from './file-upload-field'; import { switchField } from './switch-field'; @@ -68,15 +57,6 @@ export const ngModule = angular rbacModule, stacksModule, ]) - .component( - 'tagSelector', - r2a(withUIRouter(withReactQuery(TagSelector)), [ - 'allowCreate', - 'onChange', - 'value', - 'errors', - ]) - ) .component( 'beTeaserButton', r2a(BETeaserButton, [ @@ -89,11 +69,6 @@ export const ngModule = angular 'data-cy', ]) ) - .component( - 'tagButton', - r2a(TagButton, ['value', 'label', 'title', 'onRemove']) - ) - .component( 'portainerTooltip', r2a(Tooltip, ['message', 'position', 'className', 'setHtmlMessage', 'size']) @@ -130,64 +105,11 @@ export const ngModule = angular 'showTitle', ]) ) - .component( - 'fallbackImage', - r2a(FallbackImage, ['src', 'fallbackIcon', 'alt', 'className']) - ) .component('prIcon', r2a(Icon, ['className', 'icon', 'mode', 'size', 'spin'])) .component( 'reactQueryDevTools', r2a(withReactQuery(ReactQueryDevtoolsWrapper), []) ) - .component( - 'helpLink', - r2a(withUIRouter(withReactQuery(HelpLink)), [ - 'docLink', - 'target', - 'children', - ]) - ) - .component( - 'dashboardItem', - r2a(DashboardItem, [ - 'icon', - 'type', - 'value', - 'to', - 'params', - 'children', - 'pluralType', - 'isLoading', - 'isRefetching', - 'data-cy', - 'iconClass', - ]) - ) - .component( - 'datatableSearchbar', - r2a(SearchBar, [ - 'data-cy', - 'onChange', - 'value', - 'placeholder', - 'children', - 'className', - ]) - ) - .component('badgeIcon', r2a(BadgeIcon, ['icon', 'size', 'iconClass'])) - .component( - 'teamsSelector', - r2a(TeamsSelector, [ - 'onChange', - 'value', - 'dataCy', - 'inputId', - 'name', - 'placeholder', - 'teams', - 'disabled', - ]) - ) .component( 'porSelect', r2a(PortainerSelect, [ @@ -213,19 +135,6 @@ export const ngModule = angular 'onBlur', ]) ) - .component( - 'porSlider', - r2a(Slider, [ - 'min', - 'max', - 'step', - 'value', - 'onChange', - 'visibleTooltip', - 'dataCy', - 'disabled', - ]) - ) .component( 'reactCodeEditor', r2a(CodeEditor, [ @@ -257,10 +166,6 @@ export const ngModule = angular 'childrenWrapperClassName', ]) ) - .component( - 'inlineLoader', - r2a(InlineLoader, ['children', 'className', 'size']) - ) .component('annotationsBeTeaser', r2a(AnnotationsBeTeaser, [])) .component( 'shellTerminal', @@ -290,17 +195,3 @@ withFormValidation( ['explanation', 'showHelpMessage', 'isFoldable'], envVarValidation ); - -withFormValidation( - ngModule, - withUIRouter( - withReactQuery( - withControlledInput(StackEnvironmentVariablesPanel, { - values: 'onChange', - }) - ) - ), - 'stackEnvironmentVariablesPanel', - ['showHelpMessage', 'isFoldable'], - envVarValidation -); diff --git a/app/portainer/react/components/registries.ts b/app/portainer/react/components/registries.ts index 2ac733cfd9..811655d224 100644 --- a/app/portainer/react/components/registries.ts +++ b/app/portainer/react/components/registries.ts @@ -2,27 +2,11 @@ import angular from 'angular'; import { r2a } from '@/react-tools/react2angular'; import { withReactQuery } from '@/react-tools/withReactQuery'; -import { withUIRouter } from '@/react-tools/withUIRouter'; -import { RepositoriesDatatable } from '@/react/portainer/registries/repositories/ListView/RepositoriesDatatable'; -import { TagsDatatable } from '@/react/portainer/registries/repositories/ItemView/TagsDatatable/TagsDatatable'; import { GitlabProjectTable } from '@/react/portainer/registries/CreateView/GitlabProjectsTable/GitlabProjectsTable'; import { RegistryFormDockerhub } from '@/react/portainer/registries/CreateView/RegistryFormDockerhub/RegistryFormDockerhub'; export const registriesModule = angular .module('portainer.app.react.components.registries', []) - .component( - 'registryRepositoriesDatatable', - r2a(withUIRouter(withReactQuery(RepositoriesDatatable)), ['dataset']) - ) - .component( - 'registriesRepositoryTagsDatatable', - r2a(withUIRouter(withReactQuery(TagsDatatable)), [ - 'dataset', - 'advancedFeaturesAvailable', - 'onRemove', - 'onRetag', - ]) - ) .component( 'gitlabProjectSelector', r2a(GitlabProjectTable, ['dataset', 'onChange', 'value']) diff --git a/app/portainer/react/components/settings.ts b/app/portainer/react/components/settings.ts index 174559231f..c80b3fbaeb 100644 --- a/app/portainer/react/components/settings.ts +++ b/app/portainer/react/components/settings.ts @@ -4,14 +4,8 @@ import { InternalAuth } from '@/react/portainer/settings/AuthenticationView/Inte import { AuthenticationMethodSelector } from '@/react/portainer/settings/AuthenticationView/AuthenticationMethodSelector'; import { r2a } from '@/react-tools/react2angular'; import { withReactQuery } from '@/react-tools/withReactQuery'; -import { withUIRouter } from '@/react-tools/withUIRouter'; import { LDAPUsersTable } from '@/react/portainer/settings/AuthenticationView/LDAPAuth/LDAPUsersTable'; import { LDAPGroupsTable } from '@/react/portainer/settings/AuthenticationView/LDAPAuth/LDAPGroupsTable'; -import { ApplicationSettingsPanel } from '@/react/portainer/settings/SettingsView/ApplicationSettingsPanel'; -import { KubeSettingsPanel } from '@/react/portainer/settings/SettingsView/KubeSettingsPanel'; -import { HelmCertPanel } from '@/react/portainer/settings/SettingsView/HelmCertPanel'; -import { HiddenContainersPanel } from '@/react/portainer/settings/SettingsView/HiddenContainersPanel/HiddenContainersPanel'; -import { SSLSettingsPanelWrapper } from '@/react/portainer/settings/SettingsView/SSLSettingsPanel/SSLSettingsPanel'; import { AuthStyleField } from '@/react/portainer/settings/AuthenticationView/OAuth'; import { AutoUserProvisionToggle } from '@/react/portainer/settings/AuthenticationView/AutoUserProvisionToggle/AutoUserProvisionToggle'; import { LdapSettingsTestLogin } from '@/react/portainer/settings/AuthenticationView/LDAPAuth/LdapSettingsTestLogin/LdapSettingsTestLogin'; @@ -53,23 +47,6 @@ export const settingsModule = angular 'limitedFeatureId', ]) ) - .component( - 'applicationSettingsPanel', - r2a(withReactQuery(ApplicationSettingsPanel), ['onSuccess', 'settings']) - ) - .component( - 'sslSettingsPanel', - r2a(withReactQuery(SSLSettingsPanelWrapper), []) - ) - .component('helmCertPanel', r2a(withReactQuery(HelmCertPanel), [])) - .component( - 'hiddenContainersPanel', - r2a(withUIRouter(withReactQuery(HiddenContainersPanel)), []) - ) - .component( - 'kubeSettingsPanel', - r2a(withUIRouter(withReactQuery(KubeSettingsPanel)), ['settings']) - ) .component( 'oauthAuthStyle', r2a(AuthStyleField, [ diff --git a/app/portainer/react/components/users.ts b/app/portainer/react/components/users.ts index 018ed8e2d2..7656db7c21 100644 --- a/app/portainer/react/components/users.ts +++ b/app/portainer/react/components/users.ts @@ -4,18 +4,11 @@ import { r2a } from '@/react-tools/react2angular'; import { withUIRouter } from '@/react-tools/withUIRouter'; import { withReactQuery } from '@/react-tools/withReactQuery'; import { withCurrentUser } from '@/react-tools/withCurrentUser'; -import { EffectiveAccessViewerDatatable } from '@/react/portainer/users/RolesView/AccessViewer/EffectiveAccessViewerDatatable'; import { EffectiveAccessViewer } from '@/react/portainer/users/RolesView/AccessViewer/EffectiveAccessViewer'; import { RbacRolesDatatable } from '@/react/portainer/users/RolesView/RbacRolesDatatable'; export const usersModule = angular .module('portainer.app.react.components.users', []) - .component( - 'effectiveAccessViewerDatatable', - r2a(withUIRouter(withCurrentUser(EffectiveAccessViewerDatatable)), [ - 'dataset', - ]) - ) .component( 'effectiveAccessViewer', r2a(withUIRouter(withReactQuery(withCurrentUser(EffectiveAccessViewer))), [ diff --git a/app/portainer/react/views/index.ts b/app/portainer/react/views/index.ts index 566e51030d..f245aef588 100644 --- a/app/portainer/react/views/index.ts +++ b/app/portainer/react/views/index.ts @@ -7,7 +7,6 @@ import { withReactQuery } from '@/react-tools/withReactQuery'; import { withUIRouter } from '@/react-tools/withUIRouter'; import { CreateUserAccessToken } from '@/react/portainer/account/CreateAccessTokenView'; import { EdgeComputeSettingsView } from '@/react/portainer/settings/EdgeComputeView/EdgeComputeSettingsView'; -import { BackupSettingsPanel } from '@/react/portainer/settings/SettingsView/BackupSettingsView/BackupSettingsPanel'; import { SettingsView } from '@/react/portainer/settings/SettingsView/SettingsView'; import { CreateHelmRepositoriesView } from '@/react/portainer/account/helm-repositories/CreateHelmRepositoryView'; @@ -53,11 +52,6 @@ export const viewsModule = angular ['onSubmit', 'settings'] ) ) - - .component( - 'backupSettingsPanel', - r2a(withUIRouter(withReactQuery(withCurrentUser(BackupSettingsPanel))), []) - ) .component( 'settingsView', r2a(withUIRouter(withReactQuery(withCurrentUser(SettingsView))), []) diff --git a/app/react/docker/host/SetupView/GpusList.tsx b/app/react/docker/host/SetupView/GpusList.tsx index 982cbde703..252ad56ade 100644 --- a/app/react/docker/host/SetupView/GpusList.tsx +++ b/app/react/docker/host/SetupView/GpusList.tsx @@ -1,8 +1,5 @@ import { array, object, string } from 'yup'; -import { r2a } from '@/react-tools/react2angular'; -import { withControlledInput } from '@/react-tools/withControlledInput'; - import { InputList } from '@@/form-components/InputList'; import { ItemProps } from '@@/form-components/InputList/InputList'; import { InputGroup } from '@@/form-components/InputGroup'; @@ -69,8 +66,3 @@ export function gpusListValidation() { }); return array().of(gpuShape).default([]); } - -export const GpusListAngular = r2a(withControlledInput(GpusList), [ - 'value', - 'onChange', -]); diff --git a/app/react/kubernetes/applications/DetailsView/ApplicationEventsDatatable.tsx b/app/react/kubernetes/applications/DetailsView/ApplicationEventsDatatable.tsx deleted file mode 100644 index 8f4289f74f..0000000000 --- a/app/react/kubernetes/applications/DetailsView/ApplicationEventsDatatable.tsx +++ /dev/null @@ -1,106 +0,0 @@ -import { useCurrentStateAndParams } from '@uirouter/react'; -import { useMemo } from 'react'; -import { compact } from 'lodash'; - -import { createStore } from '@/react/kubernetes/datatables/default-kube-datatable-store'; -import { EnvironmentId } from '@/react/portainer/environments/types'; - -import { useTableState } from '@@/datatables/useTableState'; - -import { EventsDatatable } from '../../components/EventsDatatable'; -import { useEvents } from '../../queries/useEvents'; -import { AppKind } from '../types'; -import { useApplication } from '../queries/useApplication'; -import { useApplicationServices } from '../queries/useApplicationServices'; -import { useApplicationPods } from '../queries/useApplicationPods'; - -const storageKey = 'k8sAppEventsDatatable'; -const settingsStore = createStore(storageKey, { id: 'Date', desc: true }); - -export function ApplicationEventsDatatable() { - const tableState = useTableState(settingsStore, storageKey); - const { - params: { - namespace, - name, - 'resource-type': appKind, - endpointId: environmentId, - }, - } = useCurrentStateAndParams(); - - const { relatedEvents, isInitialLoading } = useApplicationEvents( - environmentId, - namespace, - name, - appKind, - { - autoRefreshRate: tableState.autoRefreshRate, - } - ); - - return ( -- There are ingress controllers you want to disallow that are in - use: -
-- No new ingress rules can be created for the disallowed - controllers. -
-