Commit 39d45bc7 authored by Joel Collins's avatar Joel Collins
Browse files

Updated host links to use store baseUri

parent 293e0665

src/components/controlComponents/paneCapture.vue

+1 −3
Original line number Diff line number Diff line
@@ -410,9 +410,7 @@ export default { 
            // Get plugin action link

            var link = plugins.ScanPlugin.views.tile.links.self;

            // Store plugin action URI

            this.scanUri = `http://${this.$store.state.host}:${

              this.$store.state.port

            }${link}`;

            this.scanUri = `${this.$store.getters.baseUri}${link}`;

          }

        })

        .catch(error => {

src/components/controlComponents/paneNavigate.vue

+6 −14
Original line number Diff line number Diff line
@@ -180,19 +180,13 @@ export default { 


  computed: {

    moveActionUri: function() {

      return `http://${this.$store.state.host}:${

        this.$store.state.port

      }/api/v2/actions/stage/move`;

      return `${this.$store.getters.baseUri}/api/v2/actions/stage/move`;

    },

    positionStatusUri: function() {

      return `http://${this.$store.state.host}:${

        this.$store.state.port

      }/api/v2/status/stage/position`;

      return `${this.$store.getters.baseUri}/api/v2/status/stage/position`;

    },

    pluginsUri: function() {

      return `http://${this.$store.state.host}:${

        this.$store.state.port

      }/api/v2/plugins`;

      return `${this.$store.getters.baseUri}/api/v2/plugins`;

    }

  },
@@ -343,11 +337,9 @@ export default { 
              plugins.AutofocusPlugin.views.fast_autofocus.links.self;

            var normalLink = plugins.AutofocusPlugin.views.autofocus.links.self;

            // Store plugin action URI

            this.fastAutofocusUri = `http://${this.$store.state.host}:${

              this.$store.state.port

            }${fastLink}`;

            this.normalAutofocusUri = `http://${this.$store.state.host}:${

              this.$store.state.port

            this.fastAutofocusUri = `${this.$store.getters.baseUri}${fastLink}`;

            this.normalAutofocusUri = `${

              this.$store.getters.baseUri

            }${normalLink}`;

          }

        })

src/components/controlComponents/paneStatus.vue

+2 −6
Original line number Diff line number Diff line
@@ -69,14 +69,10 @@ export default { 


  computed: {

    settingsUri: function() {

      return `http://${this.$store.state.host}:${

        this.$store.state.port

      }/api/v2/settings`;

      return `${this.$store.getters.baseUri}/api/v2/settings`;

    },

    statusUri: function() {

      return `http://${this.$store.state.host}:${

        this.$store.state.port

      }/api/v2/status`;

      return `${this.$store.getters.baseUri}/api/v2/status`;

    }

  },

src/components/controlComponents/settingsComponents/cameraSettings.vue

+3 −9
Original line number Diff line number Diff line
@@ -93,14 +93,10 @@ export default { 


  computed: {

    settingsUri: function() {

      return `http://${this.$store.state.host}:${

        this.$store.state.port

      }/api/v2/settings`;

      return `${this.$store.getters.baseUri}/api/v2/settings`;

    },

    pluginsUri: function() {

      return `http://${this.$store.state.host}:${

        this.$store.state.port

      }/api/v2/plugins`;

      return `${this.$store.getters.baseUri}/api/v2/plugins`;

    }

  },
@@ -132,9 +128,7 @@ export default { 
            var link =

              plugins.AutocalibrationPlugin.views.recalibrate.links.self;

            // Store plugin action URI

            this.recalibrationUri = `http://${this.$store.state.host}:${

              this.$store.state.port

            }${link}`;

            this.recalibrationUri = `${this.$store.getters.baseUri}${link}`;

          }

        })

        .catch(error => {

src/components/controlComponents/settingsComponents/microscopeSettings.vue

+1 −3
Original line number Diff line number Diff line
@@ -80,9 +80,7 @@ export default { 


  computed: {

    settingsUri: function() {

      return `http://${this.$store.state.host}:${

        this.$store.state.port

      }/api/v2/settings`;

      return `${this.$store.getters.baseUri}/api/v2/settings`;

    }

  },