From 2c77fa9a4fb542c033b06b2f443b969809a20727 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 14 Feb 2025 17:15:42 +0800
Subject: [PATCH] * [misc] update system db status field.

---
 module/system/config/dtable.php  | 2 +-
 module/system/js/dblist.ui.js    | 2 +-
 module/system/lang/de.php        | 3 +++
 module/system/lang/en.php        | 3 +++
 module/system/lang/fr.php        | 3 +++
 module/system/lang/zh-cn.php     | 3 +++
 module/system/ui/dblist.html.php | 1 +
 7 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/module/system/config/dtable.php b/module/system/config/dtable.php
index 6a2194dbd5..bf29dd06b3 100644
--- a/module/system/config/dtable.php
+++ b/module/system/config/dtable.php
@@ -61,7 +61,7 @@ $config->system->dtable->dbList->fieldList['dbType']['group'] = 2;
 
 $config->system->dtable->dbList->fieldList['dbStatus']['title'] = $lang->system->dbStatus;
 $config->system->dtable->dbList->fieldList['dbStatus']['name']  = 'status';
-$config->system->dtable->dbList->fieldList['dbStatus']['map']   = $lang->instance->statusList;
+$config->system->dtable->dbList->fieldList['dbStatus']['map']   = $lang->system->runningStatus;
 
 $config->system->dtable->dbList->fieldList['actions']['name']  = 'actions';
 $config->system->dtable->dbList->fieldList['actions']['title'] = $lang->actions;
diff --git a/module/system/js/dblist.ui.js b/module/system/js/dblist.ui.js
index 6039bf2e9a..35764e2ce9 100644
--- a/module/system/js/dblist.ui.js
+++ b/module/system/js/dblist.ui.js
@@ -18,7 +18,7 @@ window.renderDbList = function (result, {col, row, value})
 {
     if(col.name === 'status')
     {
-        var statusClass = value == 'running' ? 'text-success' : '';
+        var statusClass = value == 'normal' ? 'text-success' : 'text-danger';
         result[0] = {html: '<span class="' + statusClass + '">' + result[0] + '</span>'};
         return result;
     }
diff --git a/module/system/lang/de.php b/module/system/lang/de.php
index d904098479..04a4a5b2cc 100644
--- a/module/system/lang/de.php
+++ b/module/system/lang/de.php
@@ -301,3 +301,6 @@ $lang->system->platform = new stdclass();
 $lang->system->platform->navs['dblist']     = 'Database';
 $lang->system->platform->navs['domainView'] = 'Domain';
 $lang->system->platform->navs['ossview']    = 'OSS';
+
+$lang->system->runningStatus['normal'] = 'Normal';
+$lang->system->runningStatus['error']  = 'Error';
diff --git a/module/system/lang/en.php b/module/system/lang/en.php
index d904098479..04a4a5b2cc 100644
--- a/module/system/lang/en.php
+++ b/module/system/lang/en.php
@@ -301,3 +301,6 @@ $lang->system->platform = new stdclass();
 $lang->system->platform->navs['dblist']     = 'Database';
 $lang->system->platform->navs['domainView'] = 'Domain';
 $lang->system->platform->navs['ossview']    = 'OSS';
+
+$lang->system->runningStatus['normal'] = 'Normal';
+$lang->system->runningStatus['error']  = 'Error';
diff --git a/module/system/lang/fr.php b/module/system/lang/fr.php
index d904098479..04a4a5b2cc 100644
--- a/module/system/lang/fr.php
+++ b/module/system/lang/fr.php
@@ -301,3 +301,6 @@ $lang->system->platform = new stdclass();
 $lang->system->platform->navs['dblist']     = 'Database';
 $lang->system->platform->navs['domainView'] = 'Domain';
 $lang->system->platform->navs['ossview']    = 'OSS';
+
+$lang->system->runningStatus['normal'] = 'Normal';
+$lang->system->runningStatus['error']  = 'Error';
diff --git a/module/system/lang/zh-cn.php b/module/system/lang/zh-cn.php
index a36733fcb2..61005056bc 100644
--- a/module/system/lang/zh-cn.php
+++ b/module/system/lang/zh-cn.php
@@ -301,3 +301,6 @@ $lang->system->platform = new stdclass();
 $lang->system->platform->navs['dblist']     = '数据库';
 $lang->system->platform->navs['domainView'] = '域名';
 $lang->system->platform->navs['ossview']    = '对象存储';
+
+$lang->system->runningStatus['normal'] = '正常';
+$lang->system->runningStatus['error']  = '异常';
diff --git a/module/system/ui/dblist.html.php b/module/system/ui/dblist.html.php
index 193c450bf0..43b74a0f95 100644
--- a/module/system/ui/dblist.html.php
+++ b/module/system/ui/dblist.html.php
@@ -14,6 +14,7 @@ include 'sidebar.html.php';
 $config->system->dtable->dbList->fieldList['actions']['list']['dblist']['url'] = 'javascript:manageDb("{name}", "{db_type}", "{namespace}")';
 
 $dbList = initTableData($dbList, $config->system->dtable->dbList->fieldList);
+foreach($dbList as $db) $db->status = empty($db->ready) ? 'error' : 'normal';
 
 dtable
 (