From d64be94d8d63d4d26850310b7f3676feb3175d0e Mon Sep 17 00:00:00 2001
From: "shimoda.m@nds-tyo.co.jp" <shimoda.m@nds-tyo.co.jp>
Date: Thu, 5 Oct 2023 09:43:26 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20API=E5=8C=96=E3=81=AB=E4=BC=B4=E3=81=84?=
 =?UTF-8?q?=E3=80=81=E3=82=A8=E3=83=A9=E3=83=BC=E3=83=8F=E3=83=B3=E3=83=89?=
 =?UTF-8?q?=E3=83=AA=E3=83=B3=E3=82=B0=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/templates/bioSearchList.html          | 43 ++++++++++++++-----
 1 file changed, 32 insertions(+), 11 deletions(-)

diff --git a/ecs/jskult-webapp/src/templates/bioSearchList.html b/ecs/jskult-webapp/src/templates/bioSearchList.html
index 6fb17189..dd0afb36 100644
--- a/ecs/jskult-webapp/src/templates/bioSearchList.html
+++ b/ecs/jskult-webapp/src/templates/bioSearchList.html
@@ -225,7 +225,7 @@
                 success: function(data) {
                     try {
                         if (data.status === 'batch_processing') {
-                            location.href='/logout/?reason=batchProcessing';
+                            location.href='/logout/?reason=batch_processing';
                             return
                         }
 
@@ -290,15 +290,16 @@
             }
             console.log(bioHiddenForm[elem.name].value)
         }
-        // <! --ページネーションの作成-- >
 
+        // 生物由来データの検索＆ページネーションの作成
         function searchBioList() {
             const messageArea = $('#message_area')
             messageArea.text('')
-            const loading = new Loading();
+            messageArea.hide()
+            const loading = new Loading()
             const searchParams = createSearchParams()
             $('.pagination').pagination({
-                dataSource: '/bio/BioSearchListAjax',
+                dataSource: '/bio/search',
                 locator: 'data',
                 totalNumberLocator: function(response) {
                     // you can return totalNumber by analyzing response content
@@ -321,14 +322,32 @@
                     }
                 },
                 formatAjaxError: function(jqXHR, textStatus, errorThrown) {
-                    loading.stop();
-                    $(`#ErrorModal_Unexpected`).modal('toggle');
+                    loading.stop()
+                    const responseJson = jqXHR.responseJSON
+
+                    if (!responseJson) {
+                        $(`#ErrorModal_Unexpected`).modal('toggle')
+                        return
+                    }
+
+                    const status = responseJson?.status
+                    if (status === 'batch_processing') {
+                        location.href='/logout/?reason=batch_processing';
+                        return
+                    }
+
+                    if (status === 'session_expired') {
+                        location.href='/logout/?reason=session_expired';
+                        return
+                    }
+
                 },
                 callback: function(data, pagination) {
                     $('#result_data').html('')
                     if (pagination.totalNumber === 0) {
-                        loading.stop();
+                        loading.stop()
                         messageArea.text('対象のデータが存在しません')
+                        messageArea.show()
                         $('.pagination').pagination('hide')
                         $('#outExcel').attr('disabled', 'disabled')
                         $('#outCSV').attr('disabled', 'disabled')
@@ -336,16 +355,18 @@
                     }
 
                     if (pagination.totalNumber > bioDataOverflowMaxLength()) {
-                        loading.stop();
+                        loading.stop()
                         messageArea.text('検索結果が最大件数を超えました。検索条件を見直しして下さい。')
+                        messageArea.show()
                         $('.pagination').pagination('hide')
                         $('#outExcel').attr('disabled', 'disabled')
                         $('#outCSV').attr('disabled', 'disabled')
                         return
                     }
+                    messageArea.hide()
                     $('.pagination').pagination('show')
                     $('#result_data').html(pagination_content(data))
-                    loading.stop();
+                    loading.stop()
                     $('#outExcel').removeAttr('disabled')
                     $('#outCSV').removeAttr('disabled')
                     $('.paginationjs-pages > ul > li').not('.disabled,.active').each(function(index, val) {
@@ -362,8 +383,8 @@
                         })
                     })
                     // ページ送りしたときにヘッダがずれるのを修正
-                    FixedMidashi.remove();
-                    FixedMidashi.create();
+                    FixedMidashi.remove()
+                    FixedMidashi.create()
                 }
             })
         }