Browse Source

HUE-8758 [connectors] Fix ids of new connector instances

Romain 6 years ago
parent
commit
db39e44022

+ 4 - 3
desktop/core/src/desktop/lib/connectors/api.py

@@ -47,10 +47,10 @@ CONNECTOR_TYPES = [{
 CONNECTOR_TYPES += [
   {'nice_name': "Hive Tez", 'dialect': 'hive-tez', 'interface': 'hiveserver2', 'settings': [{'name': 'server_host', 'value': ''}, {'name': 'server_port', 'value': ''},], 'id': None, 'category': 'editor', 'description': ''},
   {'nice_name': "Hive LLAP", 'dialect': 'hive-llap', 'interface': 'hiveserver2', 'settings': [{'name': 'server_host', 'value': ''}, {'name': 'server_port', 'value': ''},], 'id': None, 'category': 'editor', 'description': ''},
-  {'nice_name': "Druid", 'dialect': 'sql-druid', 'interface': 'sqlalchemy', 'settings': [{'name': 'connection_url', 'value': 'druid://druid-host.com:8082/druid/v2/sql/'}], 'id': None, 'category': 'editor', 'description': ''},
+  {'nice_name': "Druid", 'dialect': 'sql-druid', 'interface': 'sqlalchemy', 'settings': [{'name': 'url', 'value': 'druid://druid-host.com:8082/druid/v2/sql/'}], 'id': None, 'category': 'editor', 'description': ''},
   {'nice_name': "Kafka SQL", 'dialect': 'kafka-sql', 'interface': 'sqlalchemy', 'settings': [], 'id': None, 'category': 'editor', 'description': ''},
   {'nice_name': "SparkSQL", 'dialect': 'spark-sql', 'interface': 'sqlalchemy', 'settings': [], 'id': None, 'category': 'editor', 'description': ''},
-  {'nice_name': "MySQL", 'dialect': 'sql-mysql', 'interface': 'sqlalchemy', 'settings': [{'name': 'connection_url', 'value': 'mysql://username:password@mysq-host:3306/hue'}], 'id': None, 'category': 'editor', 'description': ''},
+  {'nice_name': "MySQL", 'dialect': 'sql-mysql', 'interface': 'sqlalchemy', 'settings': [{'name': 'url', 'value': 'mysql://username:password@mysq-host:3306/hue'}], 'id': None, 'category': 'editor', 'description': ''},
   {'nice_name': "Presto", 'dialect': 'presto', 'interface': 'sqlalchemy', 'settings': [], 'id': None, 'category': 'editor', 'description': ''},
   {'nice_name': "Athena", 'dialect': 'athena', 'interface': 'sqlalchemy', 'settings': [], 'id': None, 'category': 'editor', 'description': ''},
   {'nice_name': "Redshift", 'dialect': 'redshift', 'interface': 'sqlalchemy', 'settings': [], 'id': None, 'category': 'editor', 'description': ''},
@@ -189,7 +189,8 @@ def update_connector(request):
     instance = connector
     instance['id'] = CONNECTOR_IDS
     instance['nice_name'] = instance['nice_name']
-    instance['type'] = '%s-%s' % (instance['type'], CONNECTOR_IDS)
+    instance['name'] = '%s-%s' % (instance['dialect'], CONNECTOR_IDS)
+    instance['is_sql'] = instance.get('interface') in ("hiveserver2", "sqlalchemy")
     CONNECTOR_IDS += 1
     CONNECTOR_INSTANCES.append(instance)
 

+ 7 - 3
desktop/core/src/desktop/templates/connectors.mako

@@ -106,7 +106,7 @@ else:
       self.newConnector = function (dialect) {
         self.apiHelper.simpleGet('/desktop/connectors/api/instance/new/' + dialect, {}, {
           successCallback: function (data) {
-          self.instance(ko.mapping.fromJS(data.connector));
+            self.instance(ko.mapping.fromJS(data.connector));
           }
         });
       };
@@ -118,7 +118,9 @@ else:
         });
       };
       self.deleteConnector = function (connector) {
-        self.apiHelper.simplePost('/desktop/connectors/api/instance/delete', {'connector': ko.mapping.toJSON(connector)}, {
+        self.apiHelper.simplePost('/desktop/connectors/api/instance/delete', {
+            'connector': ko.mapping.toJSON(connector)
+          }, {
           successCallback: function (data) {
             self.section('installed-connectors-page');
             self.fetchConnectors();
@@ -127,7 +129,9 @@ else:
         });
       };
       self.updateConnector = function (connector) {
-        self.apiHelper.simplePost('/desktop/connectors/api/instance/update', {'connector': ko.mapping.toJSON(connector)}, {
+        self.apiHelper.simplePost('/desktop/connectors/api/instance/update', {
+            'connector': ko.mapping.toJSON(connector)
+          }, {
           successCallback: function (data) {
             connector.id = data.connector.id;
             self.section('installed-connectors-page');