Skip to content

IGNITE-11711 Check availability of link UI element by link in list of… #6436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
vsisko wants to merge 1 commit into from
Closed

IGNITE-11711 Check availability of link UI element by link in list of… #6436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...uration/components/page-configure-advanced/components/cache-edit-form/templates/store.pug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down Expand Up @@ -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({
Expand Down
2 changes: 1 addition & 1 deletion ...onents/page-configure-advanced/components/cluster-edit-form/templates/checkpoint/jdbc.pug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down
2 changes: 1 addition & 1 deletion ...page-configure-advanced/components/cluster-edit-form/templates/general/discovery/jdbc.pug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?
8 changes: 4 additions & 4 deletions modules/web-console/frontend/app/configuration/services/Caches.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
8 changes: 4 additions & 4 deletions modules/web-console/frontend/app/configuration/services/Clusters.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down