From 7bd55951f1ec87dc4582cee4a6eb0ea8f0ed6065 Mon Sep 17 00:00:00 2001
From: weko3-dev20 <47239695+weko3-dev20@users.noreply.github.com>
Date: Wed, 6 Oct 2021 16:42:42 +0700
Subject: [PATCH] Weko#28175: Fix responding to events that are not required by
 index editing.

---
 .../app/tree-list2/tree-list2.component.html  |  4 +--
 .../app/tree-list2/tree-list2.component.ts    | 28 ++++++++++---------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/app-tree-index-edit/src/app/tree-list2/tree-list2.component.html b/app-tree-index-edit/src/app/tree-list2/tree-list2.component.html
index 896f85f..dc24cf6 100644
--- a/app-tree-index-edit/src/app/tree-list2/tree-list2.component.html
+++ b/app-tree-index-edit/src/app/tree-list2/tree-list2.component.html
@@ -112,7 +112,7 @@ <h3 class="panel-title">{{langJson.Index_Edit[1]}}</h3>
                         <span class="input-group-addon">{{langJson.English[1]}}<span class="text-danger">＊</span></span>
                         <input type="text" class="form-control" id="inputTitle_en" placeholder="" [(ngModel)]="detailData.index_name_english">
                       </div>
-                      <span *ngIf="checkFlg" class="text-danger">英語で入力は必要です。</span>
+                      <span *ngIf="checkIndexNameFlg" class="text-danger">{{langJson.Required_Input[1]}}</span>
                     </div>
                   </div>
                 </div>
@@ -177,7 +177,7 @@ <h3 class="panel-title">{{langJson.Index_Edit[1]}}</h3>
                           <span class="input-group-addon">{{langJson.English[1]}}<span class="text-danger">＊</span></span>
                           <input type="text" class="form-control" id="indexLink_en" placeholder="" [(ngModel)]="detailData.index_link_name_english">
                         </div>
-                        <span *ngIf="checkFlg" class="text-danger">英語で入力は必要です。</span>
+                        <span *ngIf="checkIndexLinkFlg" class="text-danger">{{langJson.Required_Input[1]}}</span>
                       </div>
                   </div>
                 </div>
diff --git a/app-tree-index-edit/src/app/tree-list2/tree-list2.component.ts b/app-tree-index-edit/src/app/tree-list2/tree-list2.component.ts
index 5f1949e..ad28bd4 100644
--- a/app-tree-index-edit/src/app/tree-list2/tree-list2.component.ts
+++ b/app-tree-index-edit/src/app/tree-list2/tree-list2.component.ts
@@ -49,6 +49,9 @@ export class TreeList2Component implements OnInit {
     id: '',
     index_name: null,
     index_name_english: null,
+    index_link_name: null,
+    index_link_name_english: null,
+    index_link_enabled: false,
     comment: '',
     public_state: false,
     public_date: null,
@@ -149,14 +152,17 @@ export class TreeList2Component implements OnInit {
     Display: [],
     Del_Success: [],
     Add_Update_Success: [],
-    Err_File_Ext: []
+    Err_File_Ext: [],
+    Enter_Required_Fields: [],
+    Required_Input: []
   };
   public formData: FormData = new FormData();
   private imgSrc = '';
   private uploadFlg = false;
   private privousUploadFlg = false;
-  private checkFlg = false;
   public deleteFlg = false;
+  private checkIndexNameFlg= false;
+  private checkIndexLinkFlg= false;
 
   constructor(private treeList2Service: TreeList2Service) {
   }
@@ -354,7 +360,8 @@ export class TreeList2Component implements OnInit {
     $('input[name=uploadFile]').val('');
     this.selNodeId = e.node.id;
     this.uploadFlg = false;
-    this.checkFlg = false;
+    this.checkIndexNameFlg = false;
+    this.checkIndexLinkFlg = false;
     if (this.selNodeId != '0') {
       this.inputFlg = true;
       const modTreeDetailUrl = document.getElementById('mod_tree_detail').innerText + this.selNodeId;
@@ -397,9 +404,8 @@ export class TreeList2Component implements OnInit {
    */
   sendingdetail() {
     // ツリー詳細を編集＞サービスを呼び出す
-    this.checkFlg = this.inputCheck();
-    if (this.checkFlg) {
-      alert('必須入力項目を入力してください');
+    if (this.inputCheck()) {
+      alert(this.langJson.Enter_Required_Fields[1]);
       return;
     }
     if (!this.moreCheck()) {
@@ -708,13 +714,9 @@ export class TreeList2Component implements OnInit {
    * 入力チェック
    */
   inputCheck(): boolean {
-    let str = this.detailData.index_name_english;
-    str = str.replace(/(^\s*)|(\s*$)/g, '');
-    if (str == '') {
-      return true;
-    } else {
-      return false;
-    }
+    this.checkIndexNameFlg = this.detailData.index_name_english.trim() == '';
+    this.checkIndexLinkFlg = this.detailData.index_link_name_english.trim() == '';
+    return this.checkIndexNameFlg || this.checkIndexLinkFlg;
   }
 
   /**