@girder/core 3.2.8 → 3.2.10

package/collections/AssetstoreCollection.js

@@ -3,7 +3,8 @@ import Collection from '@girder/core/collections/Collection';
 
 var AssetstoreCollection = Collection.extend({
     resourceName: 'assetstore',
-    model: AssetstoreModel
+    model: AssetstoreModel,
+    pageLimit: 1000
 });
 
 export default AssetstoreCollection;

package/package.json

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

package/templates/widgets/editAssetstoreWidget.pug

@@ -60,6 +60,10 @@
               label
                 input#g-edit-s3-sse(type="checkbox")
                 | Server side encryption
+            .checkbox
+              label
+                input#g-edit-s3-accelerated-endpoint(type="checkbox")
+                | Allow S3 accelerated endpoint
         if assetstore.get('hasFiles')
           div
             i.icon-attention

package/templates/widgets/newAssetstore.pug

@@ -113,6 +113,10 @@
             label
               input#g-new-s3-sse(type="checkbox")
               | Server side encryption
+          .checkbox
+            label
+              input#g-new-s3-accelerated-endpoint(type="checkbox")
+              | Allow S3 accelerated endpoint
 
           p#g-new-s3-error.g-validation-failed-message
           input.g-new-assetstore-submit.btn.btn-sm.btn-primary(type="submit", value="Create")

package/views/widgets/EditApiKeyWidget.js

@@ -22,7 +22,8 @@ var EditApiKeyWidget = View.extend({
             var fields = {
                 name: this.$('#g-api-key-name').val(),
                 tokenDuration: this.$('#g-api-key-token-duration').val(),
-                scope: null
+                scope: null,
+                targetUserId: this.targetUserId
             };
 
             if (this._getSelectedScopeMode() === 'custom') {
@@ -52,6 +53,7 @@ var EditApiKeyWidget = View.extend({
     initialize: function (settings) {
         this.model = settings.model || null;
         this.scopeInfo = null;
+        this.targetUserId = settings.parentView.model.id;
         this._shouldRender = false;
 
         restRequest({

package/views/widgets/EditAssetstoreWidget.js

@@ -126,7 +126,8 @@ fieldsMap[AssetstoreType.S3] = {
             region: this.$('#g-edit-s3-region').val(),
             readOnly: this.$('#g-edit-s3-readonly').is(':checked'),
             inferCredentials: this.$('#g-edit-s3-infercredentials').is(':checked'),
-            serverSideEncryption: this.$('#g-edit-s3-sse').is(':checked')
+            serverSideEncryption: this.$('#g-edit-s3-sse').is(':checked'),
+            allowS3AcceleratedTransfer: this.$('#g-edit-s3-accelerated-endpoint').is(':checked')
         };
     },
     set: function () {
@@ -142,6 +143,8 @@ fieldsMap[AssetstoreType.S3] = {
             (this.model.get('inferCredentials') ? 'checked' : undefined));
         this.$('#g-edit-s3-sse').attr('checked',
             (this.model.get('serverSideEncryption') ? 'checked' : undefined));
+        this.$('#g-edit-s3-accelerated-endpoint').attr('checked',
+            (this.model.get('allowS3AcceleratedTransfer') ? 'checked' : undefined));
     }
 };
 

package/views/widgets/NewAssetstoreWidget.js

@@ -45,7 +45,8 @@ var NewAssetstoreWidget = View.extend({
                 region: this.$('#g-new-s3-region').val(),
                 readOnly: this.$('#g-new-s3-readonly').is(':checked'),
                 inferCredentials: this.$('#g-new-s3-infercredentials').is(':checked'),
-                serverSideEncryption: this.$('#g-new-s3-sse').is(':checked')
+                serverSideEncryption: this.$('#g-new-s3-sse').is(':checked'),
+                allowS3AcceleratedTransfer: this.$('#g-new-s3-accelerated-endpoint').is(':checked')
             });
         }
     },