@girder/core 3.1.2 → 3.1.13

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@girder/core",
-    "version": "3.1.2",
+    "version": "3.1.13",
     "description": "Extensible data management platform",
     "homepage": "https://girder.readthedocs.org",
     "bugs": {

package/views/widgets/HierarchyWidget.js

@@ -684,6 +684,7 @@ var HierarchyWidget = View.extend({
             yesText: 'Delete',
             confirmCallback: () => {
                 var resources = this._getCheckedResourceParam();
+                var resourceSize = this._getCheckedResourceSize();
                 /* Content on DELETE requests is somewhat oddly supported (I
                  * can't get it to work under jasmine/phantom), so override the
                  * method. */
@@ -699,7 +700,9 @@ var HierarchyWidget = View.extend({
                     if (folders.length && this.parentModel.has('nFolders')) {
                         this.parentModel.increment('nFolders', -folders.length);
                     }
-
+                    if (this.parentModel.has('size') && resourceSize.items) {
+                        this.parentModel.increment('size', -resourceSize.items);
+                    }
                     this.setCurrentModel(this.parentModel, { setRoute: false });
                 });
             }
@@ -855,6 +858,26 @@ var HierarchyWidget = View.extend({
         return JSON.stringify(resources);
     },
 
+    /**
+     * Get the sum of the sizes of checked resources.
+     */
+    _getCheckedResourceSize: function () {
+        var totalSize = { items: 0, folders: 0 };
+        var folders = this.folderListView.checked;
+        _.each(folders, function (cid) {
+            var folder = this.folderListView.collection.get(cid);
+            totalSize.folders += (folder.get('size') || 0);
+        }, this);
+        if (this.itemListView) {
+            var items = this.itemListView.checked;
+            _.each(items, function (cid) {
+                var item = this.itemListView.collection.get(cid);
+                totalSize.items += (item.get('size') || 0);
+            }, this);
+        }
+        return totalSize;
+    },
+
     downloadChecked: function () {
         var url = getApiRoot() + '/resource/download';
         var resources = this._getCheckedResourceParam();

package/views/widgets/ItemListWidget.js

@@ -85,7 +85,7 @@ var ItemListWidget = View.extend({
                     restRequest({
                         url: `item/${this._selectedItem.get('_id')}/position`,
                         method: 'GET',
-                        data: { folderId: this._selectedItem.get('folderId') }
+                        data: { folderId: this._selectedItem.get('folderId'), sort: 'name' }
                     }).done((val) => {
                         // Now we fetch the correct page for the position
                         val = Number(val);
@@ -237,11 +237,16 @@ var ItemListWidget = View.extend({
     centerSelected: function () {
         const widgetcontainer = this.$el.parents('.g-hierarchy-widget-container');
         const selected = this.$('li.g-item-list-entry.g-selected');
-
         if (widgetcontainer.length > 0 && selected.length > 0) {
-            const centerPos = (widgetcontainer.height() / 2.0) + (selected.outerHeight() / 2.0);
-            // Take the current scroll top position and add it to the position of the top of the selected item, then center it
-            const scrollPos = widgetcontainer[0].scrollTop + selected.position().top - centerPos;
+            // These items will effect the scroll position if they exists
+            const folderHeight  = $('.g-folder-list').length ? $('.g-folder-list').height() : 0;
+            const breadcrumbHeight = $('.g-hierarchy-breadcrumb-bar').length ? $('.g-hierarchy-breadcrumb-bar').height() : 0;
+            const selectedTop = selected.position().top;
+            // The selectedTop position needs to account for the breadcrumbHeight and the folderHeight
+            const scrollingPos = selectedTop + folderHeight + breadcrumbHeight;
+            const centerPos = (widgetcontainer.height() / 2.0) - (folderHeight / 2.0) - (breadcrumbHeight / 2.0) - (selected.outerHeight() / 2.0);
+
+            const scrollPos = scrollingPos - centerPos;
             if (this.tempScrollPos === undefined) {
                 this.tempScrollPos = scrollPos;
             }