Skip to content

Commit

Permalink
Merge pull request #17384 from opf/bump-primer-0-50-1
Browse files Browse the repository at this point in the history
[59933] Primer view components version bump to 0.50.1
  • Loading branch information
HDinger authored Dec 10, 2024
2 parents f48be19 + c2dbcc5 commit c8ffce4
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 33 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -403,4 +403,4 @@ end

gem "openproject-octicons", "~>19.19.0"
gem "openproject-octicons_helper", "~>19.19.0"
gem "openproject-primer_view_components", "~>0.49.2"
gem "openproject-primer_view_components", "~>0.50.1"
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -814,7 +814,7 @@ GEM
actionview
openproject-octicons (= 19.19.0)
railties
openproject-primer_view_components (0.49.2)
openproject-primer_view_components (0.50.1)
actionview (>= 5.0.0)
activesupport (>= 5.0.0)
openproject-octicons (>= 19.17.0)
Expand Down Expand Up @@ -1316,7 +1316,7 @@ DEPENDENCIES
openproject-octicons (~> 19.19.0)
openproject-octicons_helper (~> 19.19.0)
openproject-openid_connect!
openproject-primer_view_components (~> 0.49.2)
openproject-primer_view_components (~> 0.50.1)
openproject-recaptcha!
openproject-reporting!
openproject-storages!
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,9 @@
component.with_description { I18n.t('sharing.project_queries.upsale.message') }

href = "#{OpenProject::Static::Links.links[:upsale][:href]}/?utm_source=unknown&utm_medium=community-edition&utm_campaign=project-list-sharing-modal"
component.with_secondary_action(href:) do
flex_layout(justify_content: :center) do |flex|
flex.with_column(mr: 1) { I18n.t("admin.enterprise.enterprise_link") }
flex.with_column { render(Primer::Beta::Octicon.new(icon: :'link-external')) }
end
component.with_secondary_action(href:) do |link|
link.with_trailing_visual_icon(icon: "link-external")
I18n.t("admin.enterprise.enterprise_link")
end
end
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,9 @@
component.with_description { I18n.t('mail.sharing.work_packages.enterprise_text') }

href = "#{OpenProject::Static::Links.links[:upsale][:href]}/?utm_source=unknown&utm_medium=community-edition&utm_campaign=work-package-sharing-modal"
component.with_secondary_action(href:) do
flex_layout(justify_content: :center) do |flex|
flex.with_column(mr: 1) { I18n.t("admin.enterprise.enterprise_link") }
flex.with_column { render(Primer::Beta::Octicon.new(icon: :'link-external')) }
end
component.with_secondary_action(href:) do |link|
link.with_trailing_visual_icon(icon: "link-external")
I18n.t("admin.enterprise.enterprise_link")
end
end
end
Expand Down
30 changes: 16 additions & 14 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,11 @@
"@ngneat/content-loader": "^7.0.0",
"@ngx-formly/core": "^6.1.4",
"@openproject/octicons-angular": "^19.19.0",
"@openproject/primer-view-components": "^0.49.2",
"@openproject/primer-view-components": "^0.50.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.49.2",
"@primer/view-components": "npm:@openproject/primer-view-components@^0.50.1",
"@types/hotwired__turbo": "^8.0.1",
"@uirouter/angular": "^13.0.0",
"@uirouter/core": "^6.1.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,11 @@

grid.with_area(:description, tag: :div, color: :subtle, test_selector: 'storage-description') do
concat(render(Primer::Beta::Text.new) { storage_description })

if can_show_open_link?
concat(render(Primer::Beta::Text.new) { " - " })
concat(render(Primer::Beta::Link.new(href: open_href, target: "_blank")) do
concat(render(Primer::Beta::Text.new) { "#{I18n.t('storages.buttons.open_storage')} " })
concat(render(Primer::Beta::Octicon.new(icon: "link-external", size: :small)))
concat(render(Primer::Beta::Link.new(href: open_href, target: "_blank")) do |link|
link.with_trailing_visual_icon(icon: "link-external", size: :small)
I18n.t('storages.buttons.open_storage')
end)
end
end
Expand Down

0 comments on commit c8ffce4

Please sign in to comment.