Skip to content

OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub

use radio buttons instead of select

as-opd68017bef855
diff --git a/frontend/src/stimulus/controllers/dynamic/meetings/export/form.controller.ts b/frontend/src/stimulus/controllers/dynamic/meetings/export/form.controller.ts
index 1c8738185cb..0b45a06f981 100644
--- a/frontend/src/stimulus/controllers/dynamic/meetings/export/form.controller.ts
+++ b/frontend/src/stimulus/controllers/dynamic/meetings/export/form.controller.ts
@@ -3,92 +3,83 @@ import * as Turbo from '@hotwired/turbo';
import { HttpErrorResponse } from '@angular/common/http';
export default class FormController extends Controller<HTMLFormElement> {
- static values = {
- jobStatusDialogUrl: String,
- };
+ static values = {
+ jobStatusDialogUrl: String,
+ };
- static targets = ['templates', 'inputGroups'];
+ static targets = ['inputGroups'];
- declare jobStatusDialogUrlValue:string;
- declare inputGroupsTargets:Array<HTMLElement>;
+ declare jobStatusDialogUrlValue:string;
+ declare inputGroupsTargets:Array<HTMLElement>;
- jobModalUrl(job_id:string):string {
- return this.jobStatusDialogUrlValue.replace('_job_uuid_', job_id);
- }
-
- async showJobModal(job_id:string) {
- const response = await fetch(this.jobModalUrl(job_id), {
- method: 'GET',
- headers: { Accept: 'text/vnd.turbo-stream.html' },
- });
- if (response.ok) {
- Turbo.renderStreamMessage(await response.text());
- } else {
- throw new Error(response.statusText || 'Invalid response from server');
+ jobModalUrl(job_id:string):string {
+ return this.jobStatusDialogUrlValue.replace('_job_uuid_', job_id);
}
- }
- async requestExport(exportURL:string):Promise<string> {
- const response = await fetch(exportURL, {
- method: 'GET',
- headers: { Accept: 'application/json' },
- credentials: 'same-origin',
- });
- if (!response.ok) {
- throw new Error(`HTTP ${response.status}: ${response.statusText}`);
- }
- const result = await response.json() as { job_id:string };
- if (!result.job_id) {
- throw new Error('Invalid response from server');
+ async showJobModal(job_id:string) {
+ const response = await fetch(this.jobModalUrl(job_id), {
+ method: 'GET',
+ headers: { Accept: 'text/vnd.turbo-stream.html' },
+ });
+ if (response.ok) {
+ Turbo.renderStreamMessage(await response.text());
+ } else {
+ throw new Error(response.statusText || 'Invalid response from server');
+ }
}
- return result.job_id;
- }
- generateExportURL(formData:FormData):string {
- const actionURL = this.element.getAttribute('action') as string;
- const searchParams = this.getExportParams(formData);
- const append = actionURL.includes('?') ? '&' : '?';
- return `${actionURL}${append}${searchParams.toString()}`;
- }
+ async requestExport(exportURL:string):Promise<string> {
+ const response = await fetch(exportURL, {
+ method: 'GET',
+ headers: { Accept: 'application/json' },
+ credentials: 'same-origin',
+ });
+ if (!response.ok) {
+ throw new Error(`HTTP ${response.status.toString()}: ${response.statusText}`);
+ }
+ const result = await response.json() as { job_id:string };
+ if (!result.job_id) {
+ throw new Error('Invalid response from server');
+ }
+ return result.job_id;
+ }
- submitForm(evt:CustomEvent) {
- evt.preventDefault(); // Don't submit
- const formData = new FormData(this.element);
- this.requestExport(this.generateExportURL(formData))
- .then((job_id) => this.showJobModal(job_id))
- .catch((error:HttpErrorResponse) => this.handleError(error));
- return true;
- }
+ generateExportURL(formData:FormData):string {
+ const actionURL = this.element.getAttribute('action') as string;
+ const searchParams = this.getExportParams(formData);
+ const append = actionURL.includes('?') ? '&' : '?';
+ return `${actionURL}${append}${searchParams.toString()}`;
+ }
- private handleError(error:HttpErrorResponse) {
- void window.OpenProject.getPluginContext().then((pluginContext) => {
- pluginContext.services.notifications.addError(error);
- });
- }
+ submitForm(evt:CustomEvent) {
+ evt.preventDefault(); // Don't submit
+ const formData = new FormData(this.element);
+ this.requestExport(this.generateExportURL(formData))
+ .then((job_id) => this.showJobModal(job_id))
+ .catch((error:HttpErrorResponse) => this.handleError(error));
+ return true;
+ }
- private getExportParams(formData:FormData):string {
- const formParams = new URLSearchParams(formData as unknown as undefined);
- const query = new URLSearchParams();
- // Remove duplicate parameters inserted by Primer::Checkbox (two inputs per checkbox)
- formParams.forEach((value, key) => {
- query.delete(key);
- query.append(key, value);
- });
- return query.toString();
- }
+ private handleError(error:HttpErrorResponse) {
+ void window.OpenProject.getPluginContext().then((pluginContext) => {
+ pluginContext.services.notifications.addError(error);
+ });
+ }
- templatesChanged(event:Event) {
- const target = event.target as HTMLSelectElement;
- const data = target.options[target.selectedIndex].dataset;
- const template = target.options[target.selectedIndex].value;
+ private getExportParams(formData:FormData):string {
+ const formParams = new URLSearchParams(formData as unknown as undefined);
+ const query = new URLSearchParams();
+ // Remove duplicate parameters inserted by Primer::Checkbox (two inputs per checkbox)
+ formParams.forEach((value, key) => {
+ query.delete(key);
+ query.append(key, value);
+ });
+ return query.toString();
+ }
- const formControl = target.closest('.FormControl') as HTMLElement;
- const captionElement = formControl.querySelector('.FormControl-caption') as HTMLElement;
- if (captionElement) {
- captionElement.innerText = (data.caption || '');
+ templatesChanged({ params: { name } }:{ params:{ name:string } }) {
+ this.inputGroupsTargets.forEach((inputGroup:HTMLElement) => {
+ inputGroup.classList.toggle('d-none', inputGroup.dataset.template !== name);
+ });
}
- this.inputGroupsTargets.forEach((inputGroup:HTMLElement) => {
- inputGroup.classList.toggle('d-none', inputGroup.dataset.template === template)
- });
- }
}
diff --git a/modules/meeting/app/components/meetings/exports/modal_dialog_component.html.erb b/modules/meeting/app/components/meetings/exports/modal_dialog_component.html.erb
index 2a15af08b00..56e3f912625 100644
--- a/modules/meeting/app/components/meetings/exports/modal_dialog_component.html.erb
+++ b/modules/meeting/app/components/meetings/exports/modal_dialog_component.html.erb
@@ -22,28 +22,31 @@
if OpenProject::FeatureDecisions.minutes_styling_meeting_pdf_active?
modal_body.with_row do
render(
- Primer::Alpha::Select.new(
+ Primer::Alpha::RadioButtonGroup.new(
+ full_width: true,
name: "template",
- label: I18n.t("pdf_generator.dialog.templates.label"),
- caption: templates_default[:caption],
- input_width: :large,
+ label: I18n.t("pdf_generator.dialog.templates.label")
+ )
+ ) do |component|
+ component.radio_button(
+ label: I18n.t("meeting.export_pdf_dialog.templates.default.label"),
+ caption: I18n.t("meeting.export_pdf_dialog.templates.default.caption"),
+ value: "default",
+ data: {
+ "meetings--export--form-name-param": "default",
+ action: "change->meetings--export--form#templatesChanged"
+ },
+ checked: true
+ )
+ component.radio_button(
+ label: I18n.t("meeting.export_pdf_dialog.templates.minutes.label"),
+ caption: I18n.t("meeting.export_pdf_dialog.templates.minutes.caption"),
+ value: "minutes",
data: {
- "meetings--export--form-target": "templates",
+ "meetings--export--form-name-param": "minutes",
action: "change->meetings--export--form#templatesChanged"
}
)
- ) do |component|
- selected = templates_default[:id]
- templates_options.each do |entry|
- component.option(
- label: entry[:label],
- value: entry[:id],
- selected: selected == entry[:id],
- data: {
- caption: entry[:caption]
- }
- )
- end
end
end
end