uffizzi_core 2.1.3 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a920d00be62a50b051ef96fecaa9d3e9ca1009e366fc2521efd215dc5193f0a
-  data.tar.gz: 6ddcda3a07b729fad5d43afcc97d729aaa392accbf3288b5bafcfc963305c357
+  metadata.gz: 31b523abfb135f26506fe25a9e6a74a90906f8fdb715ed167613d88869c1da7c
+  data.tar.gz: 387de06335635d9830d4120636100b75042fedd59221c16688c5f219c5a5a396
 SHA512:
-  metadata.gz: c4d4dfbf12d26127991891c84f15c5b978f317ebf22e0826381a32e588c3fb3ba31b7511d1ee97b65bcc4982303638580fc602d4ba72cd5f8d61185e46715510
-  data.tar.gz: 389889aa1a60bb76568e8b4775ea2ba76514c1a980a275f15433c4feae90144c3d66d15360cf813bd68c5f0f080485e4245d80c838661d2f7930c765e353bdf5
+  metadata.gz: 92172c981d9c5883dd1ab8f6dc6f7c708a6a73e94c6dcba9193dd5f95ef1daf894db88172a1eed229a319baba70c8cb5a1058072209e821f884a6505ee116b69
+  data.tar.gz: 938c57b21171b791af729fb02eff4e964836329f4ec218a5b0bf00c208a8ac53e016e9a99b9ffbdf1ffcaa58a7b7e8b4345df1dee6113fa053e5a13f1257f032

data/app/lib/uffizzi_core/concerns/models/deployment.rb

@@ -43,7 +43,7 @@ module UffizziCore::Concerns::Models::Deployment
       state :failed
       state :disabled
 
-      event :activate do
+      event :activate, after: :after_activate do
         transitions from: [:disabled], to: :active
       end
 
@@ -56,6 +56,10 @@ module UffizziCore::Concerns::Models::Deployment
       end
     end
 
+    def after_activate
+      update!(disabled_at: nil)
+    end
+
     def after_disable
       clean
       update!(disabled_at: Time.now)

data/app/services/uffizzi_core/deployment_service.rb

@@ -27,23 +27,22 @@ class UffizziCore::DeploymentService
       deployment_form
     end
 
-    def update_from_compose(compose_file, project, user, deployment, metadata)
+    def update_from_compose(compose_file, project, user, deployment, metadata = {})
       deployment_attributes = ActionController::Parameters.new(compose_file.template.payload)
 
       deployment_form = UffizziCore::Api::Cli::V1::Deployment::UpdateForm.new(deployment_attributes)
       deployment_form.assign_dependences!(project, user)
       deployment_form.compose_file = compose_file
-      deployment_form.metadata = metadata || {}
+      deployment_form.metadata = metadata
 
       ActiveRecord::Base.transaction do
         deployment.containers.destroy_all
         deployment.compose_file.destroy! if deployment.compose_file&.kind&.temporary?
+        deployment.activate unless deployment.active?
         params = {
           containers: deployment_form.containers,
           compose_file_id: compose_file.id,
-          creation_source: UffizziCore::Deployment.creation_source.compose_file_manual,
           metadata: deployment_form.metadata,
-          state: :active,
         }
         deployment.update!(params)
       end

data/lib/uffizzi_core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module UffizziCore
-  VERSION = '2.1.3'
+  VERSION = '2.1.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi_core
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-07 00:00:00.000000000 Z
+date: 2023-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm