Address UX review

- Keep 'Deploy Section' open upon save, otherwise the token might get
  lost
- When an error appears, display the error inside the form and also keep
  the Deploy Section open
- Changue copy of revoke modal

2 files changed, 4 insertions, 10 deletions

diff --git a/app/controllers/projects/deploy_tokens_controller.rb b/app/controllers/projects/deploy_tokens_controller.rb
index ecc6db50f2f..1b1bd461b27 100644
--- a/app/controllers/projects/deploy_tokens_controller.rb
+++ b/app/controllers/projects/deploy_tokens_controller.rb
@@ -3,16 +3,12 @@ class Projects::DeployTokensController < Projects::ApplicationController
 
   def create
     @token = DeployTokens::CreateService.new(@project, current_user, deploy_token_params).execute
-    token_params = {}
 
     if @token.valid?
       flash[:notice] = 'Your new project deploy token has been created.'
-    else
-      token_params = @token.attributes.slice("name", "scopes", "expires_at")
-      flash[:alert] = @token.errors.full_messages.join(', ').html_safe
     end
 
-    redirect_to project_settings_repository_path(project, deploy_token: token_params)
+    redirect_to project_settings_repository_path(project)
   end
 
   def revoke
diff --git a/app/controllers/projects/settings/repository_controller.rb b/app/controllers/projects/settings/repository_controller.rb
index 28897cc5946..ab6d8b3b10c 100644
--- a/app/controllers/projects/settings/repository_controller.rb
+++ b/app/controllers/projects/settings/repository_controller.rb
@@ -55,11 +55,9 @@ module Projects
       end
 
       def define_deploy_token
-        @deploy_token = @project.deploy_tokens.build(deploy_token_attributes)
-      end
-
-      def deploy_token_attributes
-        params.fetch(:deploy_token, {}).permit(:name, :expires_at, scopes: [])
+        attributes = @deploy_tokens.attributes_deploy_token
+        @deploy_token = @project.deploy_tokens.build(attributes)
+        @deploy_token.valid? unless attributes.empty?
       end
     end
   end