Skip to content

Feature/69641 turbo custom dialogs #21527

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
myabc wants to merge 3 commits into
base: dev
Choose a base branch
from
+1,040 −1,006
Draft

Feature/69641 turbo custom dialogs #21527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b221910
[#69641] Configure Turbo to use custom dialogs
myabc Dec 23, 2025
6d6cf89
[WIP] Harmonize Angular/spot modals with Primer
myabc Dec 23, 2025
ab70858
REMOVE MODAL OVERLAY
myabc Dec 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/components/users/hover_card_component.sass
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
// Correct the z-index of the regular hover card container so that it is above the dropdown of user auto completers
.spot-modal-overlay:has(.op-user-hover-card)
.Overlay-overlay:has(.op-user-hover-card)
z-index: 9600

// On the project list page, there is a bug when a hover card is invoked within the share dialog. The global spot
// modal overlay will darken the background while the hover card is active, since it's semi-transparent bg shading is
// added on top of the other dialog background shaders. We don't want an additional spot modal background here,
// so we disable it for this edge case.
.controller-projects.action-index, .controller-meetings.action-show
.spot-modal-overlay:not(:has(.op-user-hover-card))
.Overlay-overlay:not(:has(.op-user-hover-card))
background: transparent

.op-user-hover-card
Expand Down
2 changes: 1 addition & 1 deletion app/components/work_packages/exports/modal_dialog_component.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<%= render(
Primer::Alpha::Dialog.new(
title: I18n.t("export.dialog.title"),
size: :xlarge,
size: :medium_portrait,
id: MODAL_ID,
data: {
controller: "work-packages--export--dialog"
Expand Down
2 changes: 1 addition & 1 deletion app/views/account/_footer.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="spot-action-bar">
<div class="spot-action-bar--right">
<div class="Overlay-footer Overlay-footer--alignEnd">
<% if footer = registration_footer %>
<span><%= footer %></span>
<% end %>
Expand Down
6 changes: 3 additions & 3 deletions app/views/account/_register.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@ See COPYRIGHT and LICENSE files for more details.
@user,
url: account_register_path,
data: { turbo: false },
html: { class: "form -wide-labels spot-modal" }
html: { class: "form -wide-labels Overlay" }
) do |f| %>
<%= back_url_hidden_field_tag use_referer: false %>
<%= error_messages_for :user %>
<div id="spotModalTitle" class="spot-modal--header">
<div class="Overlay-header">
<%= I18n.t("onboarding.welcome", app_title: Setting.app_title) %>
</div>
<div class="spot-divider"></div>
<div class="spot-modal--body spot-container">
<div class="Overlay-body">
<h2><%= t(:label_register) %></h2>
<section class="form--section">
<% if @user.ldap_auth_source_id.nil? %>
Expand Down
8 changes: 4 additions & 4 deletions app/views/onboarding/_configuration_modal.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ See COPYRIGHT and LICENSE files for more details.

<div class="modal-delivery-element">
<%= labelled_tabular_form_for current_user, url: { action: "user_settings", controller: "onboarding" }, html: { id: "user-form" } do |f| %>
<div id="spotModalTitle" class="spot-modal--header">
<div class="Overlay-header">
<%= I18n.t("onboarding.welcome", app_title: Setting.app_title) %>, <%= current_user.name %>
</div>

<div class="spot-divider"></div>

<div class="onboarding--main spot-modal--body spot-container">
<div class="onboarding--main Overlay-body">
<b><%= I18n.t("onboarding.select_language") %></b>
<fieldset class="form--fieldset">
<div class="form--field">
Expand All @@ -45,9 +45,9 @@ See COPYRIGHT and LICENSE files for more details.
</div>

<div class="onboarding--footer spot-action-bar">
<div class="spot-action-bar--right">
<div class="Overlay-footer Overlay-footer--alignEnd">
<button
class="button button_no-margin spot-action-bar--action spot-modal--cancel-button"
class="button button_no-margin spot-action-bar--action Overlay--cancel-button"
data-tour-selector="modal-close-button"
dynamic-content-modal-close-button
title=<%= t(:button_close) %>><%= t(:button_close) %></button>
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/app/core/setup/globals/onboarding/onboarding_tour_trigger.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ export function detectOnboardingTour():void {
sessionStorage.setItem(onboardingTourStorageKey, 'readyToStart');

// Start automatically when modal is closed by backdrop click or cancel button
waitForElement('.spot-modal-overlay_active', 'body', () => {
const elementsByClassName = document.getElementsByClassName('spot-modal-overlay_active');
waitForElement('.Overlay-overlay_active', 'body', () => {
const elementsByClassName = document.getElementsByClassName('Overlay-overlay_active');
Array.from(elementsByClassName).forEach((modalOverlay) => {
modalOverlay.addEventListener('click', (evt) => {
if (evt.target === modalOverlay) {
Expand Down
53 changes: 30 additions & 23 deletions frontend/src/app/features/boards/board/add-list-modal/add-list-modal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
<div
class="spot-modal spot-modal_autoheight confirm-form-submit--modal loading-indicator--location"
class="Overlay_autoheight confirm-form-submit--modal loading-indicator--location"
data-indicator-name="modal"
>
<div id="spotModalTitle" class="spot-modal--header">{{ text.title }}</div>

<div class="spot-divider"></div>
<div class="Overlay-header Overlay-header--large Overlay-header--divided">
<div class="Overlay-headerContentWrap">
<div class="Overlay-titleWrap">
<h1 id="spotModalTitle" class="Overlay-title">{{text.title}}</h1>
</div>
</div>
</div>

<div class="spot-modal--body spot-container">
<div class="Overlay-body">
@if (showWarning && warningText) {
<div
class="op-toast -warning">
Expand Down Expand Up @@ -48,23 +52,26 @@
</div>
</div>
</div>
<div class="spot-action-bar">
<div class="spot-action-bar--right">
<button
class="button button_no-margin spot-modal--cancel-button spot-action-bar--action"
data-test-selector="confirmation-modal--cancel"
(click)="closeMe($event)"
[textContent]="text.button_cancel"
[attr.title]="text.button_cancel"
></button>
<button
class="button button_no-margin -primary spot-action-bar--action"
data-test-selector="confirmation-modal--confirmed"
(click)="create()"
[disabled]="!this.selectedAttribute || inFlight"
[textContent]="text.button_add"
[attr.title]="text.button_add"
></button>
</div>

<div class="Overlay-footer Overlay-footer--alignEnd">
<button
class="Button Button--secondary Button--medium"
data-test-selector="confirmation-modal--cancel"
(click)="closeMe($event)"
>
<span class="Button-content">
<span class="Button-label">{{ text.button_cancel }}</span>
</span>
</button>
<button
class="Button Button--primary Button--medium"
data-test-selector="confirmation-modal--confirmed"
(click)="create()"
[disabled]="!this.selectedAttribute || inFlight"
>
<span class="Button-content">
<span class="Button-label">{{ text.button_add }}</span>
</span>
</button>
</div>
</div>
44 changes: 26 additions & 18 deletions frontend/src/app/features/boards/board/configuration-modal/board-configuration.modal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,35 @@
<div
class="spot-modal loading-indicator--location"
class="loading-indicator--location"
data-indicator-name="modal"
>
<div id="spotModalTitle" class="spot-modal--header">{{text.title}}</div>

<div class="spot-divider"></div>
<div class="Overlay-header Overlay-header--large Overlay-header--divided">
<div class="Overlay-headerContentWrap">
<div class="Overlay-titleWrap">
<h1 id="spotModalTitle" class="Overlay-title">{{text.title}}</h1>
</div>
</div>
</div>

<div class="spot-modal--body spot-container">
<div class="Overlay-body">
<div class="tab-content" #tabContentOutlet></div>
</div>

<div class="spot-action-bar">
<div class="spot-action-bar--right">
<button
class="button button_no-margin spot-modal--cancel-button spot-action-bar--action"
[textContent]="text.cancelButton"
(click)="closeMe($event)"
></button>
<button
class="button button_no-margin -primary spot-action-bar--action"
[textContent]="text.applyButton"
(click)="saveChanges()"
></button>
</div>
<div class="Overlay-footer Overlay-footer--alignEnd">
<button
class="Button Button--secondary Button--medium"
(click)="closeMe($event)"
>
<span class="Button-content">
<span class="Button-label">{{ text.cancelButton }}</span>
</span>
</button>
<button
class="Button Button--primary Button--medium"
(click)="saveChanges()"
>
<span class="Button-content">
<span class="Button-label">{{ text.applyButton }}</span>
</span>
</button>
</div>
</div>
33 changes: 16 additions & 17 deletions ...nd/src/app/features/work-packages/components/wp-baseline/baseline/baseline.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,23 +178,22 @@
/>
}
@if (showActionBar) {
<div class="spot-action-bar"
>
<div class="spot-action-bar--right">
<button
class="button spot-action-bar--action"
[disabled]="!selectedFilter"
type="button"
(click)="resetSelection()"
>
{{ text.clear }}
</button>
<button
class="button -primary spot-action-bar--action"
>
{{ text.apply }}
</button>
</div>
<div class="Overlay-footer Overlay-footer--alignEnd">
<button
class="Button Button--secondary Button--medium"
[disabled]="!selectedFilter"
type="button"
(click)="resetSelection()"
>
<span class="Button-content">
<span class="Button-label">{{ text.clear }}</span>
</span>
</button>
<button class="Button Button--primary Button--medium">
<span class="Button-content">
<span class="Button-label">{{ text.apply }}</span>
</span>
</button>
</div>
}
</form>
Expand Down
44 changes: 18 additions & 26 deletions frontend/src/app/features/work-packages/components/wp-reminder-modal/wp-reminder.modal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,26 @@
<div
class="spot-modal op-reminder-dialog-modal"
class=" op-reminder-dialog-modal"
>
<div
class="spot-modal--header"
>
<div
id="spotModalTitle"
class="spot-modal--header-title"
[textContent]="(this.title$ | async) || this.text.new_title">
<div class="Overlay-header Overlay-header--large">
<div class="Overlay-headerContentWrap">
<div class="Overlay-titleWrap">
<h1 id="spotModalTitle" class="Overlay-title" [textContent]="(this.title$ | async) || this.text.new_title"></h1>
<h2 id="spotModalDescription" class="Overlay-description">{{ text.subtitle }}</h2>
</div>
<div class="Overlay-actionWrap">
<button
[attr.aria-label]="text.button_close"
(click)="closeMe($event)"
data-test-selector="op-reminder-dialog-modal--close-icon"
type="button"
class="close-button Overlay-closeButton">
<svg x-icon size="small"></svg>
</button>
</div>
</div>

<button
class="button button_no-margin -transparent spot-modal--header-close-button"
[attr.aria-label]="text.button_close"
(click)="closeMe($event)"
data-test-selector="op-reminder-dialog-modal--close-icon"
>
<svg
x-icon
size="small"
class="spot-modal--header-close-button-icon"
></svg>
</button>
</div>
<p
class="spot-modal--subheader fgColor-muted"
[textContent]="this.text.subtitle">
</p>

<div class="spot-modal--body spot-container">
<div class="Overlay-body">
<turbo-frame
#frameElement
id="reminder_modal_body"
Expand Down
40 changes: 19 additions & 21 deletions frontend/src/app/features/work-packages/components/wp-share-modal/wp-share.modal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,28 @@
<div
id="sharing-modal"
class="spot-modal spot-modal_wide op-share-dialog-modal"
class=" Overlay--size-large op-share-dialog-modal"
>
<div
class="spot-modal--header"
>
<div
id="spotModalTitle"
class="spot-modal--header-title"
[textContent]="this.text.title">
<div class="Overlay-header Overlay-header--large">
<div class="Overlay-headerContentWrap">
<div class="Overlay-titleWrap">
<h1 id="spotModalTitle" class="Overlay-title">
{{ text.title }}
</h1>
</div>
<div class="Overlay-actionWrap">
<button
[attr.aria-label]="text.button_close"
(click)="closeMe($event)"
data-test-selector="op-reminder-dialog-modal--close-icon"
type="button"
class="close-button Overlay-closeButton">
<svg x-icon size="small"></svg>
</button>
</div>
</div>
<button
class="button button_no-margin -transparent spot-modal--header-close-button"
[attr.aria-label]="text.button_close"
(click)="closeMe($event)"
data-test-selector="op-share-dialog-modal--close-icon"
>
<svg
x-icon
size="small"
class="spot-modal--header-close-button-icon"
></svg>
</button>
</div>

<div class="spot-modal--body spot-container">
<div class="Overlay-body">
<turbo-frame
#frameElement
id="share_modal_body"
Expand Down
Loading
Loading