girder 5.0.7.dev6__tar.gz → 5.0.8.dev2__tar.gz

{girder-5.0.7.dev6/girder.egg-info → girder-5.0.8.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: girder
-Version: 5.0.7.dev6
+Version: 5.0.8.dev2
 Summary: Web-based data management platform
 Home-page: https://girder.readthedocs.org
 Author: Kitware, Inc.

{girder-5.0.7.dev6 → girder-5.0.8.dev2}/docs/list_env_settings.yaml

@@ -95,3 +95,6 @@ GIRDER_WORKER_BACKEND: >-
 
 GIRDER_WORKER_JOB_GC_SCOPE: >-
   A comma-separated list of extra default scopes for worker jobs.  For instance to allow jobs to schedule and check on other jobs, set this to "jobs.rest.create_job,jobs.rest.list_job"
+
+GIRDER_FILESYSTEMASSETSTORE_RESERVED_MBYTES: >-
+  For filesystem assetstores, reserve this many megabytes of space.  Uploads will be rejected when there is less than this available.  If using the user quota plugin with fall-back assetstores, it will trigger the fall-back behavior.

{girder-5.0.7.dev6 → girder-5.0.8.dev2}/girder/utility/abstract_assetstore_adapter.py

@@ -47,6 +47,10 @@ class FileHandle:
     def __exit__(self, exc_type, exc_val, exc_tb):
         self.close()
 
+    @property
+    def unavailable(self) -> bool:
+        return False
+
     def read(self, size=None):
         """
         Read *size* bytes from the file data.

{girder-5.0.7.dev6 → girder-5.0.8.dev2}/girder/utility/filesystem_assetstore_adapter.py

@@ -97,15 +97,28 @@ class FilesystemAssetstoreAdapter(AbstractAssetstoreAdapter):
         # happens to existing assetstores that no longer can access their temp
         # directories.
         self.tempDir = os.path.join(self.assetstore['root'], 'temp')
+        self._unavailable = False
         try:
             mkdir(self.tempDir)
         except OSError:
-            self.unavailable = True
+            self._unavailable = True
             logger.exception('Failed to create filesystem assetstore directories %s', self.tempDir)
         if not os.access(self.assetstore['root'], os.W_OK):
-            self.unavailable = True
+            self._unavailable = True
             logger.error('Could not write to assetstore root: %s', self.assetstore['root'])
 
+    @property
+    def unavailable(self) -> bool:
+        if self._unavailable:
+            return True
+        try:
+            free = self.capacityInfo()['free']
+            if free is not None and free <= 0:
+                return True
+        except Exception:
+            pass
+        return False
+
     def capacityInfo(self):
         """
         For filesystem assetstores, we just need to report the free and total
@@ -113,7 +126,18 @@ class FilesystemAssetstoreAdapter(AbstractAssetstoreAdapter):
         """
         try:
             usage = psutil.disk_usage(self.assetstore['root'])
-            return {'free': usage.free, 'total': usage.total}
+            reserved = -1
+            try:
+                reserved = float(os.environ.get('GIRDER_FILESYSTEMASSETSTORE_RESERVED_MBYTES'))
+            except Exception:
+                pass
+            if reserved <= 0:
+                reserved = 10 * 1024
+            reserved *= 1024 ** 2
+            return {
+                'free': max(0, usage.free - reserved),
+                'reserved': reserved,
+                'total': usage.total}
         except OSError:
             logger.exception('Failed to get disk usage of %s', self.assetstore['root'])
         # If psutil.disk_usage fails or we can't query the assetstore's root
@@ -128,6 +152,9 @@ class FilesystemAssetstoreAdapter(AbstractAssetstoreAdapter):
         Generates a temporary file and sets its location in the upload document
         as tempFile. This is the file that the chunks will be appended to.
         """
+        if self.unavailable:
+            msg = 'Assetstore is unavailable or has insufficient free space.'
+            raise ValidationException(msg)
         fd, path = tempfile.mkstemp(dir=self.tempDir)
         os.close(fd)  # Must close this file descriptor or it will leak
         upload['tempFile'] = path
@@ -138,6 +165,9 @@ class FilesystemAssetstoreAdapter(AbstractAssetstoreAdapter):
         """
         Appends the chunk into the temporary file.
         """
+        if self.unavailable:
+            msg = 'Assetstore is unavailable or has insufficient free space.'
+            raise ValidationException(msg)
         # If we know the chunk size is too large or small, fail early.
         self.checkUploadSize(upload, self.getChunkSize(chunk))
 

girder-5.0.7.dev6/girder/web/dist/assets/index-BPtAgi9d.js → girder-5.0.8.dev2/girder/web/dist/assets/index-k-oavQaB.js

@@ -2732,7 +2732,7 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
 `,r=9,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`If you specify a directory, it will be imported recursively. You must also`,r=10,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`
 `,r=10,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`specify a destination collection, user, or folder ID under which to place the`,r=11,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`
 `,r=11,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`imported data.`,r=12,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`
-`,r=12,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`</div>`,r=13,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`<form class="g-s3-import-form">`,r=14,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`<div class="form-group">`,r=15,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`<label for="g-s3-import-path">`,r=15,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`Import path (key or directory)</label>`,r=16,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`<input class="form-control input-sm" id="g-s3-import-path" type="text"/></div>`,r=17,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`<div class="form-group">`,r=18,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`<label for="g-s3-import-dest-type">`,r=18,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`Destination type</label>`,r=19,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`<select class="form-control" id="g-s3-import-dest-type">`,r=20,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`<option value="folder">`,r=20,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`Folder</option>`,r=21,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`<option value="user">`,r=21,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`User</option>`,r=22,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`<option value="collection">`,r=22,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`Collection</option></select></div>`,r=23,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`<div class="form-group">`,r=24,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`<label for="g-s3-import-dest-id">`,r=24,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`Destination ID</label>`,r=25,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`<div class="input-group input-group-sm">`,r=26,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`<input class="form-control input-sm" id="g-s3-import-dest-id" type="text" placeholder="Existing folder, user, or collection ID to use as the destination"/>`,r=29,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`<div class="input-group-btn">`,r=30,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`<button class="g-open-browser btn btn-default" type="button">`,r=31,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`<i class="icon-folder-open"></i></button></div></div></div>`,r=32,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`<div class="g-validation-failed-message"></div>`,r=33,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`<button class="g-submit-assetstore-import g-submit-s3-import btn btn-success" type="submit">`,r=34,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`<i class="icon-link-ext"></i>`,r=35,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=` Begin import</button></form>`}).call(this,`assetstore`in i?i.assetstore:typeof assetstore<`u`?assetstore:void 0)}catch(e){QE(e,n,r)}return t}var eD=X.extend({events:{"submit .g-s3-import-form":function(e){e.preventDefault();var t=this.$(`#g-s3-import-dest-id`).val().trim().split(/\s/)[0],n=this.$(`#g-s3-import-dest-type`).val();this.$(`.g-validation-failed-message`).empty(),this.assetstore.off(`g:imported`).on(`g:imported`,function(){J.navigate(n+`/`+t,{trigger:!0})},this).on(`g:error`,function(e){this.$(`.g-validation-failed-message`).text(e.responseJSON.message)},this).import({importPath:this.$(`#g-s3-import-path`).val().trim(),destinationId:t,destinationType:n,progress:!0})},"click .g-open-browser":`_openBrowser`},initialize:function(e){this._browserWidgetView=new WE({parentView:this,titleText:`Destination`,helpText:`Browse to a location to select it as the destination.`,submitText:`Select Destination`,validate:function(e){let t=U.default.Deferred();return e?t.resolve():t.reject(`Please select a valid root.`),t.promise()}}),this.listenTo(this._browserWidgetView,`g:saved`,function(e){this.$(`#g-s3-import-dest-id`).val(e.id),this.$(`#g-s3-import-dest-type`).val(e.get(`_modelType`)),Ap({url:`resource/${e.id}/path`,method:`GET`,data:{type:e.get(`_modelType`)}}).done(t=>{this.$(`#g-s3-import-dest-id`).val()===e.id&&this.$(`#g-s3-import-dest-id`).val(`${e.id} (${t})`)})}),this.assetstore=e.assetstore,this.render()},render:function(){return this.$el.html($E({assetstore:this.assetstore})),this},_openBrowser:function(){this._browserWidgetView.setElement((0,U.default)(`#g-dialog-container`)).render()}});ho();var tD={};tD[om.FILESYSTEM]=YE,tD[om.S3]=eD;var nD=X.extend({events:{"click .g-set-current":`setCurrentAssetstore`,"click .g-delete-assetstore":`deleteAssetstore`,"click .g-edit-assetstore":`editAssetstore`},initialize:function(e){Pp(`fetch`),this.plots=[],this.assetstoreEdit=e.assetstoreEdit||!1,this.importableTypes=[om.FILESYSTEM,om.S3].concat(e.importableTypes||[]),this.newAssetstoreWidget=new Ob({parentView:this}).on(`g:created`,this.addAssetstore,this),this.collection=new Q_,this.collection.on(`g:changed`,function(){this.render()},this).fetch()},destroy:function(){this._destroyPlots(),X.prototype.destroy.call(this)},_destroyPlots:function(){for(let e of this.plots)e.destroy();this.plots=[]},render:function(){if(!qp()||!qp().get(`admin`)){this.$el.text(`Must be logged in as admin to view this page.`);return}return this._destroyPlots(),this.$el.html(Lb({assetstores:this.collection.toArray(),types:om,importableTypes:this.importableTypes,getAssetstoreImportRoute:this.getAssetstoreImportRoute})),this.newAssetstoreWidget.setElement(this.$(`#g-new-assetstore-container`)).render(),H.each(this.$(`.g-assetstore-capacity-chart`),this.capacityChart,this),this.assetstoreEdit&&=(this.editAssetstoreDialog(this.assetstoreEdit),!1),this},addAssetstore:function(e){this.collection.add(e),this.render()},capacityChart:function(e){var t=this.collection.get((0,U.default)(e).attr(`cid`)).get(`capacity`),n=t.total-t.free,r=[[`Used (`+R_(n)+`)`,n],[`Free (`+R_(t.free)+`)`,t.free]],i=new fC(e,{series:r.map(e=>e[1]),chart:{type:`pie`,animations:{enabled:!1}},labels:r.map(e=>e[0]),plotOptions:{pie:{startAngle:-90,endAngle:270,expandOnClick:!1,dataLabels:{enabled:!0}}},dataLabels:{style:{colors:[`#000`,`#000`]},dropShadow:{enabled:!1}},legend:{position:`right`}});i.render(),this.plots.push(i)},setCurrentAssetstore:function(e){var t=(0,U.default)(e.currentTarget),n=this.collection.get(t.attr(`cid`));n.set({current:!0}),n.off(`g:saved`).on(`g:saved`,function(){q.trigger(`g:alert`,{icon:`ok`,text:`Changed current assetstore.`,type:`success`,timeout:4e3}),this.collection.fetch({},!0)},this).off(`g:error`).on(`g:error`,function(e){q.trigger(`g:alert`,{icon:`cancel`,text:e.responseJSON.message,type:`danger`})}).save()},deleteAssetstore:function(e){var t=(0,U.default)(e.currentTarget),n=this.collection.get(t.attr(`cid`));Ev({text:`Are you sure you want to delete the assetstore <b>`+n.escape(`name`)+`</b>?  There are no files stored in it, and no data will be lost.`,escapedHtml:!0,yesText:`Delete`,confirmCallback:()=>{n.on(`g:deleted`,function(){q.trigger(`g:alert`,{icon:`ok`,text:`Assetstore deleted.`,type:`success`,timeout:4e3}),this.collection.fetch({},!0)},this).off(`g:error`).on(`g:error`,function(e){q.trigger(`g:alert`,{icon:`attention`,text:e.responseJSON.message,type:`danger`,timeout:4e3})},this).destroy()}})},editAssetstore:function(e){var t=(0,U.default)(e.currentTarget).attr(`cid`);this.editAssetstoreDialog(t)},editAssetstoreDialog:function(e){var t=this.collection.get(e);new wb({el:(0,U.default)(`#g-dialog-container`),model:t,parentView:this}).off(`g:saved`).on(`g:saved`,function(){this.render()},this).render()}},{import:function(e){var t=new Z_({_id:e});t.once(`g:fetched`,function(){var e=tD[t.get(`type`)];if(e)q.trigger(`g:navigateTo`,e,{assetstore:t});else throw Error(`No such view`)}).fetch()}});function rD(e){var t=``+e,n=iD.exec(t);if(!n)return e;var r,i,a,o=``;for(r=n.index,i=0;r<t.length;r++){switch(t.charCodeAt(r)){case 34:a=`&quot;`;break;case 38:a=`&amp;`;break;case 60:a=`&lt;`;break;case 62:a=`&gt;`;break;default:continue}i!==r&&(o+=t.substring(i,r)),i=r+1,o+=a}return i===r?o:o+t.substring(i,r)}var iD=/["&<>]/;function aD(e,t,n,r){if(!(e instanceof Error))throw e;if(!(typeof window>`u`&&t||r))throw e.message+=` on line `+n,e;var i,a,o,s;try{r||=Y().readFileSync(t,{encoding:`utf8`}),i=3,a=r.split(`
+`,r=12,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`</div>`,r=13,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`<form class="g-s3-import-form">`,r=14,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`<div class="form-group">`,r=15,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`<label for="g-s3-import-path">`,r=15,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`Import path (key or directory)</label>`,r=16,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`<input class="form-control input-sm" id="g-s3-import-path" type="text"/></div>`,r=17,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`<div class="form-group">`,r=18,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`<label for="g-s3-import-dest-type">`,r=18,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`Destination type</label>`,r=19,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`<select class="form-control" id="g-s3-import-dest-type">`,r=20,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`<option value="folder">`,r=20,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`Folder</option>`,r=21,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`<option value="user">`,r=21,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`User</option>`,r=22,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`<option value="collection">`,r=22,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`Collection</option></select></div>`,r=23,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`<div class="form-group">`,r=24,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`<label for="g-s3-import-dest-id">`,r=24,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`Destination ID</label>`,r=25,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`<div class="input-group input-group-sm">`,r=26,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`<input class="form-control input-sm" id="g-s3-import-dest-id" type="text" placeholder="Existing folder, user, or collection ID to use as the destination"/>`,r=29,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`<div class="input-group-btn">`,r=30,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`<button class="g-open-browser btn btn-default" type="button">`,r=31,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`<i class="icon-folder-open"></i></button></div></div></div>`,r=32,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`<div class="g-validation-failed-message"></div>`,r=33,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`<button class="g-submit-assetstore-import g-submit-s3-import btn btn-success" type="submit">`,r=34,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=`<i class="icon-link-ext"></i>`,r=35,n=`/home/circleci/project/girder/girder/web/src/templates/body/s3Import.pug`,t+=` Begin import</button></form>`}).call(this,`assetstore`in i?i.assetstore:typeof assetstore<`u`?assetstore:void 0)}catch(e){QE(e,n,r)}return t}var eD=X.extend({events:{"submit .g-s3-import-form":function(e){e.preventDefault();var t=this.$(`#g-s3-import-dest-id`).val().trim().split(/\s/)[0],n=this.$(`#g-s3-import-dest-type`).val();this.$(`.g-validation-failed-message`).empty(),this.assetstore.off(`g:imported`).on(`g:imported`,function(){J.navigate(n+`/`+t,{trigger:!0})},this).on(`g:error`,function(e){this.$(`.g-validation-failed-message`).text(e.responseJSON.message)},this).import({importPath:this.$(`#g-s3-import-path`).val().trim(),destinationId:t,destinationType:n,progress:!0})},"click .g-open-browser":`_openBrowser`},initialize:function(e){this._browserWidgetView=new WE({parentView:this,titleText:`Destination`,helpText:`Browse to a location to select it as the destination.`,submitText:`Select Destination`,validate:function(e){let t=U.default.Deferred();return e?t.resolve():t.reject(`Please select a valid root.`),t.promise()}}),this.listenTo(this._browserWidgetView,`g:saved`,function(e){this.$(`#g-s3-import-dest-id`).val(e.id),this.$(`#g-s3-import-dest-type`).val(e.get(`_modelType`)),Ap({url:`resource/${e.id}/path`,method:`GET`,data:{type:e.get(`_modelType`)}}).done(t=>{this.$(`#g-s3-import-dest-id`).val()===e.id&&this.$(`#g-s3-import-dest-id`).val(`${e.id} (${t})`)})}),this.assetstore=e.assetstore,this.render()},render:function(){return this.$el.html($E({assetstore:this.assetstore})),this},_openBrowser:function(){this._browserWidgetView.setElement((0,U.default)(`#g-dialog-container`)).render()}});ho();var tD={};tD[om.FILESYSTEM]=YE,tD[om.S3]=eD;var nD=X.extend({events:{"click .g-set-current":`setCurrentAssetstore`,"click .g-delete-assetstore":`deleteAssetstore`,"click .g-edit-assetstore":`editAssetstore`},initialize:function(e){Pp(`fetch`),this.plots=[],this.assetstoreEdit=e.assetstoreEdit||!1,this.importableTypes=[om.FILESYSTEM,om.S3].concat(e.importableTypes||[]),this.newAssetstoreWidget=new Ob({parentView:this}).on(`g:created`,this.addAssetstore,this),this.collection=new Q_,this.collection.on(`g:changed`,function(){this.render()},this).fetch()},destroy:function(){this._destroyPlots(),X.prototype.destroy.call(this)},_destroyPlots:function(){for(let e of this.plots)e.destroy();this.plots=[]},render:function(){if(!qp()||!qp().get(`admin`)){this.$el.text(`Must be logged in as admin to view this page.`);return}return this._destroyPlots(),this.$el.html(Lb({assetstores:this.collection.toArray(),types:om,importableTypes:this.importableTypes,getAssetstoreImportRoute:this.getAssetstoreImportRoute})),this.newAssetstoreWidget.setElement(this.$(`#g-new-assetstore-container`)).render(),H.each(this.$(`.g-assetstore-capacity-chart`),this.capacityChart,this),this.assetstoreEdit&&=(this.editAssetstoreDialog(this.assetstoreEdit),!1),this},addAssetstore:function(e){this.collection.add(e),this.render()},capacityChart:function(e){var t=this.collection.get((0,U.default)(e).attr(`cid`)).get(`capacity`),n=t.total-t.free;t.reserved&&(n-=t.reserved);var r=[[`Used (`+R_(n)+`)`,n],[`Free (`+R_(t.free)+`)`,t.free]];t.reserved&&r.push([`Reserved (`+R_(t.reserved)+`)`,t.reserved]);var i=new fC(e,{series:r.map(e=>e[1]),chart:{type:`pie`,animations:{enabled:!1}},labels:r.map(e=>e[0]),plotOptions:{pie:{startAngle:-90,endAngle:270,expandOnClick:!1,dataLabels:{enabled:!0}}},dataLabels:{style:{colors:[`#000`,`#000`,`#000`]},dropShadow:{enabled:!1}},legend:{position:`right`}});i.render(),this.plots.push(i)},setCurrentAssetstore:function(e){var t=(0,U.default)(e.currentTarget),n=this.collection.get(t.attr(`cid`));n.set({current:!0}),n.off(`g:saved`).on(`g:saved`,function(){q.trigger(`g:alert`,{icon:`ok`,text:`Changed current assetstore.`,type:`success`,timeout:4e3}),this.collection.fetch({},!0)},this).off(`g:error`).on(`g:error`,function(e){q.trigger(`g:alert`,{icon:`cancel`,text:e.responseJSON.message,type:`danger`})}).save()},deleteAssetstore:function(e){var t=(0,U.default)(e.currentTarget),n=this.collection.get(t.attr(`cid`));Ev({text:`Are you sure you want to delete the assetstore <b>`+n.escape(`name`)+`</b>?  There are no files stored in it, and no data will be lost.`,escapedHtml:!0,yesText:`Delete`,confirmCallback:()=>{n.on(`g:deleted`,function(){q.trigger(`g:alert`,{icon:`ok`,text:`Assetstore deleted.`,type:`success`,timeout:4e3}),this.collection.fetch({},!0)},this).off(`g:error`).on(`g:error`,function(e){q.trigger(`g:alert`,{icon:`attention`,text:e.responseJSON.message,type:`danger`,timeout:4e3})},this).destroy()}})},editAssetstore:function(e){var t=(0,U.default)(e.currentTarget).attr(`cid`);this.editAssetstoreDialog(t)},editAssetstoreDialog:function(e){var t=this.collection.get(e);new wb({el:(0,U.default)(`#g-dialog-container`),model:t,parentView:this}).off(`g:saved`).on(`g:saved`,function(){this.render()},this).render()}},{import:function(e){var t=new Z_({_id:e});t.once(`g:fetched`,function(){var e=tD[t.get(`type`)];if(e)q.trigger(`g:navigateTo`,e,{assetstore:t});else throw Error(`No such view`)}).fetch()}});function rD(e){var t=``+e,n=iD.exec(t);if(!n)return e;var r,i,a,o=``;for(r=n.index,i=0;r<t.length;r++){switch(t.charCodeAt(r)){case 34:a=`&quot;`;break;case 38:a=`&amp;`;break;case 60:a=`&lt;`;break;case 62:a=`&gt;`;break;default:continue}i!==r&&(o+=t.substring(i,r)),i=r+1,o+=a}return i===r?o:o+t.substring(i,r)}var iD=/["&<>]/;function aD(e,t,n,r){if(!(e instanceof Error))throw e;if(!(typeof window>`u`&&t||r))throw e.message+=` on line `+n,e;var i,a,o,s;try{r||=Y().readFileSync(t,{encoding:`utf8`}),i=3,a=r.split(`
 `),o=Math.max(n-i,0),s=Math.min(a.length,n+i)}catch(r){e.message+=` - could not read from `+t+` (`+r.message+`)`,aD(e,null,n);return}i=a.slice(o,s).map(function(e,t){var r=t+o+1;return(r==n?`  > `:`    `)+r+`| `+e}).join(`
 `),e.path=t;try{e.message=(t||`Pug`)+`:`+n+`
 `+i+`

{girder-5.0.7.dev6 → girder-5.0.8.dev2}/girder/web/dist/index.html

@@ -5,7 +5,7 @@
     <link rel="icon" type="image/png" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAABWNJREFUeNq0V01MG0cUfrsQTIzwzwLGKiSYRqJBqooTqqLKB0BRlRwqxT31WKenVmqEc8qtdY69tEb00FuM1FMvsaUeiqrIRhEHKqraEhUtUYMJkJi/xTZgYsfYfbP7ZjvZmmBKMtJod+3Zed/75ns/K1WrVThutI397MFLgB6zOBPb49eS8AqGdBwANM4M363x1zTOEAJJvDYA5PnSMXssE5DI6wDANv2E3asuJQZOuxskKEPpeQlWM1alVB4SludwhtlEMNlTA0DjDrykcdpVd/sUOG1X/7Po8DAFma2Mkt+/agISJVbSpwEQwstXbEP14pt59NzGwAjnP2wsrlYXYHtnVdnMviesYSNGjBypE/kl4IIa9R2OX9H4ObwdEf5jEXCDvEU3pBK0Kx8woGqXa/qZLK/Quus44+hMgsRcHwOi8tWLvQtoYKP6Wd+I9P0i10QKn7347CW6e3DewungwKFYnIfVdQV10m8SLNNJhOvkKAZCmnFbyxQa7+fPwhhA437SiJeO5FucHppBsFi64cL5fvXCuSm11TpD7/XQuiQ66a0JAP8YoYUA7nY32xy9TaDBAI8IGvdw7jBvaMbof3beUXyHAfkIms40Q7fbp77VO6uetfwmAInUPAJ2XkxgalPjLHowRGfNPI0LNPYcwVyORMjW+BGEli0RfJA8z8Pfj3fxWLpo/SW5RuLR1d3tLtBGSTpnPvyG+HSvOahJStPcQ8ZaGGeCjLNhA1fbvLCXQ6519pqKLU2jXDCCkWU6czs0NcQn3nd725wWLkIvRcoNgYmxF8KVjQZZTFJZ4wjEtKued8egxeol6odp07skNi/I0vrEUGcnj/n7q/vx6MruIMsIpjzAc0aCosMOmc24srPLnFvGSPCIDATI+zwaHyWvhim8+GDP0teXXSUyxIDFrnS3jH75Tsca5osVk3EnC1+KDDvCWyPjBtuykHa1+C20O+LaWeljEjcIG7GN1H7e55y2npHeZsC+GLBFcDJNxDpaGvpv9in36Jg0feC7WRKgHj1qds6Uro0w9BvUKY536TeWbAK4AUM/QL8lPLYmL91r1+9SeQ+dfW7i4c7HQoREKVdwAeaVDZVn07A5EemJx9kaRxq7yIsRMh4UKL1+e24dlrLPF5lXaJxHiP3m71vzUKn2CQykScApzeP9QlzQR9ioBUi/30DdoUjCy0kS5ZgAgIVa5ZuF7c4f07szxMzAD0u7v8Czsg/vxwXhcSNMgHbr6sZlvodYrhs5lXqINEiC2Go1HlkSa/jB033fg2zxpyvO5j9mM/u3KSdECDA/Bj2Ui8WZ5krFJ7JduxoeHlZN4cNUfolE00Obx6no5OCg/OH9J3vXeFIR+kYQomcAi1Ij39PcI8hC9gJYybSSsZyQ05PEUsrEhN0w8C9rAVP0hKBcnhE6p1CtfiDChaMcFAcxVz/RSqnejKSpBAMpfZKYSBIztwRgQKDE6BmG9e09DrxWYyKTIPxEObD6rTxa81n/Sq+gchNaRdPFGCYP7lBca1WQ9QV0VGKt0L3FTklo10LHNiRUikMmEeawIU1o+UEP0WmKEr/ATJpKMz/7qAZ6U51RtrI+nnZP0hF5CIhY//U84WqzgSwPCgUnR7kiQMCXNXaq8Kny5yPeR95BAKG6AZg646BRSDgQ1li84drCZkPshlOCIDHv7U0raxvDBNBzVKsu1flp5iDKQ2Izgk3LGnZNc1i8Rl6ogpXKovXhYzfGvo0ST+B/f5rVAOMnRgydsApaaLPNgvWsCoUDxdSe977s++DEAEyCNfeJ5jGOxoOn+jit88uZi9B+EuOvBIAJjJdScrqezzI2/hFgAGvtWR2qSjT9AAAAAElFTkSuQmCC">
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Girder</title>
-    <script type="module" crossorigin src="./assets/index-BPtAgi9d.js"></script>
+    <script type="module" crossorigin src="./assets/index-k-oavQaB.js"></script>
     <link rel="stylesheet" crossorigin href="./assets/index-BO941aQr.css">
   </head>
   <body>

{girder-5.0.7.dev6 → girder-5.0.8.dev2}/girder/web/dist/src/views/body/AssetstoresView.js

@@ -110,10 +110,16 @@ var AssetstoresView = View.extend({
         var assetstore = this.collection.get($(el).attr('cid'));
         var capacity = assetstore.get('capacity');
         var used = capacity.total - capacity.free;
+        if (capacity.reserved) {
+            used -= capacity.reserved;
+        }
         var data = [
             ['Used (' + formatSize(used) + ')', used],
             ['Free (' + formatSize(capacity.free) + ')', capacity.free]
         ];
+        if (capacity.reserved) {
+            data.push(['Reserved (' + formatSize(capacity.reserved) + ')', capacity.reserved]);
+        }
         var plot = new ApexCharts(el, {
             series: data.map(d => d[1]),
             chart: {
@@ -133,7 +139,7 @@ var AssetstoresView = View.extend({
             },
             dataLabels: {
                 style: {
-                  colors: ['#000', '#000']
+                  colors: ['#000', '#000', '#000']
                 },
                 dropShadow: {enabled: false},
             },

{girder-5.0.7.dev6 → girder-5.0.8.dev2/girder.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: girder
-Version: 5.0.7.dev6
+Version: 5.0.8.dev2
 Summary: Web-based data management platform
 Home-page: https://girder.readthedocs.org
 Author: Kitware, Inc.

{girder-5.0.7.dev6 → girder-5.0.8.dev2}/girder.egg-info/SOURCES.txt

@@ -167,7 +167,7 @@ girder/web/dist/assets/glyphicons-halflings-regular-CSehLiBc.svg
 girder/web/dist/assets/glyphicons-halflings-regular-DrwTMapi.ttf
 girder/web/dist/assets/glyphicons-halflings-regular-DzqM6ju8.woff2
 girder/web/dist/assets/index-BO941aQr.css
-girder/web/dist/assets/index-BPtAgi9d.js
+girder/web/dist/assets/index-k-oavQaB.js
 girder/web/dist/assets/jsoneditor-icons-CIlYC0TY.svg
 girder/web/dist/assets/open-sans-latin-300-B6tDWRxp.woff2
 girder/web/dist/assets/open-sans-latin-300-DZbNTRe6.woff

{girder-5.0.7.dev6 → girder-5.0.8.dev2}/scripts/publicNames.txt

@@ -774,6 +774,7 @@ girder
                 seek
                 seekable
                 tell
+                unavailable
         acl_mixin
             AccessControlMixin
                 filterResultsByPermission
@@ -817,6 +818,7 @@ girder
                 importFile
                 initUpload
                 requestOffset
+                unavailable
                 uploadChunk
                 validateInfo
             logger