From 0f4201122c2f9eb64ef06ceca7384ffbfb9750cf Mon Sep 17 00:00:00 2001 From: Nivedita Priyadarshini Date: Tue, 15 Oct 2024 16:13:50 +0530 Subject: [PATCH] Fix live release submission component overflowing texts --- app/components/v2/commit_component.html.erb | 2 +- .../previous_release_component.html.erb | 2 +- .../submission_component.html.erb | 18 ++++++++++-------- app/models/config/submission.rb | 4 ++++ 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/app/components/v2/commit_component.html.erb b/app/components/v2/commit_component.html.erb index 5b11b5954..a2859232e 100644 --- a/app/components/v2/commit_component.html.erb +++ b/app/components/v2/commit_component.html.erb @@ -4,7 +4,7 @@
<%= render V2::IconComponent.new("v2/git_commit_vertical.svg", size: :md) %> <%= render(V2::ButtonComponent.new(scheme: :link, - label: message.truncate(77), + label: message.truncate(75), options: url, type: :link_external, size: :none, diff --git a/app/components/v2/live_release/pre_prod_release/previous_release_component.html.erb b/app/components/v2/live_release/pre_prod_release/previous_release_component.html.erb index 1813ed049..e71a1c4ac 100644 --- a/app/components/v2/live_release/pre_prod_release/previous_release_component.html.erb +++ b/app/components/v2/live_release/pre_prod_release/previous_release_component.html.erb @@ -42,7 +42,7 @@ <%= render V2::IconComponent.new("v2/slash.svg", size: :md) %> <% end %> - <%= render V2::BadgeComponent.new(text: submission.submission_channel.name, kind: :badge) do |badge| %> + <%= render V2::BadgeComponent.new(text: submission.submission_channel.name.truncate(20), kind: :badge) do |badge| %> <% badge.with_icon("integrations/logo_#{submission.provider}.png") %> <% end %> <% end %> diff --git a/app/components/v2/live_release/pre_prod_release/submission_component.html.erb b/app/components/v2/live_release/pre_prod_release/submission_component.html.erb index 4857d9852..a23c7d428 100644 --- a/app/components/v2/live_release/pre_prod_release/submission_component.html.erb +++ b/app/components/v2/live_release/pre_prod_release/submission_component.html.erb @@ -34,19 +34,21 @@ <% if active? %> <%= render partial: "shared/show_time_ago", - locals: {tooltip_text: last_activity_tooltip, tooltip_placement: "bottom", last_activity_at:} %> + locals: { tooltip_text: last_activity_tooltip, tooltip_placement: "bottom", last_activity_at: } %> <% end %>
- <%= render partial: "shared/play_store_review_rejected", locals: {show: submission.failed_with_action_required?, - build:, - actionable: true, - channel_name: submission.submission_channel.name} %> + <%= render partial: "shared/play_store_review_rejected", locals: { show: submission.failed_with_action_required?, + build:, + actionable: true, + channel_name: submission.submission_channel.name } %> <%= render V2::SectionComponent.new(title: "External info", style: :titled, size: :micro) do %> -
+
+ <% if submission.conf.app_variant? %> +
<%= render V2::BadgeComponent.new(text: submission.conf.integrable.bundle_identifier, kind: :badge) %>
+ <% end %> <%= render V2::HorizontalDataSetComponent.new do |component| %> - <% component.with_data_set(title: "Bundle").with_content(submission.conf.integrable.bundle_identifier) %> <% component.with_data_set(title: "Status").with_content(external_status) %> <% component.with_data_set(title: "Tester groups").with_content(submission.submission_channel.name.truncate(50)) %> <% if active? %> @@ -55,7 +57,7 @@ <%= render V2::ButtonComponent.new(scheme: :naked_icon, type: :link_external, options: submission.store_link, - html_options: {class: "text-xs"}, + html_options: { class: "text-xs" }, authz: false, size: :none) do |b| %> <% b.with_icon("v2/external_link.svg", size: :md) %> diff --git a/app/models/config/submission.rb b/app/models/config/submission.rb index 392952590..7731c7e5d 100644 --- a/app/models/config/submission.rb +++ b/app/models/config/submission.rb @@ -57,6 +57,10 @@ def next release_step_config.submissions.where("number > ?", number).order(:number).first end + def app_variant? + integrable_type == "AppVariant" + end + def self.from_json(json) submission = new(json.except("id", "release_step_config_id", "rollout_config", "submission_config")) submission.submission_external = Config::SubmissionExternal.from_json(json["submission_config"])