Skip to content

OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub

use image instead of video for calculated-values enterprise banner

Ivan Kuchin459e2889310a
diff --git a/app/assets/images/enterprise/calculated-values.png b/app/assets/images/enterprise/calculated-values.png
new file mode 100644
index 00000000000..fbc1f06d60b
Binary files /dev/null and b/app/assets/images/enterprise/calculated-values.png differ
diff --git a/app/assets/videos/enterprise/calculated-values.mp4 b/app/assets/videos/enterprise/calculated-values.mp4
deleted file mode 100644
index 01f765fd023..00000000000
Binary files a/app/assets/videos/enterprise/calculated-values.mp4 and /dev/null differ
diff --git a/app/components/admin/custom_fields/calculated_values/details_component.html.erb b/app/components/admin/custom_fields/calculated_values/details_component.html.erb
index 6e434ae9cb3..8ea5aea4fa4 100644
--- a/app/components/admin/custom_fields/calculated_values/details_component.html.erb
+++ b/app/components/admin/custom_fields/calculated_values/details_component.html.erb
@@ -29,7 +29,7 @@ See COPYRIGHT and LICENSE files for more details.
<%=
component_wrapper do
- with_enterprise_banner_guard(:calculated_values, variant: :large, video: "enterprise/calculated-values.mp4") do
+ with_enterprise_banner_guard(:calculated_values, variant: :large, image: "enterprise/calculated-values.png") do
settings_primer_form_with(
model:,
scope: :custom_field,
diff --git a/app/components/enterprise_edition/banner_component.html.erb b/app/components/enterprise_edition/banner_component.html.erb
index 35af39eaddd..fbaeaaa2c48 100644
--- a/app/components/enterprise_edition/banner_component.html.erb
+++ b/app/components/enterprise_edition/banner_component.html.erb
@@ -55,12 +55,16 @@
if large?
flex.with_row(my: 2) do
- video_tag @video,
- controls: false,
- class: "op-enterprise-banner--video-control",
- autoplay: true,
- loop: true,
- muted: true
+ if @video
+ video_tag @video,
+ controls: false,
+ class: "op-enterprise-banner--media",
+ autoplay: true,
+ loop: true,
+ muted: true
+ else
+ image_tag @image, class: "op-enterprise-banner--media"
+ end
end
flex.with_row do
@@ -77,8 +81,8 @@
end
end
- if medium?
- grid.with_area(:image, **@image_arguments)
+ if medium? && @image
+ grid.with_area(:image, **image_as_background_arguments)
end
if @dismissable
diff --git a/app/components/enterprise_edition/banner_component.rb b/app/components/enterprise_edition/banner_component.rb
index a14c24138cb..21d2e79257a 100644
--- a/app/components/enterprise_edition/banner_component.rb
+++ b/app/components/enterprise_edition/banner_component.rb
@@ -77,22 +77,19 @@ module EnterpriseEdition
trial_overrides! if trial_feature?
- if @variant == :medium && @image.nil?
- raise ArgumentError, "The 'image' parameter is required when the variant is :medium."
- end
-
- if @variant == :large && @video.nil?
- raise ArgumentError, "The 'video' parameter is required when the variant is :large."
- end
+ check_media_arguments!
set_system_arguments(system_arguments, feature_key)
super
end
- def before_render
- @image_arguments = {}
- @image_arguments[:style] = @image.present? ? "background-image: url(#{helpers.image_path(@image)})" : nil
+ def image_as_background_arguments
+ { style: "background-image: url(#{helpers.image_path(@image)})" } if @image
+ end
+
+ def inline?
+ @variant == :inline
end
def medium?
@@ -103,16 +100,22 @@ module EnterpriseEdition
@variant == :large
end
- def inline?
- @variant == :inline
- end
-
def wrapper_key
"enterprise_banner_#{@dismiss_key}"
end
private
+ def check_media_arguments!
+ case @variant
+ when :medium
+ raise ArgumentError, "The 'video' parameter is not used for variant :medium" if @video
+ when :large
+ raise ArgumentError, "Either 'image' or 'video' parameter is required for variant :large" if !@image && !@video
+ raise ArgumentError, "Only one of 'image' and 'video' parameters can be specified for variant :large" if @image && @video
+ end
+ end
+
def set_system_arguments(system_arguments, feature_key)
@system_arguments = system_arguments
@system_arguments[:tag] = :div
diff --git a/app/components/enterprise_edition/banner_component.sass b/app/components/enterprise_edition/banner_component.sass
index 05d8aa43137..955378aad17 100644
--- a/app/components/enterprise_edition/banner_component.sass
+++ b/app/components/enterprise_edition/banner_component.sass
@@ -96,7 +96,7 @@ $op-enterprise-banner-fixed-height-large: 320px
&--image
@include upsell-image
- &--video-control
+ &--media
display: block
margin: 0 auto
max-width: 50vw
diff --git a/spec/components/enterprise_edition/banner_component_spec.rb b/spec/components/enterprise_edition/banner_component_spec.rb
index f49428876f4..d54df9cbd3c 100644
--- a/spec/components/enterprise_edition/banner_component_spec.rb
+++ b/spec/components/enterprise_edition/banner_component_spec.rb
@@ -273,16 +273,44 @@ RSpec.describe EnterpriseEdition::BannerComponent, type: :component do
component = find_test_selector(component_test_selector)
expect(component[:class]).to include("op-enterprise-banner_large")
+
+ expect(component).to have_css('video[src$="/enterprise/date-alert-notifications.mp4"]')
+ end
+ end
+
+ context "with image parameter" do
+ let(:component_args) { { variant: :large, image: "enterprise/homescreen.png" } }
+
+ it_behaves_like "renders the component"
+
+ it "renders with large variant class" do
+ render_component_in_mo
+
+ component = find_test_selector(component_test_selector)
+
+ expect(component[:class]).to include("op-enterprise-banner_large")
+
+ expect(component).to have_css('img[src$="/enterprise/homescreen.png"]')
+ end
+ end
+
+ context "with video and image parameters" do
+ let(:component_args) do
+ { variant: :large, video: "enterprise/date-alert-notifications.mp4", image: "enterprise/homescreen.png" }
+ end
+
+ it "raises an error" do
+ expect { render_component_in_mo }
+ .to raise_error(ArgumentError, "Only one of 'image' and 'video' parameters can be specified for variant :large")
end
end
- context "without video parameter" do
+ context "without video and image parameters" do
let(:component_args) { { variant: :large } }
it "raises an error" do
- expect do
- render_component_in_mo
- end.to raise_error(ArgumentError, "The 'video' parameter is required when the variant is :large.")
+ expect { render_component_in_mo }
+ .to raise_error(ArgumentError, "Either 'image' or 'video' parameter is required for variant :large")
end
end
end