Merge pull request #56 in DEC/decision-webui-dcm from ~ALAN/decision-webui-dcm:feature/10.0 to feature/10.0

* commit '6fdfcd4fa7d905742672f2b352765ba07d01aa34': fix: 更新i18n fix: DEC-9958 在操作数据连接之前，判断数据连接是否可用。
5 years ago · b0bfffa31d
10 changed files with 74 additions and 50 deletions
--- a/assets/scripts/dec.js
+++ b/assets/scripts/dec.js
@ -0,0 +1,23 @@
+window.DecCst = {
+    ErrorCode: {
+      CONNECTION_DELETED: '21300035',
+      CONNECTION_UNDER_EDIT: '21300034',
+    },
+    Connect: {
+      ConnectionType: {
+        JDBC: 'jdbc',
+        JNDI: 'jndi',
+      },
+      EditStatusEvent: {
+        OPEN: 'getConnectionStatus',
+        SHUTDOWN: 'shutdownConnectionStatus',
+      }
+    }
+};
+
+window.Dec = {
+    fineServletURL: '/webroot/decision',
+    socket: {
+        connected: false,
+    },
+}
--- a/i18n/zh_cn.properties
+++ b/i18n/zh_cn.properties
@ -105,6 +105,7 @@ Dec-Dcm_Socket_Unable_Connect= Socket未连接，可能存在多人同时编辑
 Dec-Dcm_Connection_HW_DWS=华为云DWS
 Dec-Dcm_Connection_Lack_Driver=未找到“{R1}”驱动。
 Dec-Dcm_Connection_Download_Driver=下载对应驱动
+Dec-Dec_Connection_Deleted=该数据连接已被删除，无法进行操作

 BI-Multi_Date_Quarter_End= 季度末
 BI-Multi_Date_Month_Begin= 月初
--- a/index.html
+++ b/index.html
@ -22,16 +22,13 @@
      href="./node_modules/fineui-materials/docs/materials.css"
    />
  </head>
-  <script>
-    var DecCst = null;
-    var Dec = null;
-  </script>

  <body id="body">
    <div id="wrapper"></div>
    <script src="./node_modules/fineui/dist/fineui.js"></script>
    <script src="./node_modules/fineui/i18n/i18n.cn.js"></script>
    <script src="./node_modules/fineui-materials/docs/materials.js"></script>
+    <script src="./assets/scripts/dec.js"></script>
    <script src="./redis.js"></script>
  </body>
 </html>
--- a/private/i18n.ts
+++ b/private/i18n.ts
@ -104,6 +104,7 @@ export default {
    'Dec-Dcm_Connection_HW_DWS': '华为云DWS',
    'Dec-Dcm_Connection_Lack_Driver': '未找到“{R1}”驱动。',
    'Dec-Dcm_Connection_Download_Driver': '下载对应驱动',
+    'Dec-Dec_Connection_Deleted': '该数据连接已被删除，无法进行操作',
    'BI-Multi_Date_Quarter_End': '季度末',
    'BI-Multi_Date_Month_Begin': '月初',
    'BI-Multi_Date_YMD': '年月日',
--- a/src/modules/constants/constant.ts
+++ b/src/modules/constants/constant.ts
@ -28,7 +28,7 @@ export const DATA_BASE_TYPES_OTHER =
    hasSchema: true,
    kerberos: false,
 };
-export const DATA_BASE_DRIVER_LINK = DecCst ? [
+export const DATA_BASE_DRIVER_LINK = DecCst && DecCst.Hyperlink ? [
    {
        databaseType: 'ads',
        link: DecCst.Hyperlink.Database.ADS,
--- a/src/modules/constants/env.ts
+++ b/src/modules/constants/env.ts
@ -1,14 +1,13 @@
-const fineServletURL = Dec ? Dec.fineServletURL : '/webroot/decision';
+const fineServletURL = Dec.fineServletURL;
 export const ReqPrefix = `${fineServletURL}/v10/config/connection`;
 export const ImgPrefix = `${fineServletURL}/resources?path=/com/fr/web/resources/dist/images/2x/icon/database/`;
 export const PluginImgPrefix = `${fineServletURL}/resources?path=`;

-export const connectionType = DecCst ? DecCst.Connect.ConnectionType : {
-    JDBC: 'jdbc',
-    JNDI: 'jndi',
-};
+export const connectionType = DecCst.Connect.ConnectionType;

-export const editStatusEvent = DecCst ? DecCst.Connect.EditStatusEvent : {
-    OPEN: 'getConnectionStatus',
-    SHUTDOWN: 'shutdownConnectionStatus',
-};
+export const editStatusEvent = DecCst.Connect.EditStatusEvent;
+
+export const errorCode: {
+    CONNECTION_DELETED: string;
+    CONNECTION_UNDER_EDIT: string;
+} = DecCst.ErrorCode;
--- a/src/modules/crud/decision.api.ts
+++ b/src/modules/crud/decision.api.ts
@ -1,7 +1,7 @@
 import { Api } from './api';
 import { Connection, TestRequest, ConnectionPoolType, SocketResult } from './crud.typings';
 import { requestGet, requestDelete, requestPost, requestPut } from './crud.service';
-import { editStatusEvent } from '@constants/env';
+import { editStatusEvent, errorCode } from '@constants/env';

 export class DecisionApi implements Api {
    isDec = true;
@ -49,7 +49,28 @@ export class DecisionApi implements Api {
    }

    getConnectionStatus(name: string): Promise<SocketResult> {
-        return this.sendEditStatusEvent(name, editStatusEvent.OPEN);
+        return this.sendEditStatusEvent(name, editStatusEvent.OPEN).then(re => {
+            if (re.errorCode) {
+                let errorMessage = '';
+                switch (re.errorCode) {
+                    case errorCode.CONNECTION_DELETED:
+                        errorMessage = 'Dec-Dec_Connection_Deleted';
+                        break;
+                    case errorCode.CONNECTION_UNDER_EDIT:
+                        errorMessage = 'Dec-Dcm_Connection_Is_Using';
+                        break;
+                    default:
+                        errorMessage = re.errorMsg;
+                        break;
+                }
+                BI.Msg.toast(BI.i18nText(errorMessage, re.errorMsg), {
+                    level: 'error',
+                });
+                throw re;
+            } else {
+                return re;
+            }
+        });
    }

    shutdownConnectionStatus(name: string): Promise<SocketResult> {
--- a/src/modules/pages/connection/connection.ts
+++ b/src/modules/pages/connection/connection.ts
@ -104,15 +104,10 @@ export class Connection extends BI.Widget {
                                            },
                                            handler: () => {
                                                this.store.getConnectionStatus().then(re => {
-                                                    if (re.data && re.data === 'success') {
-                                                        this.store.setPageIndex(PAGE_INDEX.MAINTAIN);
-                                                        this.store.setDatebaseTypeSelected('');
-                                                    } else {
-                                                        BI.Msg.toast(BI.i18nText('Dec-Dcm_Connection_Is_Using', re.errorMsg), {
-                                                            level: 'error',
-                                                        });
-                                                    }
-                                                });
+                                                    this.store.setPageIndex(PAGE_INDEX.MAINTAIN);
+                                                    this.store.setDatebaseTypeSelected('');
+                                                })
+                                                    .catch(() => {});
                                            },
                                        },
                                    ],
--- a/src/modules/pages/connection/list/list_item/list_item.model.ts
+++ b/src/modules/pages/connection/list/list_item/list_item.model.ts
@ -31,14 +31,11 @@ export class ListItemModel extends Model<{
        },
        deleteConnection: (name: string) => {
            api.getConnectionStatus(name).then(re => {
-                if (re.data && re.data === 'success') {
-                    this.removeConnection(name);
-                } else {
-                    BI.Msg.toast(BI.i18nText('Dec-Dcm_Connection_Is_Using', re.errorMsg), {
-                        level: 'error',
-                    });
-                }
-            });
+                this.removeConnection(name);
+            })
+                .catch(() => {
+
+                });
        },
        setPageIndex: (pageIndex: string) => {
            this.model.pageIndex = pageIndex;
@ -52,14 +49,9 @@ export class ListItemModel extends Model<{
        setIsEdit: (isEdit: boolean, name: string) => {
            if (isEdit) {
                api.getConnectionStatus(name).then(re => {
-                    if (re.data && re.data === 'success') {
-                        this.model.isEdit = true;
-                    } else {
-                        BI.Msg.toast(BI.i18nText('Dec-Dcm_Connection_Is_Using', re.errorMsg), {
-                            level: 'error',
-                        });
-                    }
-                });
+                    this.model.isEdit = true;
+                })
+                    .catch(() => {});
            } else {
                api.shutdownConnectionStatus(name);
                this.model.isEdit = false;
--- a/src/modules/pages/connection/list/list_item/list_item.ts
+++ b/src/modules/pages/connection/list/list_item/list_item.ts
@ -243,15 +243,10 @@ export class ListItem extends BI.BasicButton {
            edit: () => {
                this.store.setConnectionSelected(name);
                this.store.getConnectionStatus().then(re => {
-                    if (re.data && re.data === 'success') {
-                        this.store.setPageIndex(PAGE_INDEX.MAINTAIN);
-                        this.store.setDatebaseTypeSelected('');
-                    } else {
-                        BI.Msg.toast(BI.i18nText('Dec-Dcm_Connection_Is_Using', re.errorMsg), {
-                            level: 'error',
-                        });
-                    }
-                });
+                    this.store.setPageIndex(PAGE_INDEX.MAINTAIN);
+                    this.store.setDatebaseTypeSelected('');
+                })
+                    .catch(() => {});
            },
            changeName: () => {
                this.store.setIsEdit(true, name);