AppConfig refactor

app/components/integration_card_component.html.erb

@@ -20,19 +20,35 @@
         <% if connected? %>
           <div class="flex justify-between w-full items-baseline">
             <%= render BadgeComponent.new(text: "Connected", status: :success) %>
-            <% if disconnectable_categories? %>
-              <%= render ButtonComponent.new(
-                    scheme: :danger,
-                    options: app_integration_path(@app, integration),
-                    type: :button,
-                    size: :xxs,
-                    turbo: false,
-                    disabled: !disconnectable?,
-                    html_options: {method: :delete, data: {turbo_method: :delete, turbo_confirm: "Are you sure you want disconnect the integration?"}}
-                  ) do |b|
-                    b.with_icon("trash.svg", size: :sm)
-                  end %>
-            <% end %>
+            <div class="flex gap-2">
+              <% if further_setup? %>
+                <%= render ModalComponent.new(title: category_title, open: pre_open_category?) do |modal| %>
+                  <% button = modal.with_button(scheme: :light, type: :action, size: :xxs) %>
+                  <% button.with_icon("cog.svg", size: :sm) %>
+                  <% modal.with_body do %>
+                    <%= tag.turbo_frame id: category_config_turbo_frame_id,
+                                        src: edit_config_path,
+                                        loading: :lazy,
+                                        class: "with-turbo-frame-loader" do %>
+                      <%= render LoadingIndicatorComponent.new(skeleton_only: true, turbo_frame: true) %>
+                    <% end %>
+                  <% end %>
+                <% end %>
+              <% end %>
+
+              <% if disconnectable_categories? %>
+                <%= render ButtonComponent.new(
+                      scheme: :danger,
+                      options: app_integration_path(@app, integration),
+                      type: :button,
+                      size: :xxs,
+                      disabled: !disconnectable?,
+                      html_options: {method: :delete, data: {turbo_confirm: "Are you sure you want to disconnect this integration?"}}
+                    ) do |b|
+                      b.with_icon("trash.svg", size: :sm)
+                    end %>
+              <% end %>
+            </div>
           </div>
         <% end %>
 
@@ -45,8 +61,8 @@
 
             <% if creatable? %>
               <%= render ModalComponent.new(title: creatable_modal_title) do |modal| %>
-                <% modal.with_button(label: "Connect", scheme: :light, type: :action, size: :xxs, arrow: :none)
-                     .with_icon("plus.svg", size: :md) %>
+                <% button = modal.with_button(label: "Connect", scheme: :light, type: :action, size: :xxs, arrow: :none) %>
+                <% button.with_icon("plus.svg", size: :md) %>
                 <% modal.with_body do %>
                   <%= creatable_form_partial %>
                 <% end %>

app/components/integration_card_component.rb

@@ -10,10 +10,11 @@ class IntegrationCardComponent < BaseComponent
     bitrise: "Access Token"
   }
 
-  def initialize(app, integration, category)
+  def initialize(app, integration, category, pre_open_category = nil)
     @app = app
     @integration = integration
     @category = category
+    @pre_open_category = pre_open_category
   end
 
   attr_reader :integration
@@ -22,7 +23,8 @@ def initialize(app, integration, category)
     :providable,
     :connection_data,
     :providable_type,
-    :disconnectable_categories?, to: :integration, allow_nil: true
+    :disconnectable_categories?,
+    :further_setup?, to: :integration, allow_nil: true
   delegate :creatable?, :connectable?, to: :provider
   alias_method :provider, :providable
 
@@ -77,4 +79,78 @@ def reusable_integrations_form_partial(existing_integrations)
   def disconnectable?
     integration.disconnectable? && disconnectable_categories?
   end
+
+  def category_title
+    "Configure #{Integration.human_enum_name(:category, @category)}"
+  end
+
+  def pre_open_category?
+    @pre_open_category == @category
+  end
+
+  def category_config_turbo_frame_id
+    "#{@category}_config"
+  end
+
+  def edit_config_path
+    case integration.category
+    when "version_control" then edit_app_version_control_config_path
+    when "ci_cd" then edit_app_ci_cd_config_path
+    when "build_channel" then edit_app_build_channel_config_path
+    when "monitoring" then edit_app_monitoring_config_path
+    when "project_management" then edit_app_project_management_config_path
+    else unsupported_integration_category
+    end
+  end
+
+  private
+
+  def edit_app_version_control_config_path
+    case integration.providable_type
+    when "GithubIntegration" then edit_app_version_control_github_config_path(@app)
+    when "GitlabIntegration" then edit_app_version_control_gitlab_config_path(@app)
+    when "BitbucketIntegration" then edit_app_version_control_bitbucket_config_path(@app)
+    else unsupported_integration_type
+    end
+  end
+
+  def edit_app_ci_cd_config_path
+    case integration.providable_type
+    when "GithubIntegration" then edit_app_ci_cd_github_config_path(@app)
+    when "GitlabIntegration" then edit_app_ci_cd_gitlab_config_path(@app)
+    when "BitbucketIntegration" then edit_app_ci_cd_bitbucket_config_path(@app)
+    when "BitriseIntegration" then edit_app_ci_cd_bitrise_config_path(@app)
+    else unsupported_integration_type
+    end
+  end
+
+  def edit_app_build_channel_config_path
+    case integration.providable_type
+    when "GoogleFirebaseIntegration" then edit_app_build_channel_google_firebase_config_path(@app)
+    else unsupported_integration_type
+    end
+  end
+
+  def edit_app_monitoring_config_path
+    case integration.providable_type
+    when "BugsnagIntegration" then edit_app_monitoring_bugsnag_config_path(@app)
+    else unsupported_integration_type
+    end
+  end
+
+  def edit_app_project_management_config_path
+    case integration.providable_type
+    when "JiraIntegration" then edit_app_project_management_jira_config_path(@app)
+    when "LinearIntegration" then edit_app_project_management_linear_config_path(@app)
+    else unsupported_integration_type
+    end
+  end
+
+  def unsupported_integration_category
+    raise TypeError, "Unsupported integration category: #{integration.category}"
+  end
+
+  def unsupported_integration_type
+    raise TypeError, "Unsupported integration type: #{integration.providable_type}"
+  end
 end

app/components/integration_list_component.html.erb

@@ -5,26 +5,10 @@
     <div id="<%= category %>">
       <div class="grid grid-cols-10 gap-6 mt-4">
         <% integrations.each do |integration| %>
-          <%= render IntegrationCardComponent.new(@app, integration, category) %>
+          <%= render IntegrationCardComponent.new(@app, integration, category, @pre_open_category) %>
         <% end %>
       </div>
     </div>
-    <% if connected_integrations?(integrations) %>
-      <% sc.with_sidenote do %>
-        <%= render ModalComponent.new(title: title(category), open: pre_open?(category)) do |modal| %>
-          <% modal.with_button(label: "Configure", scheme: :light, type: :action, size: :xxs, arrow: :none)
-               .with_icon("cog.svg", size: :md) %>
-          <% modal.with_body do %>
-            <%= tag.turbo_frame id: "#{category}_config",
-                                src: edit_app_app_config_path(@app, integration_category: category),
-                                loading: :lazy,
-                                class: "with-turbo-frame-loader" do %>
-              <%= render LoadingIndicatorComponent.new(skeleton_only: true, turbo_frame: true) %>
-            <% end %>
-          <% end %>
-        <% end %>
-      <% end %>
-    <% end %>
   <% end %>
 <% end %>
 <%= render SectionComponent.new(style: :titled, title: "Coming Soon") do %>

app/components/integration_list_component.rb

@@ -12,8 +12,4 @@ def title(category)
   def pre_open?(category)
     @pre_open_category == category
   end
-
-  def connected_integrations?(integrations)
-    integrations.any? { |i| i.connected? && i.further_setup? }
-  end
 end

app/components/live_release/finalize_component.rb

@@ -72,7 +72,7 @@ def subtitle
   end
 
   def tag_link
-    link = release.tag_url || release.app.config&.code_repo_url
+    link = release.tag_url || release.app.vcs_provider&.code_repo_url
     return NOT_AVAILABLE if link.blank?
     link_to_external train.vcs_provider.display, link, class: "underline"
   end

app/controllers/apps_controller.rb

@@ -24,8 +24,11 @@ def show
       redirect_to app_train_releases_path(@app, selected_train)
     end
 
-    @train_in_creation = @app.train_in_creation
-    @app_setup_instructions = @app.app_setup_instructions
+    if @app.ready?
+      @train_in_creation = @app.train_in_creation
+    else
+      @app_setup_instructions = @app.app_setup_instructions
+    end
   end
 
   def edit

app/controllers/build_channel/google_firebase_configs_controller.rb

@@ -0,0 +1,54 @@
+class BuildChannel::GoogleFirebaseConfigsController < SignedInApplicationController
+  using RefinedString
+
+  before_action :require_write_access!
+  before_action :set_app
+  before_action :set_google_firebase_integration
+  around_action :set_time_zone
+
+  def edit
+    set_firebase_apps
+
+    respond_to do |format|
+      format.html do |variant|
+        variant.turbo_frame { render :edit }
+      end
+    end
+  end
+
+  def update
+    if @google_firebase_integration.update(parsed_google_firebase_config_params)
+      redirect_to app_path(@app), notice: t(".success")
+    else
+      redirect_back fallback_location: app_integrations_path(@app),
+        flash: {error: @google_firebase_integration.errors.full_messages.to_sentence}
+    end
+  end
+
+  private
+
+  def set_app
+    @app = current_organization.apps.friendly.find(params[:app_id])
+  end
+
+  def set_google_firebase_integration
+    @google_firebase_integration = @app.integrations.firebase_build_channel_provider
+    unless @google_firebase_integration.is_a?(GoogleFirebaseIntegration)
+      redirect_to app_integrations_path(@app), flash: {error: "Firebase build channel integration not found."}
+    end
+  end
+
+  def set_firebase_apps
+    config = @google_firebase_integration.setup
+    @firebase_android_apps, @firebase_ios_apps = config[:android], config[:ios]
+  end
+
+  def parsed_google_firebase_config_params
+    google_firebase_config_params = params.require(:google_firebase_integration)
+      .permit(:android_config, :ios_config)
+    google_firebase_config_params.merge(
+      android_config: google_firebase_config_params[:android_config]&.safe_json_parse,
+      ios_config: google_firebase_config_params[:ios_config]&.safe_json_parse
+    )
+  end
+end

app/controllers/ci_cd/bitbucket_configs_controller.rb

@@ -0,0 +1,55 @@
+class CiCd::BitbucketConfigsController < SignedInApplicationController
+  using RefinedString
+
+  before_action :require_write_access!
+  before_action :set_app
+  before_action :set_bitbucket_integration
+  around_action :set_time_zone
+
+  def edit
+    set_code_repositories
+
+    respond_to do |format|
+      format.html do |variant|
+        variant.turbo_frame { render :edit }
+      end
+      format.turbo_stream { render :edit }
+    end
+  end
+
+  def update
+    if @bitbucket_integration.update(parsed_bitbucket_config_params)
+      redirect_to app_path(@app), notice: t(".success")
+    else
+      redirect_back fallback_location: app_integrations_path(@app),
+        flash: {error: @bitbucket_integration.errors.full_messages.to_sentence}
+    end
+  end
+
+  private
+
+  def set_app
+    @app = current_organization.apps.friendly.find(params[:app_id])
+  end
+
+  def set_bitbucket_integration
+    @bitbucket_integration = @app.ci_cd_provider
+    unless @bitbucket_integration.is_a?(BitbucketIntegration)
+      redirect_to app_integrations_path(@app), flash: {error: "CI/CD integration not found."}
+    end
+  end
+
+  def set_code_repositories
+    @workspaces = @bitbucket_integration.workspaces || []
+    workspace = params[:workspace] || @workspaces.first
+    @code_repositories = @bitbucket_integration.repos(workspace)
+  end
+
+  def parsed_bitbucket_config_params
+    bitbucket_config_params = params.require(:bitbucket_integration)
+      .permit(:repository_config, :workspace)
+    bitbucket_config_params.merge(
+      repository_config: bitbucket_config_params[:repository_config]&.safe_json_parse
+    )
+  end
+end

app/controllers/ci_cd/bitrise_configs_controller.rb

@@ -0,0 +1,53 @@
+class CiCd::BitriseConfigsController < SignedInApplicationController
+  using RefinedString
+
+  before_action :require_write_access!
+  before_action :set_app
+  before_action :set_bitrise_integration
+  around_action :set_time_zone
+
+  def edit
+    set_ci_cd_projects
+
+    respond_to do |format|
+      format.html do |variant|
+        variant.turbo_frame { render :edit }
+      end
+    end
+  end
+
+  def update
+    if @bitrise_integration.update(parsed_bitrise_config_params)
+      redirect_to app_path(@app), notice: t(".success")
+    else
+      redirect_back fallback_location: app_integrations_path(@app),
+        flash: {error: @bitrise_integration.errors.full_messages.to_sentence}
+    end
+  end
+
+  private
+
+  def set_app
+    @app = current_organization.apps.friendly.find(params[:app_id])
+  end
+
+  def set_bitrise_integration
+    @bitrise_integration = @app.ci_cd_provider
+    unless @bitrise_integration.is_a?(BitriseIntegration)
+      redirect_to app_integrations_path(@app), flash: {error: "CI/CD integration not found."}
+    end
+  end
+
+  def set_ci_cd_projects
+    @ci_cd_apps = @bitrise_integration.setup
+    @project_config = @bitrise_integration.project_config
+  end
+
+  def parsed_bitrise_config_params
+    bitrise_config_params = params.require(:bitrise_integration)
+      .permit(:project_config)
+    bitrise_config_params.merge(
+      project_config: bitrise_config_params[:project_config]&.safe_json_parse
+    )
+  end
+end