Merge pull request #8881 in DEC/decision-webui-dcm from release/10.0 to bugfix/10.0

* commit '7b975aafcd3249d95c8a75240054332d1d37ce99':

package.json

@@ -16,7 +16,7 @@
     "nprogress": "0.2.0"
   },
   "devDependencies": {
-    "@fui/babel-preset-fineui": "^1.0.0",
+    "@fui/babel-preset-fineui": "^3.0.1",
     "@types/jest": "24.0.11",
     "@typescript-eslint/eslint-plugin": "1.7.0",
     "@typescript-eslint/parser": "1.7.0",
@@ -66,5 +66,8 @@
     "i18n": "node ./lib/transform-i18n/transform-i18n.js",
     "test": "jest --passWithNoTests",
     "upgrade": "node lib/upgrade"
+  },
+  "overrides": {
+    "@babel/traverse": "7.22.6"
   }
 }

src/modules/app.provider.ts

@@ -16,7 +16,7 @@ BI.provider('dec.connection.provider.datebase', function() {
             };
         }
     
-        const greenplumUrl = url.match(/^jdbc:(pivotal:greenplum):(thin:([0-9a-zA-Z/]*)?@\/\/|\/\/|)([0-9a-zA-Z_\\.-]+)(:([0-9|port]+))?(\/|;)([^]+)(.*)/i);
+        const greenplumUrl = url.match(/^jdbc:(pivotal:greenplum):(thin:([0-9a-zA-Z/]*)?@\/\/|\/\/|)([0-9a-zA-Z_\\.-]+)(:([0-9|port]+))?(\/|;DatabaseName=)?([^]+)(.*)/i);
         if (greenplumUrl) {
             return {
                 host: greenplumUrl[4],
@@ -25,7 +25,7 @@ BI.provider('dec.connection.provider.datebase', function() {
                 urlInfo: greenplumUrl[9],
             };
         }
-        const result = url.match(/^jdbc:(mysql|sqlserver|db2|impala|kylin|phoenix|derby|gbase|gbasedbt-sqli|informix-sqli|h2|postgresql|hive2|vertica|kingbase|presto|redshift|postgresql|clickhouse):(thin:([0-9a-zA-Z/]*)?@|thin:([0-9a-zA-Z/]*)?@\/\/|\/\/|)([0-9a-zA-Z_\\.-]+)(:([0-9|port]+))?(\/|;DatabaseName=)?([^]+)?(.*)/i);
+        const result = url.match(/^jdbc:(mysql|sqlserver|db2|impala|kylin|phoenix|derby|gbase|gbasedbt-sqli|informix-sqli|h2|postgresql|hive2|vertica|kingbase|presto|redshift|postgresql|clickhouse|trino):(thin:([0-9a-zA-Z/]*)?@|thin:([0-9a-zA-Z/]*)?@\/\/|\/\/|)([0-9a-zA-Z_\\.-]+)(:([0-9|port]+))?(\/|;DatabaseName=)?([^]+)?(.*)/i);
         if (result) {
             return {
                 host: result[5],

src/modules/app.service.ts

@@ -66,6 +66,14 @@ export function splitUrl(host: string, port: string, database: string, baseUrl:
         return baseUrl.replace('hostname', host).replace(':port', port ? `:${port}` : '')
             .replace('=database', `=${database}`);
     }
+
+    // https://work.fineres.com/browse/REPORT-72078
+    if (baseUrl.startsWith('jdbc:informix-sqli')) {
+        return baseUrl.replace('hostname', host)
+        .replace(':port', port ? `:${port}` : '')
+        .replace('database', database)
+        .replace(':INFORMIXSERVER={server}','');
+    }
     
     return baseUrl.replace('hostname', host).replace(':port', port ? `:${port}` : '')
         .replace('database', database)

src/modules/components/test_status/test_status.ts

@@ -29,6 +29,7 @@ export class TestStatus extends BI.Widget {
     failDriverMessage: Label;
     driverLink: FloatLeftLayout;
     detail: VerticalLayout;
+    failMaskers:any;
 
     watch = {
         status: (status: string) => {
@@ -38,7 +39,7 @@ export class TestStatus extends BI.Widget {
 
     render() {
         const { loadingCls, loadingText, successCls, successText, failCls, failText, retryText } = this.options;
-
+        var self=this;
         return {
             type: BI.CenterAdaptLayout.xtype,
             cls: 'bi-z-index-mask',
@@ -51,7 +52,7 @@ export class TestStatus extends BI.Widget {
                             cls: 'bi-card',
                             width: 450,
                             height: 250,
-                            single: true,
+                            // single: true,
                             showIndex: this.model.status,
                             ref: (_ref: Tab) => {
                                 this.tab = _ref;
@@ -70,6 +71,12 @@ export class TestStatus extends BI.Widget {
                                             tipCls: failCls,
                                             tipText: failText,
                                             retryText,
+                                            ref:(_ref:any)=>{
+                                                self.failMaskers=_ref;
+                                                if(this.failMessage.getText()===''){
+                                                    this.failMaskers.populateFail(BI.i18nText("Dec-Conn-ect-Failed"),false);
+                                                }
+                                            },
                                             listeners: [
                                                 {
                                                     eventName: TipFail.EVENT_RELOAD,
@@ -168,7 +175,7 @@ export class TestStatus extends BI.Widget {
         this.store.setStatus(TEST_STATUS.SUCCESS);
     }
 
-    setFail(message: string, driver = '', link = '') {
+    setFail(message: string='', driver = '', link = '') {
         this.store.setStatus(TEST_STATUS.FAIL);
         this.failMessage.setText(message);
         this.failDriverMessage.setVisible(!!driver);

src/modules/components/test_status/tip_icon/tip_fail.ts

@@ -1,5 +1,5 @@
 import { shortcut, store } from '@core/core';
-import { Button } from '@fui/core';
+import { Button, Label } from '@fui/core';
 import { TipFailModel } from './tip_fail.model';
 
 @shortcut()
@@ -21,7 +21,7 @@ export class TipFail extends BI.Widget {
     store: TipFailModel['store'];
 
     detailButton: Button;
-
+    failText:Label;
     watch = {
         isCollapse: (isCollapse: boolean) => {
             this.detailButton.setText(isCollapse ?
@@ -29,6 +29,10 @@ export class TipFail extends BI.Widget {
                 BI.i18nText('Dec-Dcm_Connection_Detailed_Information'));
         },
     }
+    populateFail(text:string,isVisible:boolean){
+        this.failText.setText(text);
+        this.detailButton.setVisible(isVisible);
+    }
 
     render() {
         const { tipCls, tipText, retryText } = this.options;
@@ -53,6 +57,9 @@ export class TipFail extends BI.Widget {
                             height: 14,
                             bgap: 10,
                             text: tipText,
+                            ref:(_ref:Label)=>{
+                                this.failText=_ref;
+                            }
                         },
                         {
                             type: BI.VerticalAdaptLayout.xtype,

src/modules/constants/constant.ts

@@ -537,7 +537,7 @@ export const DATA_BASE_TYPES = [
         kerberos: false,
         urls: {
             'org.postgresql.Driver': 'jdbc:postgresql://hostname:port/dbname',
-            'com.pivotal.jdbc.GreenplumDriver': 'jdbc:pivotal:greenplum://hostname:port;dbname',
+            'com.pivotal.jdbc.GreenplumDriver': 'jdbc:pivotal:greenplum://hostname:port;DatabaseName=dbname',
         },
     }, {
         text: 'Postgresql',
@@ -670,6 +670,41 @@ export const DATA_BASE_TYPES = [
             'org.sqlite.JDBC': 'jdbc:sqlite:[PATH_TO_DB_FILES]',
         },
     },
+    {
+        text: 'trino',
+        databaseType: 'trino',
+        driver: 'io.trino.jdbc.TrinoDriver',
+        url: 'jdbc:trino://hostname:port/database',
+        commonly: false,
+        internal: true,
+        type: 'jdbc',
+        hasSchema: true,
+        kerberos: false,
+    }, 
+    {
+        text: BI.i18nText('Dec-Dcm_Connection_TDSQL'),
+        databaseType: 'tdsql',
+        driver: 'org.postgresql.Driver',
+        url: 'jdbc:postgresql://hostname:port/database',
+        commonly: false,
+        internal: true,
+        type: 'jdbc',
+        hasSchema: true,
+        kerberos: false,
+        fetchSize: 10000,
+    },
+    {
+        text: BI.i18nText('StarRocks'),
+        databaseType: 'starrocks',
+        driver: 'com.mysql.jdbc.Driver',
+        drivers: ['com.mysql.jdbc.Driver'],
+        url: 'jdbc:mysql://hostname:port/database',
+        commonly: false,
+        internal: true,
+        type: 'jdbc',
+        hasSchema: false,
+        kerberos: false,
+    }
 ];
 
 

src/modules/pages/maintain/forms/form.server.ts

@@ -20,6 +20,10 @@ export function testConnection(value: Connection): Promise<string[]> {
             const formValue = value;
             api.testConnection(formValue).then(re => {
                 if (re && re.errorCode) {
+                    if(re.errorCode === DecCst.ErrorCode.NO_IP_AUTHORIZED){
+                        testStatus.setFail();
+                        return;
+                    }
                 // 判断是否是缺少驱动，如果缺少驱动则显示下载驱动的连接
                     if (api.isDriverError(re.errorCode)) {
                         if (formValue.connectionType === connectionType.JDBC) {

src/modules/pages/maintain/forms/form.ts

@@ -38,6 +38,11 @@ export class MaintainForm extends BI.Widget {
                 value.creator = BI.get(this.getFormData(), 'creator');
                 this.store.updateConnection(this.connectionName, value).then(result => {
                     if (result.errorCode) {
+                        if(result.errorCode === DecCst.ErrorCode.NO_IP_AUTHORIZED){
+                            BI.Msg.toast(BI.i18nText("Dec-Basic_Save_Fail"),{
+                                level: "error",
+                            });
+                        }
                         this.showError(result);
 
                         return;
@@ -253,6 +258,11 @@ export class MaintainForm extends BI.Widget {
     private addConnection(form: Connection) {
         this.store.addConnection(form).then(result => {
             if (result.errorCode) {
+                if(result.errorCode === DecCst.ErrorCode.NO_IP_AUTHORIZED){
+                    BI.Msg.toast(BI.i18nText("Dec-Basic_Save_Fail"),{
+                        level: "error",
+                    });
+                }
                 if (result.errorCode === errorCode.DUPLICATE_NAMES) {
                     if (form.connectionType !== connectionType.JDBC && form.connectionType !== connectionType.JNDI) {
                         // 如果不是jdbc或jndi，即如果是插件，名称重复的时候需要修改名字重新提交给后台