From d7c3c5ab6d91460bf8b8dc3f56b6a2c5028e6352 Mon Sep 17 00:00:00 2001 From: Henriette Darge Date: Thu, 16 Jan 2025 08:16:18 +0100 Subject: [PATCH] Bump primer to 0.52.1 and get rid of some custom code that is not needed any more --- Gemfile | 2 +- Gemfile.lock | 4 +-- .../new_access_token_form_component.html.erb | 2 +- .../common/attribute_component.html.erb | 2 +- .../configure_view_modal_component.html.erb | 2 +- .../delete_list_modal_component.html.erb | 2 +- .../dialog_body_form_component.html.erb | 2 +- .../shares/share_dialog_component.html.erb | 2 +- ...work_package_child_form_component.html.erb | 2 +- ...k_package_relation_form_component.html.erb | 2 +- .../dialogs/create_form_component.html.erb | 2 +- frontend/package-lock.json | 28 +++++++++---------- frontend/package.json | 4 +-- .../app/components/base_errors_component.rb | 5 ++-- .../meetings/index/form_component.html.erb | 4 +-- .../details_form_component.html.erb | 6 ++-- .../side_panel/participants_dialog.html.erb | 2 +- ...package_to_meeting_form_component.html.erb | 2 +- ...n_project_storage_modal_component.html.erb | 2 +- 19 files changed, 39 insertions(+), 38 deletions(-) diff --git a/Gemfile b/Gemfile index a02cacc303fd..d02aaf5bfe5c 100644 --- a/Gemfile +++ b/Gemfile @@ -408,4 +408,4 @@ end gem "openproject-octicons", "~>19.20.0 " gem "openproject-octicons_helper", "~>19.20.0 " -gem "openproject-primer_view_components", "~>0.52.0" +gem "openproject-primer_view_components", "~>0.52.1" diff --git a/Gemfile.lock b/Gemfile.lock index 5ae4677f445d..677c1f355341 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -818,7 +818,7 @@ GEM actionview openproject-octicons (= 19.20.0) railties - openproject-primer_view_components (0.52.0) + openproject-primer_view_components (0.52.1) actionview (>= 5.0.0) activesupport (>= 5.0.0) openproject-octicons (>= 19.20.0) @@ -1324,7 +1324,7 @@ DEPENDENCIES openproject-octicons (~> 19.20.0) openproject-octicons_helper (~> 19.20.0) openproject-openid_connect! - openproject-primer_view_components (~> 0.52.0) + openproject-primer_view_components (~> 0.52.1) openproject-recaptcha! openproject-reporting! openproject-storages! diff --git a/app/components/my/access_token/new_access_token_form_component.html.erb b/app/components/my/access_token/new_access_token_form_component.html.erb index e179d484ec29..0e190a811394 100644 --- a/app/components/my/access_token/new_access_token_form_component.html.erb +++ b/app/components/my/access_token/new_access_token_form_component.html.erb @@ -39,7 +39,7 @@ See COPYRIGHT and LICENSE files for more details. collection.with_component(Primer::Alpha::Dialog::Body.new( aria: { label: I18n.t("my.access_token.new_access_token_dialog_title") } )) do - flex_layout(my: 3) do |body| + flex_layout(mb: 3) do |body| body.with_row do render(Primer::Alpha::Banner.new(scheme: :warning)) do I18n.t("my.access_token.new_access_token_dialog_attention_text") diff --git a/app/components/open_project/common/attribute_component.html.erb b/app/components/open_project/common/attribute_component.html.erb index 5fa17c497919..b3a9cde40089 100644 --- a/app/components/open_project/common/attribute_component.html.erb +++ b/app/components/open_project/common/attribute_component.html.erb @@ -41,7 +41,7 @@ }, title: name, size: :large)) do |component| - component.with_body(mt: 2) { full_text } + component.with_body { full_text } component.with_header(variant: :large) end %> diff --git a/app/components/projects/configure_view_modal_component.html.erb b/app/components/projects/configure_view_modal_component.html.erb index bc7b0a84c24e..e1a868d1e37a 100644 --- a/app/components/projects/configure_view_modal_component.html.erb +++ b/app/components/projects/configure_view_modal_component.html.erb @@ -5,7 +5,7 @@ # enough height to display all options. # This is necessary as long as ng-select does not support popovers. style: "min-height: 480px")) do |d| %> - <% d.with_header(variant: :large, mb: 3) %> + <% d.with_header(variant: :large) %> <%= render(Primer::Alpha::Dialog::Body.new) do %> <%= primer_form_with( url: projects_path, diff --git a/app/components/projects/delete_list_modal_component.html.erb b/app/components/projects/delete_list_modal_component.html.erb index c57d5e8ee1d0..3d850d1f68fb 100644 --- a/app/components/projects/delete_list_modal_component.html.erb +++ b/app/components/projects/delete_list_modal_component.html.erb @@ -2,7 +2,7 @@ size: :large, id: MODAL_ID, data: { 'test-selector': MODAL_ID })) do |d| %> - <% d.with_header(variant: :large, mb: 2) %> + <% d.with_header(variant: :large) %> <% d.with_body { t(:'projects.lists.delete_modal.text') } %> <% d.with_footer do %> <%= render(Primer::Beta::Button.new(data: { "close-dialog-id": MODAL_ID })) { I18n.t(:button_cancel) } %> diff --git a/app/components/settings/project_custom_field_sections/dialog_body_form_component.html.erb b/app/components/settings/project_custom_field_sections/dialog_body_form_component.html.erb index a45d6a52cb20..f6f9ed27f753 100644 --- a/app/components/settings/project_custom_field_sections/dialog_body_form_component.html.erb +++ b/app/components/settings/project_custom_field_sections/dialog_body_form_component.html.erb @@ -3,7 +3,7 @@ primer_form_with(**form_config) do |f| component_collection do |collection| collection.with_component(Primer::BaseComponent.new(tag: :div)) do - flex_layout(my: 3) do |modal_body| + flex_layout(mb: 3) do |modal_body| modal_body.with_row do render(ProjectCustomFieldSections::NameForm.new(f)) end diff --git a/app/components/shares/share_dialog_component.html.erb b/app/components/shares/share_dialog_component.html.erb index d3c7f2732650..d976bc8ac7eb 100644 --- a/app/components/shares/share_dialog_component.html.erb +++ b/app/components/shares/share_dialog_component.html.erb @@ -1,6 +1,6 @@ <%= render(Primer::Alpha::Dialog.new(title: strategy.title, id: 'sharing-modal', data: { 'keep-open-on-submit': true }, size: :xlarge, open: open)) do |d| - d.with_header(variant: :large, mb: 3) + d.with_header(variant: :large) d.with_body do render(strategy.modal_body_component(errors)) end diff --git a/app/components/work_package_relations_tab/add_work_package_child_form_component.html.erb b/app/components/work_package_relations_tab/add_work_package_child_form_component.html.erb index cd3345e9a12a..a36d6993e1a3 100644 --- a/app/components/work_package_relations_tab/add_work_package_child_form_component.html.erb +++ b/app/components/work_package_relations_tab/add_work_package_child_form_component.html.erb @@ -9,7 +9,7 @@ } ) do |f| %> <%# Form fields section %> - <%= flex_layout(my: 3) do |flex| + <%= flex_layout(mb: 3) do |flex| flex.with_row do if @base_errors&.any? render(Primer::Alpha::Banner.new(mb: 3, icon: :stop, scheme: :danger)) { @base_errors.join("\n") } diff --git a/app/components/work_package_relations_tab/work_package_relation_form_component.html.erb b/app/components/work_package_relations_tab/work_package_relation_form_component.html.erb index 83879e8a97c6..914e9f1bad09 100644 --- a/app/components/work_package_relations_tab/work_package_relation_form_component.html.erb +++ b/app/components/work_package_relations_tab/work_package_relation_form_component.html.erb @@ -9,7 +9,7 @@ } ) do |f| %> <%# Form fields section %> - <%= flex_layout(my: 2) do |flex| + <%= flex_layout(mb: 3) do |flex| flex.with_row do if @base_errors&.any? render(Primer::Alpha::Banner.new(mb: 3, icon: :stop, scheme: :danger)) { @base_errors.join("\n") } diff --git a/app/components/work_packages/dialogs/create_form_component.html.erb b/app/components/work_packages/dialogs/create_form_component.html.erb index d201487ee992..2f8a1fdb6614 100644 --- a/app/components/work_packages/dialogs/create_form_component.html.erb +++ b/app/components/work_packages/dialogs/create_form_component.html.erb @@ -21,7 +21,7 @@ end end - modal_body.with_row(mt: 3) do + modal_body.with_row do render(WorkPackages::Dialogs::CreateForm.new(f, work_package:, wrapper_id: "#create-work-package-dialog")) end end diff --git a/frontend/package-lock.json b/frontend/package-lock.json index c8113f7ab9d9..106ffbd5cb0e 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -47,11 +47,11 @@ "@ngneat/content-loader": "^7.0.0", "@ngx-formly/core": "^6.1.4", "@openproject/octicons-angular": "^19.20.0", - "@openproject/primer-view-components": "^0.52.0", + "@openproject/primer-view-components": "^0.52.1", "@openproject/reactivestates": "^3.0.1", "@primer/css": "^21.5.0", "@primer/primitives": "^9.1.2", - "@primer/view-components": "npm:@openproject/primer-view-components@^0.52.0", + "@primer/view-components": "npm:@openproject/primer-view-components@^0.52.1", "@types/hotwired__turbo": "^8.0.1", "@uirouter/angular": "^13.0.0", "@uirouter/core": "^6.1.0", @@ -4828,9 +4828,9 @@ } }, "node_modules/@openproject/primer-view-components": { - "version": "0.52.0", - "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.52.0.tgz", - "integrity": "sha512-rs08YC4NtJsyQOCb+/xq3rqSrNWOOiDicOiEAKwOMf5NNjdy/aVK5vE/F19qdGETy3SXobElk68Mm+SEPXesWg==", + "version": "0.52.1", + "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.52.1.tgz", + "integrity": "sha512-eawd73DTZ1cUCoknGHWWsHodL5VVZPTwffeYxlkjuLlXjceoPjk/PrRkCn5urnW98yyfpbrH+NOZXm06BCFNfQ==", "dependencies": { "@github/auto-check-element": "^5.2.0", "@github/auto-complete-element": "^3.6.2", @@ -4925,9 +4925,9 @@ }, "node_modules/@primer/view-components": { "name": "@openproject/primer-view-components", - "version": "0.52.0", - "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.52.0.tgz", - "integrity": "sha512-rs08YC4NtJsyQOCb+/xq3rqSrNWOOiDicOiEAKwOMf5NNjdy/aVK5vE/F19qdGETy3SXobElk68Mm+SEPXesWg==", + "version": "0.52.1", + "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.52.1.tgz", + "integrity": "sha512-eawd73DTZ1cUCoknGHWWsHodL5VVZPTwffeYxlkjuLlXjceoPjk/PrRkCn5urnW98yyfpbrH+NOZXm06BCFNfQ==", "dependencies": { "@github/auto-check-element": "^5.2.0", "@github/auto-complete-element": "^3.6.2", @@ -25507,9 +25507,9 @@ } }, "@openproject/primer-view-components": { - "version": "0.52.0", - "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.52.0.tgz", - "integrity": "sha512-rs08YC4NtJsyQOCb+/xq3rqSrNWOOiDicOiEAKwOMf5NNjdy/aVK5vE/F19qdGETy3SXobElk68Mm+SEPXesWg==", + "version": "0.52.1", + "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.52.1.tgz", + "integrity": "sha512-eawd73DTZ1cUCoknGHWWsHodL5VVZPTwffeYxlkjuLlXjceoPjk/PrRkCn5urnW98yyfpbrH+NOZXm06BCFNfQ==", "requires": { "@github/auto-check-element": "^5.2.0", "@github/auto-complete-element": "^3.6.2", @@ -25582,9 +25582,9 @@ } }, "@primer/view-components": { - "version": "npm:@openproject/primer-view-components@0.52.0", - "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.52.0.tgz", - "integrity": "sha512-rs08YC4NtJsyQOCb+/xq3rqSrNWOOiDicOiEAKwOMf5NNjdy/aVK5vE/F19qdGETy3SXobElk68Mm+SEPXesWg==", + "version": "npm:@openproject/primer-view-components@0.52.1", + "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.52.1.tgz", + "integrity": "sha512-eawd73DTZ1cUCoknGHWWsHodL5VVZPTwffeYxlkjuLlXjceoPjk/PrRkCn5urnW98yyfpbrH+NOZXm06BCFNfQ==", "requires": { "@github/auto-check-element": "^5.2.0", "@github/auto-complete-element": "^3.6.2", diff --git a/frontend/package.json b/frontend/package.json index 7dc207a71bfe..4902564a4850 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -99,11 +99,11 @@ "@ngneat/content-loader": "^7.0.0", "@ngx-formly/core": "^6.1.4", "@openproject/octicons-angular": "^19.20.0", - "@openproject/primer-view-components": "^0.52.0", + "@openproject/primer-view-components": "^0.52.1", "@openproject/reactivestates": "^3.0.1", "@primer/css": "^21.5.0", "@primer/primitives": "^9.1.2", - "@primer/view-components": "npm:@openproject/primer-view-components@^0.52.0", + "@primer/view-components": "npm:@openproject/primer-view-components@^0.52.1", "@types/hotwired__turbo": "^8.0.1", "@uirouter/angular": "^13.0.0", "@uirouter/core": "^6.1.0", diff --git a/modules/meeting/app/components/base_errors_component.rb b/modules/meeting/app/components/base_errors_component.rb index 504da64a2e1d..7b8cc305c843 100644 --- a/modules/meeting/app/components/base_errors_component.rb +++ b/modules/meeting/app/components/base_errors_component.rb @@ -31,11 +31,12 @@ class BaseErrorsComponent < ApplicationComponent include OpTurbo::Streamable include OpPrimer::ComponentHelpers - def initialize(object, keys: %w[base]) + def initialize(object, keys: %w[base], **system_arguments) super @errors = object.errors @keys = keys + @system_arguments = system_arguments end def render? @@ -43,7 +44,7 @@ def render? end def call - render(Primer::Alpha::Banner.new(scheme: :danger, icon: :stop, spacious: true)) do + render(Primer::Alpha::Banner.new(scheme: :danger, icon: :stop, spacious: true, **@system_arguments)) do joined_messages end end diff --git a/modules/meeting/app/components/meetings/index/form_component.html.erb b/modules/meeting/app/components/meetings/index/form_component.html.erb index e44a22fac400..77e113df7bc8 100644 --- a/modules/meeting/app/components/meetings/index/form_component.html.erb +++ b/modules/meeting/app/components/meetings/index/form_component.html.erb @@ -29,12 +29,12 @@ end if @project.nil? - modal_body.with_row(mt: 3) do + modal_body.with_row(mb: 3) do render(Meeting::ProjectAutocompleter.new(f)) end end - modal_body.with_row(mt: 3) do + modal_body.with_row do render(Meeting::Title.new(f)) end diff --git a/modules/meeting/app/components/meetings/side_panel/details_form_component.html.erb b/modules/meeting/app/components/meetings/side_panel/details_form_component.html.erb index cc719ac1358a..e14c838f4dd6 100644 --- a/modules/meeting/app/components/meetings/side_panel/details_form_component.html.erb +++ b/modules/meeting/app/components/meetings/side_panel/details_form_component.html.erb @@ -10,14 +10,14 @@ collection.with_component(Primer::Alpha::Dialog::Body.new) do flex_layout(mb: 3) do |modal_body| modal_body.with_row do - render(BaseErrorsComponent.new(@meeting)) + render(BaseErrorsComponent.new(@meeting, mb: 3)) end - modal_body.with_row(mt: 3) do + modal_body.with_row(mb: 3) do render(Meeting::TimeGroup.new(f, meeting: @meeting)) end - modal_body.with_row(mt: 3) do + modal_body.with_row do render(Meeting::Location.new(f, meeting: @meeting)) end diff --git a/modules/meeting/app/components/meetings/side_panel/participants_dialog.html.erb b/modules/meeting/app/components/meetings/side_panel/participants_dialog.html.erb index 5fd081e9c14f..524433d6eb45 100644 --- a/modules/meeting/app/components/meetings/side_panel/participants_dialog.html.erb +++ b/modules/meeting/app/components/meetings/side_panel/participants_dialog.html.erb @@ -16,7 +16,7 @@ data: { turbo: true, turbo_stream: true }, class: 'Overlay-form' ) do |f| - flex_layout(mt: 3) do |form_container| + flex_layout do |form_container| form_container.with_row do flex_layout(justify_content: :flex_end) do |header| diff --git a/modules/meeting/app/components/work_package_meetings_tab/add_work_package_to_meeting_form_component.html.erb b/modules/meeting/app/components/work_package_meetings_tab/add_work_package_to_meeting_form_component.html.erb index 0b736b31f17f..b530a7ba08aa 100644 --- a/modules/meeting/app/components/work_package_meetings_tab/add_work_package_to_meeting_form_component.html.erb +++ b/modules/meeting/app/components/work_package_meetings_tab/add_work_package_to_meeting_form_component.html.erb @@ -6,7 +6,7 @@ method: :post, url: work_package_meeting_agenda_items_path(@work_package), ) do |f| - flex_layout(my: 3) do |flex| + flex_layout(mb: 3) do |flex| flex.with_row do if @base_errors&.any? render(Primer::Alpha::Banner.new(mb: 3, icon: :stop, scheme: :danger)) { @base_errors.join("\n") } diff --git a/modules/storages/app/components/storages/open_project_storage_modal_component.html.erb b/modules/storages/app/components/storages/open_project_storage_modal_component.html.erb index baf796521fa0..fd37bafa49ce 100644 --- a/modules/storages/app/components/storages/open_project_storage_modal_component.html.erb +++ b/modules/storages/app/components/storages/open_project_storage_modal_component.html.erb @@ -4,7 +4,7 @@ data:) ) do |dialog| %> <% dialog.with_header(display: :none) %> - <% dialog.with_body(id: self.class.dialog_body_id, p: 2) do %> + <% dialog.with_body(id: self.class.dialog_body_id) do %> <%= render(self.class::Body.new(@state)) %> <% end %> <% dialog.with_footer do %>