Merge pull request #13753 from opf/housekeeping/use-new-view-componen…

…ts-in-core Update and use new ViewComponents from Primer
opf · Sep 21, 2023 · 59f72c1 · 59f72c1
2 parents c297e44 + 59555ca
commit 59f72c1
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 37 deletions.
diff --git a/Gemfile b/Gemfile
@@ -363,6 +363,6 @@ gemfiles.each do |file|
   send(:eval_gemfile, file) if File.readable?(file)
 end
 
-gem "openproject-primer_view_components", '~>0.10.0'
+gem "openproject-primer_view_components", '~>0.11.0'
 gem "openproject-octicons", '~>19.7.0'
 gem "openproject-octicons_helper", '~>19.7.0'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -680,7 +680,7 @@ GEM
       actionview
       openproject-octicons (= 19.7.0)
       railties
-    openproject-primer_view_components (0.10.0)
+    openproject-primer_view_components (0.11.0)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
       openproject-octicons (>= 19.7.0)
@@ -1114,7 +1114,7 @@ DEPENDENCIES
   openproject-octicons (~> 19.7.0)
   openproject-octicons_helper (~> 19.7.0)
   openproject-openid_connect!
-  openproject-primer_view_components (~> 0.10.0)
+  openproject-primer_view_components (~> 0.11.0)
   openproject-recaptcha!
   openproject-reporting!
   openproject-storages!

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -118,7 +118,7 @@
     "@ngneat/content-loader": "^7.0.0",
     "@ngx-formly/core": "^6.1.4",
     "@openproject/octicons-angular": "^19.7.0",
-    "@openproject/primer-view-components": "^0.10.0",
+    "@openproject/primer-view-components": "^0.11.0",
     "@openproject/reactivestates": "^3.0.1",
     "@primer/css": "^21.0.2",
     "@uirouter/angular": "^12.0.0",
@@ -198,6 +198,6 @@
     "storybook:build": "ng run OpenProject:build-storybook"
   },
   "overrides": {
-    "@primer/view-components": "npm:@openproject/primer-view-components@^0.10.0"
+    "@primer/view-components": "npm:@openproject/primer-view-components@^0.11.0"
   }
 }
diff --git a/frontend/src/stimulus/controllers/dynamic/meeting-agenda-item-drag-and-drop.controller.ts b/frontend/src/stimulus/controllers/dynamic/meeting-agenda-item-drag-and-drop.controller.ts
@@ -39,7 +39,7 @@ export default class extends Controller {
   connect() {
     this.drake = dragula(
       [this.containerTarget],
-      { moves: (_el, _source, handle, _sibling) => !!handle?.classList.contains('handle') },
+      { moves: (_el, _source, handle, _sibling) => !!handle?.classList.contains('octicon-grabber') },
     )
       // eslint-disable-next-line @typescript-eslint/no-misused-promises
       .on('drop', this.drop.bind(this));

diff --git a/modules/meeting/app/components/meeting_agenda_items/item_component/show_component.rb b/modules/meeting/app/components/meeting_agenda_items/item_component/show_component.rb
@@ -111,13 +111,7 @@ def right_column_partial
     end
 
     def drag_handler_partial
-      render(Primer::Beta::Octicon.new(
-               color: :subtle,
-               classes: "handle",
-               style: "cursor: move;",
-               size: :small,
-               icon: :grabber
-             ))
+      render(Primer::OpenProject::DragHandle.new(classes: 'handle'))
     end
 
     def work_package_title_partial

diff --git a/modules/meeting/app/components/meetings/sidebar_component.rb b/modules/meeting/app/components/meetings/sidebar_component.rb
@@ -40,16 +40,10 @@ def initialize(meeting:)
 
     def call
       component_wrapper do
-        flex_layout(pl: 1) do |flex|
-          flex.with_row(border: :bottom, pb: 2) do
-            details_partial
-          end
-          flex.with_row(mt: 3, border: :bottom, pb: 2) do
-            state_partial
-          end
-          flex.with_row(mt: 3) do
-            participants_partial
-          end
+        render(Primer::OpenProject::BorderGrid.new) do |border_grid|
+          border_grid.with_row { details_partial }
+          border_grid.with_row { state_partial }
+          border_grid.with_row { participants_partial }
         end
       end
     end