Переглянути джерело

HUE-3422 [editor] Rename parentUuid to parentSavedQueryUuid

Romain Rigaux 9 роки тому
батько
коміт
356524c

+ 5 - 5
desktop/libs/notebook/src/notebook/api.py

@@ -247,8 +247,8 @@ def save_notebook(request):
   notebook = json.loads(request.POST.get('notebook', '{}'))
   notebook_type = notebook.get('type', 'notebook')
 
-  if notebook.get('parentUuid'): # We save into the original saved query, not into the query history
-    notebook_doc = Document2.objects.get_by_uuid(user=request.user, uuid=notebook['parentUuid'])
+  if notebook.get('parentSavedQueryUuid'): # We save into the original saved query, not into the query history
+    notebook_doc = Document2.objects.get_by_uuid(user=request.user, uuid=notebook['parentSavedQueryUuid'])
   elif notebook.get('id'):
     notebook_doc = Document2.objects.get(id=notebook['id'])
   else:
@@ -290,8 +290,8 @@ def _historify(notebook, user):
 
   # Link history of saved query
   if notebook['isSaved']:
-    parent_doc = Document2.objects.get(uuid=notebook.get('parentUuid') or notebook['uuid']) # From previous history query or initial saved query
-    notebook['parentUuid'] = parent_doc.uuid
+    parent_doc = Document2.objects.get(uuid=notebook.get('parentSavedQueryUuid') or notebook['uuid']) # From previous history query or initial saved query
+    notebook['parentSavedQueryUuid'] = parent_doc.uuid
     history_doc.dependencies.add(parent_doc)
 
   Document.objects.link(
@@ -332,7 +332,7 @@ def get_history(request):
             'statement_raw': notebook['snippets'][0]['statement_raw'][:1001],
             'lastExecuted':  notebook['snippets'][0]['lastExecuted'],
             'status':  notebook['snippets'][0]['status'],
-            'parentUuid': notebook.get('parentUuid', '')
+            'parentSavedQueryUuid': notebook.get('parentSavedQueryUuid', '')
         } if notebook['snippets'] else {},
         'absoluteUrl': doc.get_absolute_url(),
       })

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

@@ -616,7 +616,7 @@
           notebook.id(data.history_id);
           notebook.uuid(data.history_uuid);
           notebook.isHistory(true);
-          notebook.parentUuid(data.history_parent_uuid);
+          notebook.parentSavedQueryUuid(data.history_parent_uuid);
 
           notebook.history.unshift(
             notebook._makeHistoryRecord(
@@ -1025,7 +1025,7 @@
     self.description = ko.observable(typeof notebook.description != "undefined" && notebook.description != null ? notebook.description: '');
     self.type = ko.observable(typeof notebook.type != "undefined" && notebook.type != null ? notebook.type : 'notebook');
     self.isHistory = ko.observable(typeof notebook.is_history != "undefined" && notebook.is_history != null ? notebook.is_history : false);
-    self.parentUuid = ko.observable(typeof notebook.parentUuid != "undefined" && notebook.parentUuid != null ? notebook.parentUuid : null); // History parent
+    self.parentSavedQueryUuid = ko.observable(typeof notebook.parentSavedQueryUuid != "undefined" && notebook.parentSavedQueryUuid != null ? notebook.parentSavedQueryUuid : null); // History parent
     self.isSaved = ko.observable(typeof notebook.isSaved != "undefined" && notebook.isSaved != null ? notebook.isSaved : false);
     self.snippets = ko.observableArray();
     self.selectedSnippet = ko.observable(vm.availableSnippets().length > 0 ? vm.availableSnippets()[0].type() : 'NO_SNIPPETS');
@@ -1212,7 +1212,7 @@
      return {
          id: self.id,
          uuid: self.uuid,
-         parentUuid: self.parentUuid,
+         parentSavedQueryUuid: self.parentSavedQueryUuid,
          isSaved: self.isSaved,
          sessions: self.sessions,
          type: self.type
@@ -1472,7 +1472,7 @@
       // Saved query or history but history coming from a saved query
       return self.selectedNotebook() && (
          self.selectedNotebook().isSaved() ||
-         (self.selectedNotebook().isHistory() && self.selectedNotebook().parentUuid())
+         (self.selectedNotebook().isHistory() && self.selectedNotebook().parentSavedQueryUuid())
       );
     });
 
@@ -1640,7 +1640,7 @@
     self.saveAsNotebook = function () {
       self.selectedNotebook().id(null);
       self.selectedNotebook().uuid(UUID());
-      self.selectedNotebook().parentUuid(null);
+      self.selectedNotebook().parentSavedQueryUuid(null);
       self.saveNotebook();
     };
   }

+ 3 - 3
desktop/libs/notebook/src/notebook/templates/editor_components.mako

@@ -310,10 +310,10 @@ ${ hueIcons.symbols() }
           </li>
           <!-- ko with: selectedNotebook -->
           <li data-bind="visible: isHistory" style="display: none">
-            <!-- ko if: parentUuid -->
-              <a title="${ _('Open saved query') }" data-bind="click: function() { $root.openNotebook(parentUuid()) }" style="cursor: pointer"><i class="fa fa-fw fa-history"></i></a>
+            <!-- ko if: parentSavedQueryUuid -->
+              <a title="${ _('Open saved query') }" data-bind="click: function() { $root.openNotebook(parentSavedQueryUuid()) }" style="cursor: pointer"><i class="fa fa-fw fa-history"></i></a>
             <!-- /ko -->
-            <!-- ko ifnot: parentUuid -->
+            <!-- ko ifnot: parentSavedQueryUuid -->
               <a title="${ _('Query history') }"><i class="fa fa-fw fa-history"></i></a>
             <!-- /ko -->
           </li>