From 24471a9ae1d4fb810cb54bc3a467fc4081d21734 Mon Sep 17 00:00:00 2001 From: Dakota Walsh <101994734+dakota-portainer@users.noreply.github.com> Date: Wed, 14 Feb 2024 08:40:34 +1300 Subject: [PATCH] fix(restore): add S3 teaser [EE-6675] (#11096) --- app/portainer/views/init/admin/initAdmin.html | 168 ++++++++++++++---- .../views/init/admin/initAdminController.js | 2 + 2 files changed, 137 insertions(+), 33 deletions(-) diff --git a/app/portainer/views/init/admin/initAdmin.html b/app/portainer/views/init/admin/initAdmin.html index 1f6cc2ed3..d842824a9 100644 --- a/app/portainer/views/init/admin/initAdmin.html +++ b/app/portainer/views/init/admin/initAdmin.html @@ -131,48 +131,150 @@ + -
-
- You can upload a backup file from your computer. +
+ +
+
+ You can upload a backup file from your computer. +
-
- - -
-
- - - {{ formValues.BackupFile.name }} - - + + +
+
+ + + {{ formValues.BackupFile.name }} + + +
+ +
+ +
+ +
+
+
- -
- -
- +
+ +
+ +
+ +
+ + +
+ +
+ +
+
+ + +
+ +
+ +
+
+ + +
+ +
+ +
+
+ + +
+ +
+ +
+
+ + +
+ +
+ +
+
+ + +
+ +
+ +
+
+
-
diff --git a/app/portainer/views/init/admin/initAdminController.js b/app/portainer/views/init/admin/initAdminController.js index e985d6d10..68e4eec0b 100644 --- a/app/portainer/views/init/admin/initAdminController.js +++ b/app/portainer/views/init/admin/initAdminController.js @@ -17,12 +17,14 @@ angular.module('portainer.app').controller('InitAdminController', [ $scope.uploadBackup = uploadBackup; $scope.logo = StateManager.getState().application.logo; + $scope.RESTORE_FORM_TYPES = { S3: 's3', FILE: 'file' }; $scope.formValues = { Username: 'admin', Password: '', ConfirmPassword: '', enableTelemetry: process.env.NODE_ENV === 'production', + restoreFormType: $scope.RESTORE_FORM_TYPES.FILE, }; $scope.state = {