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

Updated to new API structure

Browse source
This commit is contained in:
Joel Collins 2020-01-14 16:10:05 +00:00
parent 733b6f4b61
commit fcdb30eedf
11 changed files with 113 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/components/viewComponents/galleryComponents/captureCard.vue
View file

@ -195,20 +195,19 @@ export default {
return "#" + this.metadataModalID;
},
thumbURL: function() {
return `${this.$store.getters.baseUri}${
this.captureState.links.download
}?thumbnail=true`;
return `${this.captureState.links.download.href}?thumbnail=true`;
},
imgURL: function() {
return `${this.$store.getters.baseUri}${
this.captureState.links.download
}`;
return this.captureState.links.download.href;
},
tagsURL: function() {
return `${this.$store.getters.baseUri}${this.captureState.links.tags}`;
return this.captureState.links.tags.href;
},
metadataURL: function() {
return this.captureState.links.metadata.href;
},
captureURL: function() {
return `${this.$store.getters.baseUri}${this.captureState.links.self}`;
return this.captureState.links.self.href;
},
betterTimestring: function() {
var dtSplit = this.captureState.metadata.time.split("_");
@ -250,7 +249,7 @@ export default {
.delete(this.captureURL)
.then(() => {
// Emit signal to update capture list
this.$root.$emit("globalUpdateCaptureList");
this.$root.$emit("globalUpdateCaptures");
})
.catch(error => {
this.modalError(error); // Let mixin handle error
@ -273,7 +272,7 @@ export default {
putMetadataRequest: function(metadataObject) {
// Send metadata PUT request
axios
.put(this.captureURL, metadataObject)
.put(this.metadataURL, metadataObject)
.then(() => {
// Update metadata object
this.getMetadataRequest();
@ -319,9 +318,9 @@ export default {
getMetadataRequest: function() {
// Send tag request
axios
.get(this.captureURL)
.get(this.metadataURL)
.then(response => {
this.customMetadata = response.data.metadata.custom;
this.customMetadata = response.data.custom;
})
.catch(error => {
this.modalError(error); // Let mixin handle error

16
src/components/viewComponents/galleryComponents/zipDownloader.vue
View file

@ -59,7 +59,7 @@ export default {
computed: {
pluginsUri: function() {
return `${this.$store.getters.baseUri}/api/v2/plugins`;
return `${this.$store.getters.baseUri}/api/v2/extensions`;
}
},
@ -73,14 +73,14 @@ export default {
.get(this.pluginsUri) // Get a list of plugins
.then(response => {
var plugins = response.data;
var foundExtension = plugins.find(
e => e.title === "org.openflexure.zipbuilder"
);
// if ZipBuilderPlugin is enabled
if ("ZipBuilderPlugin" in plugins) {
// Get plugin action link
var builderLink = plugins.ZipBuilderPlugin.views.build.links.self;
var getterLink = plugins.ZipBuilderPlugin.views.get.links.self;
// Store plugin action URI
this.zipBuilderUri = `${this.$store.getters.baseUri}${builderLink}`;
this.zipGetterUri = `${this.$store.getters.baseUri}${getterLink}`;
if (foundExtension) {
// Get plugin action links
this.zipBuilderUri = foundExtension.links.build.href;
this.zipGetterUri = foundExtension.links.get.href;
}
})
.catch(error => {