From 7b12725d836b74c5fc8d5b0dae252690a18b09a6 Mon Sep 17 00:00:00 2001
From: gitstart_bot <gitstart_bot@users.noreply.github.com>
Date: Wed, 8 Jan 2025 12:13:21 +0000
Subject: [PATCH 01/20] Jira integration for release readiness

---
 app/assets/images/integrations/logo_jira.png  | Bin 0 -> 757 bytes
 app/controllers/app_configs_controller.rb     |  70 ++++-
 .../integration_listeners/jira_controller.rb  |  94 +++++++
 .../domain/release_filters_controller.js      |  17 ++
 app/javascript/controllers/helper.js          |   5 +
 .../project_selector_controller.js            |  37 +++
 .../controllers/project_states_controller.js  |  10 +
 app/libs/installations/jira/api.rb            | 150 +++++++++++
 app/libs/installations/jira/error.rb          |  60 +++++
 app/models/app.rb                             |   5 +
 app/models/app_config.rb                      |  35 +++
 app/models/integration.rb                     |  18 +-
 app/models/jira_integration.rb                | 245 ++++++++++++++++++
 app/views/app_configs/_jira_form.html.erb     |  29 +++
 .../app_configs/project_management.html.erb   |   7 +
 .../_project_selection.html.erb               |  98 +++++++
 .../_release_filter_form.html.erb             |  28 ++
 .../select_organization.html.erb              |  47 ++++
 config/locales/en.yml                         |  28 ++
 config/routes.rb                              |   6 +
 ...20241114104939_create_jira_integrations.rb |  13 +
 ...15100841_add_jira_config_to_app_configs.rb |   5 +
 db/schema.rb                                  |  10 +
 .../jira_controller_spec.rb                   | 138 ++++++++++
 spec/factories/integrations.rb                |  10 +
 spec/factories/jira_integrations.rb           |  20 ++
 spec/libs/installations/jira/api_spec.rb      | 149 +++++++++++
 spec/models/jira_integration_spec.rb          | 156 +++++++++++
 28 files changed, 1484 insertions(+), 6 deletions(-)
 create mode 100644 app/assets/images/integrations/logo_jira.png
 create mode 100644 app/controllers/integration_listeners/jira_controller.rb
 create mode 100644 app/javascript/controllers/domain/release_filters_controller.js
 create mode 100644 app/javascript/controllers/helper.js
 create mode 100644 app/javascript/controllers/project_selector_controller.js
 create mode 100644 app/javascript/controllers/project_states_controller.js
 create mode 100644 app/libs/installations/jira/api.rb
 create mode 100644 app/libs/installations/jira/error.rb
 create mode 100644 app/models/jira_integration.rb
 create mode 100644 app/views/app_configs/_jira_form.html.erb
 create mode 100644 app/views/app_configs/project_management.html.erb
 create mode 100644 app/views/jira_integration/_project_selection.html.erb
 create mode 100644 app/views/jira_integration/_release_filter_form.html.erb
 create mode 100644 app/views/jira_integration/select_organization.html.erb
 create mode 100644 db/migrate/20241114104939_create_jira_integrations.rb
 create mode 100644 db/migrate/20241115100841_add_jira_config_to_app_configs.rb
 create mode 100644 spec/controllers/integration_listeners/jira_controller_spec.rb
 create mode 100644 spec/factories/jira_integrations.rb
 create mode 100644 spec/libs/installations/jira/api_spec.rb
 create mode 100644 spec/models/jira_integration_spec.rb

diff --git a/app/assets/images/integrations/logo_jira.png b/app/assets/images/integrations/logo_jira.png
new file mode 100644
index 0000000000000000000000000000000000000000..a97b51bb2b6ece5f493cf2a0f873b0007f1d3a5e
GIT binary patch
literal 757
zcmV<R0t)?!P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0*XmQK~zXft&~kn
z6G0TmH^hL5A~Y(Y0h_vRi6@R8_vpckh8RsqCD_D5NNKQ|Duxca3*J0>?9rn~k3D)p
zBx)=NLK|#CNl5FVQUu~W=S^pq-RV|Z(tq-je!Ta7Gw)-RRunR6JY)hiYnn-yMQC#x
zF+lf9^gk1!&1onFUF=jjuSAVZgf=hLq&Hcqs$R*wOoX+j>n4n92F-dUlud-V6(DdC
z>y4(8BR%l4qWcrSbYHxv_eKkP_r!+YIsRSuJ<f**W(x7(eD!vt0T3zOLV(jreRTv^
z=l8(>v<#PLcc6djC-h8iK-c&W=(x8A%H7Y^p}F0#GsZHJvR-lt)I|n)@!N*<MYmiK
z-&8*0^tVi;tCwcNgzT&?9&*TFf<a<#h%&auMwpi67?I9fEa1Hy;DlU?6>SLigpKeA
z*<Yk;EPfM%esTtRL9p>R2n;aDw$oP$8IaVBza+S@Pll5fGB{TvzF3j;N4Lni$xYH3
zUMC&*zY=9^l_+;sqRPVzU$$$+f|NL<H=5V^ftFyz**`2p20ySLA(;9D!_O=B$#7cE
zKiY)u@H(7%@Qu}ZmD$R&waqr<NeO&2MGipmjW_5m%>crt1&BqHA=XGrkTfgV7b^xK
z=zk@#YXe-8-xqI4!3jw-pSPBO4RQefWW^hR;;VlWWV!$sA~`r4&ZfOyRh8^F2B7%%
zV#E2U(Tw(*W`YX`+cKmll1rn%d<%r~M6D>aMALYEC!}w>zyYY*GS-&s)Bp@dh&}hS
zJ2t=)KH*pa@wIue)7dYi4S80s1Dsmed<$?4*=rvF#hU)n2??eS+Y1Q2fdGRXzb~vW
n;;;6pHp28B8_jHM07dx+96b@nbj5h`00000NkvXXu0mjf60uSQ

literal 0
HcmV?d00001

diff --git a/app/controllers/app_configs_controller.rb b/app/controllers/app_configs_controller.rb
index e2bc46990..11eb719b8 100644
--- a/app/controllers/app_configs_controller.rb
+++ b/app/controllers/app_configs_controller.rb
@@ -40,6 +40,7 @@ def pick_category
     when Integration.categories[:ci_cd] then configure_ci_cd
     when Integration.categories[:monitoring] then configure_monitoring
     when Integration.categories[:build_channel] then configure_build_channel
+    when Integration.categories[:project_management] then configure_project_management
     else raise "Invalid integration category."
     end
   end
@@ -64,6 +65,10 @@ def configure_monitoring
     set_monitoring_projects if further_setup_by_category?.dig(:monitoring, :further_setup)
   end
 
+  def configure_project_management
+    set_jira_projects if further_setup_by_category?.dig(:project_management, :further_setup)
+  end
+
   def set_app_config
     @config = AppConfig.find_or_initialize_by(app: @app)
   end
@@ -80,7 +85,13 @@ def app_config_params
         :bugsnag_ios_project_id,
         :bugsnag_android_release_stage,
         :bugsnag_android_project_id,
-        :bitbucket_workspace
+        :bitbucket_workspace,
+        jira_config: {
+          selected_projects: [],
+          project_configs: {},
+          release_tracking: [:track_tickets, :auto_transition],
+          release_filters: [[:type, :value]]
+        }
       )
   end
 
@@ -91,6 +102,7 @@ def parsed_app_config_params
       .merge(bugsnag_config(app_config_params.slice(*BUGSNAG_CONFIG_PARAMS)))
       .merge(firebase_ios_config: app_config_params[:firebase_ios_config]&.safe_json_parse)
       .merge(firebase_android_config: app_config_params[:firebase_android_config]&.safe_json_parse)
+      .merge(jira_config: parse_jira_config(app_config_params[:jira_config]))
       .except(*BUGSNAG_CONFIG_PARAMS)
       .compact
   end
@@ -122,6 +134,62 @@ def set_integration_category
     end
   end
 
+  def set_jira_projects
+    provider = @app.integrations.project_management_provider
+    @jira_data = provider.setup
+
+    @config.jira_config = {} if @config.jira_config.nil?
+
+    @config.jira_config = {
+      "selected_projects" => @config.jira_config["selected_projects"] || [],
+      "project_configs" => @config.jira_config["project_configs"] || {},
+      "release_tracking" => @config.jira_config["release_tracking"] || {
+        "track_tickets" => false,
+        "auto_transition" => false
+      },
+      "release_filters" => @config.jira_config["release_filters"] || []
+    }
+
+    @jira_data[:projects]&.each do |project|
+      project_key = project["key"]
+      statuses = @jira_data[:project_statuses][project_key]
+
+      done_states = statuses&.select { |status| status["name"] == "Done" }&.pluck("name") || []
+
+      @config.jira_config["project_configs"][project_key] ||= {
+        "done_states" => done_states
+      }
+    end
+
+    @config.save! if @config.changed?
+    @current_jira_config = @config.jira_config.with_indifferent_access
+  end
+
+  def parse_jira_config(config)
+    return {} if config.blank?
+
+    {
+      selected_projects: Array(config[:selected_projects]),
+      project_configs: config[:project_configs]&.transform_values do |project_config|
+        {
+          done_states: Array(project_config[:done_states])&.reject(&:blank?),
+          custom_done_states: Array(project_config[:custom_done_states])&.reject(&:blank?)
+        }
+      end || {},
+      release_tracking: {
+        track_tickets: ActiveModel::Type::Boolean.new.cast(config.dig(:release_tracking, :track_tickets)),
+        auto_transition: ActiveModel::Type::Boolean.new.cast(config.dig(:release_tracking, :auto_transition))
+      },
+      release_filters: config[:release_filters]&.values&.filter_map do |filter|
+        next if filter[:type].blank? || filter[:value].blank?
+        {
+          "type" => filter[:type],
+          "value" => filter[:value]
+        }
+      end || []
+    }
+  end
+
   def bugsnag_config(config_params)
     config = {}
 
diff --git a/app/controllers/integration_listeners/jira_controller.rb b/app/controllers/integration_listeners/jira_controller.rb
new file mode 100644
index 000000000..938b556ca
--- /dev/null
+++ b/app/controllers/integration_listeners/jira_controller.rb
@@ -0,0 +1,94 @@
+class IntegrationListeners::JiraController < IntegrationListenerController
+  using RefinedString
+
+  INTEGRATION_CREATE_ERROR = "Failed to create the integration, please try again."
+
+  def callback
+    unless valid_state?
+      redirect_to app_path(state_app), alert: INTEGRATION_CREATE_ERROR
+      return
+    end
+
+    begin
+      @integration = state_app.integrations.build(integration_params)
+      @integration.providable = build_providable
+
+      if @integration.providable.complete_access
+        @integration.save!
+        redirect_to app_path(state_app),
+          notice: t("integrations.project_management.jira.integration_created")
+      else
+        @resources = @integration.providable.available_resources
+
+        if @resources.blank?
+          redirect_to app_integrations_path(state_app),
+            alert: t("integrations.project_management.jira.no_organization")
+          return
+        end
+
+        render "jira_integration/select_organization"
+      end
+    rescue => e
+      Rails.logger.error("Failed to create Jira integration: #{e.message}")
+      redirect_to app_integrations_path(state_app),
+        alert: INTEGRATION_CREATE_ERROR
+    end
+  end
+
+  def set_organization
+    @integration = state_app.integrations.build(integration_params)
+    @integration.providable = build_providable
+    @integration.providable.cloud_id = params[:cloud_id]
+    @integration.providable.code = params[:code]
+
+    if @integration.save!
+      @integration.providable.setup
+      redirect_to app_path(@integration.integrable),
+        notice: t("integrations.project_management.jira.integration_created")
+    else
+      @resources = @integration.providable.available_resources
+      render "jira_integration/select_organization"
+    end
+  rescue => e
+    Rails.logger.error("Failed to create Jira integration: #{e.message}")
+    redirect_to app_integrations_path(state_app),
+      alert: INTEGRATION_CREATE_ERROR
+  end
+
+  protected
+
+  def providable_params
+    super.merge(
+      code: code,
+      callback_url: callback_url
+    )
+  end
+
+  private
+
+  def callback_url
+    host = request.host_with_port
+    Rails.application.routes.url_helpers.jira_callback_url(
+      host: host,
+      protocol: request.protocol.gsub("://", "")
+    )
+  end
+
+  def state
+    @state ||= begin
+      cleaned_state = params[:state].tr(" ", "+")
+      JSON.parse(cleaned_state.decode).with_indifferent_access
+    rescue ActiveSupport::MessageEncryptor::InvalidMessage => e
+      Rails.logger.error "Invalid state parameter: #{e.message}"
+      {}
+    end
+  end
+
+  def error?
+    params[:error].present? || state.empty?
+  end
+
+  def state_app
+    @state_app ||= App.find(state[:app_id])
+  end
+end
diff --git a/app/javascript/controllers/domain/release_filters_controller.js b/app/javascript/controllers/domain/release_filters_controller.js
new file mode 100644
index 000000000..25ac4e3af
--- /dev/null
+++ b/app/javascript/controllers/domain/release_filters_controller.js
@@ -0,0 +1,17 @@
+import { Controller } from "@hotwired/stimulus"
+
+export default class extends Controller {
+  static targets = ["template", "container", "filter"]
+
+  add(event) {
+    event.preventDefault()
+    const content = this.templateTarget.innerHTML.replace(/__INDEX__/g, this.filterTargets.length)
+    this.containerTarget.insertAdjacentHTML("beforeend", content)
+  }
+
+  remove(event) {
+    event.preventDefault()
+    const filter = event.target.closest("[data-domain--release-filters-target='filter']")
+    filter.remove()
+  }
+}
diff --git a/app/javascript/controllers/helper.js b/app/javascript/controllers/helper.js
new file mode 100644
index 000000000..9d915b762
--- /dev/null
+++ b/app/javascript/controllers/helper.js
@@ -0,0 +1,5 @@
+export function toggleDisplay(target, condition) {
+  if (target) {
+    target.style.display = condition ? "block" : "none";
+  }
+}
diff --git a/app/javascript/controllers/project_selector_controller.js b/app/javascript/controllers/project_selector_controller.js
new file mode 100644
index 000000000..2a474474e
--- /dev/null
+++ b/app/javascript/controllers/project_selector_controller.js
@@ -0,0 +1,37 @@
+import { Controller } from "@hotwired/stimulus"
+import { toggleDisplay } from "./helper"
+
+export default class extends Controller {
+  static targets = [ "projectCheckbox", "config", "filterDivider"]
+
+  connect() {
+    this.toggleConfigurations()
+    this.toggleFilterDivider()
+  }
+
+  toggle() {
+    this.toggleConfigurations()
+    this.toggleFilterDivider()
+  }
+
+  toggleConfigurations() {
+    const configs = document.querySelectorAll('.project-config')
+    configs.forEach(config => {
+      const projectKey = config.dataset.project
+      const checkbox = document.querySelector(`#project_${projectKey}`)
+      if (checkbox) {
+        toggleDisplay(config, checkbox.checked)
+      }
+    })
+  }
+
+  toggleFilterDivider() {
+    const anyProjectSelected = this.projectCheckboxTargets.some(checkbox => checkbox.checked)
+
+    if (this.hasFilterDividerTarget) {
+      toggleDisplay(this.filterDividerTarget, anyProjectSelected)
+      this.filterDividerTarget.classList.add('border-t')
+      this.filterDividerTarget.classList.add('border-b')
+    }
+  }
+}
diff --git a/app/javascript/controllers/project_states_controller.js b/app/javascript/controllers/project_states_controller.js
new file mode 100644
index 000000000..fa86268e9
--- /dev/null
+++ b/app/javascript/controllers/project_states_controller.js
@@ -0,0 +1,10 @@
+import { Controller } from "@hotwired/stimulus"
+import { toggleDisplay } from "./helper"
+
+export default class extends Controller {
+  static targets = ["content"]
+
+  toggle(event) {
+    toggleDisplay(this.contentTarget, event.target.checked)
+  }
+}
diff --git a/app/libs/installations/jira/api.rb b/app/libs/installations/jira/api.rb
new file mode 100644
index 000000000..249c2405b
--- /dev/null
+++ b/app/libs/installations/jira/api.rb
@@ -0,0 +1,150 @@
+module Installations
+  class Jira::Api
+    include Vaultable
+    attr_reader :oauth_access_token, :cloud_id
+
+    BASE_URL = "https://api.atlassian.com/ex/jira"
+
+    # API Endpoints
+    PROJECTS_URL = Addressable::Template.new "#{BASE_URL}/{cloud_id}/rest/api/3/project/search"
+    PROJECT_STATUSES_URL = Addressable::Template.new "#{BASE_URL}/{cloud_id}/rest/api/3/project/{project_key}/statuses"
+    SEARCH_URL = Addressable::Template.new "#{BASE_URL}/{cloud_id}/rest/api/3/search/jql"
+    TICKET_SEARCH_FIELDS = "summary, description, status, assignee, fix_versions, labels"
+
+    class << self
+      include Vaultable
+
+      OAUTH_ACCESS_TOKEN_URL = "https://auth.atlassian.com/oauth/token"
+      ACCESSIBLE_RESOURCES_URL = "https://api.atlassian.com/oauth/token/accessible-resources"
+
+      def get_accessible_resources(code, redirect_uri)
+        @tokens ||= oauth_access_token(code, redirect_uri)
+        return [[], @tokens] unless @tokens
+
+        response = HTTP
+          .auth("Bearer #{@tokens.access_token}")
+          .get(ACCESSIBLE_RESOURCES_URL)
+
+        return [[], @tokens] unless response.status.success?
+        [JSON.parse(response.body.to_s), @tokens]
+      rescue HTTP::Error => e
+        Rails.logger.error "Failed to fetch Jira accessible resources: #{e.message}"
+        [[], @tokens]
+      end
+
+      def oauth_access_token(code, redirect_uri)
+        params = {
+          form: {
+            grant_type: :authorization_code,
+            code:,
+            redirect_uri:
+          }
+        }
+
+        get_oauth_token(params)
+      end
+
+      def oauth_refresh_token(refresh_token, redirect_uri)
+        params = {
+          form: {
+            grant_type: :refresh_token,
+            redirect_uri:,
+            refresh_token:
+          }
+        }
+
+        get_oauth_token(params)
+      end
+
+      def get_oauth_token(params)
+        response = HTTP
+          .basic_auth(user: creds.integrations.jira.client_id, pass: creds.integrations.jira.client_secret)
+          .post(OAUTH_ACCESS_TOKEN_URL, params)
+
+        body = JSON.parse(response.body.to_s)
+        tokens = {
+          "access_token" => body["access_token"],
+          "refresh_token" => body["refresh_token"]
+        }
+
+        return OpenStruct.new(tokens) if tokens.present?
+        nil
+      end
+    end
+
+    def initialize(oauth_access_token, cloud_id)
+      @oauth_access_token = oauth_access_token
+      @cloud_id = cloud_id
+    end
+
+    def projects(transformations)
+      response = execute(:get, PROJECTS_URL.expand(cloud_id:).to_s)
+      transform_data(response["values"], transformations)
+    end
+
+    def project_statuses(project_key, transformations)
+      response = execute(:get, PROJECT_STATUSES_URL.expand(cloud_id:, project_key:).to_s)
+      extract_unique_statuses(response, transformations)
+    end
+
+    def search_tickets_by_filters(project_key, release_filters, transformations, start_at: 0, max_results: 50)
+      return {"issues" => []} if release_filters.blank?
+      params = {
+        params: {
+          jql: build_jql_query(project_key, release_filters),
+          fields: TICKET_SEARCH_FIELDS
+        }
+      }
+
+      response = execute(:get, SEARCH_URL.expand(cloud_id:).to_s, params)
+      transform_data(response["issues"], transformations)
+    rescue HTTP::Error => e
+      Rails.logger.error "Failed to search Jira tickets: #{e.message}"
+      raise Installations::Error.new("Failed to search Jira tickets", reason: :api_error)
+    end
+
+    private
+
+    def extract_unique_statuses(statuses, transformations)
+      statuses.flat_map { |issue_type| issue_type["statuses"] }
+        .uniq { |status| status["id"] }
+        .then { |statuses| transform_data(statuses, transformations) }
+    end
+
+    def transform_data(data, transformations)
+      Installations::Response::Keys.transform(data, transformations)
+    end
+
+    def execute(method, url, params = {}, parse_response = true)
+      response = HTTP.auth("Bearer #{oauth_access_token}").headers("Accept" => "application/json").public_send(method, url, params)
+
+      parsed_body = parse_response ? JSON.parse(response.body) : response.body
+      Rails.logger.debug { "Jira API returned #{response.status} for #{url} with body - #{parsed_body}" }
+
+      return parsed_body unless response.status.client_error?
+
+      raise Installations::Error.new("Token expired", reason: :token_expired) if response.status == 401
+      raise Installations::Error.new("Resource not found", reason: :not_found) if response.status == 404
+      raise Installations::Jira::Error.new(parsed_body)
+    end
+
+    def build_jql_query(project_key, release_filters)
+      conditions = ["project = '#{sanitize_jql_value(project_key)}'"]
+      release_filters.each do |filter|
+        value = sanitize_jql_value(filter["value"])
+        filter_condition =
+          case filter["type"]
+          when "label" then "labels = '#{value}'"
+          when "fix_version" then "fixVersion = '#{value}'"
+          else Rails.logger.warn("Unsupported Jira filter type: #{filter["type"]}")
+          end
+        conditions << filter_condition if filter_condition
+      end
+      conditions.join(" AND ")
+    end
+
+    def sanitize_jql_value(value)
+      value.to_s.gsub("'", "\\'").gsub(/[^\w\s\-\.]/, "")
+    end
+  end
+end
diff --git a/app/libs/installations/jira/error.rb b/app/libs/installations/jira/error.rb
new file mode 100644
index 000000000..e8b210ed7
--- /dev/null
+++ b/app/libs/installations/jira/error.rb
@@ -0,0 +1,60 @@
+module Installations
+  class Jira::Error < Installations::Error
+    ERRORS = [
+      {
+        message_matcher: /The access token expired/i,
+        decorated_reason: :token_expired
+      },
+      {
+        message_matcher: /does not have the required scope/i,
+        decorated_reason: :insufficient_scope
+      },
+      {
+        message_matcher: /Project .* does not exist/i,
+        decorated_reason: :project_not_found
+      },
+      {
+        message_matcher: /Issue does not exist/i,
+        decorated_reason: :issue_not_found
+      },
+      {
+        message_matcher: /Service Unavailable/i,
+        decorated_reason: :service_unavailable
+      }
+    ].freeze
+
+    def initialize(error_body)
+      @error_body = error_body
+      log
+      super(error_message, reason: handle)
+    end
+
+    def handle
+      return :unknown_failure if match.nil?
+      match[:decorated_reason]
+    end
+
+    private
+
+    attr_reader :error_body
+    delegate :logger, to: Rails
+
+    def match
+      @match ||= matched_error
+    end
+
+    def matched_error
+      ERRORS.find do |known_error|
+        known_error[:message_matcher] =~ error_message
+      end
+    end
+
+    def error_message
+      error_body.dig("error", "message")
+    end
+
+    def log
+      logger.error(error_message: error_message, error_body: error_body)
+    end
+  end
+end
diff --git a/app/models/app.rb b/app/models/app.rb
index fe36beec6..0b92da854 100644
--- a/app/models/app.rb
+++ b/app/models/app.rb
@@ -60,6 +60,7 @@ class App < ApplicationRecord
     :ci_cd_provider,
     :monitoring_provider,
     :notification_provider,
+    :project_management_provider,
     :slack_notifications?, to: :integrations, allow_nil: true
 
   def self.allowed_platforms
@@ -109,6 +110,10 @@ def bitbucket_connected?
     integrations.bitbucket_integrations.any?
   end
 
+  def project_management_connected?
+    integrations.project_management.connected.any?
+  end
+
   def ready?
     integrations.ready? and config&.ready?
   end
diff --git a/app/models/app_config.rb b/app/models/app_config.rb
index d0721d53c..38b196123 100644
--- a/app/models/app_config.rb
+++ b/app/models/app_config.rb
@@ -10,6 +10,8 @@
 #  code_repository         :json
 #  firebase_android_config :jsonb
 #  firebase_ios_config     :jsonb
+#  jira_config             :jsonb            not null
+#  notification_channel    :json
 #  created_at              :datetime         not null
 #  updated_at              :datetime         not null
 #  app_id                  :uuid             not null, indexed
@@ -96,6 +98,13 @@ def further_setup_by_category?
       }
     end
 
+    if integrations.project_management.present?
+      categories[:project_management] = {
+        further_setup: integrations.project_management.map(&:providable).any?(&:further_setup?),
+        ready: project_management_ready?
+      }
+    end
+
     categories
   end
 
@@ -127,6 +136,20 @@ def set_ci_cd_workflows(workflows)
     update(ci_cd_workflows: workflows)
   end
 
+  def add_jira_release_filter(type:, value:)
+    return unless JiraIntegration::VALID_FILTER_TYPES.include?(type)
+
+    new_filters = (jira_config&.dig("release_filters") || []).dup
+    new_filters << {"type" => type, "value" => value}
+    update!(jira_config: jira_config.merge("release_filters" => new_filters))
+  end
+
+  def remove_jira_release_filter(index)
+    new_filters = (jira_config&.dig("release_filters") || []).dup
+    new_filters.delete_at(index)
+    update!(jira_config: jira_config.merge("release_filters" => new_filters))
+  end
+
   private
 
   def set_bugsnag_config
@@ -156,4 +179,16 @@ def configs_ready?(ios, android)
     return android.present? if app.android?
     ios.present? && android.present? if app.cross_platform?
   end
+
+  def project_management_ready?
+    return false if app.integrations.project_management.blank?
+
+    jira = app.integrations.project_management.find(&:jira_integration?)&.providable
+    return false unless jira
+
+    jira_config.present? &&
+      jira_config["selected_projects"].present? &&
+      jira_config["selected_projects"].any? &&
+      jira_config["project_configs"].present?
+  end
 end
diff --git a/app/models/integration.rb b/app/models/integration.rb
index b3360cdd1..d541e3e88 100644
--- a/app/models/integration.rb
+++ b/app/models/integration.rb
@@ -24,7 +24,7 @@ class Integration < ApplicationRecord
 
   belongs_to :app, optional: true
 
-  PROVIDER_TYPES = %w[GithubIntegration GitlabIntegration SlackIntegration AppStoreIntegration GooglePlayStoreIntegration BitriseIntegration GoogleFirebaseIntegration BugsnagIntegration BitbucketIntegration CrashlyticsIntegration]
+  PROVIDER_TYPES = %w[GithubIntegration GitlabIntegration SlackIntegration AppStoreIntegration GooglePlayStoreIntegration BitriseIntegration GoogleFirebaseIntegration BugsnagIntegration BitbucketIntegration CrashlyticsIntegration JiraIntegration]
   delegated_type :providable, types: PROVIDER_TYPES, autosave: true, validate: false
   delegated_type :integrable, types: INTEGRABLE_TYPES, autosave: true, validate: false
 
@@ -39,21 +39,24 @@ class Integration < ApplicationRecord
       "ci_cd" => %w[BitriseIntegration GithubIntegration BitbucketIntegration],
       "notification" => %w[SlackIntegration],
       "build_channel" => %w[AppStoreIntegration GoogleFirebaseIntegration],
-      "monitoring" => %w[BugsnagIntegration CrashlyticsIntegration]
+      "monitoring" => %w[BugsnagIntegration CrashlyticsIntegration],
+      "project_management" => %w[JiraIntegration]
     },
     android: {
       "version_control" => %w[GithubIntegration GitlabIntegration BitbucketIntegration],
       "ci_cd" => %w[BitriseIntegration GithubIntegration BitbucketIntegration],
       "notification" => %w[SlackIntegration],
       "build_channel" => %w[GooglePlayStoreIntegration SlackIntegration GoogleFirebaseIntegration],
-      "monitoring" => %w[BugsnagIntegration CrashlyticsIntegration]
+      "monitoring" => %w[BugsnagIntegration CrashlyticsIntegration],
+      "project_management" => %w[JiraIntegration]
     },
     cross_platform: {
       "version_control" => %w[GithubIntegration GitlabIntegration BitbucketIntegration],
       "ci_cd" => %w[BitriseIntegration GithubIntegration BitbucketIntegration],
       "notification" => %w[SlackIntegration],
       "build_channel" => %w[GooglePlayStoreIntegration SlackIntegration GoogleFirebaseIntegration AppStoreIntegration],
-      "monitoring" => %w[BugsnagIntegration CrashlyticsIntegration]
+      "monitoring" => %w[BugsnagIntegration CrashlyticsIntegration],
+      "project_management" => %w[JiraIntegration]
     }
   }.with_indifferent_access
 
@@ -76,7 +79,8 @@ class Integration < ApplicationRecord
     ci_cd: "Trigger workflows to create builds and stay up-to-date as they're made available.",
     notification: "Send release activity notifications at the right time, to the right people.",
     build_channel: "Send builds to the right deployment service for the right stakeholders.",
-    monitoring: "Monitor release metrics and stability to make the correct decisions about your release progress."
+    monitoring: "Monitor release metrics and stability to make the correct decisions about your release progress.",
+    project_management: "Track tickets and establish release readiness by associating tickets with your releases."
   }.freeze
   MULTI_INTEGRATION_CATEGORIES = ["build_channel"].freeze
   MINIMUM_REQUIRED_SET = [:version_control, :ci_cd, :build_channel].freeze
@@ -197,6 +201,10 @@ def firebase_build_channel_provider
       kept.build_channel.find(&:google_firebase_integration?)&.providable
     end
 
+    def project_management_provider
+      kept.project_management.first&.providable
+    end
+
     def existing_integration(app, providable_type)
       app.integrations.connected.find_by(providable_type: providable_type)
     end
diff --git a/app/models/jira_integration.rb b/app/models/jira_integration.rb
new file mode 100644
index 000000000..5c06c8553
--- /dev/null
+++ b/app/models/jira_integration.rb
@@ -0,0 +1,245 @@
+# == Schema Information
+#
+# Table name: jira_integrations
+#
+#  id                  :uuid             not null, primary key
+#  oauth_access_token  :string
+#  oauth_refresh_token :string
+#  created_at          :datetime         not null
+#  updated_at          :datetime         not null
+#  cloud_id            :string           indexed
+#
+class JiraIntegration < ApplicationRecord
+  has_paper_trail
+  using RefinedHash
+  include Linkable
+  include Vaultable
+  include Providable
+  include Displayable
+
+  encrypts :oauth_access_token, deterministic: true
+  encrypts :oauth_refresh_token, deterministic: true
+
+  BASE_INSTALLATION_URL =
+    Addressable::Template.new("https://auth.atlassian.com/authorize{?params*}")
+  PUBLIC_ICON = "https://storage.googleapis.com/tramline-public-assets/jira_small.png".freeze
+  VALID_FILTER_TYPES = %w[label fix_version].freeze
+
+  USER_INFO_TRANSFORMATIONS = {
+    id: :accountId,
+    name: :displayName,
+    email: :emailAddress
+  }.freeze
+
+  PROJECT_TRANSFORMATIONS = {
+    id: :id,
+    key: :key,
+    name: :name,
+    description: :description,
+    url: :self
+  }.freeze
+
+  STATUS_TRANSFORMATIONS = {
+    id: :id,
+    name: :name,
+    category: [:statusCategory, :key]
+  }.freeze
+
+  TICKET_TRANSFORMATIONS = {
+    key: :key,
+    summary: [:fields, :summary],
+    status: [:fields, :status, :name],
+    assignee: [:fields, :assignee, :displayName],
+    labels: [:fields, :labels],
+    fix_versions: [:fields, :fixVersions]
+  }.freeze
+
+  attr_accessor :code, :callback_url, :available_resources
+  before_validation :complete_access, on: :create
+  delegate :app, to: :integration
+  delegate :cache, to: Rails
+
+  validates :cloud_id, presence: true
+  validate :validate_release_filters, if: -> { app.config.jira_config&.dig("release_filters").present? }
+
+  def install_path
+    BASE_INSTALLATION_URL
+      .expand(params: {
+        client_id: creds.integrations.jira.client_id,
+        audience: "api.atlassian.com",
+        redirect_uri: redirect_uri,
+        response_type: :code,
+        prompt: "consent",
+        scope: "read:jira-work write:jira-work read:jira-user offline_access",
+        state: integration.installation_state
+      }).to_s
+  end
+
+  def complete_access
+    return false if code.blank? || (callback_url.blank? && redirect_uri.blank?)
+
+    resources, tokens = Installations::Jira::Api.get_accessible_resources(code, callback_url || redirect_uri)
+    set_tokens(tokens)
+
+    if resources.length == 1
+      self.cloud_id = resources.first["id"]
+      true
+    else
+      @available_resources = resources
+      false
+    end
+  end
+
+  def installation
+    Installations::Jira::Api.new(oauth_access_token, cloud_id)
+  end
+
+  def to_s = "jira"
+
+  def creatable? = false
+
+  def connectable? = true
+
+  def store? = false
+
+  def project_link = nil
+
+  def further_setup? = true
+
+  def public_icon_img
+    PUBLIC_ICON
+  end
+
+  def setup
+    return {} if cloud_id.blank?
+
+    with_api_retries do
+      projects_result = fetch_projects
+      return {} if projects_result[:projects].empty?
+
+      statuses_data = fetch_project_statuses(projects_result[:projects])
+
+      {
+        projects: projects_result[:projects],
+        project_statuses: statuses_data
+      }
+    end
+  rescue => e
+    Rails.logger.error("Failed to fetch Jira setup data for cloud_id #{cloud_id}: #{e.message}")
+    {}
+  end
+
+  def metadata
+    with_api_retries { installation.user_info(USER_INFO_TRANSFORMATIONS) }
+  end
+
+  def connection_data
+    return unless integration.metadata
+    "Added by user: #{integration.metadata["name"]} (#{integration.metadata["email"]})"
+  end
+
+  def fetch_tickets_for_release
+    return [] if app.config.jira_config.blank?
+
+    project_key = app.config.jira_config["selected_projects"]&.last
+    release_filters = app.config.jira_config["release_filters"]
+    return [] if project_key.blank? || release_filters.blank?
+
+    with_api_retries do
+      response = api.search_tickets_by_filters(
+        project_key,
+        release_filters,
+        TICKET_TRANSFORMATIONS
+      )
+      return [] if response["issues"].blank?
+
+      response["issues"]
+    end
+  rescue => e
+    Rails.logger.error("Failed to fetch Jira tickets for release: #{e.message}")
+    []
+  end
+
+  def display
+    "Jira"
+  end
+
+  private
+
+  MAX_RETRY_ATTEMPTS = 2
+  RETRYABLE_ERRORS = []
+
+  def with_api_retries(attempt: 0, &)
+    yield
+  rescue Installations::Error => ex
+    raise ex if attempt >= MAX_RETRY_ATTEMPTS
+    next_attempt = attempt + 1
+
+    if ex.reason == :token_expired
+      reset_tokens!
+      return with_api_retries(attempt: next_attempt, &)
+    end
+
+    if RETRYABLE_ERRORS.include?(ex.reason)
+      return with_api_retries(attempt: next_attempt, &)
+    end
+
+    raise ex
+  end
+
+  def reset_tokens!
+    set_tokens(Installations::Jira::Api.oauth_refresh_token(oauth_refresh_token, redirect_uri))
+    save!
+  end
+
+  def set_tokens(tokens)
+    return unless tokens
+
+    self.oauth_access_token = tokens.access_token
+    self.oauth_refresh_token = tokens.refresh_token
+  end
+
+  def redirect_uri
+    jira_callback_url(link_params)
+  end
+
+  def api
+    @api ||= Installations::Jira::Api.new(oauth_access_token, cloud_id)
+  end
+
+  def fetch_projects
+    return {projects: []} if cloud_id.blank?
+    with_api_retries do
+      response = api.projects(PROJECT_TRANSFORMATIONS)
+      {projects: response}
+    end
+  rescue => e
+    Rails.logger.error("Failed to fetch Jira projects for cloud_id #{cloud_id}: #{e.message}")
+    {projects: []}
+  end
+
+  def fetch_project_statuses(projects)
+    return {} if cloud_id.blank? || projects.blank?
+    with_api_retries do
+      statuses = {}
+      projects.each do |project|
+        project_statuses = api.project_statuses(project["key"], STATUS_TRANSFORMATIONS)
+        statuses[project["key"]] = project_statuses
+      end
+      statuses
+    end
+  rescue => e
+    Rails.logger.error("Failed to fetch Jira project statuses for cloud_id #{cloud_id}: #{e.message}")
+    {}
+  end
+
+  def validate_release_filters
+    return if app.config.jira_config&.dig("release_filters").blank?
+
+    app.config.jira_config["release_filters"].each do |filter|
+      unless filter.is_a?(Hash) && VALID_FILTER_TYPES.include?(filter["type"]) && filter["value"].present?
+        errors.add(:release_filters, "must contain valid type and value")
+      end
+    end
+  end
+end
diff --git a/app/views/app_configs/_jira_form.html.erb b/app/views/app_configs/_jira_form.html.erb
new file mode 100644
index 000000000..3b4676485
--- /dev/null
+++ b/app/views/app_configs/_jira_form.html.erb
@@ -0,0 +1,29 @@
+<div class="p-4 sm:p-6 lg:p-8">
+<div class="space-y-6">
+  <div>
+    <h2 class="text-base font-semibold leading-7 text-gray-900">Jira Configuration</h2>
+    <p class="mt-1 text-sm leading-6 text-gray-600">Select projects and their done states for tracking releases.</p>
+  </div>
+
+  <%= form_with model: config,
+                url: app_app_config_path(app),
+                method: :patch,
+                data: { turbo_frame: "_top" },
+                builder: EnhancedFormHelper::AuthzForm do |f| %>
+    <div class="mt-6 space-y-6 bg-white rounded-lg border" data-controller="project-selector">
+      <% if jira_data && jira_data[:projects].present? %>
+        <!-- Project Selection -->
+        <%= render 'jira_integration/project_selection' %>
+      <% else %>
+        <div class="p-4 text-sm text-gray-600">
+          No Jira projects found. Please ensure your Jira integration is properly configured.
+        </div>
+      <% end %>
+    </div>
+
+    <div class="mt-6 flex items-center justify-end gap-x-6">
+      <%= f.authz_submit "Update", "plus.svg", size: :xs %>
+    </div>
+  <% end %>
+</div>
+</div>
diff --git a/app/views/app_configs/project_management.html.erb b/app/views/app_configs/project_management.html.erb
new file mode 100644
index 000000000..6a33b7fe0
--- /dev/null
+++ b/app/views/app_configs/project_management.html.erb
@@ -0,0 +1,7 @@
+<%= render V2::EnhancedTurboFrameComponent.new("#{@integration_category}_config") do %>
+    <%= render partial: "jira_form", locals: {
+            config: @config,
+            app: @app,
+            jira_data: @jira_data
+          } %>
+<% end %>
diff --git a/app/views/jira_integration/_project_selection.html.erb b/app/views/jira_integration/_project_selection.html.erb
new file mode 100644
index 000000000..40098ce0c
--- /dev/null
+++ b/app/views/jira_integration/_project_selection.html.erb
@@ -0,0 +1,98 @@
+<div class="p-4">
+  <h3 class="text-sm font-medium text-gray-900">Select Projects</h3>
+  <p class="mt-1 text-sm text-gray-500">Choose one or more projects to track tickets from.</p>
+
+  <div class="mt-4 space-y-3">
+    <% @jira_data[:projects].each do |project| %>
+      <div class="flex items-start">
+        <div class="flex h-6 items-center">
+          <%= check_box_tag "app_config[jira_config][selected_projects][]",
+                          project['key'],
+                          @current_jira_config&.dig('selected_projects')&.include?(project['key']),
+                          class: "h-4 w-4 rounded border-gray-300 text-primary focus:ring-primary",
+                          data: {
+                            action: "project-selector#toggle",
+                            project_key: project['key'],
+                            project_selector_target: "projectCheckbox"
+                          },
+                          id: "project_#{project['key']}" %>
+          <label for="project_<%= project['key'] %>" class="ml-2 text-sm font-medium text-gray-900">
+            <%= project['name'] %> (<%= project['key'] %>)
+          </label>
+        </div>
+      </div>
+    <% end %>
+  </div>
+</div>
+
+<!-- Release Filters Section -->
+<div class="p-4" data-controller="domain--release-filters" data-project-selector-target="filterDivider">
+  <h3 class="text-sm font-medium text-gray-900"><%= t('integrations.project_management.jira.release_filters.title') %></h3>
+  <p class="mt-1 text-sm text-gray-500"><%= t('integrations.project_management.jira.release_filters.help_text') %></p>
+
+  <div class="mt-4 space-y-4">
+    <template data-domain--release-filters-target="template">
+      <%= render 'jira_integration/release_filter_form', index: '__INDEX__' %>
+    </template>
+
+    <div data-domain--release-filters-target="container">
+      <% if (@current_jira_config&.dig('release_filters') || []).any? %>
+        <% @current_jira_config['release_filters'].each_with_index do |filter, index| %>
+          <%= render 'jira_integration/release_filter_form',
+                      filter: filter,
+                      index: index,
+                      local_assigns: true %>
+        <% end %>
+      <% else %>
+        <%= render 'jira_integration/release_filter_form',
+                    filter: {},
+                    index: 0,
+                    local_assigns: true %>
+      <% end %>
+    </div>
+
+    <button type="button"
+            class="mt-4 text-sm text-blue-600 hover:text-blue-500"
+            data-action="domain--release-filters#add">
+      <%= t('integrations.project_management.jira.release_filters.add') %>
+    </button>
+  </div>
+</div>
+
+<!-- Project Configurations -->
+<div id="project_configurations">
+  <% @jira_data[:projects].each do |project| %>
+    <% project_key = project['key'] %>
+    <% statuses = @jira_data[:project_statuses][project_key] %>
+
+    <div class="p-4 project-config" data-project="<%= project_key %>">
+      <h4 class="text-sm font-medium text-gray-900 mb-3"><%= project['name'] %> Configuration</h4>
+
+      <div class="space-y-4">
+        <!-- Status Selection -->
+        <div>
+          <p class="text-sm font-medium text-gray-700 mb-2">Done States</p>
+          <div class="space-y-2">
+            <% if statuses&.any? %>
+              <% statuses.each do |status| %>
+                <div class="flex items-center">
+                  <%= check_box_tag "app_config[jira_config][project_configs][#{project_key}][done_states][]",
+                                  status['name'],
+                                  @current_jira_config&.dig('project_configs', project_key, 'done_states')&.include?(status['name']),
+                                  class: "h-4 w-4 rounded border-gray-300 text-primary focus:ring-primary",
+                                  id: "status_#{project_key}_#{status['name'].parameterize}" %>
+                  <label for="status_<%= project_key %>_<%= status['name'].parameterize %>"
+                          class="ml-2 text-sm text-gray-600">
+                    <%= status['name'] %>
+                  </label>
+                </div>
+              <% end %>
+            <% else %>
+              <p class="text-sm text-gray-500">No status configurations found for this project.</p>
+            <% end %>
+          </div>
+        </div>
+      </div>
+    </div>
+  <% end %>
+</div>
diff --git a/app/views/jira_integration/_release_filter_form.html.erb b/app/views/jira_integration/_release_filter_form.html.erb
new file mode 100644
index 000000000..0bc08cbb6
--- /dev/null
+++ b/app/views/jira_integration/_release_filter_form.html.erb
@@ -0,0 +1,28 @@
+<!--  Set default values for the partial -->
+<% filter ||= {} %>
+<% index ||= 0 %>
+
+<div class="flex items-center gap-4" data-domain--release-filters-target="filter">
+  <%= select_tag "app_config[jira_config][release_filters][#{index}][type]",
+                 options_for_select([
+                   [t("integrations.project_management.jira.release_filters.types.label"), "label"],
+                   [t("integrations.project_management.jira.release_filters.types.fix_version"), "fix_version"]
+                 ], filter['type']),
+                 class: "mt-2 block w-full rounded-md border-0 py-1.5 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 focus:ring-2 focus:ring-inset focus:ring-blue-600 sm:text-sm sm:leading-6" %>
+
+  <%= text_field_tag "app_config[jira_config][release_filters][#{index}][value]",
+                     filter['value'],
+                     placeholder: "e.g., release-1.0.0",
+                     class: "mt-2 block w-full rounded-md border-0 py-1.5 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-blue-600 sm:text-sm sm:leading-6" %>
+
+  <%= render V2::ButtonComponent.new(
+    scheme: :naked_icon,
+    type: :action,
+    size: :none,
+    html_options: {
+      class: "mt-2",
+      data: { action: "domain--release-filters#remove" }
+    }) do |b|
+    b.with_icon("v2/trash.svg", size: :md)
+  end %>
+</div>
diff --git a/app/views/jira_integration/select_organization.html.erb b/app/views/jira_integration/select_organization.html.erb
new file mode 100644
index 000000000..5cc30288c
--- /dev/null
+++ b/app/views/jira_integration/select_organization.html.erb
@@ -0,0 +1,47 @@
+<div class="min-h-screen bg-gray-100 flex items-center justify-center">
+  <div class="w-full max-w-lg px-4">
+    <div class="bg-white shadow rounded-xl p-8">
+      <div class="space-y-4">
+        <div class="flex items-center justify-between mb-2">
+          <h2 class="text-xl font-bold text-gray-900">Select Jira Organization</h2>
+        </div>
+
+        <% if @resources&.any? %>
+          <%= form_tag jira_set_organization_path, method: :post, class: "space-y-4" do %>
+            <%= hidden_field_tag :code, params[:code] %>
+            <%= hidden_field_tag :state, params[:state] %>
+            <div class="space-y-3">
+              <% @resources.each do |org| %>
+                <div class="relative flex items-center space-x-3 rounded-lg border border-gray-300 bg-white px-4 py-3 shadow-sm hover:border-gray-400 focus-within:ring-2 focus-within:ring-blue-500 focus-within:ring-offset-2">
+                  <div class="flex-shrink-0">
+                    <%= radio_button_tag 'cloud_id', org["id"], false,
+                        class: "h-4 w-4 border-gray-300 text-blue-600 focus:ring-blue-600",
+                        required: true %>
+                  </div>
+                  <div class="min-w-0 flex-1">
+                    <label for="cloud_id_<%= org["id"] %>" class="cursor-pointer block focus:outline-none">
+                      <span class="absolute inset-0" aria-hidden="true"></span>
+                      <p class="text-sm font-medium text-gray-900"><%= org["name"] %></p>
+                      <p class="truncate text-xs text-gray-500"><%= org["url"] %></p>
+                    </label>
+                  </div>
+                </div>
+              <% end %>
+            </div>
+
+            <div class="flex w-full justify-end items-center pt-2">
+              <%= submit_tag "Continue", class: "ml-auto inline-flex justify-center rounded-md bg-blue-600 px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-blue-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-blue-600" %>
+            </div>
+          <% end %>
+        <% else %>
+          <div class="rounded-md bg-yellow-50 p-4">
+            <div class="text-sm text-yellow-700">
+              <h3 class="font-medium text-yellow-800">No organizations available</h3>
+              <p class="mt-1">Please try again or contact support if the issue persists.</p>
+            </div>
+          </div>
+        <% end %>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index c060ded79..2e192469d 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -405,6 +405,7 @@ en:
           notification: "Notifications"
           build_channel: "Submissions"
           monitoring: "Monitoring and Analytics"
+          project_management: "Project Management"
       bitrise_integration:
         access_token: "Bitrise Personal Access Token"
       bugsnag_integration:
@@ -701,3 +702,30 @@ en:
         title: "Release stability fixes"
         scope: "Last 6 releases. Commits after release start per team."
         help_text: "These are the changes made to the release branch after the release has started by members in these respective teams.\n\nThis is a good indicator of how much the team is involved in the release stability."
+
+  integrations:
+    project_management:
+      jira:
+        connect:
+          success: "Successfully connected to Jira!"
+          failure: "Failed to connect to Jira: %{errors}"
+        configure:
+          success: "Jira configuration was successfully updated."
+          failure: "Failed to update Jira configuration: %{errors}"
+        projects:
+          select: "Select Jira Projects"
+          help_text: "Choose the projects you want to track in Tramline"
+        done_states:
+          select: "Select Done States"
+          help_text: "Choose which states represent completed work"
+        release_filters:
+          title: "Release Filters"
+          help_text: "Configure how tickets are associated with releases"
+          types:
+            label: "Label"
+            fix_version: "Fix Version"
+          add: "Add Filter"
+          placeholder:
+            label: "e.g., release-1.0.0"
+        no_organization: "No Jira organizations available. Please try again."
+        integration_created: "Integration was successfully created."
diff --git a/config/routes.rb b/config/routes.rb
index fb26eefe9..4237801c1 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -268,6 +268,12 @@
     get :callback, controller: "integration_listeners/slack", as: :slack_callback
   end
 
+  scope :jira do
+    get :callback, controller: "integration_listeners/jira", as: :jira_callback
+    get :select_organization, to: "integration_listeners/jira#select_organization", as: :jira_select_organization
+    post :set_organization, to: "integration_listeners/jira#set_organization", as: :jira_set_organization
+  end
+
   get "/rails/active_storage/blobs/redirect/:signed_id/*filename",
     to: "authorized_blob_redirect#show", as: "blob_redirect"
   match "/", via: %i[post put patch delete], to: "application#raise_not_found", format: false
diff --git a/db/migrate/20241114104939_create_jira_integrations.rb b/db/migrate/20241114104939_create_jira_integrations.rb
new file mode 100644
index 000000000..9888a8789
--- /dev/null
+++ b/db/migrate/20241114104939_create_jira_integrations.rb
@@ -0,0 +1,13 @@
+class CreateJiraIntegrations < ActiveRecord::Migration[7.2]
+  def change
+    create_table :jira_integrations, id: :uuid do |t|
+      t.string :oauth_access_token
+      t.string :oauth_refresh_token
+      t.string :cloud_id
+
+      t.timestamps
+    end
+
+    add_index :jira_integrations, :cloud_id
+  end
+end
diff --git a/db/migrate/20241115100841_add_jira_config_to_app_configs.rb b/db/migrate/20241115100841_add_jira_config_to_app_configs.rb
new file mode 100644
index 000000000..538d39226
--- /dev/null
+++ b/db/migrate/20241115100841_add_jira_config_to_app_configs.rb
@@ -0,0 +1,5 @@
+class AddJiraConfigToAppConfigs < ActiveRecord::Migration[7.2]
+  def change
+    add_column :app_configs, :jira_config, :jsonb, default: {}, null: false
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index fe24a6bdf..3b7691862 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -60,6 +60,7 @@
     t.jsonb "ci_cd_workflows"
     t.jsonb "firebase_crashlytics_ios_config"
     t.jsonb "firebase_crashlytics_android_config"
+    t.jsonb "jira_config", default: {}, null: false
     t.index ["app_id"], name: "index_app_configs_on_app_id", unique: true
   end
 
@@ -399,6 +400,15 @@
     t.index ["sender_id"], name: "index_invites_on_sender_id"
   end
 
+  create_table "jira_integrations", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.string "oauth_access_token"
+    t.string "oauth_refresh_token"
+    t.string "cloud_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["cloud_id"], name: "index_jira_integrations_on_cloud_id"
+  end
+
   create_table "memberships", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
     t.uuid "user_id"
     t.uuid "organization_id"
diff --git a/spec/controllers/integration_listeners/jira_controller_spec.rb b/spec/controllers/integration_listeners/jira_controller_spec.rb
new file mode 100644
index 000000000..2191f068c
--- /dev/null
+++ b/spec/controllers/integration_listeners/jira_controller_spec.rb
@@ -0,0 +1,138 @@
+require "rails_helper"
+
+RSpec.describe IntegrationListeners::JiraController do
+  let(:organization) { create(:organization) }
+  let(:app) { create(:app, :android, organization: organization) }
+  let(:user) { create(:user, :with_email_authentication, :as_developer, member_organization: organization) }
+  let(:state) {
+    {
+      app_id: app.id,
+      user_id: user.id,
+      organization_id: organization.id
+    }.to_json.encode
+  }
+  let(:code) { "test_code" }
+  let(:integration) { build(:integration, :jira, integrable: app) }
+  let(:jira_integration) { build(:jira_integration) }
+
+  before do
+    sign_in user.email_authentication
+    allow_any_instance_of(described_class).to receive(:current_user).and_return(user)
+    allow_any_instance_of(described_class).to receive(:state_user).and_return(user)
+    allow_any_instance_of(described_class).to receive(:state_app).and_return(app)
+    allow_any_instance_of(described_class).to receive(:state_organization).and_return(organization)
+    allow_any_instance_of(described_class).to receive(:build_providable).and_return(jira_integration)
+    allow_any_instance_of(described_class).to receive(:valid_state?).and_return(true)
+  end
+
+  describe "GET #callback" do
+    context "with valid state" do
+      context "when single organization" do
+        before do
+          allow(app.integrations).to receive(:build).and_return(integration)
+          allow(integration).to receive_messages(
+            providable: jira_integration,
+            save!: true,
+            valid?: true
+          )
+
+          allow(jira_integration).to receive_messages(
+            complete_access: true,
+            setup: {}
+          )
+
+          get :callback, params: {state: state, code: code}
+        end
+
+        it "creates integration and redirects to app" do
+          expect(response).to redirect_to(app_path(app))
+          expect(flash[:alert]).to be_nil
+          expect(flash[:notice]).to eq("Integration was successfully created.")
+        end
+      end
+
+      context "when multiple organizations" do
+        let(:resources) { [{"id" => "cloud_1"}, {"id" => "cloud_2"}] }
+
+        before do
+          allow(app.integrations).to receive(:build).and_return(integration)
+          allow(integration).to receive_messages(
+            providable: jira_integration,
+            valid?: true
+          )
+
+          allow(jira_integration).to receive_messages(
+            complete_access: false,
+            available_resources: resources
+          )
+
+          get :callback, params: {state: state, code: code}
+        end
+
+        it "shows organization selection page" do
+          expect(response).to be_successful
+          expect(response.content_type).to include("text/html")
+          expect(flash[:alert]).to be_nil
+          expect(jira_integration).to have_received(:available_resources)
+        end
+      end
+    end
+
+    context "with invalid state" do
+      before do
+        allow_any_instance_of(described_class).to receive(:valid_state?).and_return(false)
+        get :callback, params: {state: state, code: code}
+      end
+
+      it "redirects with error" do
+        expect(response).to redirect_to(app_path(app))
+        expect(flash[:alert]).to eq("Failed to create the integration, please try again.")
+      end
+    end
+  end
+
+  describe "POST #set_organization" do
+    let(:cloud_id) { "cloud_123" }
+    let(:valid_params) do
+      {
+        cloud_id: cloud_id,
+        code: code,
+        state: state
+      }
+    end
+
+    context "with valid parameters" do
+      before do
+        allow(app.integrations).to receive(:build).and_return(integration)
+        allow(integration).to receive_messages(
+          providable: jira_integration,
+          save!: true
+        )
+
+        allow(jira_integration).to receive_messages(
+          setup: {}
+        )
+
+        post :set_organization, params: valid_params
+      end
+
+      it "creates integration and redirects to app integrations" do
+        expect(flash[:notice]).to eq("Integration was successfully created.")
+      end
+    end
+
+    context "with invalid parameters" do
+      before do
+        allow(app.integrations).to receive(:build).and_return(integration)
+        allow(integration).to receive(:save!).and_raise(ActiveRecord::RecordInvalid.new(integration))
+
+        post :set_organization, params: valid_params
+      end
+
+      it "redirects to integrations path with error" do
+        expect(response).to redirect_to(app_integrations_path(app))
+        expect(flash[:alert]).to eq("Failed to create the integration, please try again.")
+      end
+    end
+  end
+end
diff --git a/spec/factories/integrations.rb b/spec/factories/integrations.rb
index 899bc02bb..9cbd5b06e 100644
--- a/spec/factories/integrations.rb
+++ b/spec/factories/integrations.rb
@@ -36,5 +36,15 @@
       providable factory: %i[slack_integration without_callbacks_and_validations]
       category { "notification" }
     end
+
+    trait :jira do
+      category { "project_management" }
+      providable factory: :jira_integration
+    end
+
+    trait :with_jira do
+      category { "project_management" }
+      providable factory: %i[jira_integration with_app_config]
+    end
   end
 end
diff --git a/spec/factories/jira_integrations.rb b/spec/factories/jira_integrations.rb
new file mode 100644
index 000000000..3c9bd39e8
--- /dev/null
+++ b/spec/factories/jira_integrations.rb
@@ -0,0 +1,20 @@
+FactoryBot.define do
+  factory :jira_integration do
+    oauth_access_token { "test_access_token" }
+    oauth_refresh_token { "test_refresh_token" }
+    cloud_id { "cloud_123" }
+    integration
+
+    trait :with_app_config do
+      after(:create) do |jira_integration|
+        app = jira_integration.integration.integrable
+        app.config.update!(jira_config: {
+          "release_filters" => [
+            {"type" => "label", "value" => "release-1.0"},
+            {"type" => "fix_version", "value" => "v1.0.0"}
+          ]
+        })
+      end
+    end
+  end
+end
diff --git a/spec/libs/installations/jira/api_spec.rb b/spec/libs/installations/jira/api_spec.rb
new file mode 100644
index 000000000..593df5f53
--- /dev/null
+++ b/spec/libs/installations/jira/api_spec.rb
@@ -0,0 +1,149 @@
+require "rails_helper"
+require "webmock/rspec"
+
+RSpec.describe Installations::Jira::Api do
+  let(:oauth_access_token) { "test_token" }
+  let(:cloud_id) { "test_cloud_id" }
+  let(:api) { described_class.new(oauth_access_token, cloud_id) }
+  let(:transformations) { JiraIntegration::TICKET_TRANSFORMATIONS }
+
+  describe ".get_accessible_resources" do
+    let(:code) { "test_code" }
+    let(:redirect_uri) { "http://example.com/callback" }
+
+    context "when successful" do
+      let(:resources) { [{"id" => "cloud_1"}] }
+      let(:tokens) { {"access_token" => "token", "refresh_token" => "refresh"} }
+
+      before do
+        allow(described_class).to receive(:creds)
+          .and_return(OpenStruct.new(
+            integrations: OpenStruct.new(
+              jira: OpenStruct.new(
+                client_id: "test_id",
+                client_secret: "test_secret"
+              )
+            )
+          ))
+
+        stub_request(:post, "https://auth.atlassian.com/oauth/token")
+          .with(
+            body: {
+              grant_type: "authorization_code",
+              code: code,
+              redirect_uri: redirect_uri
+            }
+          )
+          .to_return(body: tokens.to_json)
+
+        stub_request(:get, "https://api.atlassian.com/oauth/token/accessible-resources")
+          .with(headers: {"Authorization" => "Bearer #{tokens["access_token"]}"})
+          .to_return(body: resources.to_json, status: 200)
+      end
+
+      it "returns resources and tokens" do
+        result_resources, result_tokens = described_class.get_accessible_resources(code, redirect_uri)
+        expect(result_resources).to eq(resources)
+        expect(result_tokens.access_token).to eq(tokens["access_token"])
+      end
+    end
+
+    context "when HTTP error occurs" do
+      before do
+        allow(described_class).to receive(:creds)
+          .and_return(OpenStruct.new(
+            integrations: OpenStruct.new(
+              jira: OpenStruct.new(
+                client_id: "test_id",
+                client_secret: "test_secret"
+              )
+            )
+          ))
+
+        stub_request(:post, "https://auth.atlassian.com/oauth/token")
+          .with(
+            basic_auth: ["test_id", "test_secret"],
+            body: {
+              grant_type: "authorization_code",
+              code: code,
+              redirect_uri: redirect_uri
+            }
+          )
+          .to_return(body: tokens.to_json)
+
+        stub_request(:get, "https://api.atlassian.com/oauth/token/accessible-resources")
+          .to_raise(HTTP::Error.new("Network error"))
+      end
+
+      let(:tokens) { {"access_token" => "token", "refresh_token" => "refresh"} }
+
+      it "returns empty resources with tokens" do
+        resources, tokens = described_class.get_accessible_resources(code, redirect_uri)
+        expect(resources).to be_empty
+        expect(tokens).to be_present
+      end
+    end
+  end
+
+  describe "#search_tickets_by_filters" do
+    let(:project_key) { "TEST" }
+    let(:empty_response) { {"issues" => []} }
+
+    context "when release filters are not configured" do
+      it "returns empty issues array" do
+        result = api.search_tickets_by_filters(project_key, [], transformations)
+        expect(result["issues"]).to eq([])
+      end
+    end
+
+    context "with release filters" do
+      let(:release_filters) do
+        [
+          {"type" => "label", "value" => "release-1.0"},
+          {"type" => "fix_version", "value" => "1.0.0"}
+        ]
+      end
+
+      let(:mock_response) do
+        {
+          "issues" => [
+            {
+              "key" => "TEST-1",
+              "fields" => {
+                "summary" => "Test issue",
+                "status" => {"name" => "Done"},
+                "assignee" => {"displayName" => "John Doe"},
+                "labels" => ["release-1.0."],
+                "fixVersions" => [{"name" => "1.0.0"}]
+              }
+            }
+          ]
+        }
+      end
+
+      it "returns original response structure" do
+        allow(api).to receive(:execute).and_return(mock_response)
+        result = api.search_tickets_by_filters(project_key, release_filters, transformations)
+        expect(result[0]["key"]).to eq(mock_response["issues"][0]["key"])
+      end
+
+      it "builds correct JQL query" do
+        expected_query = "project = 'TEST' AND labels = 'release-1.0' AND fixVersion = '1.0.0'"
+        expected_url = "https://api.atlassian.com/ex/jira/#{cloud_id}/rest/api/3/search/jql"
+        expected_params = {
+          params: {
+            jql: expected_query,
+            fields: described_class::TICKET_SEARCH_FIELDS
+          }
+        }
+
+        allow(api).to receive(:execute).and_return({"issues" => []})
+
+        api.search_tickets_by_filters(project_key, release_filters, transformations)
+
+        expect(api).to have_received(:execute)
+          .with(:get, expected_url, expected_params)
+      end
+    end
+  end
+end
diff --git a/spec/models/jira_integration_spec.rb b/spec/models/jira_integration_spec.rb
new file mode 100644
index 000000000..496f8d58c
--- /dev/null
+++ b/spec/models/jira_integration_spec.rb
@@ -0,0 +1,156 @@
+require "rails_helper"
+
+RSpec.describe JiraIntegration do
+  subject(:integration) { build(:jira_integration) }
+
+  let(:sample_release_label) { "release-1.0" }
+  let(:sample_version) { "v1.0.0" }
+
+  describe "#installation" do
+    it "returns a new API instance with correct credentials" do
+      api = integration.installation
+      expect(api).to be_a(Installations::Jira::Api)
+      expect(api.oauth_access_token).to eq(integration.oauth_access_token)
+      expect(api.cloud_id).to eq(integration.cloud_id)
+    end
+  end
+
+  describe "#with_api_retries" do
+    context "when token expired" do
+      let(:error) { Installations::Jira::Error.new("error" => {"message" => "The access token expired"}) }
+      let(:integration) { build(:jira_integration) }
+
+      it "retries after refreshing token" do
+        call_count = 0
+        allow(integration).to receive(:reset_tokens!)
+
+        result = integration.send(:with_api_retries) do
+          call_count += 1
+          raise error if call_count == 1
+          "success"
+        end
+
+        expect(integration).to have_received(:reset_tokens!).once
+        expect(result).to eq("success")
+      end
+    end
+
+    context "when max retries exceeded" do
+      it "raises the error" do
+        expect do
+          integration.send(:with_api_retries) { raise Installations::Jira::Error.new({}) }
+        end.to raise_error(Installations::Jira::Error)
+      end
+    end
+  end
+
+  describe "#fetch_tickets_for_release" do
+    let(:app) { create(:app, :android) }
+    let(:integration) { create(:jira_integration, integration: create(:integration, integrable: app)) }
+    let(:api_response) do
+      {
+        "issues" => [
+          {
+            "key" => "PROJ-1",
+            "fields" => {
+              "summary" => "Test ticket",
+              "status" => {"name" => "Done"},
+              "assignee" => {"displayName" => "John Doe"},
+              "labels" => [sample_release_label],
+              "fixVersions" => [{"name" => sample_version}]
+            }
+          }
+        ]
+      }
+    end
+
+    before do
+      app.config.update!(jira_config: {
+        "selected_projects" => ["PROJ"],
+        "release_filters" => [{"type" => "label", "value" => sample_release_label}]
+      })
+
+      allow_any_instance_of(Installations::Jira::Api)
+        .to receive(:search_tickets_by_filters)
+        .with("PROJ", [{"type" => "label", "value" => sample_release_label}], any_args)
+        .and_return(api_response)
+    end
+
+    it "returns formatted tickets" do
+      expect(integration.fetch_tickets_for_release).to eq([{"key" => "PROJ-1",
+                                                            "fields" =>
+        {"summary" => "Test ticket",
+         "status" => {"name" => "Done"},
+         "assignee" => {"displayName" => "John Doe"},
+         "labels" => [sample_release_label],
+         "fixVersions" => [{"name" => sample_version}]}}])
+    end
+
+    context "when missing required configuration" do
+      it "returns empty array when no selected projects" do
+        app.config.update!(jira_config: {
+          "release_filters" => [{"type" => "label", "value" => sample_release_label}]
+        })
+        expect(integration.fetch_tickets_for_release).to eq([])
+      end
+
+      it "returns empty array when no release filters" do
+        app.config.update!(jira_config: {
+          "selected_projects" => ["PROJ"]
+        })
+        expect(integration.fetch_tickets_for_release).to eq([])
+      end
+    end
+  end
+
+  describe "#validate_release_filters" do
+    let(:app) { create(:app, :android) }
+    let(:integration) { build(:jira_integration, integration: create(:integration, integrable: app)) }
+
+    context "with invalid filter type" do
+      let(:filters) { [{"type" => "invalid", "value" => "test"}] }
+
+      before do
+        app.config.update!(jira_config: {"release_filters" => filters})
+        integration.valid?
+      end
+
+      it "is invalid" do
+        expect(integration).not_to be_valid
+        expect(integration.errors[:release_filters]).to include("must contain valid type and value")
+      end
+    end
+
+    context "with empty filter value" do
+      let(:filters) { [{"type" => "label", "value" => ""}] }
+
+      before do
+        app.config.update!(jira_config: {"release_filters" => filters})
+        integration.valid?
+      end
+
+      it "is invalid" do
+        expect(integration).not_to be_valid
+        expect(integration.errors[:release_filters]).to include("must contain valid type and value")
+      end
+    end
+
+    context "with valid filters" do
+      let(:filters) do
+        [
+          {"type" => "label", "value" => sample_release_label},
+          {"type" => "fix_version", "value" => sample_version}
+        ]
+      end
+
+      before do
+        app.config.update!(jira_config: {"release_filters" => filters})
+        integration.valid?
+      end
+
+      it "is valid" do
+        expect(integration).to be_valid
+      end
+    end
+  end
+end

From 4ecc7bd6544c9192a9c8d195626a68c9e1c4a7f2 Mon Sep 17 00:00:00 2001
From: Akshay Gupta <kitallis@gmail.com>
Date: Fri, 17 Jan 2025 14:49:12 +0530
Subject: [PATCH 02/20] revive

---
 app/views/app_configs/project_management.html.erb        | 2 +-
 app/views/jira_integration/_release_filter_form.html.erb | 4 ++--
 config/credentials.yml.enc                               | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/app_configs/project_management.html.erb b/app/views/app_configs/project_management.html.erb
index 6a33b7fe0..02f8b088f 100644
--- a/app/views/app_configs/project_management.html.erb
+++ b/app/views/app_configs/project_management.html.erb
@@ -1,4 +1,4 @@
-<%= render V2::EnhancedTurboFrameComponent.new("#{@integration_category}_config") do %>
+<%= render EnhancedTurboFrameComponent.new("#{@integration_category}_config") do %>
     <%= render partial: "jira_form", locals: {
             config: @config,
             app: @app,
diff --git a/app/views/jira_integration/_release_filter_form.html.erb b/app/views/jira_integration/_release_filter_form.html.erb
index 0bc08cbb6..96379c1b4 100644
--- a/app/views/jira_integration/_release_filter_form.html.erb
+++ b/app/views/jira_integration/_release_filter_form.html.erb
@@ -15,7 +15,7 @@
                      placeholder: "e.g., release-1.0.0",
                      class: "mt-2 block w-full rounded-md border-0 py-1.5 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-blue-600 sm:text-sm sm:leading-6" %>
 
-  <%= render V2::ButtonComponent.new(
+  <%= render ButtonComponent.new(
     scheme: :naked_icon,
     type: :action,
     size: :none,
@@ -23,6 +23,6 @@
       class: "mt-2",
       data: { action: "domain--release-filters#remove" }
     }) do |b|
-    b.with_icon("v2/trash.svg", size: :md)
+    b.with_icon("trash.svg", size: :md)
   end %>
 </div>
diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc
index 25fb89aab..d494e22b6 100644
--- a/config/credentials.yml.enc
+++ b/config/credentials.yml.enc
@@ -1 +1 @@
-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--yryFVhjV2gsmHUKR--CNr8jveivL9GtLj7i2w5Tw==
\ No newline at end of file
+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--7TF2RCQNwICYRZrZ--3EMUkidT7luRJwFoiO2g7w==
\ No newline at end of file

From 06afa23221dcd926092fb9f8f72c98e55e760e65 Mon Sep 17 00:00:00 2001
From: Akshay Gupta <kitallis@gmail.com>
Date: Fri, 24 Jan 2025 23:15:08 +0530
Subject: [PATCH 03/20] simplify the jira integration setup

---
 app/controllers/app_configs_controller.rb     |  2 -
 .../integration_listener_controller.rb        | 17 ++++-
 .../integration_listeners/jira_controller.rb  | 60 ++-------------
 app/models/app_config.rb                      | 13 +++-
 app/models/jira_integration.rb                | 41 ++++-------
 app/views/app_configs/_jira_form.html.erb     | 50 ++++++-------
 .../select_organization.html.erb              | 73 ++++++++-----------
 config/routes.rb                              |  2 +-
 8 files changed, 103 insertions(+), 155 deletions(-)

diff --git a/app/controllers/app_configs_controller.rb b/app/controllers/app_configs_controller.rb
index 3f5dd07d7..0a7f657e7 100644
--- a/app/controllers/app_configs_controller.rb
+++ b/app/controllers/app_configs_controller.rb
@@ -139,7 +139,6 @@ def set_jira_projects
     @jira_data = provider.setup
 
     @config.jira_config = {} if @config.jira_config.nil?
-
     @config.jira_config = {
       "selected_projects" => @config.jira_config["selected_projects"] || [],
       "project_configs" => @config.jira_config["project_configs"] || {},
@@ -153,7 +152,6 @@ def set_jira_projects
     @jira_data[:projects]&.each do |project|
       project_key = project["key"]
       statuses = @jira_data[:project_statuses][project_key]
-
       done_states = statuses&.select { |status| status["name"] == "Done" }&.pluck("name") || []
 
       @config.jira_config["project_configs"][project_key] ||= {
diff --git a/app/controllers/integration_listener_controller.rb b/app/controllers/integration_listener_controller.rb
index d8e4ae55f..eed05455f 100644
--- a/app/controllers/integration_listener_controller.rb
+++ b/app/controllers/integration_listener_controller.rb
@@ -1,10 +1,11 @@
 class IntegrationListenerController < SignedInApplicationController
   using RefinedString
   before_action :require_write_access!, only: %i[callback]
+  INTEGRATION_CREATE_ERROR = "Failed to create the integration, please try again."
 
   def callback
     unless valid_state?
-      redirect_to app_path(state_app), alert: "Failed to create the integration, please try again."
+      redirect_to app_path(state_app), alert: INTEGRATION_CREATE_ERROR
       return
     end
 
@@ -14,8 +15,11 @@ def callback
     if @integration.save
       redirect_to app_path(state_app), notice: "Integration was successfully created."
     else
-      redirect_to app_integrations_path(state_app), alert: "Failed to create the integration, please try again."
+      redirect_to app_integrations_path(state_app), alert: INTEGRATION_CREATE_ERROR
     end
+  rescue => e
+    Rails.logger.error("Failed to create integration: #{e.message}")
+    redirect_to app_integrations_path(state_app), alert: INTEGRATION_CREATE_ERROR
   end
 
   protected
@@ -27,7 +31,13 @@ def providable_params
   private
 
   def state
-    @state ||= JSON.parse(params[:state].decode).with_indifferent_access
+    @state ||=
+      begin
+        JSON.parse(params[:state].tr(" ", "+").decode).with_indifferent_access
+      rescue ActiveSupport::MessageEncryptor::InvalidMessage => e
+        Rails.logger.error(e)
+        {}
+      end
   end
 
   def installation_id
@@ -59,6 +69,7 @@ def state_organization
 
   def state_app
     @state_app ||= @state_organization.apps.find(state[:app_id])
+    @app = @state_app
   end
 
   def state_integration_category
diff --git a/app/controllers/integration_listeners/jira_controller.rb b/app/controllers/integration_listeners/jira_controller.rb
index 938b556ca..093e069c9 100644
--- a/app/controllers/integration_listeners/jira_controller.rb
+++ b/app/controllers/integration_listeners/jira_controller.rb
@@ -1,8 +1,6 @@
 class IntegrationListeners::JiraController < IntegrationListenerController
   using RefinedString
 
-  INTEGRATION_CREATE_ERROR = "Failed to create the integration, please try again."
-
   def callback
     unless valid_state?
       redirect_to app_path(state_app), alert: INTEGRATION_CREATE_ERROR
@@ -13,82 +11,36 @@ def callback
       @integration = state_app.integrations.build(integration_params)
       @integration.providable = build_providable
 
-      if @integration.providable.complete_access
-        @integration.save!
-        redirect_to app_path(state_app),
-          notice: t("integrations.project_management.jira.integration_created")
+      if @integration.providable.complete_access && @integration.save
+        redirect_to app_path(state_app), notice: t("integrations.project_management.jira.integration_created")
       else
         @resources = @integration.providable.available_resources
 
         if @resources.blank?
-          redirect_to app_integrations_path(state_app),
-            alert: t("integrations.project_management.jira.no_organization")
+          redirect_to app_integrations_path(state_app), alert: t("integrations.project_management.jira.no_organization")
           return
         end
 
         render "jira_integration/select_organization"
       end
     rescue => e
-      Rails.logger.error("Failed to create Jira integration: #{e.message}")
-      redirect_to app_integrations_path(state_app),
-        alert: INTEGRATION_CREATE_ERROR
+      Rails.logger.error(e)
+      redirect_to app_integrations_path(state_app), alert: INTEGRATION_CREATE_ERROR
     end
   end
 
-  def set_organization
-    @integration = state_app.integrations.build(integration_params)
-    @integration.providable = build_providable
-    @integration.providable.cloud_id = params[:cloud_id]
-    @integration.providable.code = params[:code]
-
-    if @integration.save!
-      @integration.providable.setup
-      redirect_to app_path(@integration.integrable),
-        notice: t("integrations.project_management.jira.integration_created")
-    else
-      @resources = @integration.providable.available_resources
-      render "jira_integration/select_organization"
-    end
-  rescue => e
-    Rails.logger.error("Failed to create Jira integration: #{e.message}")
-    redirect_to app_integrations_path(state_app),
-      alert: INTEGRATION_CREATE_ERROR
-  end
-
   protected
 
   def providable_params
     super.merge(
       code: code,
-      callback_url: callback_url
+      cloud_id: params[:cloud_id]
     )
   end
 
   private
 
-  def callback_url
-    host = request.host_with_port
-    Rails.application.routes.url_helpers.jira_callback_url(
-      host: host,
-      protocol: request.protocol.gsub("://", "")
-    )
-  end
-
-  def state
-    @state ||= begin
-      cleaned_state = params[:state].tr(" ", "+")
-      JSON.parse(cleaned_state.decode).with_indifferent_access
-    rescue ActiveSupport::MessageEncryptor::InvalidMessage => e
-      Rails.logger.error "Invalid state parameter: #{e.message}"
-      {}
-    end
-  end
-
   def error?
     params[:error].present? || state.empty?
   end
-
-  def state_app
-    @state_app ||= App.find(state[:app_id])
-  end
 end
diff --git a/app/models/app_config.rb b/app/models/app_config.rb
index 38b196123..37362c0af 100644
--- a/app/models/app_config.rb
+++ b/app/models/app_config.rb
@@ -35,6 +35,7 @@ class AppConfig < ApplicationRecord
   validates :firebase_android_config,
     allow_blank: true,
     json: {message: ->(errors) { errors }, schema: PLATFORM_AWARE_CONFIG_SCHEMA}
+  validate :jira_release_filters, if: -> { jira_config&.dig("release_filters").present? }
 
   after_initialize :set_bugsnag_config, if: :persisted?
 
@@ -139,13 +140,13 @@ def set_ci_cd_workflows(workflows)
   def add_jira_release_filter(type:, value:)
     return unless JiraIntegration::VALID_FILTER_TYPES.include?(type)
 
-    new_filters = (jira_config&.dig("release_filters") || []).dup
+    new_filters = (jira_config.dig("release_filters") || []).dup
     new_filters << {"type" => type, "value" => value}
     update!(jira_config: jira_config.merge("release_filters" => new_filters))
   end
 
   def remove_jira_release_filter(index)
-    new_filters = (jira_config&.dig("release_filters") || []).dup
+    new_filters = (jira_config.dig("release_filters") || []).dup
     new_filters.delete_at(index)
     update!(jira_config: jira_config.merge("release_filters" => new_filters))
   end
@@ -191,4 +192,12 @@ def project_management_ready?
       jira_config["selected_projects"].any? &&
       jira_config["project_configs"].present?
   end
+
+  def jira_release_filters
+    jira_config["release_filters"].each do |filter|
+      unless filter.is_a?(Hash) && JiraIntegration::VALID_FILTER_TYPES.include?(filter["type"]) && filter["value"].present?
+        errors.add(:jira_config, "release filters must contain valid type and value")
+      end
+    end
+  end
 end
diff --git a/app/models/jira_integration.rb b/app/models/jira_integration.rb
index 5c06c8553..c1181484c 100644
--- a/app/models/jira_integration.rb
+++ b/app/models/jira_integration.rb
@@ -20,10 +20,10 @@ class JiraIntegration < ApplicationRecord
   encrypts :oauth_access_token, deterministic: true
   encrypts :oauth_refresh_token, deterministic: true
 
-  BASE_INSTALLATION_URL =
-    Addressable::Template.new("https://auth.atlassian.com/authorize{?params*}")
+  BASE_INSTALLATION_URL = Addressable::Template.new("https://auth.atlassian.com/authorize{?params*}")
   PUBLIC_ICON = "https://storage.googleapis.com/tramline-public-assets/jira_small.png".freeze
   VALID_FILTER_TYPES = %w[label fix_version].freeze
+  API = Installations::Jira::Api
 
   USER_INFO_TRANSFORMATIONS = {
     id: :accountId,
@@ -54,13 +54,10 @@ class JiraIntegration < ApplicationRecord
     fix_versions: [:fields, :fixVersions]
   }.freeze
 
-  attr_accessor :code, :callback_url, :available_resources
-  before_validation :complete_access, on: :create
+  attr_accessor :code, :available_resources
   delegate :app, to: :integration
   delegate :cache, to: Rails
-
   validates :cloud_id, presence: true
-  validate :validate_release_filters, if: -> { app.config.jira_config&.dig("release_filters").present? }
 
   def install_path
     BASE_INSTALLATION_URL
@@ -75,12 +72,17 @@ def install_path
       }).to_s
   end
 
+  # if the user has access to only one organization, then set the cloud_id and assume the access is complete
+  # otherwise, set available_resources so that the user can select the right cloud_id and then eventually complete the access
   def complete_access
-    return false if code.blank? || (callback_url.blank? && redirect_uri.blank?)
+    return false if code.blank? || redirect_uri.blank?
 
-    resources, tokens = Installations::Jira::Api.get_accessible_resources(code, callback_url || redirect_uri)
+    resources, tokens = API.get_accessible_resources(code, redirect_uri)
     set_tokens(tokens)
 
+    # access is already complete if cloud_id is already set
+    return true if cloud_id.present?
+
     if resources.length == 1
       self.cloud_id = resources.first["id"]
       true
@@ -91,7 +93,7 @@ def complete_access
   end
 
   def installation
-    Installations::Jira::Api.new(oauth_access_token, cloud_id)
+    API.new(oauth_access_token, cloud_id)
   end
 
   def to_s = "jira"
@@ -129,13 +131,10 @@ def setup
     {}
   end
 
-  def metadata
-    with_api_retries { installation.user_info(USER_INFO_TRANSFORMATIONS) }
-  end
+  def metadata = cloud_id
 
   def connection_data
-    return unless integration.metadata
-    "Added by user: #{integration.metadata["name"]} (#{integration.metadata["email"]})"
+    "Cloud ID: #{integration.metadata}" if integration.metadata
   end
 
   def fetch_tickets_for_release
@@ -188,7 +187,7 @@ def with_api_retries(attempt: 0, &)
   end
 
   def reset_tokens!
-    set_tokens(Installations::Jira::Api.oauth_refresh_token(oauth_refresh_token, redirect_uri))
+    set_tokens(API.oauth_refresh_token(oauth_refresh_token, redirect_uri))
     save!
   end
 
@@ -204,7 +203,7 @@ def redirect_uri
   end
 
   def api
-    @api ||= Installations::Jira::Api.new(oauth_access_token, cloud_id)
+    @api ||= API.new(oauth_access_token, cloud_id)
   end
 
   def fetch_projects
@@ -232,14 +231,4 @@ def fetch_project_statuses(projects)
     Rails.logger.error("Failed to fetch Jira project statuses for cloud_id #{cloud_id}: #{e.message}")
     {}
   end
-
-  def validate_release_filters
-    return if app.config.jira_config&.dig("release_filters").blank?
-
-    app.config.jira_config["release_filters"].each do |filter|
-      unless filter.is_a?(Hash) && VALID_FILTER_TYPES.include?(filter["type"]) && filter["value"].present?
-        errors.add(:release_filters, "must contain valid type and value")
-      end
-    end
-  end
 end
diff --git a/app/views/app_configs/_jira_form.html.erb b/app/views/app_configs/_jira_form.html.erb
index 3b4676485..258c24ce3 100644
--- a/app/views/app_configs/_jira_form.html.erb
+++ b/app/views/app_configs/_jira_form.html.erb
@@ -1,29 +1,29 @@
 <div class="p-4 sm:p-6 lg:p-8">
-<div class="space-y-6">
-  <div>
-    <h2 class="text-base font-semibold leading-7 text-gray-900">Jira Configuration</h2>
-    <p class="mt-1 text-sm leading-6 text-gray-600">Select projects and their done states for tracking releases.</p>
-  </div>
-
-  <%= form_with model: config,
-                url: app_app_config_path(app),
-                method: :patch,
-                data: { turbo_frame: "_top" },
-                builder: EnhancedFormHelper::AuthzForm do |f| %>
-    <div class="mt-6 space-y-6 bg-white rounded-lg border" data-controller="project-selector">
-      <% if jira_data && jira_data[:projects].present? %>
-        <!-- Project Selection -->
-        <%= render 'jira_integration/project_selection' %>
-      <% else %>
-        <div class="p-4 text-sm text-gray-600">
-          No Jira projects found. Please ensure your Jira integration is properly configured.
-        </div>
-      <% end %>
+  <div class="space-y-6">
+    <div>
+      <h2 class="text-base font-semibold leading-7 text-gray-900">Jira Configuration</h2>
+      <p class="mt-1 text-sm leading-6 text-gray-600">Select projects and their done states for tracking releases.</p>
     </div>
 
-    <div class="mt-6 flex items-center justify-end gap-x-6">
-      <%= f.authz_submit "Update", "plus.svg", size: :xs %>
-    </div>
-  <% end %>
-</div>
+    <%= form_with model: config,
+                  url: app_app_config_path(app),
+                  method: :patch,
+                  data: { turbo_frame: "_top" },
+                  builder: EnhancedFormHelper::AuthzForm do |f| %>
+      <div class="mt-6 space-y-6 bg-white rounded-lg border" data-controller="project-selector">
+        <% if jira_data && jira_data[:projects].present? %>
+          <!-- Project Selection -->
+          <%= render 'jira_integration/project_selection' %>
+        <% else %>
+          <div class="p-4 text-sm text-gray-600">
+            No Jira projects found. Please ensure your Jira integration is properly configured.
+          </div>
+        <% end %>
+      </div>
+
+      <div class="mt-6 flex items-center justify-end gap-x-6">
+        <%= f.authz_submit "Update", "plus.svg", size: :xs %>
+      </div>
+    <% end %>
+  </div>
 </div>
diff --git a/app/views/jira_integration/select_organization.html.erb b/app/views/jira_integration/select_organization.html.erb
index 5cc30288c..32ec231f3 100644
--- a/app/views/jira_integration/select_organization.html.erb
+++ b/app/views/jira_integration/select_organization.html.erb
@@ -1,47 +1,36 @@
-<div class="min-h-screen bg-gray-100 flex items-center justify-center">
-  <div class="w-full max-w-lg px-4">
-    <div class="bg-white shadow rounded-xl p-8">
-      <div class="space-y-4">
-        <div class="flex items-center justify-between mb-2">
-          <h2 class="text-xl font-bold text-gray-900">Select Jira Organization</h2>
-        </div>
+<div class="min-h-screen flex items-center justify-center">
+  <%= render CardComponent.new(title: "Pick your Jira Organization", separator: true, size: :base) do %>
+    <% if @resources&.any? %>
+      <%= render FormComponent.new(url: resend_jira_callback_path, method: :post, free_form: true) do |form| %>
+        <%= form.F.hidden_field :code, value: params[:code] %>
+        <%= form.F.hidden_field :state, value: params[:state] %>
+
+        <% options = @resources.map do |org| %>
+          <%
+            {
+              title: org["name"],
+              subtitle: org["url"],
+              icon: "integrations/logo_jira.png",
+              opt_name: :cloud_id,
+              opt_value: org["id"],
+              options: { checked: true }
+            }
+          %>
+        <% end %>
 
-        <% if @resources&.any? %>
-          <%= form_tag jira_set_organization_path, method: :post, class: "space-y-4" do %>
-            <%= hidden_field_tag :code, params[:code] %>
-            <%= hidden_field_tag :state, params[:state] %>
-            <div class="space-y-3">
-              <% @resources.each do |org| %>
-                <div class="relative flex items-center space-x-3 rounded-lg border border-gray-300 bg-white px-4 py-3 shadow-sm hover:border-gray-400 focus-within:ring-2 focus-within:ring-blue-500 focus-within:ring-offset-2">
-                  <div class="flex-shrink-0">
-                    <%= radio_button_tag 'cloud_id', org["id"], false,
-                        class: "h-4 w-4 border-gray-300 text-blue-600 focus:ring-blue-600",
-                        required: true %>
-                  </div>
-                  <div class="min-w-0 flex-1">
-                    <label for="cloud_id_<%= org["id"] %>" class="cursor-pointer block focus:outline-none">
-                      <span class="absolute inset-0" aria-hidden="true"></span>
-                      <p class="text-sm font-medium text-gray-900"><%= org["name"] %></p>
-                      <p class="truncate text-xs text-gray-500"><%= org["url"] %></p>
-                    </label>
-                  </div>
-                </div>
-              <% end %>
-            </div>
+        <%= render OptionCardsComponent.new(form: form.F, options:) %>
 
-            <div class="flex w-full justify-end items-center pt-2">
-              <%= submit_tag "Continue", class: "ml-auto inline-flex justify-center rounded-md bg-blue-600 px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-blue-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-blue-600" %>
-            </div>
-          <% end %>
-        <% else %>
-          <div class="rounded-md bg-yellow-50 p-4">
-            <div class="text-sm text-yellow-700">
-              <h3 class="font-medium text-yellow-800">No organizations available</h3>
-              <p class="mt-1">Please try again or contact support if the issue persists.</p>
-            </div>
-          </div>
+        <% form.with_action do %>
+          <%= form.F.authz_submit "Continue", "archive.svg", size: :sm %>
         <% end %>
+      <% end %>
+    <% else %>
+      <div class="rounded-md bg-yellow-50 p-4">
+        <div class="text-sm text-yellow-700">
+          <h3 class="font-medium text-yellow-800">No organizations available</h3>
+          <p class="mt-1">Please try again or contact support if the issue persists.</p>
+        </div>
       </div>
-    </div>
-  </div>
+    <% end %>
+  <% end %>
 </div>
diff --git a/config/routes.rb b/config/routes.rb
index ac2e17f1a..34bf1eda3 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -269,8 +269,8 @@
 
   scope :jira do
     get :callback, controller: "integration_listeners/jira", as: :jira_callback
+    post :callback, controller: "integration_listeners/jira", as: :resend_jira_callback
     get :select_organization, to: "integration_listeners/jira#select_organization", as: :jira_select_organization
-    post :set_organization, to: "integration_listeners/jira#set_organization", as: :jira_set_organization
   end
 
   get "/rails/active_storage/blobs/redirect/:signed_id/*filename",

From 3064452b0cee48ced7885a1927cd4f23b22df6d5 Mon Sep 17 00:00:00 2001
From: Akshay Gupta <kitallis@gmail.com>
Date: Mon, 27 Jan 2025 18:17:06 +0530
Subject: [PATCH 04/20] minor

---
 app/assets/images/integrations/logo_jira.png  | Bin 757 -> 32471 bytes
 .../option_cards_component.html.erb           |   2 +-
 app/components/option_cards_component.rb      |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/images/integrations/logo_jira.png b/app/assets/images/integrations/logo_jira.png
index a97b51bb2b6ece5f493cf2a0f873b0007f1d3a5e..72dfa728e983f1261c2566f56cb38b359accb51e 100644
GIT binary patch
literal 32471
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
Of5-KVbxX7<VgC<^Z`w8h

literal 757
zcmV<R0t)?!P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0*XmQK~zXft&~kn
z6G0TmH^hL5A~Y(Y0h_vRi6@R8_vpckh8RsqCD_D5NNKQ|Duxca3*J0>?9rn~k3D)p
zBx)=NLK|#CNl5FVQUu~W=S^pq-RV|Z(tq-je!Ta7Gw)-RRunR6JY)hiYnn-yMQC#x
zF+lf9^gk1!&1onFUF=jjuSAVZgf=hLq&Hcqs$R*wOoX+j>n4n92F-dUlud-V6(DdC
z>y4(8BR%l4qWcrSbYHxv_eKkP_r!+YIsRSuJ<f**W(x7(eD!vt0T3zOLV(jreRTv^
z=l8(>v<#PLcc6djC-h8iK-c&W=(x8A%H7Y^p}F0#GsZHJvR-lt)I|n)@!N*<MYmiK
z-&8*0^tVi;tCwcNgzT&?9&*TFf<a<#h%&auMwpi67?I9fEa1Hy;DlU?6>SLigpKeA
z*<Yk;EPfM%esTtRL9p>R2n;aDw$oP$8IaVBza+S@Pll5fGB{TvzF3j;N4Lni$xYH3
zUMC&*zY=9^l_+;sqRPVzU$$$+f|NL<H=5V^ftFyz**`2p20ySLA(;9D!_O=B$#7cE
zKiY)u@H(7%@Qu}ZmD$R&waqr<NeO&2MGipmjW_5m%>crt1&BqHA=XGrkTfgV7b^xK
z=zk@#YXe-8-xqI4!3jw-pSPBO4RQefWW^hR;;VlWWV!$sA~`r4&ZfOyRh8^F2B7%%
zV#E2U(Tw(*W`YX`+cKmll1rn%d<%r~M6D>aMALYEC!}w>zyYY*GS-&s)Bp@dh&}hS
zJ2t=)KH*pa@wIue)7dYi4S80s1Dsmed<$?4*=rvF#hU)n2??eS+Y1Q2fdGRXzb~vW
n;;;6pHp28B8_jHM07dx+96b@nbj5h`00000NkvXXu0mjf60uSQ

diff --git a/app/components/option_cards_component.html.erb b/app/components/option_cards_component.html.erb
index 1bbaca22b..085ebbaf9 100644
--- a/app/components/option_cards_component.html.erb
+++ b/app/components/option_cards_component.html.erb
@@ -2,7 +2,7 @@
   <% options.each do |opt| %>
     <li>
       <%= form.radio_button(opt[:opt_name], opt[:opt_value], opt[:options]) %>
-      <label for="<%= opt[:id] %>" class="inline-flex items-center justify-between gap-1 w-full h-full p-3 text-secondary bg-white border border-main-200 rounded-lg cursor-pointer dark:hover:text-main-300 dark:border-main-700 dark:peer-checked:text-blue-700 peer-checked:border-blue-800 peer-checked:text-blue-800 hover:text-main-600 peer-checked:bg-main-100 hover:bg-main-100 dark:text-secondary-50 dark:bg-main-800 dark:peer-checked:bg-main-700 dark:hover:bg-main-700">
+      <label for="<%= opt[:id] %>" class="inline-flex items-center justify-between gap-6 w-full h-full p-3 text-secondary bg-white border border-main-200 rounded-lg cursor-pointer dark:hover:text-main-300 dark:border-main-700 dark:peer-checked:text-blue-700 peer-checked:border-blue-800 peer-checked:text-blue-800 hover:text-main-600 peer-checked:bg-main-100 hover:bg-main-100 dark:text-secondary-50 dark:bg-main-800 dark:peer-checked:bg-main-700 dark:hover:bg-main-700">
         <div class="block">
           <div class="w-full text-base font-semibold"><%= opt[:title] %></div>
           <div class="w-full"><%= opt[:subtitle] %></div>
diff --git a/app/components/option_cards_component.rb b/app/components/option_cards_component.rb
index 9a04a3262..4edef8c0a 100644
--- a/app/components/option_cards_component.rb
+++ b/app/components/option_cards_component.rb
@@ -14,7 +14,7 @@ def initialize(form:, options:)
 
   def enhance_opts(opts)
     opts.map do |option|
-      base_id = "#{form.object_name}_#{option[:opt_name]}"
+      base_id = [form.object_name, option[:opt_name]].compact_blank.join("_")
       base_id += "_#{option[:opt_value]}" if option[:opt_value]
       option[:id] = base_id
       option[:icon] = IconComponent.new(option[:icon], size: :xl)

From cab68c6d8aa5a1b77c439e8e713d085ab8297949 Mon Sep 17 00:00:00 2001
From: Akshay Gupta <kitallis@gmail.com>
Date: Tue, 28 Jan 2025 11:42:07 +0530
Subject: [PATCH 05/20] use standard tramline components

---
 app/assets/images/folder_open.svg             |   6 +
 app/helpers/enhanced_form_helper.rb           |   7 +-
 app/models/app_config.rb                      |  26 ++--
 app/views/app_configs/_jira_form.html.erb     |  51 ++++---
 .../app_configs/project_management.html.erb   |   6 +-
 .../_project_selection.html.erb               | 131 +++++++++---------
 config/locales/en.yml                         |   1 -
 7 files changed, 119 insertions(+), 109 deletions(-)
 create mode 100644 app/assets/images/folder_open.svg

diff --git a/app/assets/images/folder_open.svg b/app/assets/images/folder_open.svg
new file mode 100644
index 000000000..69211022a
--- /dev/null
+++ b/app/assets/images/folder_open.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 24 24" fill="none" stroke="currentColor"
+     stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+  <path
+    d="m6 14 1.45-2.9A2 2 0 0 1 9.24 10H20a2 2 0 0 1 1.94 2.5l-1.55 6a2 2 0 0 1-1.94 1.5H4a2 2 0 0 1-2-2V5c0-1.1.9-2 2-2h3.93a2 2 0 0 1 1.66.9l.82 1.2a2 2 0 0 0 1.66.9H18a2 2 0 0 1 2 2v2"/>
+  <circle cx="14" cy="15" r="1"/>
+</svg>
diff --git a/app/helpers/enhanced_form_helper.rb b/app/helpers/enhanced_form_helper.rb
index 6fd57abe2..86f3f2b1d 100644
--- a/app/helpers/enhanced_form_helper.rb
+++ b/app/helpers/enhanced_form_helper.rb
@@ -120,11 +120,16 @@ def labeled_file_field(method, label_text, help_text = nil, options = {})
     def labeled_checkbox(method, label_text, options = {})
       hopts = {class: field_classes(is_disabled: options[:disabled], classes: CHECK_BOX_CLASSES)}.merge(options)
       @template.content_tag(:div, class: "flex items-center") do
-        @template.concat check_box(method, hopts)
+        @template.concat checkbox(method, hopts)
         @template.concat label_only(method, label_text, type: :side)
       end
     end
 
+    def checkbox(method, options = {}, checked_value = "1", unchecked_value = "0")
+      hopts = {class: field_classes(is_disabled: options[:disabled], classes: CHECK_BOX_CLASSES)}.merge(options)
+      check_box(method, hopts, checked_value, unchecked_value)
+    end
+
     def labeled_radio_option(method, value, label_text, options = {})
       hopts = {class: field_classes(is_disabled: options[:disabled], classes: OPTION_CLASSES)}.merge(options)
       @template.content_tag(:div, class: "flex items-center me-4") do
diff --git a/app/models/app_config.rb b/app/models/app_config.rb
index 37362c0af..37b487740 100644
--- a/app/models/app_config.rb
+++ b/app/models/app_config.rb
@@ -137,19 +137,19 @@ def set_ci_cd_workflows(workflows)
     update(ci_cd_workflows: workflows)
   end
 
-  def add_jira_release_filter(type:, value:)
-    return unless JiraIntegration::VALID_FILTER_TYPES.include?(type)
-
-    new_filters = (jira_config.dig("release_filters") || []).dup
-    new_filters << {"type" => type, "value" => value}
-    update!(jira_config: jira_config.merge("release_filters" => new_filters))
-  end
-
-  def remove_jira_release_filter(index)
-    new_filters = (jira_config.dig("release_filters") || []).dup
-    new_filters.delete_at(index)
-    update!(jira_config: jira_config.merge("release_filters" => new_filters))
-  end
+  # def add_jira_release_filter(type:, value:)
+  #   return unless JiraIntegration::VALID_FILTER_TYPES.include?(type)
+  #
+  #   new_filters = (jira_config.dig("release_filters") || []).dup
+  #   new_filters << {"type" => type, "value" => value}
+  #   update!(jira_config: jira_config.merge("release_filters" => new_filters))
+  # end
+  #
+  # def remove_jira_release_filter(index)
+  #   new_filters = (jira_config.dig("release_filters") || []).dup
+  #   new_filters.delete_at(index)
+  #   update!(jira_config: jira_config.merge("release_filters" => new_filters))
+  # end
 
   private
 
diff --git a/app/views/app_configs/_jira_form.html.erb b/app/views/app_configs/_jira_form.html.erb
index 258c24ce3..6a62bf8cf 100644
--- a/app/views/app_configs/_jira_form.html.erb
+++ b/app/views/app_configs/_jira_form.html.erb
@@ -1,29 +1,28 @@
-<div class="p-4 sm:p-6 lg:p-8">
-  <div class="space-y-6">
-    <div>
-      <h2 class="text-base font-semibold leading-7 text-gray-900">Jira Configuration</h2>
-      <p class="mt-1 text-sm leading-6 text-gray-600">Select projects and their done states for tracking releases.</p>
-    </div>
-
-    <%= form_with model: config,
-                  url: app_app_config_path(app),
-                  method: :patch,
-                  data: { turbo_frame: "_top" },
-                  builder: EnhancedFormHelper::AuthzForm do |f| %>
-      <div class="mt-6 space-y-6 bg-white rounded-lg border" data-controller="project-selector">
-        <% if jira_data && jira_data[:projects].present? %>
-          <!-- Project Selection -->
-          <%= render 'jira_integration/project_selection' %>
-        <% else %>
-          <div class="p-4 text-sm text-gray-600">
-            No Jira projects found. Please ensure your Jira integration is properly configured.
-          </div>
-        <% end %>
+<% if jira_data && jira_data[:projects].present? %>
+  <%= render FormComponent.new(model: config,
+                               url: app_app_config_path(app),
+                               method: :patch,
+                               data: { turbo_frame: "_top" },
+                               builder: EnhancedFormHelper::AuthzForm,
+                               free_form: true) do |f| %>
+    <%= render CardComponent.new(title: "Select Jira Projects",
+                                 subtitle: "Pick projects, add release filters and done states for tracking releases",
+                                 separator: true,
+                                 size: :full) do %>
+      <div data-controller="project-selector">
+        <%= render partial: "jira_integration/project_selection",
+                   locals: { form: f.F, jira_data: @jira_data, current_jira_config: @current_jira_config } %>
       </div>
 
-      <div class="mt-6 flex items-center justify-end gap-x-6">
-        <%= f.authz_submit "Update", "plus.svg", size: :xs %>
-      </div>
+      <% f.with_action do %>
+        <%= f.F.authz_submit "Update", "plus.svg", size: :sm %>
+      <% end %>
     <% end %>
-  </div>
-</div>
+  <% end %>
+<% else %>
+  <%= render EmptyStateComponent.new(
+    title: "No Jira projects found",
+    text: "Please try loading this configuration screen again or check your configured projects.",
+    banner_image: "folder_open.svg",
+    type: :subdued) %>
+<% end %>
diff --git a/app/views/app_configs/project_management.html.erb b/app/views/app_configs/project_management.html.erb
index 02f8b088f..1198028fc 100644
--- a/app/views/app_configs/project_management.html.erb
+++ b/app/views/app_configs/project_management.html.erb
@@ -1,7 +1,3 @@
 <%= render EnhancedTurboFrameComponent.new("#{@integration_category}_config") do %>
-    <%= render partial: "jira_form", locals: {
-            config: @config,
-            app: @app,
-            jira_data: @jira_data
-          } %>
+    <%= render partial: "jira_form", locals: { config: @config, app: @app, jira_data: @jira_data } %>
 <% end %>
diff --git a/app/views/jira_integration/_project_selection.html.erb b/app/views/jira_integration/_project_selection.html.erb
index 40098ce0c..3abe2418d 100644
--- a/app/views/jira_integration/_project_selection.html.erb
+++ b/app/views/jira_integration/_project_selection.html.erb
@@ -1,69 +1,33 @@
-<div class="p-4">
-  <h3 class="text-sm font-medium text-gray-900">Select Projects</h3>
-  <p class="mt-1 text-sm text-gray-500">Choose one or more projects to track tickets from.</p>
+<%# locals: (form:, jira_data:, current_jira_config:) %>
 
-  <div class="mt-4 space-y-3">
-    <% @jira_data[:projects].each do |project| %>
-      <div class="flex items-start">
-        <div class="flex h-6 items-center">
-          <%= check_box_tag "app_config[jira_config][selected_projects][]",
-                          project['key'],
-                          @current_jira_config&.dig('selected_projects')&.include?(project['key']),
-                          class: "h-4 w-4 rounded border-gray-300 text-primary focus:ring-primary",
-                          data: {
-                            action: "project-selector#toggle",
-                            project_key: project['key'],
-                            project_selector_target: "projectCheckbox"
-                          },
-                          id: "project_#{project['key']}" %>
-          <label for="project_<%= project['key'] %>" class="ml-2 text-sm font-medium text-gray-900">
-            <%= project['name'] %> (<%= project['key'] %>)
-          </label>
-        </div>
-      </div>
+<% jira_data[:projects].each do |project| %>
+  <div class="flex items-center">
+    <%= form.fields_for :jira_config do |sf| %>
+      <%= sf.checkbox :selected_projects,
+                       { multiple: true,
+                         include_hidden: false,
+                         data: {
+                           action: "project-selector#toggle",
+                           project_key: project['key'],
+                           project_selector_target: "projectCheckbox"
+                         },
+                         id: "project_#{project['key']}",
+                         checked: current_jira_config&.dig('selected_projects')&.include?(project['key'])
+                       },
+                       project['key'] %>
     <% end %>
-  </div>
-</div>
 
-<!-- Release Filters Section -->
-<div class="p-4" data-controller="domain--release-filters" data-project-selector-target="filterDivider">
-  <h3 class="text-sm font-medium text-gray-900"><%= t('integrations.project_management.jira.release_filters.title') %></h3>
-  <p class="mt-1 text-sm text-gray-500"><%= t('integrations.project_management.jira.release_filters.help_text') %></p>
-
-  <div class="mt-4 space-y-4">
-    <template data-domain--release-filters-target="template">
-      <%= render 'jira_integration/release_filter_form', index: '__INDEX__' %>
-    </template>
-
-    <div data-domain--release-filters-target="container">
-      <% if (@current_jira_config&.dig('release_filters') || []).any? %>
-        <% @current_jira_config['release_filters'].each_with_index do |filter, index| %>
-          <%= render 'jira_integration/release_filter_form',
-                      filter: filter,
-                      index: index,
-                      local_assigns: true %>
-        <% end %>
-      <% else %>
-        <%= render 'jira_integration/release_filter_form',
-                    filter: {},
-                    index: 0,
-                    local_assigns: true %>
-      <% end %>
-    </div>
-
-    <button type="button"
-            class="mt-4 text-sm text-blue-600 hover:text-blue-500"
-            data-action="domain--release-filters#add">
-      <%= t('integrations.project_management.jira.release_filters.add') %>
-    </button>
+    <label for="project_<%= project['key'] %>" class="ml-2 text-sm font-medium text-gray-900">
+      <%= project['name'] %> (<%= project['key'] %>)
+    </label>
   </div>
-</div>
+<% end %>
 
 <!-- Project Configurations -->
 <div id="project_configurations">
-  <% @jira_data[:projects].each do |project| %>
+  <% jira_data[:projects].each do |project| %>
     <% project_key = project['key'] %>
-    <% statuses = @jira_data[:project_statuses][project_key] %>
+    <% statuses = jira_data[:project_statuses][project_key] %>
 
     <div class="p-4 project-config" data-project="<%= project_key %>">
       <h4 class="text-sm font-medium text-gray-900 mb-3"><%= project['name'] %> Configuration</h4>
@@ -77,12 +41,12 @@
               <% statuses.each do |status| %>
                 <div class="flex items-center">
                   <%= check_box_tag "app_config[jira_config][project_configs][#{project_key}][done_states][]",
-                                  status['name'],
-                                  @current_jira_config&.dig('project_configs', project_key, 'done_states')&.include?(status['name']),
-                                  class: "h-4 w-4 rounded border-gray-300 text-primary focus:ring-primary",
-                                  id: "status_#{project_key}_#{status['name'].parameterize}" %>
+                                    status['name'],
+                                    current_jira_config&.dig('project_configs', project_key, 'done_states')&.include?(status['name']),
+                                    class: "h-4 w-4 rounded border-gray-300 text-primary focus:ring-primary",
+                                    id: "status_#{project_key}_#{status['name'].parameterize}" %>
                   <label for="status_<%= project_key %>_<%= status['name'].parameterize %>"
-                          class="ml-2 text-sm text-gray-600">
+                         class="ml-2 text-sm text-gray-600">
                     <%= status['name'] %>
                   </label>
                 </div>
@@ -96,3 +60,44 @@
     </div>
   <% end %>
 </div>
+
+<div data-controller="domain--release-filters" data-project-selector-target="filterDivider">
+  <h3 class="text-sm font-medium">Release Filters</h3>
+
+
+  <div data-controller="nested-form-ext" class="grid">
+    <div>
+      <%= render ButtonComponent.new(
+        scheme: :light,
+        type: :action,
+        size: :xs,
+        label: "Add filter",
+        html_options: { data: { action: "nested-form-ext#add" } },
+        arrow: :none) do |b|
+        b.with_icon("plus.svg", rounded: false)
+      end %>
+    </div>
+
+    <ul class="flex flex-col gap-1">
+      <% release_filters = current_jira_config&.dig("release_filters") || [] %>
+
+      <% if release_filters.any? %>
+        <% release_filters.each_with_index do |filter, index| %>
+          <li class="nested-form-wrapper" data-new-record="false">
+            <%= render "jira_integration/release_filter_form", filter: filter, index: index, local_assigns: true %>
+          </li>
+        <% end %>
+      <% else %>
+        <%= render "jira_integration/release_filter_form", filter: {}, index: 0, local_assigns: true %>
+      <% end %>
+
+      <template data-nested-form-ext-target="template">
+        <li class="nested-form-wrapper" data-new-record="true">
+          <%= render "jira_integration/release_filter_form", index: "NEW_RECORD" %>
+        </li>
+      </template>
+
+      <div data-nested-form-ext-target="target"></div>
+    </ul>
+  </div>
+</div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 152e91ae7..2ab087bfb 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -725,7 +725,6 @@ en:
           help_text: "Choose which states represent completed work"
         release_filters:
           title: "Release Filters"
-          help_text: "Configure how tickets are associated with releases"
           types:
             label: "Label"
             fix_version: "Fix Version"

From d6b3ea87ba5f717e4ca15ab6e1444c1b21254dba Mon Sep 17 00:00:00 2001
From: Akshay Gupta <kitallis@gmail.com>
Date: Tue, 28 Jan 2025 21:06:15 +0530
Subject: [PATCH 06/20] rewrite the entire jira form partial

---
 .tool-versions                                |   1 -
 .../domain/release_filters_controller.js      |  17 --
 app/javascript/controllers/helper.js          |   5 -
 .../project_selector_controller.js            |  37 ----
 .../controllers/project_states_controller.js  |  10 -
 .../controllers/targeted_toggle_controller.js |  20 ++
 .../controllers/visibility_controller.js      |  21 --
 app/libs/installations/jira/api.rb            |  24 +--
 app/models/jira_integration.rb                |   4 +-
 app/views/app_configs/_jira_form.html.erb     |   9 +-
 .../_project_selection.html.erb               | 187 ++++++++++--------
 .../_release_filter_form.html.erb             |   7 +-
 12 files changed, 142 insertions(+), 200 deletions(-)
 delete mode 100644 .tool-versions
 delete mode 100644 app/javascript/controllers/domain/release_filters_controller.js
 delete mode 100644 app/javascript/controllers/helper.js
 delete mode 100644 app/javascript/controllers/project_selector_controller.js
 delete mode 100644 app/javascript/controllers/project_states_controller.js
 create mode 100644 app/javascript/controllers/targeted_toggle_controller.js
 delete mode 100644 app/javascript/controllers/visibility_controller.js

diff --git a/.tool-versions b/.tool-versions
deleted file mode 100644
index 5aa8e0c30..000000000
--- a/.tool-versions
+++ /dev/null
@@ -1 +0,0 @@
-ruby 3.3.6
diff --git a/app/javascript/controllers/domain/release_filters_controller.js b/app/javascript/controllers/domain/release_filters_controller.js
deleted file mode 100644
index 25ac4e3af..000000000
--- a/app/javascript/controllers/domain/release_filters_controller.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { Controller } from "@hotwired/stimulus"
-
-export default class extends Controller {
-  static targets = ["template", "container", "filter"]
-
-  add(event) {
-    event.preventDefault()
-    const content = this.templateTarget.innerHTML.replace(/__INDEX__/g, this.filterTargets.length)
-    this.containerTarget.insertAdjacentHTML("beforeend", content)
-  }
-
-  remove(event) {
-    event.preventDefault()
-    const filter = event.target.closest("[data-domain--release-filters-target='filter']")
-    filter.remove()
-  }
-}
diff --git a/app/javascript/controllers/helper.js b/app/javascript/controllers/helper.js
deleted file mode 100644
index 9d915b762..000000000
--- a/app/javascript/controllers/helper.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export function toggleDisplay(target, condition) {
-  if (target) {
-    target.style.display = condition ? "block" : "none";
-  }
-}
diff --git a/app/javascript/controllers/project_selector_controller.js b/app/javascript/controllers/project_selector_controller.js
deleted file mode 100644
index 2a474474e..000000000
--- a/app/javascript/controllers/project_selector_controller.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import { Controller } from "@hotwired/stimulus"
-import { toggleDisplay } from "./helper"
-
-export default class extends Controller {
-  static targets = [ "projectCheckbox", "config", "filterDivider"]
-
-  connect() {
-    this.toggleConfigurations()
-    this.toggleFilterDivider()
-  }
-
-  toggle() {
-    this.toggleConfigurations()
-    this.toggleFilterDivider()
-  }
-
-  toggleConfigurations() {
-    const configs = document.querySelectorAll('.project-config')
-    configs.forEach(config => {
-      const projectKey = config.dataset.project
-      const checkbox = document.querySelector(`#project_${projectKey}`)
-      if (checkbox) {
-        toggleDisplay(config, checkbox.checked)
-      }
-    })
-  }
-
-  toggleFilterDivider() {
-    const anyProjectSelected = this.projectCheckboxTargets.some(checkbox => checkbox.checked)
-
-    if (this.hasFilterDividerTarget) {
-      toggleDisplay(this.filterDividerTarget, anyProjectSelected)
-      this.filterDividerTarget.classList.add('border-t')
-      this.filterDividerTarget.classList.add('border-b')
-    }
-  }
-}
diff --git a/app/javascript/controllers/project_states_controller.js b/app/javascript/controllers/project_states_controller.js
deleted file mode 100644
index fa86268e9..000000000
--- a/app/javascript/controllers/project_states_controller.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import { Controller } from "@hotwired/stimulus"
-import { toggleDisplay } from "./helper"
-
-export default class extends Controller {
-  static targets = ["content"]
-
-  toggle(event) {
-    toggleDisplay(this.contentTarget, event.target.checked)
-  }
-}
diff --git a/app/javascript/controllers/targeted_toggle_controller.js b/app/javascript/controllers/targeted_toggle_controller.js
new file mode 100644
index 000000000..76a22b418
--- /dev/null
+++ b/app/javascript/controllers/targeted_toggle_controller.js
@@ -0,0 +1,20 @@
+import {Controller} from "@hotwired/stimulus"
+
+export default class extends Controller {
+  static targets = ["section", "subsection"]
+
+  connect() {
+    this.sectionTargets.forEach((section) => this.targetedToggle(section))
+  }
+
+  toggle(e) {
+    this.targetedToggle(e.target)
+  }
+
+  targetedToggle(target) {
+    let subsection = this.subsectionTargets.find(t => t.dataset.sectionKey === target.dataset.sectionKey)
+    if (subsection) {
+      subsection.hidden = !target.checked
+    }
+  }
+}
diff --git a/app/javascript/controllers/visibility_controller.js b/app/javascript/controllers/visibility_controller.js
deleted file mode 100644
index 5ac7be9d0..000000000
--- a/app/javascript/controllers/visibility_controller.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import {Controller} from "@hotwired/stimulus"
-
-export default class extends Controller {
-  static targets = ["visible"]
-
-  initialize() {
-    if (this.hasVisibleTarget) {
-      this.visibleTarget.style.visibility = "hidden"
-    }
-  }
-
-  toggle() {
-    if (this.hasVisibleTarget) {
-      if (this.visibleTarget.style.visibility === "hidden") {
-        this.visibleTarget.style.visibility = "visible";
-      } else {
-        this.visibleTarget.style.visibility = "hidden";
-      }
-    }
-  }
-}
diff --git a/app/libs/installations/jira/api.rb b/app/libs/installations/jira/api.rb
index 249c2405b..e6314946d 100644
--- a/app/libs/installations/jira/api.rb
+++ b/app/libs/installations/jira/api.rb
@@ -4,6 +4,7 @@ class Jira::Api
     attr_reader :oauth_access_token, :cloud_id
 
     BASE_URL = "https://api.atlassian.com/ex/jira"
+    DATA = Installations::Response::Keys
 
     # API Endpoints
     PROJECTS_URL = Addressable::Template.new "#{BASE_URL}/{cloud_id}/rest/api/3/project/search"
@@ -57,9 +58,10 @@ def oauth_refresh_token(refresh_token, redirect_uri)
       end
 
       def get_oauth_token(params)
-        response = HTTP
-          .basic_auth(user: creds.integrations.jira.client_id, pass: creds.integrations.jira.client_secret)
-          .post(OAUTH_ACCESS_TOKEN_URL, params)
+        response =
+          HTTP
+            .basic_auth(user: creds.integrations.jira.client_id, pass: creds.integrations.jira.client_secret)
+            .post(OAUTH_ACCESS_TOKEN_URL, params)
 
         body = JSON.parse(response.body.to_s)
         tokens = {
@@ -79,7 +81,7 @@ def initialize(oauth_access_token, cloud_id)
 
     def projects(transformations)
       response = execute(:get, PROJECTS_URL.expand(cloud_id:).to_s)
-      transform_data(response["values"], transformations)
+      DATA.transform(response["values"], transformations)
     end
 
     def project_statuses(project_key, transformations)
@@ -97,7 +99,7 @@ def search_tickets_by_filters(project_key, release_filters, transformations, sta
       }
 
       response = execute(:get, SEARCH_URL.expand(cloud_id:).to_s, params)
-      transform_data(response["issues"], transformations)
+      DATA.transform(response["issues"], transformations)
     rescue HTTP::Error => e
       Rails.logger.error "Failed to search Jira tickets: #{e.message}"
       raise Installations::Error.new("Failed to search Jira tickets", reason: :api_error)
@@ -108,15 +110,15 @@ def search_tickets_by_filters(project_key, release_filters, transformations, sta
     def extract_unique_statuses(statuses, transformations)
       statuses.flat_map { |issue_type| issue_type["statuses"] }
         .uniq { |status| status["id"] }
-        .then { |statuses| transform_data(statuses, transformations) }
-    end
-
-    def transform_data(data, transformations)
-      Installations::Response::Keys.transform(data, transformations)
+        .then { |statuses| DATA.transform(statuses, transformations) }
     end
 
     def execute(method, url, params = {}, parse_response = true)
-      response = HTTP.auth("Bearer #{oauth_access_token}").headers("Accept" => "application/json").public_send(method, url, params)
+      response =
+        HTTP
+          .auth("Bearer #{oauth_access_token}")
+          .headers("Accept" => "application/json")
+          .public_send(method, url, params)
 
       parsed_body = parse_response ? JSON.parse(response.body) : response.body
       Rails.logger.debug { "Jira API returned #{response.status} for #{url} with body - #{parsed_body}" }
diff --git a/app/models/jira_integration.rb b/app/models/jira_integration.rb
index c1181484c..eb2997889 100644
--- a/app/models/jira_integration.rb
+++ b/app/models/jira_integration.rb
@@ -213,7 +213,7 @@ def fetch_projects
       {projects: response}
     end
   rescue => e
-    Rails.logger.error("Failed to fetch Jira projects for cloud_id #{cloud_id}: #{e.message}")
+    Rails.logger.error("Failed to fetch Jira projects for cloud_id #{cloud_id}: #{e}")
     {projects: []}
   end
 
@@ -228,7 +228,7 @@ def fetch_project_statuses(projects)
       statuses
     end
   rescue => e
-    Rails.logger.error("Failed to fetch Jira project statuses for cloud_id #{cloud_id}: #{e.message}")
+    Rails.logger.error("Failed to fetch Jira project statuses for cloud_id #{cloud_id}: #{e}")
     {}
   end
 end
diff --git a/app/views/app_configs/_jira_form.html.erb b/app/views/app_configs/_jira_form.html.erb
index 6a62bf8cf..03c7243cd 100644
--- a/app/views/app_configs/_jira_form.html.erb
+++ b/app/views/app_configs/_jira_form.html.erb
@@ -7,13 +7,10 @@
                                free_form: true) do |f| %>
     <%= render CardComponent.new(title: "Select Jira Projects",
                                  subtitle: "Pick projects, add release filters and done states for tracking releases",
-                                 separator: true,
+                                 separator: false,
                                  size: :full) do %>
-      <div data-controller="project-selector">
-        <%= render partial: "jira_integration/project_selection",
-                   locals: { form: f.F, jira_data: @jira_data, current_jira_config: @current_jira_config } %>
-      </div>
-
+      <%= render partial: "jira_integration/project_selection",
+                 locals: { form: f.F, jira_data: @jira_data, current_jira_config: @current_jira_config } %>
       <% f.with_action do %>
         <%= f.F.authz_submit "Update", "plus.svg", size: :sm %>
       <% end %>
diff --git a/app/views/jira_integration/_project_selection.html.erb b/app/views/jira_integration/_project_selection.html.erb
index 3abe2418d..1ee528d16 100644
--- a/app/views/jira_integration/_project_selection.html.erb
+++ b/app/views/jira_integration/_project_selection.html.erb
@@ -1,103 +1,120 @@
 <%# locals: (form:, jira_data:, current_jira_config:) %>
 
-<% jira_data[:projects].each do |project| %>
-  <div class="flex items-center">
-    <%= form.fields_for :jira_config do |sf| %>
-      <%= sf.checkbox :selected_projects,
-                       { multiple: true,
-                         include_hidden: false,
-                         data: {
-                           action: "project-selector#toggle",
-                           project_key: project['key'],
-                           project_selector_target: "projectCheckbox"
-                         },
-                         id: "project_#{project['key']}",
-                         checked: current_jira_config&.dig('selected_projects')&.include?(project['key'])
-                       },
-                       project['key'] %>
-    <% end %>
+<div class="flex flex-col gap-6" data-controller="targeted_toggle">
+  <div class="flex flex-col">
+    <h4 class="heading-4 mb-3 border-default-b pb-1">Projects</h4>
+    <% jira_data[:projects].each do |project| %>
+      <% project_key = project["key"] %>
+
+      <div class="flex items-center">
+        <%= form.fields_for :jira_config do |sf| %>
+          <% checked =
+               current_jira_config
+                 &.dig("selected_projects")
+                 &.include?(project["key"]) %>
+
+          <%= sf.checkbox :selected_projects,
+                          { multiple: true,
+                            include_hidden: false,
+                            id: "project_#{project["key"]}",
+                            checked:,
+                            data: {
+                              action: "targeted-toggle#toggle",
+                              section_key: project_key,
+                              project_selector_target: "section",
+                            },
+                          },
+                          project["key"] %>
+        <% end %>
 
-    <label for="project_<%= project['key'] %>" class="ml-2 text-sm font-medium text-gray-900">
-      <%= project['name'] %> (<%= project['key'] %>)
-    </label>
+        <label for="project_<%= project["key"] %>" class="ml-2 text-sm font-medium text-gray-900">
+          <%= project["name"] %> (<%= project["key"] %>)
+        </label>
+      </div>
+    <% end %>
   </div>
-<% end %>
 
-<!-- Project Configurations -->
-<div id="project_configurations">
-  <% jira_data[:projects].each do |project| %>
-    <% project_key = project['key'] %>
-    <% statuses = jira_data[:project_statuses][project_key] %>
+  <div id="project_configurations">
+    <h4 class="heading-4 mb-3 border-default-b pb-1">Done States</h4>
+    <div class="flex flex-col item-gap-default">
+      <% jira_data[:projects].each do |project| %>
+        <% project_key = project["key"] %>
+        <% statuses = jira_data[:project_statuses][project_key] %>
 
-    <div class="p-4 project-config" data-project="<%= project_key %>">
-      <h4 class="text-sm font-medium text-gray-900 mb-3"><%= project['name'] %> Configuration</h4>
+        <div data-targeted_toggle-target="subsection" data-section-key="<%= project_key %>">
+          <h3 class="heading-5">For <%= project["name"] %> (<%= project["key"] %>)</h3>
 
-      <div class="space-y-4">
-        <!-- Status Selection -->
-        <div>
-          <p class="text-sm font-medium text-gray-700 mb-2">Done States</p>
-          <div class="space-y-2">
-            <% if statuses&.any? %>
-              <% statuses.each do |status| %>
-                <div class="flex items-center">
-                  <%= check_box_tag "app_config[jira_config][project_configs][#{project_key}][done_states][]",
-                                    status['name'],
-                                    current_jira_config&.dig('project_configs', project_key, 'done_states')&.include?(status['name']),
-                                    class: "h-4 w-4 rounded border-gray-300 text-primary focus:ring-primary",
-                                    id: "status_#{project_key}_#{status['name'].parameterize}" %>
-                  <label for="status_<%= project_key %>_<%= status['name'].parameterize %>"
-                         class="ml-2 text-sm text-gray-600">
-                    <%= status['name'] %>
-                  </label>
-                </div>
-              <% end %>
-            <% else %>
-              <p class="text-sm text-gray-500">No status configurations found for this project.</p>
-            <% end %>
-          </div>
-        </div>
-      </div>
-    </div>
-  <% end %>
-</div>
+          <% if statuses&.any? %>
+            <% statuses.each do |status| %>
+              <% status_name = "status_#{project_key}_#{status["name"].parameterize}" %>
 
-<div data-controller="domain--release-filters" data-project-selector-target="filterDivider">
-  <h3 class="text-sm font-medium">Release Filters</h3>
+              <div class="flex items-center">
+                <%= form.fields_for :jira_config do |sf| %>
+                  <%= sf.fields_for :project_configs do |pf| %>
+                    <%= pf.fields_for project_key do |pk| %>
+                      <% checked =
+                           current_jira_config
+                             &.dig("project_configs", project_key, "done_states")
+                             &.include?(status["name"]) %>
 
+                      <%= pk.checkbox :done_states,
+                                      { multiple: true, include_hidden: false, id: status_name, checked: },
+                                      status["name"] %>
+                    <% end %>
+                  <% end %>
+                <% end %>
 
-  <div data-controller="nested-form-ext" class="grid">
-    <div>
-      <%= render ButtonComponent.new(
-        scheme: :light,
-        type: :action,
-        size: :xs,
-        label: "Add filter",
-        html_options: { data: { action: "nested-form-ext#add" } },
-        arrow: :none) do |b|
-        b.with_icon("plus.svg", rounded: false)
-      end %>
+                <label for="<%= status_name %>" class="ml-2 text-sm text-gray-600">
+                  <%= status["name"] %>
+                </label>
+              </div>
+            <% end %>
+          <% else %>
+            <%= render EmptyStateComponent.new(text: "No status configurations found for this project.",
+                                               banner_image: "list_checks.svg",
+                                               type: :tiny) %>
+          <% end %>
+        </div>
+      <% end %>
     </div>
+  </div>
+
+  <div>
+    <h4 class="heading-4 mb-3 border-default-b pb-1">Release Filters</h4>
+    <div data-controller="nested-form-ext" class="grid">
+      <div>
+        <%= render ButtonComponent.new(
+          scheme: :light,
+          type: :action,
+          size: :xs,
+          label: "Add filter",
+          html_options: { data: { action: "nested-form-ext#add" } },
+          arrow: :none) do |b|
+          b.with_icon("plus.svg", rounded: false)
+        end %>
+      </div>
 
-    <ul class="flex flex-col gap-1">
-      <% release_filters = current_jira_config&.dig("release_filters") || [] %>
+      <ul class="flex flex-col gap-1">
+        <% release_filters = current_jira_config&.dig("release_filters") || [] %>
 
-      <% if release_filters.any? %>
-        <% release_filters.each_with_index do |filter, index| %>
-          <li class="nested-form-wrapper" data-new-record="false">
-            <%= render "jira_integration/release_filter_form", filter: filter, index: index, local_assigns: true %>
-          </li>
+        <% if release_filters.any? %>
+          <% release_filters.each_with_index do |filter, index| %>
+            <li class="nested-form-wrapper" data-new-record="false">
+              <%= render "jira_integration/release_filter_form", filter: filter, index: index, local_assigns: true %>
+            </li>
+          <% end %>
+        <% else %>
+          <%= render "jira_integration/release_filter_form", filter: {}, index: 0, local_assigns: true %>
         <% end %>
-      <% else %>
-        <%= render "jira_integration/release_filter_form", filter: {}, index: 0, local_assigns: true %>
-      <% end %>
 
-      <template data-nested-form-ext-target="template">
-        <li class="nested-form-wrapper" data-new-record="true">
-          <%= render "jira_integration/release_filter_form", index: "NEW_RECORD" %>
-        </li>
-      </template>
+        <template data-nested-form-ext-target="template">
+          <li class="nested-form-wrapper" data-new-record="true">
+            <%= render "jira_integration/release_filter_form", index: "NEW_RECORD" %>
+          </li>
+        </template>
 
-      <div data-nested-form-ext-target="target"></div>
-    </ul>
+        <div data-nested-form-ext-target="target"></div>
+      </ul>
+    </div>
   </div>
 </div>
diff --git a/app/views/jira_integration/_release_filter_form.html.erb b/app/views/jira_integration/_release_filter_form.html.erb
index 96379c1b4..1fe1568e2 100644
--- a/app/views/jira_integration/_release_filter_form.html.erb
+++ b/app/views/jira_integration/_release_filter_form.html.erb
@@ -2,7 +2,7 @@
 <% filter ||= {} %>
 <% index ||= 0 %>
 
-<div class="flex items-center gap-4" data-domain--release-filters-target="filter">
+<div class="flex items-center gap-4">
   <%= select_tag "app_config[jira_config][release_filters][#{index}][type]",
                  options_for_select([
                    [t("integrations.project_management.jira.release_filters.types.label"), "label"],
@@ -19,10 +19,7 @@
     scheme: :naked_icon,
     type: :action,
     size: :none,
-    html_options: {
-      class: "mt-2",
-      data: { action: "domain--release-filters#remove" }
-    }) do |b|
+    html_options: {data: {action: "nested-form-ext#remove"}}) do |b|
     b.with_icon("trash.svg", size: :md)
   end %>
 </div>

From 77581efa9e8b6ba5113c470b54907477edc43019 Mon Sep 17 00:00:00 2001
From: Akshay Gupta <kitallis@gmail.com>
Date: Tue, 28 Jan 2025 21:06:34 +0530
Subject: [PATCH 07/20] tool updates + lint

---
 Justfile                                    |  7 +++++--
 app/views/trains/_release_tag_form.html.erb |  8 ++++----
 compose.yml                                 |  4 ----
 spec/models/jira_integration_spec.rb        | 10 +++++-----
 4 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/Justfile b/Justfile
index 436c59a48..27a180da8 100644
--- a/Justfile
+++ b/Justfile
@@ -1,5 +1,8 @@
 start:
-  docker compose up -d
+  docker compose up -d --remove-orphans
+
+stop:
+  docker compose down
 
 restart container="web":
   docker compose restart {{ container }}
@@ -12,7 +15,7 @@ spec file="":
   fi
 
 lint:
-  bin/rubocop --autocorrect
+  docker exec -it tramline-web-1 bin/rubocop --autocorrect
 
 pre-setup:
   docker compose run --rm pre-setup
diff --git a/app/views/trains/_release_tag_form.html.erb b/app/views/trains/_release_tag_form.html.erb
index fece87d31..da823c41b 100644
--- a/app/views/trains/_release_tag_form.html.erb
+++ b/app/views/trains/_release_tag_form.html.erb
@@ -1,8 +1,8 @@
 <%= render Form::SwitchComponent.new(form:,
-                                         field_name: :tag_releases,
-                                         on_label: "Release Tag enabled",
-                                         off_label: "Release Tag disabled",
-                                         hide_child: @train.tag_releases?) do |component| %>
+                                     field_name: :tag_releases,
+                                     on_label: "Release Tag enabled",
+                                     off_label: "Release Tag disabled",
+                                     hide_child: @train.tag_releases?) do |component| %>
   <% component.with_child do %>
     <section data-controller="help-text">
       <div data-controller="string-affix"
diff --git a/compose.yml b/compose.yml
index cb8fbe5e3..62597f691 100644
--- a/compose.yml
+++ b/compose.yml
@@ -59,8 +59,6 @@ services:
         condition: service_healthy
       redis:
         condition: service_healthy
-      ngrok:
-        condition: service_healthy
 
   ngrok:
     image: ngrok/ngrok:latest
@@ -137,8 +135,6 @@ services:
     depends_on:
       postgres:
         condition: service_healthy
-      setup:
-        condition: service_completed_successfully
 
 volumes:
   bundle:
diff --git a/spec/models/jira_integration_spec.rb b/spec/models/jira_integration_spec.rb
index 496f8d58c..997d1cc8f 100644
--- a/spec/models/jira_integration_spec.rb
+++ b/spec/models/jira_integration_spec.rb
@@ -79,11 +79,11 @@
     it "returns formatted tickets" do
       expect(integration.fetch_tickets_for_release).to eq([{"key" => "PROJ-1",
                                                             "fields" =>
-        {"summary" => "Test ticket",
-         "status" => {"name" => "Done"},
-         "assignee" => {"displayName" => "John Doe"},
-         "labels" => [sample_release_label],
-         "fixVersions" => [{"name" => sample_version}]}}])
+                                                               {"summary" => "Test ticket",
+                                                                "status" => {"name" => "Done"},
+                                                                "assignee" => {"displayName" => "John Doe"},
+                                                                "labels" => [sample_release_label],
+                                                                "fixVersions" => [{"name" => sample_version}]}}])
     end
 
     context "when missing required configuration" do

From b6b54b5a1139a43f56a4e59e2b93f740e2bfaa05 Mon Sep 17 00:00:00 2001
From: Akshay Gupta <kitallis@gmail.com>
Date: Tue, 28 Jan 2025 22:21:58 +0530
Subject: [PATCH 08/20] allow deleting release filters

---
 app/controllers/app_configs_controller.rb     |  8 +++---
 .../_project_selection.html.erb               | 26 ++++++++-----------
 .../_release_filter_form.html.erb             | 26 ++++++++-----------
 3 files changed, 26 insertions(+), 34 deletions(-)

diff --git a/app/controllers/app_configs_controller.rb b/app/controllers/app_configs_controller.rb
index b50ede9a3..ef99784ce 100644
--- a/app/controllers/app_configs_controller.rb
+++ b/app/controllers/app_configs_controller.rb
@@ -90,7 +90,7 @@ def app_config_params
           selected_projects: [],
           project_configs: {},
           release_tracking: [:track_tickets, :auto_transition],
-          release_filters: [[:type, :value]]
+          release_filters: [[:type, :value, :_destroy]]
         }
       )
   end
@@ -170,8 +170,8 @@ def parse_jira_config(config)
       selected_projects: Array(config[:selected_projects]),
       project_configs: config[:project_configs]&.transform_values do |project_config|
         {
-          done_states: Array(project_config[:done_states])&.reject(&:blank?),
-          custom_done_states: Array(project_config[:custom_done_states])&.reject(&:blank?)
+          done_states: Array(project_config[:done_states]).reject(&:blank?),
+          custom_done_states: Array(project_config[:custom_done_states]).reject(&:blank?)
         }
       end || {},
       release_tracking: {
@@ -179,7 +179,7 @@ def parse_jira_config(config)
         auto_transition: ActiveModel::Type::Boolean.new.cast(config.dig(:release_tracking, :auto_transition))
       },
       release_filters: config[:release_filters]&.values&.filter_map do |filter|
-        next if filter[:type].blank? || filter[:value].blank?
+        next if filter[:type].blank? || filter[:value].blank? || filter[:_destroy] == "1"
         {
           "type" => filter[:type],
           "value" => filter[:value]
diff --git a/app/views/jira_integration/_project_selection.html.erb b/app/views/jira_integration/_project_selection.html.erb
index 1ee528d16..1cb1db07b 100644
--- a/app/views/jira_integration/_project_selection.html.erb
+++ b/app/views/jira_integration/_project_selection.html.erb
@@ -1,6 +1,6 @@
 <%# locals: (form:, jira_data:, current_jira_config:) %>
 
-<div class="flex flex-col gap-6" data-controller="targeted_toggle">
+<div class="flex flex-col gap-6" data-controller="targeted-toggle">
   <div class="flex flex-col">
     <h4 class="heading-4 mb-3 border-default-b pb-1">Projects</h4>
     <% jira_data[:projects].each do |project| %>
@@ -21,7 +21,7 @@
                             data: {
                               action: "targeted-toggle#toggle",
                               section_key: project_key,
-                              project_selector_target: "section",
+                              targeted_toggle_target: "section",
                             },
                           },
                           project["key"] %>
@@ -34,14 +34,14 @@
     <% end %>
   </div>
 
-  <div id="project_configurations">
+  <div>
     <h4 class="heading-4 mb-3 border-default-b pb-1">Done States</h4>
     <div class="flex flex-col item-gap-default">
       <% jira_data[:projects].each do |project| %>
         <% project_key = project["key"] %>
         <% statuses = jira_data[:project_statuses][project_key] %>
 
-        <div data-targeted_toggle-target="subsection" data-section-key="<%= project_key %>">
+        <div data-targeted-toggle-target="subsection" data-section-key="<%= project_key %>">
           <h3 class="heading-5">For <%= project["name"] %> (<%= project["key"] %>)</h3>
 
           <% if statuses&.any? %>
@@ -81,7 +81,7 @@
 
   <div>
     <h4 class="heading-4 mb-3 border-default-b pb-1">Release Filters</h4>
-    <div data-controller="nested-form-ext" class="grid">
+    <div data-controller="nested-form-ext" class="grid item-gap-default">
       <div>
         <%= render ButtonComponent.new(
           scheme: :light,
@@ -94,22 +94,18 @@
         end %>
       </div>
 
-      <ul class="flex flex-col gap-1">
+      <ul class="flex flex-col gap-2">
         <% release_filters = current_jira_config&.dig("release_filters") || [] %>
 
-        <% if release_filters.any? %>
-          <% release_filters.each_with_index do |filter, index| %>
-            <li class="nested-form-wrapper" data-new-record="false">
-              <%= render "jira_integration/release_filter_form", filter: filter, index: index, local_assigns: true %>
-            </li>
-          <% end %>
-        <% else %>
-          <%= render "jira_integration/release_filter_form", filter: {}, index: 0, local_assigns: true %>
+        <% release_filters.each_with_index do |filter, index| %>
+          <li class="nested-form-wrapper" data-new-record="false">
+            <%= render partial: "jira_integration/release_filter_form", locals: { form:, filter: filter, index: index } %>
+          </li>
         <% end %>
 
         <template data-nested-form-ext-target="template">
           <li class="nested-form-wrapper" data-new-record="true">
-            <%= render "jira_integration/release_filter_form", index: "NEW_RECORD" %>
+            <%= render partial: "jira_integration/release_filter_form", locals: { form:, index: "NEW_RECORD" } %>
           </li>
         </template>
 
diff --git a/app/views/jira_integration/_release_filter_form.html.erb b/app/views/jira_integration/_release_filter_form.html.erb
index 1fe1568e2..3bed89d7b 100644
--- a/app/views/jira_integration/_release_filter_form.html.erb
+++ b/app/views/jira_integration/_release_filter_form.html.erb
@@ -1,25 +1,21 @@
-<!--  Set default values for the partial -->
-<% filter ||= {} %>
-<% index ||= 0 %>
+<%# locals: (form:, filter: {}, index: 0) %>
 
 <div class="flex items-center gap-4">
-  <%= select_tag "app_config[jira_config][release_filters][#{index}][type]",
-                 options_for_select([
-                   [t("integrations.project_management.jira.release_filters.types.label"), "label"],
-                   [t("integrations.project_management.jira.release_filters.types.fix_version"), "fix_version"]
-                 ], filter['type']),
-                 class: "mt-2 block w-full rounded-md border-0 py-1.5 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 focus:ring-2 focus:ring-inset focus:ring-blue-600 sm:text-sm sm:leading-6" %>
-
-  <%= text_field_tag "app_config[jira_config][release_filters][#{index}][value]",
-                     filter['value'],
-                     placeholder: "e.g., release-1.0.0",
-                     class: "mt-2 block w-full rounded-md border-0 py-1.5 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-blue-600 sm:text-sm sm:leading-6" %>
+  <%= form.fields_for :jira_config do |sf| %>
+    <%= sf.fields_for :release_filters do |pf| %>
+      <%= pf.fields_for index.to_s do |rf| %>
+        <%= rf.select_without_label :type, options_for_select([["Label", "label"], ["Fix Version", "fix_version"]], filter['type']) %>
+        <%= rf.text_field_without_label :value, "e.g., release-1.0.0", value: filter["value"] %>
+        <%= rf.hidden_field :_destroy %>
+      <% end %>
+    <% end %>
+  <% end %>
 
   <%= render ButtonComponent.new(
     scheme: :naked_icon,
     type: :action,
     size: :none,
-    html_options: {data: {action: "nested-form-ext#remove"}}) do |b|
+    html_options: { data: { action: "nested-form-ext#remove" } }) do |b|
     b.with_icon("trash.svg", size: :md)
   end %>
 </div>

From 799216361d89680c03dffb0559a11f33141f5aa7 Mon Sep 17 00:00:00 2001
From: Akshay Gupta <kitallis@gmail.com>
Date: Tue, 28 Jan 2025 22:25:26 +0530
Subject: [PATCH 09/20] lint

---
 app/controllers/app_configs_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/app_configs_controller.rb b/app/controllers/app_configs_controller.rb
index ef99784ce..b8f9d1a4a 100644
--- a/app/controllers/app_configs_controller.rb
+++ b/app/controllers/app_configs_controller.rb
@@ -170,8 +170,8 @@ def parse_jira_config(config)
       selected_projects: Array(config[:selected_projects]),
       project_configs: config[:project_configs]&.transform_values do |project_config|
         {
-          done_states: Array(project_config[:done_states]).reject(&:blank?),
-          custom_done_states: Array(project_config[:custom_done_states]).reject(&:blank?)
+          done_states: Array(project_config[:done_states]).compact_blank,
+          custom_done_states: Array(project_config[:custom_done_states]).compact_blank
         }
       end || {},
       release_tracking: {

From 1b761657642d51a7a00c28ac7f12c9be5295a5a7 Mon Sep 17 00:00:00 2001
From: Akshay Gupta <kitallis@gmail.com>
Date: Wed, 29 Jan 2025 01:15:03 +0530
Subject: [PATCH 10/20] specs

---
 app/models/app_config.rb                      | 14 ----
 .../jira_controller_spec.rb                   | 73 +++++--------------
 spec/models/app_config_spec.rb                | 57 +++++++++++++++
 spec/models/jira_integration_spec.rb          | 54 +-------------
 4 files changed, 76 insertions(+), 122 deletions(-)
 create mode 100644 spec/models/app_config_spec.rb

diff --git a/app/models/app_config.rb b/app/models/app_config.rb
index 37b487740..f91b30324 100644
--- a/app/models/app_config.rb
+++ b/app/models/app_config.rb
@@ -137,20 +137,6 @@ def set_ci_cd_workflows(workflows)
     update(ci_cd_workflows: workflows)
   end
 
-  # def add_jira_release_filter(type:, value:)
-  #   return unless JiraIntegration::VALID_FILTER_TYPES.include?(type)
-  #
-  #   new_filters = (jira_config.dig("release_filters") || []).dup
-  #   new_filters << {"type" => type, "value" => value}
-  #   update!(jira_config: jira_config.merge("release_filters" => new_filters))
-  # end
-  #
-  # def remove_jira_release_filter(index)
-  #   new_filters = (jira_config.dig("release_filters") || []).dup
-  #   new_filters.delete_at(index)
-  #   update!(jira_config: jira_config.merge("release_filters" => new_filters))
-  # end
-
   private
 
   def set_bugsnag_config
diff --git a/spec/controllers/integration_listeners/jira_controller_spec.rb b/spec/controllers/integration_listeners/jira_controller_spec.rb
index 2191f068c..777ba7e3e 100644
--- a/spec/controllers/integration_listeners/jira_controller_spec.rb
+++ b/spec/controllers/integration_listeners/jira_controller_spec.rb
@@ -1,6 +1,6 @@
 require "rails_helper"
 
-RSpec.describe IntegrationListeners::JiraController do
+describe IntegrationListeners::JiraController do
   let(:organization) { create(:organization) }
   let(:app) { create(:app, :android, organization: organization) }
   let(:user) { create(:user, :with_email_authentication, :as_developer, member_organization: organization) }
@@ -8,7 +8,7 @@
     {
       app_id: app.id,
       user_id: user.id,
-      organization_id: organization.id
+      organization_id: organization.id,
     }.to_json.encode
   }
   let(:code) { "test_code" }
@@ -30,16 +30,8 @@
       context "when single organization" do
         before do
           allow(app.integrations).to receive(:build).and_return(integration)
-          allow(integration).to receive_messages(
-            providable: jira_integration,
-            save!: true,
-            valid?: true
-          )
-
-          allow(jira_integration).to receive_messages(
-            complete_access: true,
-            setup: {}
-          )
+          allow(integration).to receive_messages(providable: jira_integration, save!: true, valid?: true)
+          allow(jira_integration).to receive_messages(complete_access: true, setup: {})
 
           get :callback, params: {state: state, code: code}
         end
@@ -56,15 +48,8 @@
 
         before do
           allow(app.integrations).to receive(:build).and_return(integration)
-          allow(integration).to receive_messages(
-            providable: jira_integration,
-            valid?: true
-          )
-
-          allow(jira_integration).to receive_messages(
-            complete_access: false,
-            available_resources: resources
-          )
+          allow(integration).to receive_messages(providable: jira_integration, valid?: true)
+          allow(jira_integration).to receive_messages(complete_access: false, available_resources: resources)
 
           get :callback, params: {state: state, code: code}
         end
@@ -89,50 +74,28 @@
         expect(flash[:alert]).to eq("Failed to create the integration, please try again.")
       end
     end
-  end
 
-  describe "POST #set_organization" do
-    let(:cloud_id) { "cloud_123" }
-    let(:valid_params) do
-      {
-        cloud_id: cloud_id,
-        code: code,
-        state: state
-      }
-    end
+    context "as a POST request" do
+      let(:valid_params) do
+        {
+          cloud_id: "cloud_123",
+          code: code,
+          state: state
+        }
+      end
 
-    context "with valid parameters" do
       before do
         allow(app.integrations).to receive(:build).and_return(integration)
-        allow(integration).to receive_messages(
-          providable: jira_integration,
-          save!: true
-        )
-
-        allow(jira_integration).to receive_messages(
-          setup: {}
-        )
+        allow(integration).to receive_messages(providable: jira_integration, save!: true)
+        allow(jira_integration).to receive_messages(complete_access: true, setup: {})
 
-        post :set_organization, params: valid_params
+        post :callback, params: valid_params
       end
 
       it "creates integration and redirects to app integrations" do
+        expect(response).to redirect_to(app_path(app))
         expect(flash[:notice]).to eq("Integration was successfully created.")
       end
     end
-
-    context "with invalid parameters" do
-      before do
-        allow(app.integrations).to receive(:build).and_return(integration)
-        allow(integration).to receive(:save!).and_raise(ActiveRecord::RecordInvalid.new(integration))
-
-        post :set_organization, params: valid_params
-      end
-
-      it "redirects to integrations path with error" do
-        expect(response).to redirect_to(app_integrations_path(app))
-        expect(flash[:alert]).to eq("Failed to create the integration, please try again.")
-      end
-    end
   end
 end
diff --git a/spec/models/app_config_spec.rb b/spec/models/app_config_spec.rb
new file mode 100644
index 000000000..424dd5336
--- /dev/null
+++ b/spec/models/app_config_spec.rb
@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+describe AppConfig do
+  describe "#jira_release_filters" do
+    let(:app) { create(:app, :android) }
+    let(:sample_release_label) { "release-1.0" }
+    let(:sample_version) { "v1.0.0" }
+
+    context "with invalid filter type" do
+      let(:filters) { [{"type" => "invalid", "value" => "test"}] }
+
+      before do
+        app.config[:jira_config] = {"release_filters" => filters}
+        app.config.valid?
+      end
+
+      it "is invalid" do
+        expect(app.config).not_to be_valid
+        expect(app.config.errors[:jira_config]).to include("release filters must contain valid type and value")
+      end
+    end
+
+    context "with empty filter value" do
+      let(:filters) { [{"type" => "label", "value" => ""}] }
+
+      before do
+        app.config[:jira_config] = {"release_filters" => filters}
+        app.config.valid?
+      end
+
+      it "is invalid" do
+        expect(app.config).not_to be_valid
+        expect(app.config.errors[:jira_config]).to include("release filters must contain valid type and value")
+      end
+    end
+
+    context "with valid filters" do
+      let(:filters) do
+        [
+          {"type" => "label", "value" => sample_release_label},
+          {"type" => "fix_version", "value" => sample_version}
+        ]
+      end
+
+      before do
+        app.config[:jira_config] = {"release_filters" => filters}
+        app.config.valid?
+      end
+
+      it "is valid" do
+        expect(app.config).to be_valid
+      end
+    end
+  end
+end
diff --git a/spec/models/jira_integration_spec.rb b/spec/models/jira_integration_spec.rb
index 997d1cc8f..2387ee169 100644
--- a/spec/models/jira_integration_spec.rb
+++ b/spec/models/jira_integration_spec.rb
@@ -1,8 +1,7 @@
 require "rails_helper"
 
-RSpec.describe JiraIntegration do
+describe JiraIntegration do
   subject(:integration) { build(:jira_integration) }
-
   let(:sample_release_label) { "release-1.0" }
   let(:sample_version) { "v1.0.0" }
 
@@ -102,55 +101,4 @@
       end
     end
   end
-
-  describe "#validate_release_filters" do
-    let(:app) { create(:app, :android) }
-    let(:integration) { build(:jira_integration, integration: create(:integration, integrable: app)) }
-
-    context "with invalid filter type" do
-      let(:filters) { [{"type" => "invalid", "value" => "test"}] }
-
-      before do
-        app.config.update!(jira_config: {"release_filters" => filters})
-        integration.valid?
-      end
-
-      it "is invalid" do
-        expect(integration).not_to be_valid
-        expect(integration.errors[:release_filters]).to include("must contain valid type and value")
-      end
-    end
-
-    context "with empty filter value" do
-      let(:filters) { [{"type" => "label", "value" => ""}] }
-
-      before do
-        app.config.update!(jira_config: {"release_filters" => filters})
-        integration.valid?
-      end
-
-      it "is invalid" do
-        expect(integration).not_to be_valid
-        expect(integration.errors[:release_filters]).to include("must contain valid type and value")
-      end
-    end
-
-    context "with valid filters" do
-      let(:filters) do
-        [
-          {"type" => "label", "value" => sample_release_label},
-          {"type" => "fix_version", "value" => sample_version}
-        ]
-      end
-
-      before do
-        app.config.update!(jira_config: {"release_filters" => filters})
-        integration.valid?
-      end
-
-      it "is valid" do
-        expect(integration).to be_valid
-      end
-    end
-  end
 end

From 046c6805677d265e2d24a5f3fac9d19b052593fc Mon Sep 17 00:00:00 2001
From: Akshay Gupta <kitallis@gmail.com>
Date: Wed, 29 Jan 2025 01:35:41 +0530
Subject: [PATCH 11/20] lint

---
 app/views/jira_integration/_project_selection.html.erb    | 2 ++
 config/locales/en.yml                                     | 8 --------
 .../integration_listeners/jira_controller_spec.rb         | 4 ++--
 spec/models/jira_integration_spec.rb                      | 1 +
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/app/views/jira_integration/_project_selection.html.erb b/app/views/jira_integration/_project_selection.html.erb
index 1cb1db07b..78f02d1c7 100644
--- a/app/views/jira_integration/_project_selection.html.erb
+++ b/app/views/jira_integration/_project_selection.html.erb
@@ -112,5 +112,7 @@
         <div data-nested-form-ext-target="target"></div>
       </ul>
     </div>
+
+    <div class="text-sm text-secondary-50">† Release filters will be applied to all selected projects.</div>
   </div>
 </div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2ab087bfb..96aa43ed9 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -723,13 +723,5 @@ en:
         done_states:
           select: "Select Done States"
           help_text: "Choose which states represent completed work"
-        release_filters:
-          title: "Release Filters"
-          types:
-            label: "Label"
-            fix_version: "Fix Version"
-          add: "Add Filter"
-          placeholder:
-            label: "e.g., release-1.0.0"
         no_organization: "No Jira organizations available. Please try again."
         integration_created: "Integration was successfully created."
diff --git a/spec/controllers/integration_listeners/jira_controller_spec.rb b/spec/controllers/integration_listeners/jira_controller_spec.rb
index 777ba7e3e..2ca209a88 100644
--- a/spec/controllers/integration_listeners/jira_controller_spec.rb
+++ b/spec/controllers/integration_listeners/jira_controller_spec.rb
@@ -8,7 +8,7 @@
     {
       app_id: app.id,
       user_id: user.id,
-      organization_id: organization.id,
+      organization_id: organization.id
     }.to_json.encode
   }
   let(:code) { "test_code" }
@@ -75,7 +75,7 @@
       end
     end
 
-    context "as a POST request" do
+    context "when it behaves as a POST request" do
       let(:valid_params) do
         {
           cloud_id: "cloud_123",
diff --git a/spec/models/jira_integration_spec.rb b/spec/models/jira_integration_spec.rb
index 2387ee169..3f940bcd6 100644
--- a/spec/models/jira_integration_spec.rb
+++ b/spec/models/jira_integration_spec.rb
@@ -2,6 +2,7 @@
 
 describe JiraIntegration do
   subject(:integration) { build(:jira_integration) }
+
   let(:sample_release_label) { "release-1.0" }
   let(:sample_version) { "v1.0.0" }
 

From 0f757b8b5c83c48279b7a193776dc4661f8e4b39 Mon Sep 17 00:00:00 2001
From: Akshay Gupta <kitallis@gmail.com>
Date: Mon, 3 Feb 2025 16:56:50 +0530
Subject: [PATCH 12/20] handle no projects selected empty state

---
 .../controllers/targeted_toggle_controller.js       | 13 ++++++++++++-
 app/views/app_configs/_jira_form.html.erb           |  2 +-
 .../jira_integration/_project_selection.html.erb    |  8 +++++++-
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/app/javascript/controllers/targeted_toggle_controller.js b/app/javascript/controllers/targeted_toggle_controller.js
index 76a22b418..5153a0508 100644
--- a/app/javascript/controllers/targeted_toggle_controller.js
+++ b/app/javascript/controllers/targeted_toggle_controller.js
@@ -1,7 +1,8 @@
 import {Controller} from "@hotwired/stimulus"
 
 export default class extends Controller {
-  static targets = ["section", "subsection"]
+  static targets = ["section", "subsection", "emptyState"]
+  static outlets = ["reveal"]
 
   connect() {
     this.sectionTargets.forEach((section) => this.targetedToggle(section))
@@ -16,5 +17,15 @@ export default class extends Controller {
     if (subsection) {
       subsection.hidden = !target.checked
     }
+
+    this.updateEmptiness()
+  }
+
+  updateEmptiness() {
+    if (this.subsectionTargets.every(t => t.hidden)) {
+      this.revealOutlet.show()
+    } else {
+      this.revealOutlet.hide()
+    }
   }
 }
diff --git a/app/views/app_configs/_jira_form.html.erb b/app/views/app_configs/_jira_form.html.erb
index 03c7243cd..8e29d9fd3 100644
--- a/app/views/app_configs/_jira_form.html.erb
+++ b/app/views/app_configs/_jira_form.html.erb
@@ -19,7 +19,7 @@
 <% else %>
   <%= render EmptyStateComponent.new(
     title: "No Jira projects found",
-    text: "Please try loading this configuration screen again or check your configured projects.",
+    text: "Please try loading this page again or check your configured projects.",
     banner_image: "folder_open.svg",
     type: :subdued) %>
 <% end %>
diff --git a/app/views/jira_integration/_project_selection.html.erb b/app/views/jira_integration/_project_selection.html.erb
index 78f02d1c7..2a945e798 100644
--- a/app/views/jira_integration/_project_selection.html.erb
+++ b/app/views/jira_integration/_project_selection.html.erb
@@ -1,6 +1,6 @@
 <%# locals: (form:, jira_data:, current_jira_config:) %>
 
-<div class="flex flex-col gap-6" data-controller="targeted-toggle">
+<div class="flex flex-col gap-6" data-controller="targeted-toggle" data-targeted-toggle-reveal-outlet="#no-projects-selected">
   <div class="flex flex-col">
     <h4 class="heading-4 mb-3 border-default-b pb-1">Projects</h4>
     <% jira_data[:projects].each do |project| %>
@@ -77,6 +77,12 @@
         </div>
       <% end %>
     </div>
+
+    <div id="no-projects-selected" data-controller="reveal" hidden data-reveal>
+      <%= render EmptyStateComponent.new(text: "Select a project to see the done states.",
+                                         banner_image: "list_checks.svg",
+                                         type: :tiny) %>
+    </div>
   </div>
 
   <div>

From 8ccbc6373cc1c38709542048693e583f95026f6b Mon Sep 17 00:00:00 2001
From: Akshay Gupta <kitallis@gmail.com>
Date: Mon, 3 Feb 2025 16:57:01 +0530
Subject: [PATCH 13/20] minor formatting

---
 app/javascript/controllers/nested_form_ext_controller.js | 3 +++
 app/javascript/controllers/nested_select_controller.js   | 1 +
 2 files changed, 4 insertions(+)

diff --git a/app/javascript/controllers/nested_form_ext_controller.js b/app/javascript/controllers/nested_form_ext_controller.js
index 2fc45c36c..6273c72d2 100644
--- a/app/javascript/controllers/nested_form_ext_controller.js
+++ b/app/javascript/controllers/nested_form_ext_controller.js
@@ -2,14 +2,17 @@ import NestedForm from "stimulus-rails-nested-form"
 
 export default class extends NestedForm {
   static outlets = ["list-position"]
+
   add(e) {
     super.add(e)
     this.updatePositions()
   }
+
   remove(e) {
     super.remove(e)
     this.updatePositions()
   }
+
   updatePositions() {
     if (this.hasListPositionOutlet) {
       this.listPositionOutlet.update()
diff --git a/app/javascript/controllers/nested_select_controller.js b/app/javascript/controllers/nested_select_controller.js
index 36eb6bb91..4674de1ea 100644
--- a/app/javascript/controllers/nested_select_controller.js
+++ b/app/javascript/controllers/nested_select_controller.js
@@ -1,3 +1,4 @@
+// TODO: This controller should be deprecated in favor of the multi-level select component
 import {Controller} from "@hotwired/stimulus"
 
 export default class extends Controller {

From 85f597351ee52a323c421b04497c1a9066cc82a2 Mon Sep 17 00:00:00 2001
From: Akshay Gupta <kitallis@gmail.com>
Date: Mon, 3 Feb 2025 16:58:51 +0530
Subject: [PATCH 14/20] check for outlet presence

---
 .../controllers/targeted_toggle_controller.js          | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/javascript/controllers/targeted_toggle_controller.js b/app/javascript/controllers/targeted_toggle_controller.js
index 5153a0508..e48b0829b 100644
--- a/app/javascript/controllers/targeted_toggle_controller.js
+++ b/app/javascript/controllers/targeted_toggle_controller.js
@@ -22,10 +22,12 @@ export default class extends Controller {
   }
 
   updateEmptiness() {
-    if (this.subsectionTargets.every(t => t.hidden)) {
-      this.revealOutlet.show()
-    } else {
-      this.revealOutlet.hide()
+    if (this.hasRevealOutlet) {
+      if (this.subsectionTargets.every(t => t.hidden)) {
+        this.revealOutlet.show()
+      } else {
+        this.revealOutlet.hide()
+      }
     }
   }
 }

From 122f5b78ab337f7f955ae1b2d045281eb7bd7664 Mon Sep 17 00:00:00 2001
From: Akshay Gupta <kitallis@gmail.com>
Date: Mon, 3 Feb 2025 17:08:31 +0530
Subject: [PATCH 15/20] minor

---
 app/javascript/controllers/character_counter_controller.js | 1 -
 app/javascript/controllers/dialog_controller.js            | 5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/javascript/controllers/character_counter_controller.js b/app/javascript/controllers/character_counter_controller.js
index a5c710b6d..3b38120d8 100644
--- a/app/javascript/controllers/character_counter_controller.js
+++ b/app/javascript/controllers/character_counter_controller.js
@@ -1,5 +1,4 @@
 import { Controller } from "@hotwired/stimulus"
-
 const ERROR_CLASS = "text-rose-700"
 
 export default class extends Controller {
diff --git a/app/javascript/controllers/dialog_controller.js b/app/javascript/controllers/dialog_controller.js
index d619cf3ba..4536c2f28 100644
--- a/app/javascript/controllers/dialog_controller.js
+++ b/app/javascript/controllers/dialog_controller.js
@@ -21,9 +21,10 @@ export default class extends Controller {
       event.preventDefault();
     }
 
-    this.dialogTarget.showModal(); // Show the dialog
+    // Show the dialog
+    this.dialogTarget.showModal();
 
-    /* Remove focus from the dialog */
+    // Remove the focus from the dialog
     this.dialogTarget.focus();
     this.dialogTarget.blur();
 

From 2b02710e21365b04c74d457e341c81862807e7a8 Mon Sep 17 00:00:00 2001
From: Akshay Gupta <kitallis@gmail.com>
Date: Mon, 3 Feb 2025 17:12:52 +0530
Subject: [PATCH 16/20] temporarily remove jira

---
 app/models/integration.rb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/models/integration.rb b/app/models/integration.rb
index e360e7084..ee00c1d82 100644
--- a/app/models/integration.rb
+++ b/app/models/integration.rb
@@ -40,7 +40,6 @@ class Integration < ApplicationRecord
       "notification" => %w[SlackIntegration],
       "build_channel" => %w[AppStoreIntegration GoogleFirebaseIntegration],
       "monitoring" => %w[BugsnagIntegration CrashlyticsIntegration],
-      "project_management" => %w[JiraIntegration]
     },
     android: {
       "version_control" => %w[GithubIntegration GitlabIntegration BitbucketIntegration],
@@ -48,7 +47,6 @@ class Integration < ApplicationRecord
       "notification" => %w[SlackIntegration],
       "build_channel" => %w[GooglePlayStoreIntegration SlackIntegration GoogleFirebaseIntegration],
       "monitoring" => %w[BugsnagIntegration CrashlyticsIntegration],
-      "project_management" => %w[JiraIntegration]
     },
     cross_platform: {
       "version_control" => %w[GithubIntegration GitlabIntegration BitbucketIntegration],
@@ -56,7 +54,6 @@ class Integration < ApplicationRecord
       "notification" => %w[SlackIntegration],
       "build_channel" => %w[GooglePlayStoreIntegration SlackIntegration GoogleFirebaseIntegration AppStoreIntegration],
       "monitoring" => %w[BugsnagIntegration CrashlyticsIntegration],
-      "project_management" => %w[JiraIntegration]
     }
   }.with_indifferent_access
 

From c27544d8f6cf880d4b7e24817f95b87e1936f08d Mon Sep 17 00:00:00 2001
From: Akshay Gupta <kitallis@gmail.com>
Date: Mon, 3 Feb 2025 17:39:57 +0530
Subject: [PATCH 17/20] Update production jira creds

---
 config/credentials/production.yml.enc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/credentials/production.yml.enc b/config/credentials/production.yml.enc
index f606972df..42bdec77a 100644
--- a/config/credentials/production.yml.enc
+++ b/config/credentials/production.yml.enc
@@ -1 +1 @@
-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--bvYKBPzJQyGL+WY+--PCAe+9tEKbCO65vyS01PTQ==
\ No newline at end of file
+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--xM5U8oK0YhdhTxvF--qfkgWtRdCL+D49msQU2lGA==
\ No newline at end of file

From d0137e92dc80665cbacabc2545dee8d4ff984ac4 Mon Sep 17 00:00:00 2001
From: Akshay Gupta <kitallis@gmail.com>
Date: Mon, 3 Feb 2025 17:41:22 +0530
Subject: [PATCH 18/20] lint

---
 app/models/integration.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/integration.rb b/app/models/integration.rb
index ee00c1d82..5a7ac203a 100644
--- a/app/models/integration.rb
+++ b/app/models/integration.rb
@@ -39,21 +39,21 @@ class Integration < ApplicationRecord
       "ci_cd" => %w[BitriseIntegration GithubIntegration BitbucketIntegration],
       "notification" => %w[SlackIntegration],
       "build_channel" => %w[AppStoreIntegration GoogleFirebaseIntegration],
-      "monitoring" => %w[BugsnagIntegration CrashlyticsIntegration],
+      "monitoring" => %w[BugsnagIntegration CrashlyticsIntegration]
     },
     android: {
       "version_control" => %w[GithubIntegration GitlabIntegration BitbucketIntegration],
       "ci_cd" => %w[BitriseIntegration GithubIntegration BitbucketIntegration],
       "notification" => %w[SlackIntegration],
       "build_channel" => %w[GooglePlayStoreIntegration SlackIntegration GoogleFirebaseIntegration],
-      "monitoring" => %w[BugsnagIntegration CrashlyticsIntegration],
+      "monitoring" => %w[BugsnagIntegration CrashlyticsIntegration]
     },
     cross_platform: {
       "version_control" => %w[GithubIntegration GitlabIntegration BitbucketIntegration],
       "ci_cd" => %w[BitriseIntegration GithubIntegration BitbucketIntegration],
       "notification" => %w[SlackIntegration],
       "build_channel" => %w[GooglePlayStoreIntegration SlackIntegration GoogleFirebaseIntegration AppStoreIntegration],
-      "monitoring" => %w[BugsnagIntegration CrashlyticsIntegration],
+      "monitoring" => %w[BugsnagIntegration CrashlyticsIntegration]
     }
   }.with_indifferent_access
 

From 641d17c70f8707449e6ac36c6f2d2d46dc2d3ae0 Mon Sep 17 00:00:00 2001
From: Akshay Gupta <kitallis@gmail.com>
Date: Mon, 3 Feb 2025 18:06:33 +0530
Subject: [PATCH 19/20] just disable jira from ui

---
 app/models/integration.rb | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/models/integration.rb b/app/models/integration.rb
index 5a7ac203a..2eb2b126e 100644
--- a/app/models/integration.rb
+++ b/app/models/integration.rb
@@ -39,21 +39,24 @@ class Integration < ApplicationRecord
       "ci_cd" => %w[BitriseIntegration GithubIntegration BitbucketIntegration],
       "notification" => %w[SlackIntegration],
       "build_channel" => %w[AppStoreIntegration GoogleFirebaseIntegration],
-      "monitoring" => %w[BugsnagIntegration CrashlyticsIntegration]
+      "monitoring" => %w[BugsnagIntegration CrashlyticsIntegration],
+      "project_management" => %w[JiraIntegration]
     },
     android: {
       "version_control" => %w[GithubIntegration GitlabIntegration BitbucketIntegration],
       "ci_cd" => %w[BitriseIntegration GithubIntegration BitbucketIntegration],
       "notification" => %w[SlackIntegration],
       "build_channel" => %w[GooglePlayStoreIntegration SlackIntegration GoogleFirebaseIntegration],
-      "monitoring" => %w[BugsnagIntegration CrashlyticsIntegration]
+      "monitoring" => %w[BugsnagIntegration CrashlyticsIntegration],
+      "project_management" => %w[JiraIntegration]
     },
     cross_platform: {
       "version_control" => %w[GithubIntegration GitlabIntegration BitbucketIntegration],
       "ci_cd" => %w[BitriseIntegration GithubIntegration BitbucketIntegration],
       "notification" => %w[SlackIntegration],
       "build_channel" => %w[GooglePlayStoreIntegration SlackIntegration GoogleFirebaseIntegration AppStoreIntegration],
-      "monitoring" => %w[BugsnagIntegration CrashlyticsIntegration]
+      "monitoring" => %w[BugsnagIntegration CrashlyticsIntegration],
+      "project_management" => %w[JiraIntegration]
     }
   }.with_indifferent_access
 
@@ -83,6 +86,7 @@ class Integration < ApplicationRecord
   MINIMUM_REQUIRED_SET = [:version_control, :ci_cd, :build_channel].freeze
   DEFAULT_CONNECT_STATUS = Integration.statuses[:connected].freeze
   DEFAULT_INITIAL_STATUS = Integration.statuses[:disconnected].freeze
+  DISABLED_CATEGORIES = ["project_management"].freeze
 
   # FIXME: Can we make a better External Deployment abstraction?
   EXTERNAL_BUILD_INTEGRATION = {
@@ -112,6 +116,8 @@ def by_categories_for(app)
       integrations = ALLOWED_INTEGRATIONS_FOR_APP[app.platform]
 
       integrations.each_with_object({}) do |(category, providers), combination|
+        next if DISABLED_CATEGORIES.include?(category)
+        
         existing_integration = existing_integrations.select { |integration| integration.category.eql?(category) }
         combination[category] ||= []
 

From 94daa1a195b3705628792dbc5d720b256e984431 Mon Sep 17 00:00:00 2001
From: Akshay Gupta <kitallis@gmail.com>
Date: Mon, 3 Feb 2025 18:15:10 +0530
Subject: [PATCH 20/20] lint

---
 app/models/integration.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/integration.rb b/app/models/integration.rb
index 2eb2b126e..700827dba 100644
--- a/app/models/integration.rb
+++ b/app/models/integration.rb
@@ -117,7 +117,7 @@ def by_categories_for(app)
 
       integrations.each_with_object({}) do |(category, providers), combination|
         next if DISABLED_CATEGORIES.include?(category)
-        
+
         existing_integration = existing_integrations.select { |integration| integration.category.eql?(category) }
         combination[category] ||= []