rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed individual captures creating 'undefined' dataset

Browse source
This commit is contained in:
Joel Collins 2020-12-04 14:24:00 +00:00
parent 3c3ecd7f0c
commit 213dec3e5c
1 changed files with 42 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

40
openflexure_microscope/api/static/src/components/tabContentComponents/galleryContent.vue
View file

@ -24,7 +24,7 @@
<a href="#">Filter</a> <a href="#">Filter</a>
<div <div
:class="{ :class="{
'uk-light uk-background-secondary': $store.state.darkMode, 'uk-light uk-background-secondary': $store.state.darkMode
}" }"
class="uk-navbar-dropdown" class="uk-navbar-dropdown"
> >
@ -159,7 +159,7 @@ export default {
captureCard, captureCard,
scanCard, scanCard,
ZipDownloader, ZipDownloader,
Paginate, Paginate
}, },
data: function() { data: function() {
@ -171,7 +171,7 @@ export default {
scanTag: "scan", scanTag: "scan",
unwatchStoreFunction: null, unwatchStoreFunction: null,
maxitems: 10, maxitems: 10,
page: 1, page: 1
}; };
}, },
@ -197,11 +197,7 @@ export default {
var captures = []; var captures = [];
for (var capture of this.captures) { for (var capture of this.captures) {
// Add to capture list if matched // Add to capture list if matched
if ( if (!this.isDatasetPopulated(capture.dataset)) {
!capture.dataset || // If no dataset key
(capture.dataset.constructor === Object && // Or dataset is an object...
Object.keys(capture.dataset).length === 0) // ...but it's empty
) {
captures.push(capture); captures.push(capture);
} }
} }
@ -216,7 +212,7 @@ export default {
for (var capture of this.captures) { for (var capture of this.captures) {
var dataset = capture.dataset; var dataset = capture.dataset;
if (dataset) { if (this.isDatasetPopulated(dataset)) {
var id = dataset["id"]; var id = dataset["id"];
// If this scan ID hasn't been seen before // If this scan ID hasn't been seen before
@ -304,7 +300,7 @@ export default {
numberOfPages: function() { numberOfPages: function() {
return Math.floor(this.sortedItems.length / this.maxitems); return Math.floor(this.sortedItems.length / this.maxitems);
}, }
}, },
mounted() { mounted() {
@ -322,7 +318,7 @@ export default {
(state, getters) => { (state, getters) => {
return getters.ready; return getters.ready;
}, },
(ready) => { ready => {
if (ready) { if (ready) {
// If the connection is now ready, update capture list // If the connection is now ready, update capture list
this.updateCaptures(); this.updateCaptures();
@ -356,15 +352,27 @@ export default {
if (this.$store.state.available) { if (this.$store.state.available) {
axios axios
.get(this.capturesUri) .get(this.capturesUri)
.then((response) => { .then(response => {
this.captures = response.data; this.captures = response.data;
}) })
.catch((error) => { .catch(error => {
this.modalError(error); // Let mixin handle error this.modalError(error); // Let mixin handle error
}); });
} }
}, },
isDatasetPopulated: function(dataset) {
if (
!dataset || // If no dataset key
(dataset.constructor === Object && // Or dataset is an object...
Object.keys(dataset).length === 0) // ...but it's empty
) {
return false;
} else {
return true;
}
},
filterCaptures: function(list, filterTags) { filterCaptures: function(list, filterTags) {
// Filter a list of captures by an array of tags // Filter a list of captures by an array of tags
var result = []; var result = [];
@ -374,7 +382,7 @@ export default {
// Filter by selected tags // Filter by selected tags
var tags = capture.tags; var tags = capture.tags;
let checker = (arr, target) => target.every((v) => arr.includes(v)); let checker = (arr, target) => target.every(v => arr.includes(v));
// True if all tags match // True if all tags match
includeCapture = checker(tags, filterTags); includeCapture = checker(tags, filterTags);
@ -409,8 +417,8 @@ export default {
selectFolder: function(folderID) { selectFolder: function(folderID) {
this.galleryFolder = folderID; this.galleryFolder = folderID;
}, }
}, }
}; };
</script> </script>