Skip to content

Commit c0f8fac

Browse files
authored
Merge pull request #76 from Landoop/fixes-for-debezium-connectors
Fixes for Debezium connectors
2 parents 629301b + 4283073 commit c0f8fac

File tree

3 files changed

+13
-9
lines changed

3 files changed

+13
-9
lines changed

src/kafka-connect/create-connector/create-connector.controller.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@ angularAPP.controller('CreateConnectorCtrl', function ($scope, $rootScope, $http
6969
var validConnectorConfigKeys = [];
7070
var requiredConfigKeys = [];
7171
angular.forEach(data.configs, function (config) {
72-
if (config.value.errors.length > 0) {
72+
if (data.error_count && config.value.errors.length > 0) {
7373
errorConfigs.push(config.value);
7474
$log.info(config.value.name + ' : ' + config.value.errors[0]);
7575
}
76-
if ( (config.definition.required == true) || ( (config.value.name.indexOf("topic") == 0) && (config.definition.documentation != "") ) ) {
76+
if ( ( config.definition && config.definition.required == true) || ( (config.value.name.indexOf("topic") == 0) && (config.definition.documentation != "") ) ) {
7777
requiredConfigKeys.push(config.value.name);
7878
}
7979
validConnectorConfigKeys.push(config.value.name);
@@ -150,7 +150,7 @@ angularAPP.controller('CreateConnectorCtrl', function ($scope, $rootScope, $http
150150
if (a[a.length-1].toLowerCase().indexOf('sink') > 0) {
151151
type="Sink";
152152
var myElements = [{key:'name',value: a[a.length-1], required: true}, {key:'connector.class', value: pluginClass, required: true},{key:'topics',value: 'TopicName_'+ a[a.length-1], required: true}, {key:'tasks.max',value: 1, required: true}];
153-
} else if (a[a.length-1].toLowerCase().indexOf('source') > 0) {
153+
} else {
154154
type="Source";
155155
var myElements = [{key:'name',value: a[a.length-1], required: true}, {key:'connector.class', value: pluginClass, required: true}, {key:'tasks.max',value: 1, required: true}];
156156
}
@@ -193,7 +193,8 @@ angularAPP.controller('CreateConnectorCtrl', function ($scope, $rootScope, $http
193193

194194
$http(request).then(function(data){
195195
angular.forEach(data.data.configs, function (config) {
196-
if (config.definition.name !== 'name' && config.definition.name !== 'connector.class' && config.definition.required == true) {
196+
197+
if (config.definition && config.definition.name !== 'name' && config.definition.name !== 'connector.class' && config.definition.required == true) {
197198
connector.template[0].sections[0].elements.push({
198199
key: config.definition.name,
199200
value: config.definition.default_value ? config.definition.default_value : '',
@@ -235,9 +236,10 @@ angularAPP.controller('CreateConnectorCtrl', function ($scope, $rootScope, $http
235236

236237
data.data.configs.forEach(function (config) {
237238
definition = config.definition;
239+
if(definition)
238240
name = definition.name;
239241

240-
if (angular.isUndefined($scope.model[name])) {
242+
if (definition && angular.isUndefined($scope.model[name])) {
241243
optionalConfig[name] = model[name] = definition.default_value ? definition.default_value : '';
242244
}
243245
});

src/kafka-connect/create-connector/create-connector.html

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,11 @@ <h3 ng-show="connector.type=='Sink'" style="font-size:12px;padding:0px; margin:0
7373
<div class="red" ng-messages="form.$error">
7474
<div ng-message="parse">Invalid syntax</div>
7575
</div>
76-
<div class="red" ng-repeat="errorConfig in errorConfigs">
77-
<div ng-bind="error" ng-repeat="error in errorConfig.errors"></div>
78-
</div>
76+
<div class="red" ng-repeat="errorConfig in errorConfigs">
77+
<div ng-repeat="error in errorConfig.errors track by $index">
78+
{{errorConfig.name ? '"' + errorConfig.name + '" : ' : ''}} {{error}}
79+
</div>
80+
</div>
7981
<div ng-repeat="warningConfig in warningConfigs">
8082
<div ng-repeat="warning in warningConfig.warnings" style="color: orange">
8183
{{warning}}<br>

src/kafka-connect/select-type/sink-or-source.controller.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ angularAPP.controller('SelectNewConnectorCtrl', function ($scope, $http, $log, $
3535
if(!plugin.type) {
3636
o.type = calcName.toLowerCase().indexOf('sink') > 0 ? 'Sink' : 'Source'
3737
} else {
38-
o.type = plugin.type.toLowerCase().indexOf('sink') > 0 ? 'Sink' : 'Source'
38+
o.type = plugin.type.toLowerCase() === 'sink' ? 'Sink' : 'Source'
3939
}
4040
if (o.type == "Source")
4141
$scope.sources.push(o);

0 commit comments

Comments
 (0)