@ -6,6 +6,10 @@ import { ConnectionJDBC } from 'src/modules/crud/crud.typings';
import { getAllDatabaseTypes , getJdbcDatabaseType , resolveUrlInfo } from '../../../app.service' ;
import { getAllDatabaseTypes , getJdbcDatabaseType , resolveUrlInfo } from '../../../app.service' ;
import { CONNECTION_LAYOUT } from '@constants/constant' ;
import { CONNECTION_LAYOUT } from '@constants/constant' ;
import { VerticalLayout } from '@fui/core' ;
import { VerticalLayout } from '@fui/core' ;
import { ApiFactory } from '../../../crud/apiFactory' ;
const api = new ApiFactory ( ) . create ( ) ;
@shortcut ( )
@shortcut ( )
@store ( ConnectionJdecModel )
@store ( ConnectionJdecModel )
export class ConnectionJdbc extends BI . Widget {
export class ConnectionJdbc extends BI . Widget {
@ -21,7 +25,7 @@ export class ConnectionJdbc extends BI.Widget {
const databaseType = getJdbcDatabaseType ( database , driver ) ;
const databaseType = getJdbcDatabaseType ( database , driver ) ;
const { host , port , databaseName } = resolveUrlInfo ( url , database ) ;
const { host , port , databaseName } = resolveUrlInfo ( url , database ) ;
const { hgap , vgap } = CONNECTION_LAYOUT ;
const { hgap , vgap } = CONNECTION_LAYOUT ;
return {
return {
type : BI . VerticalLayout . xtype ,
type : BI . VerticalLayout . xtype ,
hgap ,
hgap ,
@ -132,7 +136,7 @@ export class ConnectionJdbc extends BI.Widget {
{
{
type : FormItem . xtype ,
type : FormItem . xtype ,
name : BI.i18nText ( 'Dec-Dcm_Connection_Form_Database_Validation_Query' ) ,
name : BI.i18nText ( 'Dec-Dcm_Connection_Form_Database_Validation_Query' ) ,
value : connectionPoolAttr.validationQuery ,
value : api.getPlain ( connectionPoolAttr . validationQuery || '' ) ,
} ,
} ,
{
{
type : FormItem . xtype ,
type : FormItem . xtype ,