Merge pull request #1357 from Pervanovo/pr-remember-last-folder-and-f…

…ilter Persist asset selector folder and filter
agentejo · Apr 13, 2021 · 67a923b · 67a923b
2 parents 689ca6d + af20f1f
commit 67a923b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/modules/Cockpit/assets/cockpit.js b/modules/Cockpit/assets/cockpit.js
@@ -107,7 +107,7 @@
                 var selected = [], dialog = UIkit.modal.dialog([
                     '<div>',
                     '<div class="uk-modal-header uk-text-large">' + App.i18n.get('Select asset') + '</div>',
-                    '<cp-assets path="' + (options.path || '') + '" typefilter="' + (options.typefilter || '') + '" modal="true"></cp-assets>',
+                    '<cp-assets typefilter="' + (options.typefilter || '') + '" modal="true"></cp-assets>',
                     '<div class="uk-modal-footer uk-text-right">',
                     '<button class="uk-button uk-button-primary uk-margin-right uk-button-large uk-hidden js-select-button">' + App.i18n.get('Select') + ': <span></span> item(s)</button>',
                     '<a class="uk-button uk-button-large uk-button-link uk-modal-close">' + App.i18n.get('Close') + '</a>',

diff --git a/modules/Cockpit/assets/components.js b/modules/Cockpit/assets/components.js
@@ -116,8 +116,8 @@ riot.tag2('cp-assets', '<div ref="list" show="{mode==\'list\'}"> <div ref="uploa
         this.selected = [];
 
         this.folders  = [];
-        this.folder   = '';
-        this.foldersPath = [];
+        this.folder   = App.session.get('app.assets.last.folder', '');
+        this.foldersPath = App.session.get('app.assets.last.foldersPath', []);
 
         this.modal    = opts.modal;
 
@@ -127,6 +127,7 @@ riot.tag2('cp-assets', '<div ref="list" show="{mode==\'list\'}"> <div ref="uploa
         this.limit    = opts.limit || 15;
 
         this.on('mount', function() {
+            this.refs.filtertitle.value = App.session.get('app.assets.last.filtertitle', '');
 
             if (opts.typefilter) {
                 this.refs.filtertype.value = opts.typefilter;
@@ -297,7 +298,7 @@ riot.tag2('cp-assets', '<div ref="list" show="{mode==\'list\'}"> <div ref="uploa
         }.bind(this)
 
         this.updateFilter = function() {
-
+            App.session.set('app.assets.last.filtertitle', this.refs.filtertitle.value);
             this.listAssets(1);
         }.bind(this)
 
@@ -499,6 +500,9 @@ riot.tag2('cp-assets', '<div ref="list" show="{mode==\'list\'}"> <div ref="uploa
                 this.foldersPath = [];
             }
 
+            App.session.set('app.assets.last.folder', this.folder);
+            App.session.set('app.assets.last.foldersPath', this.foldersPath);
+
             $this.listAssets(1);
         }.bind(this)
 

diff --git a/modules/Cockpit/assets/components/cp-assets.tag b/modules/Cockpit/assets/components/cp-assets.tag
@@ -285,8 +285,8 @@
         this.selected = [];
 
         this.folders  = [];
-        this.folder   = '';
-        this.foldersPath = [];
+        this.folder   = App.session.get('app.assets.last.folder', '');
+        this.foldersPath = App.session.get('app.assets.last.foldersPath', []);
 
         this.modal    = opts.modal;
 
@@ -297,6 +297,7 @@
         this.limit    = opts.limit || 15;
 
         this.on('mount', function() {
+            this.refs.filtertitle.value = App.session.get('app.assets.last.filtertitle', '');
 
             if (opts.typefilter) {
                 this.refs.filtertype.value = opts.typefilter;
@@ -470,7 +471,7 @@
         }
 
         updateFilter() {
-
+            App.session.set('app.assets.last.filtertitle', this.refs.filtertitle.value);
             this.listAssets(1);
         }
 
@@ -672,6 +673,9 @@
                 this.foldersPath = [];
             }
 
+            App.session.set('app.assets.last.folder', this.folder);
+            App.session.set('app.assets.last.foldersPath', this.foldersPath);
+
             $this.listAssets(1);
         }