[63466] Replace opce-collapsible-section-augment with Primer::CollapsibleSection

app/views/augmented/_collapsible_section.html.erb

@@ -1,6 +1,8 @@
-<opce-collapsible-section-augment initially-expanded="<%= initiallyExpanded %>"
-                             section-title="<%= title %>">
-</opce-collapsible-section-augment>
-<div class="opce-collapsible-section-augment--body" hidden>
-  <%= capture(&block) %>
-</div>
+<%=
+  render(Primer::OpenProject::CollapsibleSection.new(collapsed: !initiallyExpanded, display: :block, mb: 3)) do |section|
+    section.with_title { title }
+    section.with_collapsible_content do
+      capture(&block)
+    end
+  end
+%>

app/views/enterprises/_form.html.erb

@@ -4,9 +4,7 @@
   <%= labelled_tabular_form_for @token,
                url: { action: :create },
                html: { class: 'token-form form -vertical' },
-               method: :post do |f|%>
-
-    <div class="form--space"></div>
+               method: :post do |f| %>
 
     <%= f.text_area :encoded_token,
                     value: nil,

frontend/src/app/app.module.ts

@@ -192,9 +192,6 @@ import { NoResultsComponent } from 'core-app/shared/components/no-results/no-res
 import {
   OpNonWorkingDaysListComponent,
 } from 'core-app/shared/components/op-non-working-days-list/op-non-working-days-list.component';
-import {
-  CollapsibleSectionComponent,
-} from 'core-app/shared/components/collapsible-section/collapsible-section.component';
 import { CopyToClipboardComponent } from 'core-app/shared/components/copy-to-clipboard/copy-to-clipboard.component';
 import { GlobalSearchTitleComponent } from 'core-app/core/global_search/title/global-search-title.component';
 import { ContentTabsComponent } from 'core-app/shared/components/tabs/content-tabs/content-tabs.component';
@@ -457,7 +454,6 @@ export class OpenProjectModule implements DoBootstrap {
     registerCustomElement('opce-enterprise-base', EnterpriseBaseComponent, { injector });
     registerCustomElement('opce-no-results', NoResultsComponent, { injector });
     registerCustomElement('opce-non-working-days-list', OpNonWorkingDaysListComponent, { injector });
-    registerCustomElement('opce-collapsible-section-augment', CollapsibleSectionComponent, { injector });
     registerCustomElement('opce-main-menu-toggle', MainMenuToggleComponent, { injector });
     registerCustomElement('opce-main-menu-resizer', MainMenuResizerComponent, { injector });
     registerCustomElement('opce-copy-to-clipboard', CopyToClipboardComponent, { injector });

frontend/src/app/shared/shared.module.ts

@@ -68,7 +68,6 @@ import { ToastComponent } from './components/toaster/toast.component';
 import { ToastsContainerComponent } from './components/toaster/toasts-container.component';
 import { UploadProgressComponent } from './components/toaster/upload-progress.component';
 import { ResizerComponent } from './components/resizer/resizer.component';
-import { CollapsibleSectionComponent } from './components/collapsible-section/collapsible-section.component';
 import { NoResultsComponent } from './components/no-results/no-results.component';
 import { EditableToolbarTitleComponent } from './components/editable-toolbar-title/editable-toolbar-title.component';
 import { PersistentToggleComponent } from './components/persistent-toggle/persistent-toggle.component';
@@ -200,7 +199,6 @@ export function bootstrapModule(injector:Injector):void {
 
     // Add functionality to rails rendered templates
     CopyToClipboardComponent,
-    CollapsibleSectionComponent,
 
     ResizerComponent,
 

frontend/src/global_styles/content/_index.sass

@@ -9,7 +9,6 @@
 @import forms
 @import forms_mobile
 @import comments
-@import collapsible_section
 @import copy_to_clipboard
 @import custom_logo
 @import toast

frontend/src/global_styles/content/modules/_documents.sass

@@ -23,9 +23,6 @@ dt.document:before
 .sidebar--document-sort label:last-of-type
   margin-bottom: 2rem
 
-.document-category--inner-section
-  padding-top: 20px
-
 .document-category-elements
   display: inline
 
@@ -37,4 +34,3 @@ dt.document:before
 
 .document-category-elements .wiki
   margin-bottom: 2rem
-

modules/documents/app/views/documents/index.html.erb

@@ -59,7 +59,7 @@ See COPYRIGHT and LICENSE files for more details.
 <% end %>
 
 <% @grouped.keys.sort.each do |group| %>
-  <%= augmented_collapsible_section title: group do %>
+  <%= augmented_collapsible_section(title: group.name) do %>
     <div class="document-category--inner-section">
       <div class="form--field document-category-elements">
         <%= render partial: "documents/document", collection: @grouped[group] %>

spec/features/admin/enterprise/enterprise_spec.rb

@@ -102,7 +102,7 @@
         expect(EnterpriseToken.current.encoded_token).to eq("foobar")
 
         expect(page).to have_text("Successful update")
-        click_on "Replace your current support token"
+        find("h2", text: "Replace your current support token").click
         fill_in "enterprise_token_encoded_token", with: "blabla"
         submit_button.click
 

spec/features/workflows/edit_spec.rb

@@ -55,24 +55,28 @@
   it "allows adding another workflow" do
     click_button "Edit"
 
-    check "status_#{statuses[1].id}_#{statuses[2].id}_"
+    within "#workflow_form_always" do
+      check "status_#{statuses[1].id}_#{statuses[2].id}_"
+    end
 
     click_button "Save"
 
     expect_flash(message: "Successful update.")
 
-    expect(page)
-      .to have_field "status_#{statuses[0].id}_#{statuses[1].id}_", checked: true
-    expect(page)
-      .to have_field "status_#{statuses[1].id}_#{statuses[2].id}_", checked: true
+    within "#workflow_form_always" do
+      expect(page)
+        .to have_field "status_#{statuses[0].id}_#{statuses[1].id}_", checked: true
+      expect(page)
+        .to have_field "status_#{statuses[1].id}_#{statuses[2].id}_", checked: true
 
-    expect(page)
-      .to have_field "status_#{statuses[0].id}_#{statuses[2].id}_", checked: false
-    expect(page)
-      .to have_field "status_#{statuses[1].id}_#{statuses[0].id}_", checked: false
-    expect(page)
-      .to have_field "status_#{statuses[2].id}_#{statuses[0].id}_", checked: false
-    expect(page)
-      .to have_field "status_#{statuses[2].id}_#{statuses[1].id}_", checked: false
+      expect(page)
+        .to have_field "status_#{statuses[0].id}_#{statuses[2].id}_", checked: false
+      expect(page)
+        .to have_field "status_#{statuses[1].id}_#{statuses[0].id}_", checked: false
+      expect(page)
+        .to have_field "status_#{statuses[2].id}_#{statuses[0].id}_", checked: false
+      expect(page)
+        .to have_field "status_#{statuses[2].id}_#{statuses[1].id}_", checked: false
+    end
   end
 end