Skip to content

Commit 35b4d99

Browse files
authored
Revert "feature 8783: Implement rich text links in custom forms (#8957)" (#8961)
This reverts commit b17a83e.
1 parent b058d75 commit 35b4d99

File tree

15 files changed

+74
-726
lines changed

15 files changed

+74
-726
lines changed

app/components/forms/orders/attendee-list.js

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -84,23 +84,6 @@ export default class AttendeeList extends Component {
8484
return groupBy(customFields, field => field.get('form'));
8585
}
8686

87-
prepareFieldId(fieldIdentifier, holderIndex, fieldIndex) {
88-
return `${fieldIdentifier}_${holderIndex}_${fieldIndex}`;
89-
}
90-
91-
get fieldNameConvertRichText() {
92-
const fields = orderBy(this.fields.toArray(), 'position');
93-
this.holders.forEach((holder, indexHolder) => {
94-
fields.forEach((field, index) => {
95-
const elem = document.getElementById(this.prepareFieldId(field.fieldIdentifier, indexHolder, index));
96-
if (elem) {
97-
elem.innerHTML = field.transName;
98-
}
99-
});
100-
});
101-
return null;
102-
}
103-
10487
@action
10588
toggleEditFields() {
10689
this.editFields = !this.editFields;

app/components/forms/orders/order-form.js

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -630,7 +630,9 @@ export default Component.extend(FormMixin, {
630630
if ((main_language && main_language.split('-')[0] === current_locale) || !field.translations || !field.translations.length) {
631631
field.transName = field.name;
632632
} else if (field.translations?.length) {
633+
633634
const transName = field.translations.filter(trans => trans.language_code.split('-')[0] === current_locale);
635+
634636
if (transName.length) {
635637
field.transName = transName[0].name;
636638
} else {
@@ -639,6 +641,7 @@ export default Component.extend(FormMixin, {
639641
} else {
640642
field.transName = field.name;
641643
}
644+
642645
return !isFixed;
643646
}), ['position']);
644647
return groupBy(requiredFixed.concat(customFields), field => field.get('form'));
@@ -661,23 +664,6 @@ export default Component.extend(FormMixin, {
661664
return 'hello';
662665
},
663666

664-
prepareFieldId(fieldIdentifier, holderIndex, fieldIndex) {
665-
return `${fieldIdentifier}_${holderIndex}_${fieldIndex}`;
666-
},
667-
668-
get fieldNameConvertRichText() {
669-
const fields = orderBy(this.fields.toArray(), 'position');
670-
this.holders.forEach((holder, indexHolder) => {
671-
fields.forEach((field, index) => {
672-
const elem = document.getElementById(this.prepareFieldId(field.fieldIdentifier, indexHolder, index));
673-
if (elem) {
674-
elem.innerHTML = field.transName;
675-
}
676-
});
677-
});
678-
return null;
679-
},
680-
681667
actions: {
682668
submit(data) {
683669
this.onValid(() => {
Lines changed: 21 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,25 @@
1-
{{#if (eq @type "number")}}
2-
<div class="rich-text-type-number" >
3-
<Widgets::Forms::RichTextLink
4-
@value={{@data.name}}/>
1+
{{#if (not-eq @type "number")}}
2+
<div style="width: 30%">
3+
<Input type="text" placeholder={{t "Field Name"}} @value={{@data.name}}/>
54
</div>
65
{{else}}
7-
<div class="rich-text-other" >
8-
<Widgets::Forms::RichTextLink
9-
@value={{@data.name}}/>
6+
<div style="width: 20%">
7+
<Input type="text" placeholder={{t "Field Name"}} @value={{@data.name}}/>
108
</div>
119
{{/if}}
12-
<div style="width: 11rem">
13-
<div class="ui hidden divider wrapper-button"></div>
14-
<UiDropdown class="ui selection dropdown custom-form-dropdown-attendee"
15-
@selected={{@data.selectedLang}}
16-
@onChange={{action 'onChangeLanguage'}}
17-
style="line-height: inherit; min-width: 11rem;">
18-
<div class="default text">
19-
{{ @data.selectedLang }}
20-
</div>
21-
<i class="dropdown icon"></i>
22-
<div class="menu">
23-
{{#each this.languageList as |language|}}
24-
<div class="item" data-value={{language.code}}>{{language.name}}</div>
25-
{{/each}}
26-
</div>
27-
</UiDropdown>
28-
</div>
29-
<div>
30-
<div class="ui hidden divider wrapper-button"></div>
31-
<button class="ui compact icon negative button btn-delele-lang" data-tooltip="{{t 'Delete'}}" {{action (confirm (t "Are you sure you want to delete this?") (action 'onRemoveForm' ))}}>
32-
<i class="trash box icon"></i>
33-
</button>
34-
</div>
10+
<UiDropdown class="ui selection dropdown custom-form-dropdown-attendee"
11+
@selected={{@data.selectedLang}}
12+
@onChange={{action 'onChangeLanguage' }}>
13+
<div class="default text">
14+
{{ @data.selectedLang }}
15+
</div>
16+
<i class="dropdown icon"></i>
17+
<div class="menu">
18+
{{#each this.languageList as |language|}}
19+
<div class="item" data-value={{language.code}}>{{language.name}}</div>
20+
{{/each}}
21+
</div>
22+
</UiDropdown>
23+
<button style="font-size: 1.1em;" class="ui compact icon negative circular button" data-tooltip="{{t 'Delete'}}" {{action (confirm (t "Are you sure you want to delete this?") (action 'onRemoveForm' ))}}>
24+
<i class="trash box icon"></i>
25+
</button>

app/components/forms/wizard/custom-form-input.hbs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@
3030
</UiDropdown>
3131
{{/if}}
3232
{{#if (or (eq this.type "number") (eq this.type "year"))}}
33-
<div class="ui action input input-attendee-custom-form number-item">
33+
<div class="ui action input input-attendee-custom-form" style="width: 8%;">
3434
<Input
3535
@type="number"
3636
@name="min_price"
3737
placeholder={{t "Min"}}
3838
@value={{this.min}} />
3939
</div>
40-
<div class="ui action input input-attendee-custom-form number-item">
40+
<div class="ui action input input-attendee-custom-form" style="width: 8%;">
4141
<Input
4242
@type="number"
4343
@name="max_price"
@@ -71,7 +71,7 @@
7171
</div>
7272
<div style="display: flex; flex-direction: column">
7373
{{#each this.visibleForm as |sub|}}
74-
<div {{did-update this.updated @field}} class="ui action input sub child-language">
74+
<div {{did-update this.updated @field}} class="ui action input sub" style="width: inherit; margin-top: 10px">
7575
{{#unless sub.isDeleted }}
7676
<Forms::Wizard::CustomFormInputTranslation
7777
@data={{sub}}

app/components/forms/wizard/custom-form-rich-text.hbs

Lines changed: 0 additions & 99 deletions
This file was deleted.

0 commit comments

Comments
 (0)