|
@@ -384,59 +384,72 @@ ${ assist.assistPanel() }
|
|
|
<!-- /ko -->
|
|
<!-- /ko -->
|
|
|
</div>
|
|
</div>
|
|
|
|
|
|
|
|
- <div class="control-group" data-bind="visible: (createWizard.source.rdbmsMode() == 'configRdbms' || createWizard.source.rdbmsMode() == 'customRdbms') && createWizard.source.inputFormat() == 'rdbms'">
|
|
|
|
|
- <label for="rdbmsType" class="control-label"><div>${ _('Database') }</div>
|
|
|
|
|
- <select id="rdbmsType" data-bind="selectize: createWizard.source.rdbmsTypes, value: createWizard.source.rdbmsType, optionsText: 'name', optionsValue: 'value'"></select>
|
|
|
|
|
- </label>
|
|
|
|
|
- </div>
|
|
|
|
|
|
|
+ <!-- ko if: createWizard.source.inputFormat() == 'rdbms' -->
|
|
|
|
|
|
|
|
- <div class="control-group input-append" data-bind="visible: createWizard.source.rdbmsMode() == 'configRdbms' && createWizard.source.inputFormat() == 'rdbms'">
|
|
|
|
|
- <label for="rdbmsConfigDatabaseName" class="control-label"><div>${ _('Database Name') }</div>
|
|
|
|
|
- <select id="rdbmsConfigDatabaseName" data-bind="selectize: createWizard.source.rdbmsConfigDatabaseNames, value: createWizard.source.rdbmsConfigDatabaseName, optionsText: 'name', optionsValue: 'value'"></select>
|
|
|
|
|
- </label>
|
|
|
|
|
- </div>
|
|
|
|
|
|
|
+ <!-- ko if: createWizard.source.rdbmsMode() -->
|
|
|
|
|
+ <div class="control-group">
|
|
|
|
|
+ <label for="rdbmsType" class="control-label"><div>${ _('Database') }</div>
|
|
|
|
|
+ <select id="rdbmsType" data-bind="selectize: createWizard.source.rdbmsTypes, value: createWizard.source.rdbmsType, optionsText: 'name', optionsValue: 'value'"></select>
|
|
|
|
|
+ </label>
|
|
|
|
|
+ </div>
|
|
|
|
|
+ <!-- /ko -->
|
|
|
|
|
|
|
|
- <div class="control-group input-append" data-bind="visible: createWizard.source.rdbmsMode() == 'configRdbms' && createWizard.source.inputFormat() == 'rdbms'">
|
|
|
|
|
- <label for="rdbmsConfigTableName" class="control-label"><div>${ _('Table Name') }</div>
|
|
|
|
|
- <select id="rdbmsConfigTableName" data-bind="selectize: createWizard.source.rdbmsConfigTableNames, value: createWizard.source.rdbmsConfigTableName, optionsText: 'name', optionsValue: 'value'"></select>
|
|
|
|
|
- </label>
|
|
|
|
|
- </div>
|
|
|
|
|
|
|
+ <!-- ko if: createWizard.source.rdbmsMode() == 'configRdbms' -->
|
|
|
|
|
+ <!-- ko if: createWizard.source.rdbmsType -->
|
|
|
|
|
+ <div class="control-group input-append">
|
|
|
|
|
+ <label for="rdbmsDatabaseName" class="control-label"><div>${ _('Database Name') }</div>
|
|
|
|
|
+ <select id="rdbmsDatabaseName" data-bind="selectize: createWizard.source.rdbmsDatabaseNames, value: createWizard.source.rdbmsDatabaseName, optionsText: 'name', optionsValue: 'value'"></select>
|
|
|
|
|
+ </label>
|
|
|
|
|
+ </div>
|
|
|
|
|
+ <!-- /ko -->
|
|
|
|
|
|
|
|
- <div class="control-group input-append" data-bind="visible: createWizard.source.rdbmsMode() == 'customRdbms' && createWizard.source.inputFormat() == 'rdbms'">
|
|
|
|
|
- <label for="rdbmsHostname" class="control-label"><div>${ _('Database Hostname') }</div>
|
|
|
|
|
- <input type="text" class="input-xxlarge" data-bind="value: createWizard.source.rdbmsHostname" placeholder="${ _('Enter host/ip here eg. mysql.vpc.cloudera.com or 74.217.76.101') }">
|
|
|
|
|
- </label>
|
|
|
|
|
- </div>
|
|
|
|
|
|
|
+ <!-- ko if: createWizard.source.rdbmsDatabaseName -->
|
|
|
|
|
+ <div class="control-group input-append">
|
|
|
|
|
+ <label for="rdbmsTableName" class="control-label"><div>${ _('Table Name') }</div>
|
|
|
|
|
+ <select id="rdbmsTableName" data-bind="selectize: createWizard.source.rdbmsTableNames, value: createWizard.source.rdbmsTableName, optionsText: 'name', optionsValue: 'value'"></select>
|
|
|
|
|
+ </label>
|
|
|
|
|
+ </div>
|
|
|
|
|
+ <!-- /ko -->
|
|
|
|
|
+ <!-- /ko -->
|
|
|
|
|
|
|
|
- <div class="control-group input-append" data-bind="visible: createWizard.source.rdbmsMode() == 'customRdbms' && createWizard.source.inputFormat() == 'rdbms'">
|
|
|
|
|
- <label for="rdbmsPort" class="control-label"><div>${ _('Database Port') }</div>
|
|
|
|
|
- <input type="text" class="input-xxlarge" data-bind="value: createWizard.source.rdbmsPort" placeholder="${ _('Enter port number here eg. 3306') }">
|
|
|
|
|
- </label>
|
|
|
|
|
- </div>
|
|
|
|
|
|
|
+ <!-- ko if: createWizard.source.rdbmsMode() == 'customRdbms' -->
|
|
|
|
|
+ <div class="control-group input-append">
|
|
|
|
|
+ <label for="rdbmsHostname" class="control-label"><div>${ _('Database Hostname') }</div>
|
|
|
|
|
+ <input type="text" class="input-xxlarge" data-bind="value: createWizard.source.rdbmsHostname" placeholder="${ _('Enter host/ip here eg. mysql.vpc.cloudera.com or 74.217.76.101') }">
|
|
|
|
|
+ </label>
|
|
|
|
|
+ </div>
|
|
|
|
|
|
|
|
- <div class="control-group input-append" data-bind="visible: createWizard.source.rdbmsMode() == 'customRdbms' && createWizard.source.inputFormat() == 'rdbms'">
|
|
|
|
|
- <label for="rdbmsUsername" class="control-label"><div>${ _('Database Username') }</div>
|
|
|
|
|
- <input type="text" class="input-xxlarge" data-bind="value: createWizard.source.rdbmsUsername" placeholder="${ _('Enter username here') }">
|
|
|
|
|
- </label>
|
|
|
|
|
- </div>
|
|
|
|
|
|
|
+ <div class="control-group input-append">
|
|
|
|
|
+ <label for="rdbmsPort" class="control-label"><div>${ _('Database Port') }</div>
|
|
|
|
|
+ <input type="text" class="input-xxlarge" data-bind="value: createWizard.source.rdbmsPort" placeholder="${ _('Enter port number here eg. 3306') }">
|
|
|
|
|
+ </label>
|
|
|
|
|
+ </div>
|
|
|
|
|
|
|
|
- <div class="control-group input-append" data-bind="visible: createWizard.source.rdbmsMode() == 'customRdbms' && createWizard.source.inputFormat() == 'rdbms'">
|
|
|
|
|
- <label for="rdbmsPassword" class="control-label"><div>${ _('Database Password') }</div>
|
|
|
|
|
- <input type="password" class="input-xxlarge" data-bind="value: createWizard.source.rdbmsPassword" placeholder="${ _('Enter password here') }">
|
|
|
|
|
- </label>
|
|
|
|
|
- </div>
|
|
|
|
|
|
|
+ <div class="control-group input-append">
|
|
|
|
|
+ <label for="rdbmsUsername" class="control-label"><div>${ _('Database Username') }</div>
|
|
|
|
|
+ <input type="text" class="input-xxlarge" data-bind="value: createWizard.source.rdbmsUsername" placeholder="${ _('Enter username here') }">
|
|
|
|
|
+ </label>
|
|
|
|
|
+ </div>
|
|
|
|
|
|
|
|
- <div class="control-group input-append" data-bind="visible: createWizard.source.rdbmsMode() == 'customRdbms' && createWizard.source.inputFormat() == 'rdbms'">
|
|
|
|
|
- <label for="rdbmsCustomDatabaseName" class="control-label"><div>${ _('Database Name') }</div>
|
|
|
|
|
- <input type="text" class="input-xxlarge" data-bind="value: createWizard.source.rdbmsCustomDatabaseName" placeholder="${ _('Enter database name here') }">
|
|
|
|
|
- </label>
|
|
|
|
|
- </div>
|
|
|
|
|
|
|
+ <div class="control-group input-append">
|
|
|
|
|
+ <label for="rdbmsPassword" class="control-label"><div>${ _('Database Password') }</div>
|
|
|
|
|
+ <input type="password" class="input-xxlarge" data-bind="value: createWizard.source.rdbmsPassword" placeholder="${ _('Enter password here') }">
|
|
|
|
|
+ </label>
|
|
|
|
|
+ </div>
|
|
|
|
|
|
|
|
- <div class="control-group input-append" data-bind="visible: createWizard.source.rdbmsMode() == 'customRdbms' && createWizard.source.inputFormat() == 'rdbms'">
|
|
|
|
|
- <label for="rdbmsTableNames" class="control-label"><div>${ _('Table Name') }</div>
|
|
|
|
|
- <input type="text" class="input-xxlarge" data-bind="value: createWizard.source.rdbmsTableNames" placeholder="${ _('Enter table name here') }">
|
|
|
|
|
- </label>
|
|
|
|
|
- </div>
|
|
|
|
|
|
|
+ <div class="control-group input-append">
|
|
|
|
|
+ <label for="rdbmsDatabaseName" class="control-label"><div>${ _('Database Name') }</div>
|
|
|
|
|
+ <input type="text" class="input-xxlarge" data-bind="value: createWizard.source.rdbmsDatabaseName" placeholder="${ _('Enter database name here') }">
|
|
|
|
|
+ </label>
|
|
|
|
|
+ </div>
|
|
|
|
|
+
|
|
|
|
|
+ <div class="control-group input-append">
|
|
|
|
|
+ <label for="rdbmsTableNames" class="control-label"><div>${ _('Table Name') }</div>
|
|
|
|
|
+ <input type="text" class="input-xxlarge" data-bind="value: createWizard.source.rdbmsTableName" placeholder="${ _('Enter table name here') }">
|
|
|
|
|
+ </label>
|
|
|
|
|
+ </div>
|
|
|
|
|
+ <!-- /ko -->
|
|
|
|
|
+ <!-- /ko -->
|
|
|
|
|
|
|
|
<div class="control-group" data-bind="visible: createWizard.source.inputFormat() == 'table'">
|
|
<div class="control-group" data-bind="visible: createWizard.source.inputFormat() == 'table'">
|
|
|
<label for="path" class="control-label"><div>${ _('Table') }</div>
|
|
<label for="path" class="control-label"><div>${ _('Table') }</div>
|
|
@@ -1275,42 +1288,30 @@ ${ assist.assistPanel() }
|
|
|
return self.rdbmsTypesAll();
|
|
return self.rdbmsTypesAll();
|
|
|
});
|
|
});
|
|
|
self.rdbmsType = ko.observable('');
|
|
self.rdbmsType = ko.observable('');
|
|
|
- self.rdbmsType.subscribe(function(val) {
|
|
|
|
|
- viewModel = new IndexerViewModel();
|
|
|
|
|
|
|
+ self.rdbmsType.subscribe(function (val) {
|
|
|
self.path('');
|
|
self.path('');
|
|
|
resizeElements();
|
|
resizeElements();
|
|
|
- var abc = { rdbmsConfigDatabaseNamesAll: ko.observableArray() };
|
|
|
|
|
$.post("${ url('indexer:get_databases') }", {
|
|
$.post("${ url('indexer:get_databases') }", {
|
|
|
"source": ko.mapping.toJSON(self)
|
|
"source": ko.mapping.toJSON(self)
|
|
|
- }, function(resp) {
|
|
|
|
|
- console.log(resp);
|
|
|
|
|
- this.rdbmsConfigDatabaseName = ko.observable();
|
|
|
|
|
- this.rdbmsConfigDatabaseNamesAll = ko.observableArray([]);
|
|
|
|
|
- var mappedjobTitles = $.map(resp.data, function (item) {
|
|
|
|
|
- return new rdbmsConfigDatabaseNamesAll(item)
|
|
|
|
|
- });
|
|
|
|
|
- this.rdbmsConfigDatabaseNamesAll(mappedjobTitles);
|
|
|
|
|
|
|
+ }, function (resp) {
|
|
|
|
|
+ if (resp.status == 0 && resp.data) {
|
|
|
|
|
+ self.rdbmsDatabaseNames(resp.data);
|
|
|
|
|
+ }
|
|
|
});
|
|
});
|
|
|
});
|
|
});
|
|
|
- self.rdbmsConfigDatabaseName = ko.observable('');
|
|
|
|
|
- //self.rdbmsConfigDatabaseName.subscribe(function(val) {
|
|
|
|
|
- // $.post("${ url('indexer:get_tables') }", {
|
|
|
|
|
- // "source": ko.mapping.toJSON(self)
|
|
|
|
|
- // }, function(resp) {
|
|
|
|
|
- // console.log(resp);
|
|
|
|
|
- // // set rdbmsConfigTableNamesAll here
|
|
|
|
|
- // });
|
|
|
|
|
- //});
|
|
|
|
|
- self.rdbmsConfigDatabaseNamesAll = ko.observableArray([]);
|
|
|
|
|
- self.rdbmsConfigDatabaseNames = ko.pureComputed(function() {
|
|
|
|
|
- return self.rdbmsConfigDatabaseNamesAll();
|
|
|
|
|
- });
|
|
|
|
|
- self.rdbmsConfigTableName = ko.observable('');
|
|
|
|
|
- self.rdbmsConfigTableNamesAll = ko.observableArray([]);
|
|
|
|
|
- self.rdbmsConfigTableNames = ko.pureComputed(function() {
|
|
|
|
|
- return self.rdbmsConfigTableNamesAll();
|
|
|
|
|
|
|
+ self.rdbmsDatabaseName = ko.observable('');
|
|
|
|
|
+ self.rdbmsDatabaseName.subscribe(function (val) {
|
|
|
|
|
+ $.post("${ url('indexer:get_tables') }", {
|
|
|
|
|
+ "source": ko.mapping.toJSON(self)
|
|
|
|
|
+ }, function (resp) {
|
|
|
|
|
+ if (resp.status == 0 && resp.data) {
|
|
|
|
|
+ self.rdbmsTableNames(resp.data);
|
|
|
|
|
+ }
|
|
|
|
|
+ });
|
|
|
});
|
|
});
|
|
|
-
|
|
|
|
|
|
|
+ self.rdbmsDatabaseNames = ko.observableArray([]);
|
|
|
|
|
+ self.rdbmsTableName = ko.observable('');
|
|
|
|
|
+ self.rdbmsTableNames = ko.observableArray([]);
|
|
|
// Table
|
|
// Table
|
|
|
self.table = ko.observable('');
|
|
self.table = ko.observable('');
|
|
|
self.tableName = ko.computed(function() {
|
|
self.tableName = ko.computed(function() {
|
|
@@ -1353,7 +1354,7 @@ ${ assist.assistPanel() }
|
|
|
} else if (self.inputFormat() == 'manual') {
|
|
} else if (self.inputFormat() == 'manual') {
|
|
|
return true;
|
|
return true;
|
|
|
} else if (self.inputFormat() == 'rdbms') {
|
|
} else if (self.inputFormat() == 'rdbms') {
|
|
|
- return true; //self.rdbmsDatabaseName().length > 0 && self.rdbmsTableName().length > 0;
|
|
|
|
|
|
|
+ return self.rdbmsDatabaseName().length > 0 && self.rdbmsTableName().length > 0;
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
|
self.defaultName = ko.computed(function() {
|
|
self.defaultName = ko.computed(function() {
|