You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2019/04/12 06:35:15 UTC
[ignite] branch master updated: IGNITE-11711 Web console: Fixed
visibility logic for "JDBC driver download link".
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 6fd5a76 IGNITE-11711 Web console: Fixed visibility logic for "JDBC driver download link".
6fd5a76 is described below
commit 6fd5a7622e3ad5e8c0b02a302b7a7a5d0d4dd007
Author: Vasiliy Sisko <vs...@gridgain.com>
AuthorDate: Fri Apr 12 13:34:42 2019 +0700
IGNITE-11711 Web console: Fixed visibility logic for "JDBC driver download link".
---
.../components/cache-edit-form/templates/store.pug | 4 ++--
.../components/cluster-edit-form/templates/checkpoint/jdbc.pug | 2 +-
.../cluster-edit-form/templates/general/discovery/jdbc.pug | 2 +-
modules/web-console/frontend/app/configuration/services/Caches.ts | 8 ++++----
.../web-console/frontend/app/configuration/services/Clusters.ts | 8 ++++----
5 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/store.pug b/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/store.pug
index b4baac5..42153d8 100644
--- a/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/store.pug
+++ b/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/store.pug
@@ -86,7 +86,7 @@ panel-collapsible(ng-form=form on-open=`ui.loadPanel('${form}')`)
change:`$ctrl.clearImplementationVersion(${pojoStoreFactory})`
})
.pc-form-grid-col-60(ng-if=`$ctrl.Caches.requiresProprietaryDrivers(${pojoStoreFactory})`)
- a.link-success(ng-href=`{{ $ctrl.Caches.JDBCDriverURL(${pojoStoreFactory}) }}` target='_blank')
+ a.link-success(ng-href=`{{ $ctrl.Caches.jdbcDriverURL(${pojoStoreFactory}) }}` target='_blank')
| Download JDBC drivers?
.pc-form-grid-col-30
+form-field__number({
@@ -223,7 +223,7 @@ panel-collapsible(ng-form=form on-open=`ui.loadPanel('${form}')`)
placeholder: 'Choose database'
})
.pc-form-grid-col-60(ng-if=`$ctrl.Caches.requiresProprietaryDrivers(${blobStoreFactory})`)
- a.link-success(ng-href=`{{ $ctrl.Caches.JDBCDriverURL(${blobStoreFactory}) }}` target='_blank')
+ a.link-success(ng-href=`{{ $ctrl.Caches.jdbcDriverURL(${blobStoreFactory}) }}` target='_blank')
| Download JDBC drivers?
.pc-form-grid-col-60
+form-field__checkbox({
diff --git a/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/checkpoint/jdbc.pug b/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/checkpoint/jdbc.pug
index ed5f148..945f54d 100644
--- a/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/checkpoint/jdbc.pug
+++ b/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/checkpoint/jdbc.pug
@@ -38,7 +38,7 @@ include /app/helpers/jade/mixins
placeholder: 'Choose JDBC dialect'
})
.pc-form-grid-col-60(ng-if='$ctrl.Clusters.requiresProprietaryDrivers($checkpointSPI.JDBC)')
- a.link-success(ng-href='{{ $ctrl.Clusters.JDBCDriverURL($checkpointSPI.JDBC) }}' target='_blank')
+ a.link-success(ng-href='{{ $ctrl.Clusters.jdbcDriverURL($checkpointSPI.JDBC) }}' target='_blank')
| Download JDBC drivers?
.pc-form-grid-col-60
+form-field__java-class({
diff --git a/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/jdbc.pug b/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/jdbc.pug
index a285408..e82814f 100644
--- a/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/jdbc.pug
+++ b/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/jdbc.pug
@@ -48,5 +48,5 @@ mixin discovery-jdbc(modelAt = '$ctrl.clonedCluster')
tip: 'Flag indicating whether DB schema should be initialized by Ignite or was explicitly created by user'
})
.pc-form-grid-col-30(ng-if=`$ctrl.Clusters.requiresProprietaryDrivers(${modelAt}.discovery.Jdbc)`)
- a.link-success(ng-href=`{{ $ctrl.Clusters.JDBCDriverURL(${modelAt}.discovery.Jdbc) }}` target='_blank')
+ a.link-success(ng-href=`{{ $ctrl.Clusters.jdbcDriverURL(${modelAt}.discovery.Jdbc) }}` target='_blank')
| Download JDBC drivers?
\ No newline at end of file
diff --git a/modules/web-console/frontend/app/configuration/services/Caches.ts b/modules/web-console/frontend/app/configuration/services/Caches.ts
index 8ee2b48..d1ea010 100644
--- a/modules/web-console/frontend/app/configuration/services/Caches.ts
+++ b/modules/web-console/frontend/app/configuration/services/Caches.ts
@@ -226,11 +226,11 @@ export default class Caches {
return cache && cache.cacheMode === 'PARTITIONED';
}
- requiresProprietaryDrivers(storeFactory) {
- return ['Oracle', 'DB2', 'SQLServer'].includes(get(storeFactory, 'dialect'));
+ jdbcDriverURL(storeFactory) {
+ return this.JDBC_LINKS[get(storeFactory, 'dialect')];
}
- JDBCDriverURL(storeFactory) {
- return this.JDBC_LINKS[get(storeFactory, 'dialect')];
+ requiresProprietaryDrivers(storeFactory) {
+ return !!this.jdbcDriverURL(storeFactory);
}
}
diff --git a/modules/web-console/frontend/app/configuration/services/Clusters.ts b/modules/web-console/frontend/app/configuration/services/Clusters.ts
index 5aaa3f1..ba6ddc6 100644
--- a/modules/web-console/frontend/app/configuration/services/Clusters.ts
+++ b/modules/web-console/frontend/app/configuration/services/Clusters.ts
@@ -226,12 +226,12 @@ export default class Clusters {
};
}
- requiresProprietaryDrivers(dataSrc) {
- return ['Oracle', 'DB2', 'SQLServer'].includes(get(dataSrc, 'dialect'));
+ jdbcDriverURL(dataSrc) {
+ return this.JDBC_LINKS[get(dataSrc, 'dialect')];
}
- JDBCDriverURL(dataSrc) {
- return this.JDBC_LINKS[get(dataSrc, 'dialect')];
+ requiresProprietaryDrivers(dataSrc) {
+ return !!this.jdbcDriverURL(dataSrc);
}
dataRegion = {