Split change of use-deployment-status-in-job-log-page

3 files changed, 13 insertions, 29 deletions

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index c5e6e0d46d2..cdfe8175a42 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -701,21 +701,17 @@ module Ci
     end
 
     # Virtual deployment status depending on the environment status.
-    # def deployment_status
-    #   last_deployment.detailed_status
-    # end
+    def deployment_status
+      return nil unless starts_environment?
 
-    # def deployment_status
-    #   return nil unless starts_environment?
-
-    #   if success?
-    #     return successful_deployment_status
-    #   elsif complete? && !success?
-    #     return :failed
-    #   end
+      if success?
+        return successful_deployment_status
+      elsif complete? && !success?
+        return :failed
+      end
 
-    #   :creating
-    # end
+      :creating
+    end
 
     private
 
diff --git a/app/serializers/build_details_entity.rb b/app/serializers/build_details_entity.rb
index 0c2b0dfacf4..066a5b1885c 100644
--- a/app/serializers/build_details_entity.rb
+++ b/app/serializers/build_details_entity.rb
@@ -9,13 +9,11 @@ class BuildDetailsEntity < JobEntity
   expose :runner, using: RunnerEntity
   expose :pipeline, using: PipelineEntity
 
-  expose :deployment_status, with: DetailedStatusEntity
+  expose :deployment_status, if: -> (*) { build.starts_environment? } do
+    expose :deployment_status, as: :status
 
-  # expose :deployment_status, if: -> (*) { build.starts_environment? } do
-  #   expose :deployment_status, as: :status
-
-  #   expose :persisted_environment, as: :environment, with: EnvironmentEntity
-  # end
+    expose :persisted_environment, as: :environment, with: EnvironmentEntity
+  end
 
   expose :metadata, using: BuildMetadataEntity
 
@@ -111,8 +109,4 @@ class BuildDetailsEntity < JobEntity
   def can_admin_build?
     can?(request.current_user, :admin_build, project)
   end
-
-  def deployment_status
-    build.last_deployment.detailed_status(current_user)
-  end
 end
diff --git a/app/serializers/detailed_status_entity.rb b/app/serializers/detailed_status_entity.rb
index cf66a8cadd7..da994d78286 100644
--- a/app/serializers/detailed_status_entity.rb
+++ b/app/serializers/detailed_status_entity.rb
@@ -32,10 +32,4 @@ class DetailedStatusEntity < Grape::Entity
     expose :action_method, as: :method
     expose :action_button_title, as: :button_title
   end
-
-  expose :deployment, if: -> (status, _) { status.has_deployment? } do
-    expose :environment_text
-    expose :environment_path
-    expose :deployment_path
-  end
 end