From 68adc696b9a5705d262c412f59a30d6ab9aac7f2 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Thu, 19 Sep 2024 16:08:36 +0200
Subject: [PATCH] Fix markdown textarea input id/name

---
 .../edit-basic-configuration.component.html    |  2 +-
 .../edit-homepage.component.html               |  2 +-
 .../edit-instance-information.component.html   | 18 +++++++++---------
 .../video-channel-edit.component.html          |  2 +-
 .../my-video-playlist-edit.component.html      |  2 +-
 .../shared/video-edit.component.html           |  6 ++++--
 .../dynamic-form-field.component.html          |  4 ++--
 .../markdown-textarea.component.html           |  2 +-
 .../markdown-textarea.component.ts             |  2 +-
 9 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html b/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html
index ea8094d5f..79e9aa898 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html
+++ b/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html
@@ -134,7 +134,7 @@
           <label i18n for="broadcastMessageMessage">Message</label><my-help helpType="markdownText"></my-help>
 
           <my-markdown-textarea
-            name="broadcastMessageMessage" formControlName="message"
+            inputId="broadcastMessageMessage" formControlName="message"
             [formError]="formErrors['broadcastMessage.message']" markdownType="to-unsafe-html"
           ></my-markdown-textarea>
 
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-homepage.component.html b/client/src/app/+admin/config/edit-custom-config/edit-homepage.component.html
index 091d14ab7..7a8fcb3fe 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-homepage.component.html
+++ b/client/src/app/+admin/config/edit-custom-config/edit-homepage.component.html
@@ -16,7 +16,7 @@
           </div>
 
           <my-markdown-textarea
-            name="instanceCustomHomepageContent" formControlName="content"
+            inputId="instanceCustomHomepageContent" formControlName="content"
             [customMarkdownRenderer]="getCustomMarkdownRenderer()" [debounceTime]="500"
             [formError]="formErrors['instanceCustomHomepage.content']"
             dir="ltr"
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-instance-information.component.html b/client/src/app/+admin/config/edit-custom-config/edit-instance-information.component.html
index 4a886c7fb..d96240339 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-instance-information.component.html
+++ b/client/src/app/+admin/config/edit-custom-config/edit-instance-information.component.html
@@ -65,7 +65,7 @@
           </div>
 
           <my-markdown-textarea
-            name="instanceDescription" formControlName="description"
+            inputId="instanceDescription" formControlName="description"
             [customMarkdownRenderer]="getCustomMarkdownRenderer()" [debounceTime]="500"
             [formError]="formErrors['instance.description']"
           ></my-markdown-textarea>
@@ -152,7 +152,7 @@
           <label i18n for="instanceTerms">Terms</label><my-help helpType="markdownText"></my-help>
 
           <my-markdown-textarea
-            name="instanceTerms" formControlName="terms" markdownType="enhanced"
+            inputId="instanceTerms" formControlName="terms" markdownType="enhanced"
             [formError]="formErrors['instance.terms']"
           ></my-markdown-textarea>
         </div>
@@ -161,7 +161,7 @@
           <label i18n for="instanceCodeOfConduct">Code of conduct</label><my-help helpType="markdownText"></my-help>
 
           <my-markdown-textarea
-            name="instanceCodeOfConduct" formControlName="codeOfConduct" markdownType="enhanced"
+            inputId="instanceCodeOfConduct" formControlName="codeOfConduct" markdownType="enhanced"
             [formError]="formErrors['instance.codeOfConduct']"
           ></my-markdown-textarea>
         </div>
@@ -171,7 +171,7 @@
           <div i18n class="label-small-info">Who moderates the instance? What is the policy regarding NSFW videos? Political videos? etc</div>
 
           <my-markdown-textarea
-            name="instanceModerationInformation" formControlName="moderationInformation" markdownType="enhanced"
+            inputId="instanceModerationInformation" formControlName="moderationInformation" markdownType="enhanced"
             [formError]="formErrors['instance.moderationInformation']"
           ></my-markdown-textarea>
         </div>
@@ -191,7 +191,7 @@
           <div i18n class="label-small-info">A single person? A non-profit? A company?</div>
 
           <my-markdown-textarea
-            name="instanceAdministrator" formControlName="administrator" markdownType="enhanced"
+            inputId="instanceAdministrator" formControlName="administrator" markdownType="enhanced"
             [formError]="formErrors['instance.administrator']"
           ></my-markdown-textarea>
         </div>
@@ -201,7 +201,7 @@
           <div i18n class="label-small-info">To share your personal videos? To open registrations and allow people to upload what they want?</div>
 
           <my-markdown-textarea
-            name="instanceCreationReason" formControlName="creationReason" markdownType="enhanced"
+            inputId="instanceCreationReason" formControlName="creationReason" markdownType="enhanced"
             [formError]="formErrors['instance.creationReason']"
           ></my-markdown-textarea>
         </div>
@@ -211,7 +211,7 @@
           <div i18n class="label-small-info">It's important to know for users who want to register on your instance</div>
 
           <my-markdown-textarea
-            name="instanceMaintenanceLifetime" formControlName="maintenanceLifetime" markdownType="enhanced"
+            inputId="instanceMaintenanceLifetime" formControlName="maintenanceLifetime" markdownType="enhanced"
             [formError]="formErrors['instance.maintenanceLifetime']"
           ></my-markdown-textarea>
         </div>
@@ -221,7 +221,7 @@
           <div i18n class="label-small-info">With your own funds? With user donations? Advertising?</div>
 
           <my-markdown-textarea
-            name="instanceBusinessModel" formControlName="businessModel" markdownType="enhanced"
+            inputId="instanceBusinessModel" formControlName="businessModel" markdownType="enhanced"
             [formError]="formErrors['instance.businessModel']"
           ></my-markdown-textarea>
         </div>
@@ -241,7 +241,7 @@
           <div i18n class="label-small-info">i.e. 2vCore 2GB RAM, a direct the link to the server you rent, etc.</div>
 
           <my-markdown-textarea
-            name="instanceHardwareInformation" formControlName="hardwareInformation" markdownType="enhanced"
+            inputId="instanceHardwareInformation" formControlName="hardwareInformation" markdownType="enhanced"
             [formError]="formErrors['instance.hardwareInformation']"
           ></my-markdown-textarea>
         </div>
diff --git a/client/src/app/+manage/video-channel-edit/video-channel-edit.component.html b/client/src/app/+manage/video-channel-edit/video-channel-edit.component.html
index 97edeee84..58d1cf2f5 100644
--- a/client/src/app/+manage/video-channel-edit/video-channel-edit.component.html
+++ b/client/src/app/+manage/video-channel-edit/video-channel-edit.component.html
@@ -70,7 +70,7 @@
           ></my-help>
 
           <my-markdown-textarea
-            id="support" formControlName="support" class="d-block"
+            inputId="support" formControlName="support" class="d-block"
             markdownType="enhanced" [formError]="formErrors['support']"
           ></my-markdown-textarea>
         </div>
diff --git a/client/src/app/+my-library/my-video-playlists/my-video-playlist-edit.component.html b/client/src/app/+my-library/my-video-playlists/my-video-playlist-edit.component.html
index 5ee74e6b1..7299e17d6 100644
--- a/client/src/app/+my-library/my-video-playlists/my-video-playlist-edit.component.html
+++ b/client/src/app/+my-library/my-video-playlists/my-video-playlist-edit.component.html
@@ -54,7 +54,7 @@
 
       <div class="form-group">
         <label i18n for="description">Description</label><my-help helpType="markdownText"></my-help>
-        <my-markdown-textarea id="description" formControlName="description" [formError]="formErrors['description']"></my-markdown-textarea>
+        <my-markdown-textarea inputId="description" formControlName="description" [formError]="formErrors['description']"></my-markdown-textarea>
       </div>
 
       <div class="form-group">
diff --git a/client/src/app/+videos/+video-edit/shared/video-edit.component.html b/client/src/app/+videos/+video-edit/shared/video-edit.component.html
index c5d0c157c..3449839b2 100644
--- a/client/src/app/+videos/+video-edit/shared/video-edit.component.html
+++ b/client/src/app/+videos/+video-edit/shared/video-edit.component.html
@@ -54,6 +54,7 @@
               </my-help>
 
               <my-markdown-textarea
+                inputId="description"
                 formControlName="description" [markdownVideo]="publishedVideo"
                 [formError]="formErrors.description" truncateTo3Lines="true" withEmoji="true"
               ></my-markdown-textarea>
@@ -395,6 +396,7 @@
 
             <div class="form-group">
               <label i18n for="support">Support</label>
+
               <my-help helpType="markdownEnhanced">
                 <ng-template ptTemplate="preHtml">
                   <ng-container i18n>
@@ -404,7 +406,7 @@
               </my-help>
 
               <my-markdown-textarea
-                id="support" formControlName="support" markdownType="enhanced"
+                inputId="support" formControlName="support" markdownType="enhanced"
                 [formError]="formErrors['support']"
               ></my-markdown-textarea>
             </div>
@@ -440,7 +442,7 @@
               </div>
 
               <p-calendar
-                id="originallyPublishedAt" formControlName="originallyPublishedAt" [dateFormat]="calendarDateFormat" [firstDayOfWeek]="0"
+                inputId="originallyPublishedAt" formControlName="originallyPublishedAt" [dateFormat]="calendarDateFormat" [firstDayOfWeek]="0"
                 [showTime]="true" [hideOnDateTimeSelect]="true" [monthNavigator]="true" [yearNavigator]="true" [yearRange]="myYearRange"
               >
               </p-calendar>
diff --git a/client/src/app/shared/shared-forms/dynamic-form-field.component.html b/client/src/app/shared/shared-forms/dynamic-form-field.component.html
index d447395ce..5b10bf335 100644
--- a/client/src/app/shared/shared-forms/dynamic-form-field.component.html
+++ b/client/src/app/shared/shared-forms/dynamic-form-field.component.html
@@ -28,13 +28,13 @@
 
   <my-markdown-textarea
     *ngIf="setting.type === 'markdown-text'"
-    markdownType="text" [id]="setting.name" [formControlName]="setting.name"
+    markdownType="text" [inputId]="setting.name" [formControlName]="setting.name"
     [formError]="formErrors['settings.name']"
   ></my-markdown-textarea>
 
   <my-markdown-textarea
     *ngIf="setting.type === 'markdown-enhanced'"
-    markdownType="enhanced" [id]="setting.name" [formControlName]="setting.name"
+    markdownType="enhanced" [inputId]="setting.name" [formControlName]="setting.name"
     [formError]="formErrors['settings.name']"
   ></my-markdown-textarea>
 
diff --git a/client/src/app/shared/shared-forms/markdown-textarea.component.html b/client/src/app/shared/shared-forms/markdown-textarea.component.html
index 8a4877bd8..c120e9d38 100644
--- a/client/src/app/shared/shared-forms/markdown-textarea.component.html
+++ b/client/src/app/shared/shared-forms/markdown-textarea.component.html
@@ -4,7 +4,7 @@
     [(ngModel)]="content" (ngModelChange)="onModelChange()"
     class="form-control" [ngClass]="{ 'input-error': formError }"
     [attr.disabled]="disabled || null"
-    [id]="name" [name]="name" [dir]="dir">
+    [id]="inputId" [name]="inputId" [dir]="dir">
   </textarea>
 
   <div ngbNav #nav="ngbNav" class="nav-pills nav-preview">
diff --git a/client/src/app/shared/shared-forms/markdown-textarea.component.ts b/client/src/app/shared/shared-forms/markdown-textarea.component.ts
index d334cb4a4..2e1e5899a 100644
--- a/client/src/app/shared/shared-forms/markdown-textarea.component.ts
+++ b/client/src/app/shared/shared-forms/markdown-textarea.component.ts
@@ -51,7 +51,7 @@ export class MarkdownTextareaComponent implements ControlValueAccessor, OnInit {
 
   @Input() markdownVideo: Video
 
-  @Input() name = 'description'
+  @Input({ required: true }) inputId: string
 
   @Input() dir: string
   @Input({ transform: booleanAttribute }) withEmoji = false