Преглед изворни кода

HUE-5677 [metadata] More robust and friendly check upload status

Romain Rigaux пре 8 година
родитељ
комит
98e182e

+ 5 - 8
desktop/libs/metadata/src/metadata/optimizer_client.py

@@ -53,16 +53,11 @@ class OptimizerApi(object):
     self._email_password = OPTIMIZER.EMAIL_PASSWORD.get()
     self._product_secret = product_secret if product_secret else OPTIMIZER.PRODUCT_SECRET.get()
     self._product_auth_secret = product_auth_secret if product_auth_secret else (OPTIMIZER.PRODUCT_AUTH_SECRET.get() and OPTIMIZER.PRODUCT_AUTH_SECRET.get().replace('\\n', '\n'))
-    self._product_name = product_name if product_name else (OPTIMIZER.PRODUCT_NAME.get() or self.get_tenant()['tenant']) # Aka "workload"
-
-#     self._client = HttpClient(self._api_url, logger=LOG)
-#     self._client.set_verify(ssl_cert_ca_verify)
-#
-#     self._root = resource.Resource(self._client)
-#     self._token = None
 
     self._api = ApiLib("navopt", urlparse(self._api_url).hostname, self._product_secret, self._product_auth_secret)
 
+    self._product_name = product_name if product_name else (OPTIMIZER.PRODUCT_NAME.get() or self.get_tenant()['tenant']) # Aka "workload"
+
   def _authenticate(self, force=False):
     if self._token is None or force:
       self._token = self.authenticate()['token']
@@ -130,7 +125,9 @@ class OptimizerApi(object):
           'rowDelim': '\n',
           'headerFields': OptimizerApi.UPLOAD[data_type]['headerFields']
       })
-      return json.loads(response)
+      status = json.loads(response)
+      status['count'] = len(data)
+      return status
 
     except RestException, e:
       raise PopupException(e, title=_('Error while accessing Optimizer'))

+ 1 - 1
desktop/libs/notebook/src/notebook/static/notebook/js/notebook.ko.js

@@ -1456,7 +1456,7 @@ var EditorViewModel = (function() {
         sourcePlatform: self.type()
       }, function(data) {
         if (data.status == 0) {
-          $(document).trigger("info", "Queries uploaded successfully. Processing them...");
+          $(document).trigger("info", data.upload_history.count + " queries uploaded successfully. Processing them...");
           self.watchUploadStatus(data.upload_history.status.workloadId);
         } else {
           $(document).trigger("error", data.message);