github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-26 22:13:45 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Convert form-template-validation-options modal to component-based API (#23236)

Browse Source 
<img width="794" alt="Screenshot 2023-08-25 at 6 38 21 AM" src="https://github.com/discourse/discourse/assets/50783505/f5cf6fa0-7a2f-4e38-93e2-657fb01f6703">
This commit is contained in:
Isaac Janzen 2023-08-25 07:02:54 -05:00 committed by GitHub
parent 0b74ba7c66
commit c22e2de2d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/admin/addon/components/form-template/form.js
View File

@ -6,15 +6,18 @@ import I18n from "I18n";
import { popupAjaxError } from "discourse/lib/ajax-error";
import { templateFormFields } from "admin/lib/template-form-fields";
import FormTemplate from "admin/models/form-template";
import showModal from "discourse/lib/show-modal";
import FormTemplateValidationOptionsModal from "admin/components/modal/form-template-validation-options";
export default class FormTemplateForm extends Component {
@service router;
@service dialog;
@service modal;
@tracked formSubmitted = false;
@tracked templateContent = this.args.model?.template || "";
@tracked templateName = this.args.model?.name || "";
@tracked showFormTemplateFormPreview;
isEditing = this.args.model?.id ? true : false;
quickInsertFields = [
{
@ -112,9 +115,7 @@ export default class FormTemplateForm extends Component {
@action
showValidationOptionsModal() {
return showModal("admin-form-template-validation-options", {
admin: true,
});
return this.modal.show(FormTemplateValidationOptionsModal);
}
@action

26
app/assets/javascripts/admin/addon/components/modal/form-template-validation-options.hbs Normal file
View File

@ -0,0 +1,26 @@
<DModal
class="form-templates__validation-options admin-form-template-validation-options-modal"
@title={{i18n "admin.form_templates.validations_modal.modal_title"}}
@closeModal={{@closeModal}}
>
<:body>
<table>
<thead>
<tr>
{{#each this.tableHeaders as |header|}}
<th>{{header}}</th>
{{/each}}
</tr>
</thead>
<tbody>
{{#each this.validations as |item|}}
<tr>
<td><pre>{{item.key}}</pre></td>
<td>{{item.type}}</td>
<td>{{item.description}}</td>
</tr>
{{/each}}
</tbody>
</table>
</:body>
</DModal>

15
app/assets/javascripts/admin/addon/controllers/modals/admin-form-template-validation-options.js → app/assets/javascripts/admin/addon/components/modal/form-template-validation-options.js
View File

@ -1,16 +1,13 @@
import Controller from "@ember/controller";
import ModalFunctionality from "discourse/mixins/modal-functionality";
import Component from "@glimmer/component";
import I18n from "I18n";
export default class AdminFormTemplateValidationOptions extends Controller.extend(
ModalFunctionality
) {
TABLE_HEADER_KEYS = ["key", "type", "description"];
VALIDATION_KEYS = ["required", "minimum", "maximum", "pattern", "type"];
const TABLE_HEADER_KEYS = ["key", "type", "description"];
const VALIDATION_KEYS = ["required", "minimum", "maximum", "pattern", "type"];
export default class FormTemplateValidationOptions extends Component {
get tableHeaders() {
const translatedHeaders = [];
this.TABLE_HEADER_KEYS.forEach((header) => {
TABLE_HEADER_KEYS.forEach((header) => {
translatedHeaders.push(
I18n.t(`admin.form_templates.validations_modal.table_headers.${header}`)
);
@ -22,7 +19,7 @@ export default class AdminFormTemplateValidationOptions extends Controller.exten
get validations() {
const translatedValidations = [];
const prefix = "admin.form_templates.validations_modal.validations";
this.VALIDATION_KEYS.forEach((validation) => {
VALIDATION_KEYS.forEach((validation) => {
translatedValidations.push({
key: I18n.t(`${prefix}.${validation}.key`),
type: I18n.t(`${prefix}.${validation}.type`),

23
app/assets/javascripts/admin/addon/templates/modal/admin-form-template-validation-options.hbs
View File

@ -1,23 +0,0 @@
<DModalBody
@class="form-templates__validation-options"
@title="admin.form_templates.validations_modal.modal_title"
>
<table>
<thead>
<tr>
{{#each this.tableHeaders as |header|}}
<th>{{header}}</th>
{{/each}}
</tr>
</thead>
<tbody>
{{#each this.validations as |item|}}
<tr>
<td><pre>{{item.key}}</pre></td>
<td>{{item.type}}</td>
<td>{{item.description}}</td>
</tr>
{{/each}}
</tbody>
</table>
</DModalBody>

1
app/assets/javascripts/discourse/app/services/modal.js
View File

@ -37,7 +37,6 @@ const KNOWN_LEGACY_MODALS = [
"share-and-invite",
"tag-upload",
"admin-reseed",
"admin-form-template-validation-options",
"admin-uploaded-image-list",
];