diff --git a/webapp/src/stores/settings.js b/webapp/src/stores/settings.js index 82e0ecc7..94779722 100644 --- a/webapp/src/stores/settings.js +++ b/webapp/src/stores/settings.js @@ -1,5 +1,5 @@ import { defineStore } from "pinia"; -import { ref, computed } from "vue"; +import { ref } from "vue"; function getOriginFromLocation() { // This will default to the same origin that's serving @@ -13,8 +13,8 @@ export const useSettingsStore = defineStore( "settings", () => { // State - const origin = ref(getOriginFromLocation()); - const available = ref(false); + const baseUri = ref(getOriginFromLocation()); + const ready = ref(false); const waiting = ref(false); const error = ref(""); const trackWindow = ref(true); @@ -43,14 +43,14 @@ export const useSettingsStore = defineStore( // Actions function resetState() { waiting.value = false; - available.value = false; + ready.value = false; // On resetState there is no connection. error.value = "Microscope is not connected."; } function setConnected() { waiting.value = false; - available.value = true; + ready.value = true; } function addStream(id) { @@ -59,15 +59,12 @@ export const useSettingsStore = defineStore( function removeStream(id) { activeStreams.value[id] = false; } - // Getters - const baseUri = computed(() => origin.value); - const ready = computed(() => available.value); // Export return { - //State - origin, - available, + // State + baseUri, + ready, waiting, error, trackWindow, @@ -79,11 +76,7 @@ export const useSettingsStore = defineStore( navigationStepSize, navigationInvert, - //Getters - baseUri, - ready, - - //Actions + // Actions resetState, setConnected, addStream, diff --git a/webapp/src/tests/unit/LoggingContent.spec.js b/webapp/src/tests/unit/LoggingContent.spec.js index 2153c29f..4f541750 100644 --- a/webapp/src/tests/unit/LoggingContent.spec.js +++ b/webapp/src/tests/unit/LoggingContent.spec.js @@ -53,7 +53,7 @@ describe("Test LoggingContent.vue", () => { createTestingPinia({ createSpy: vi.fn, initialState: { - settings: { origin: "http://microscope.local:5000/api/v3" }, + settings: { baseUri: "http://microscope.local:5000/api/v3" }, }, }), ], diff --git a/webapp/vitest.config.js b/webapp/vitest.config.js index b4b29cb2..dc9dbbf4 100644 --- a/webapp/vitest.config.js +++ b/webapp/vitest.config.js @@ -50,7 +50,7 @@ export default defineConfig({ thresholds: { lines: 4, statements: 3, - functions: 3, + functions: 2, branches: 1, }, },