Эх сурвалжийг харах

HUE-7299 [assist] Keep the type filter when navigating to different directories

Johan Ahlen 8 жил өмнө
parent
commit
7498c54

+ 2 - 1
desktop/core/src/desktop/static/desktop/js/document/hueFileEntry.js

@@ -139,7 +139,7 @@ var HueFileEntry = (function () {
       return result;
     });
 
-    self.typeFilter = ko.observable(self.availableTypeFilters()[0]); // First one is always 'all'
+    self.typeFilter = options.typeFilter || ko.observable(self.availableTypeFilters()[0]); // First one is always 'all'
 
     self.isFilterVisible.subscribe(function (newValue) {
       if (!newValue && self.filter()) {
@@ -423,6 +423,7 @@ var HueFileEntry = (function () {
       trashEntry: self.trashEntry,
       apiHelper: self.apiHelper,
       serverTypeFilter: self.serverTypeFilter,
+      typeFilter: self.typeFilter,
       app: self.app,
       user: self.user,
       superuser: self.superuser

+ 6 - 0
desktop/core/src/desktop/templates/assist.mako

@@ -1196,6 +1196,10 @@ from notebook.conf import ENABLE_QUERY_BUILDER, ENABLE_QUERY_SCHEDULING, get_ord
         self.user = options.user;
 
         self.activeEntry = ko.observable();
+        self.typeFilter = ko.observable({
+          type: 'all',
+          label: DocumentTypeGlobals['all']
+        });
 
         var lastOpenedUuid = self.apiHelper.getFromTotalStorage('assist', 'last.opened.assist.doc.uuid');
 
@@ -1207,6 +1211,7 @@ from notebook.conf import ENABLE_QUERY_BUILDER, ENABLE_QUERY_SCHEDULING, get_ord
             app: 'documents',
             user: self.user,
             activeSort: ko.observable('name'),
+            typeFilter: self.typeFilter,
             definition: {
               uuid: lastOpenedUuid,
               type: 'directory'
@@ -1252,6 +1257,7 @@ from notebook.conf import ENABLE_QUERY_BUILDER, ENABLE_QUERY_SCHEDULING, get_ord
             app: 'documents',
             user: self.user,
             activeSort: ko.observable('name'),
+            typeFilter: self.typeFilter,
             definition: {
               name: '/',
               type: 'directory'