Fix initial status again

3 files changed, 9 insertions, 13 deletions

diff --git a/app/models/clusters/applications/helm.rb b/app/models/clusters/applications/helm.rb
index d60bb7dcd02..0bbe5219715 100644
--- a/app/models/clusters/applications/helm.rb
+++ b/app/models/clusters/applications/helm.rb
@@ -11,16 +11,14 @@ module Clusters
 
       validates :cluster, presence: true
 
+      after_initialize :set_initial_status
+
       def self.application_name
         self.to_s.demodulize.underscore
       end
 
-      def initial_status
-        if cluster&.platform_kubernetes_active?
-          :installable
-        else
-          :not_installable
-        end
+      def set_initial_status
+        self.status = 'installable' if cluster&.platform_kubernetes_active?
       end
 
       def name
diff --git a/app/models/clusters/applications/ingress.rb b/app/models/clusters/applications/ingress.rb
index c97e9db925e..02c14a33e23 100644
--- a/app/models/clusters/applications/ingress.rb
+++ b/app/models/clusters/applications/ingress.rb
@@ -12,6 +12,8 @@ module Clusters
       default_value_for :ingress_type, :nginx
       default_value_for :version, :nginx
 
+      after_initialize :set_initial_status
+
       enum ingress_type: {
         nginx: 1
       }
@@ -20,12 +22,8 @@ module Clusters
         self.to_s.demodulize.underscore
       end
 
-      def initial_status
-        if cluster&.application_helm_installed?
-          :installable
-        else
-          :not_installable
-        end
+      def set_initial_status
+        self.status = 'installable' if cluster&.application_helm_installed?
       end
 
       def name
diff --git a/app/models/clusters/concerns/application_status.rb b/app/models/clusters/concerns/application_status.rb
index 3e15da7fc32..516fb0d1a7d 100644
--- a/app/models/clusters/concerns/application_status.rb
+++ b/app/models/clusters/concerns/application_status.rb
@@ -4,7 +4,7 @@ module Clusters
       extend ActiveSupport::Concern
 
       included do
-        state_machine :status, initial: ->(application) { application.initial_status } do
+        state_machine :status, initial: :not_installable do
           state :not_installable, value: -2
           state :errored, value: -1
           state :installable, value: 0