+
You can onboard different types of environments, select all that
apply.
-
- {filterEdgeDevicesIfNeed(environmentTypes, createEdgeDevice).map(
- (eType) => (
-
+
+
);
-
- function handleClick(eType: EnvironmentSelectorValue) {
- if (value.includes(eType)) {
- onChange(value.filter((v) => v !== eType));
- return;
- }
-
- onChange([...value, eType]);
- }
}
function filterEdgeDevicesIfNeed(
@@ -64,8 +49,8 @@ function filterEdgeDevicesIfNeed(
createEdgeDevice?: boolean
) {
if (!createEdgeDevice) {
- return types;
+ return [...types];
}
- return types.filter((eType) => hasEdge.includes(eType.id));
+ return [...types.filter((eType) => hasEdge.includes(eType.id))];
}
diff --git a/app/react/portainer/environments/wizard/EnvironmentTypeSelectView/environment-types.ts b/app/react/portainer/environments/wizard/EnvironmentTypeSelectView/environment-types.ts
index fdd8add7a..e91c8d996 100644
--- a/app/react/portainer/environments/wizard/EnvironmentTypeSelectView/environment-types.ts
+++ b/app/react/portainer/environments/wizard/EnvironmentTypeSelectView/environment-types.ts
@@ -1,52 +1,71 @@
import { FeatureId } from '@/react/portainer/feature-flags/enums';
-import DockerIcon from '@/assets/ico/vendor/docker-icon.svg?c';
-import Kube from '@/assets/ico/kube.svg?c';
-import MicrosoftIcon from '@/assets/ico/vendor/microsoft-icon.svg?c';
-import NomadIcon from '@/assets/ico/vendor/nomad-icon.svg?c';
+import Docker from '@/assets/ico/vendor/docker.svg?c';
+import Kubernetes from '@/assets/ico/vendor/kubernetes.svg?c';
+import Azure from '@/assets/ico/vendor/azure.svg?c';
+import Nomad from '@/assets/ico/vendor/nomad.svg?c';
import KaaSIcon from './kaas-icon.svg?c';
export const environmentTypes = [
{
id: 'dockerStandalone',
- title: 'Docker Standalone',
- icon: DockerIcon,
+ value: 'dockerStandalone',
+ label: 'Docker Standalone',
+ icon: Docker,
+ iconType: 'logo',
description: 'Connect to Docker Standalone via URL/IP, API or Socket',
- featureId: undefined,
},
{
id: 'dockerSwarm',
- title: 'Docker Swarm',
- icon: DockerIcon,
+ value: 'dockerSwarm',
+ label: 'Docker Swarm',
+ icon: Docker,
+ iconType: 'logo',
description: 'Connect to Docker Swarm via URL/IP, API or Socket',
- featureId: undefined,
},
{
id: 'kubernetes',
- title: 'Kubernetes',
- icon: Kube,
+ value: 'kubernetes',
+ label: 'Kubernetes',
+ icon: Kubernetes,
+ iconType: 'logo',
description: 'Connect to a kubernetes environment via URL/IP',
- featureId: undefined,
},
{
id: 'aci',
- title: 'ACI',
+ value: 'aci',
+ label: 'ACI',
description: 'Connect to ACI environment via API',
- icon: MicrosoftIcon,
- featureId: undefined,
+ iconType: 'logo',
+ icon: Azure,
},
{
id: 'nomad',
- title: 'Nomad',
+ value: 'nomad',
+ label: 'Nomad',
description: 'Connect to HashiCorp Nomad environment via API',
- icon: NomadIcon,
- featureId: FeatureId.NOMAD,
+ icon: Nomad,
+ iconType: 'logo',
+ feature: FeatureId.NOMAD,
+ disabledWhenLimited: true,
},
{
id: 'kaas',
- title: 'KaaS',
+ value: 'kaas',
+ label: 'KaaS',
description: 'Provision a Kubernetes environment with a cloud provider',
icon: KaaSIcon,
- featureId: FeatureId.KAAS_PROVISIONING,
+ iconType: 'logo',
+ feature: FeatureId.KAAS_PROVISIONING,
+ disabledWhenLimited: true,
},
] as const;
+
+export const formTitles = {
+ dockerStandalone: 'Connect to your Docker Standalone environment',
+ dockerSwarm: 'Connect to your Docker Swarm environment',
+ kubernetes: 'Connect to your Kubernetes environment',
+ aci: 'Connect to your ACI environment',
+ nomad: 'Connect to your Nomad environment',
+ kaas: 'Provision a KaaS environment',
+};
diff --git a/app/react/portainer/environments/wizard/EnvironmentsCreationView/EnvironmentsCreationView.tsx b/app/react/portainer/environments/wizard/EnvironmentsCreationView/EnvironmentsCreationView.tsx
index 4aa6727cb..0d75ade82 100644
--- a/app/react/portainer/environments/wizard/EnvironmentsCreationView/EnvironmentsCreationView.tsx
+++ b/app/react/portainer/environments/wizard/EnvironmentsCreationView/EnvironmentsCreationView.tsx
@@ -18,7 +18,10 @@ import { Button } from '@@/buttons';
import { FormSection } from '@@/form-components/FormSection';
import { Icon } from '@@/Icon';
-import { environmentTypes } from '../EnvironmentTypeSelectView/environment-types';
+import {
+ environmentTypes,
+ formTitles,
+} from '../EnvironmentTypeSelectView/environment-types';
import { EnvironmentSelectorValue } from '../EnvironmentTypeSelectView/EnvironmentSelector';
import { WizardDocker } from './WizardDocker';
@@ -77,10 +80,7 @@ export function EnvironmentCreationView() {
-
+
(
- options: BoxSelectorOption[],
- edgeValue: T
-) {
+export function useFilterEdgeOptionsIfNeeded<
+ T extends Value = EnvironmentCreationTypes
+>(options: BoxSelectorOption[], edgeValue: T) {
const createEdgeDevice = useCreateEdgeDeviceParam();
if (!createEdgeDevice) {
diff --git a/app/react/portainer/feature-flags/enums.ts b/app/react/portainer/feature-flags/enums.ts
index afdcb8af3..dd2dcf300 100644
--- a/app/react/portainer/feature-flags/enums.ts
+++ b/app/react/portainer/feature-flags/enums.ts
@@ -20,6 +20,7 @@ export enum FeatureId {
REGISTRY_MANAGEMENT = 'registry-management',
K8S_SETUP_DEFAULT = 'k8s-setup-default',
S3_BACKUP_SETTING = 's3-backup-setting',
+ S3_RESTORE = 'restore-s3-form',
HIDE_INTERNAL_AUTHENTICATION_PROMPT = 'hide-internal-authentication-prompt',
TEAM_MEMBERSHIP = 'team-membership',
HIDE_INTERNAL_AUTH = 'hide-internal-auth',
diff --git a/app/react/portainer/feature-flags/feature-flags.service.ts b/app/react/portainer/feature-flags/feature-flags.service.ts
index 1e372fb50..1e6646589 100644
--- a/app/react/portainer/feature-flags/feature-flags.service.ts
+++ b/app/react/portainer/feature-flags/feature-flags.service.ts
@@ -28,6 +28,7 @@ export async function init(edition: Edition) {
[FeatureId.RBAC_ROLES]: Edition.BE,
[FeatureId.REGISTRY_MANAGEMENT]: Edition.BE,
[FeatureId.S3_BACKUP_SETTING]: Edition.BE,
+ [FeatureId.S3_RESTORE]: Edition.BE,
[FeatureId.TEAM_MEMBERSHIP]: Edition.BE,
[FeatureId.FORCE_REDEPLOYMENT]: Edition.BE,
[FeatureId.HIDE_AUTO_UPDATE_WINDOW]: Edition.BE,