Fix persistance in pinia store

This commit is contained in:
Julian Stirling 2026-04-30 09:44:41 +01:00
parent 793441aadf
commit ebd67cd410
3 changed files with 114 additions and 102 deletions

View file

@ -99,7 +99,13 @@ export const useSettingsStore = defineStore(
{
// PiniaPluginPersistedState will now automatically persist ONLY these specific refs to localStorage
persist: {
paths: ["appTheme", "disableStream", "navigationStepSize", "navigationInvert"],
pick: [
"appTheme",
"overrideOrigin",
"disableStream",
"navigationStepSize",
"navigationInvert",
],
},
},
);

View file

@ -2,114 +2,120 @@ import { defineStore } from "pinia";
import { ref, computed } from "vue";
import axios from "axios";
export const useWotStore = defineStore("wot", () => {
// State
const thingDescriptions = ref({});
const servient = ref(null);
const helpers = ref(null);
// Actions
function addThingDescription(thingName, thingDescription) {
thingDescriptions.value[thingName] = thingDescription;
}
function removeThingDescription(thingName) {
delete thingDescriptions.value[thingName];
}
function removeAllThingDescriptions() {
thingDescriptions.value = {};
}
async function fetchThingDescription(uri, name = null) {
// Fetch the thing description from the given URI and consume it
// NB this should only be called once, or we'll duplicate effort.
// Deduplication should be done elsewhere.
const response = await axios.get(uri);
const td = response.data;
const thingName = name || uri.replace(/\/$/, "").split("/").pop();
addThingDescription(thingName, td);
}
async function fetchThingDescriptions(uri) {
// Fetch thing descriptions from the given URI
const response = await axios.get(uri);
if (response.status !== 200) throw "Could not retrieve thing descriptions";
for (const k in response.data) {
let thingName = k.replace(/\/$/, "").replace(/^\//, "");
addThingDescription(thingName, response.data[k]);
export const useWotStore = defineStore(
"wot",
() => {
// State
const thingDescriptions = ref({});
const servient = ref(null);
const helpers = ref(null);
// Actions
function addThingDescription(thingName, thingDescription) {
thingDescriptions.value[thingName] = thingDescription;
}
}
const thingList = computed(() => Object.keys(thingDescriptions.value));
function removeThingDescription(thingName) {
delete thingDescriptions.value[thingName];
}
const thingAvailable = computed(() => (thingName) => {
return thingName in thingDescriptions.value;
});
function removeAllThingDescriptions() {
thingDescriptions.value = {};
}
const thingAffordanceAvailable = computed(() => (thing, affordanceType, affordance) => {
const td = thingDescriptions.value[thing];
if (!td || !td[affordanceType]) return false;
return affordance in td[affordanceType];
});
async function fetchThingDescription(uri, name = null) {
// Fetch the thing description from the given URI and consume it
// NB this should only be called once, or we'll duplicate effort.
// Deduplication should be done elsewhere.
const response = await axios.get(uri);
const td = response.data;
const thingName = name || uri.replace(/\/$/, "").split("/").pop();
addThingDescription(thingName, td);
}
const thingFormUrl = computed(
() =>
(thing, affordanceType, affordance, op, allowUndefined = true) => {
// Find the URL for a particular operation
const td = thingDescriptions.value[thing];
if (!td) {
if (allowUndefined) return undefined;
throw `Could not find form for ${affordanceType} ${thing}/${affordance} with op ${op}`;
}
const affordances = td[affordanceType];
if (!affordances || !(affordance in affordances)) {
if (allowUndefined) return undefined;
throw `Could not find form for ${affordanceType} ${thing}/${affordance} with op ${op}`;
}
let href = findFormHref(affordances[affordance], op);
if (href === undefined) {
if (allowUndefined) return undefined;
throw `Could not find form for ${affordanceType} ${thing}/${affordance} with op ${op}`;
}
// If we've found an href, prepend the `base` URL if appropriate
if (href.startsWith("http")) return href;
if ("base" in td) {
let base = td.base;
if (href.startsWith("/")) href = href.slice(1);
if (!base.endsWith("/")) base += "/";
return base + href;
}
return href;
},
);
async function fetchThingDescriptions(uri) {
// Fetch thing descriptions from the given URI
const response = await axios.get(uri);
if (response.status !== 200) throw "Could not retrieve thing descriptions";
for (const k in response.data) {
let thingName = k.replace(/\/$/, "").replace(/^\//, "");
addThingDescription(thingName, response.data[k]);
}
}
const thingPropertyUrl = computed(() => (thing, property, op, allowUndefined) => {
// Find the URL for a particular property
return thingFormUrl.value(thing, "properties", property, op, allowUndefined);
});
const thingList = computed(() => Object.keys(thingDescriptions.value));
const thingActionUrl = computed(() => (thing, action, op, allowUndefined) => {
// Find the URL for a particular action
return thingFormUrl.value(thing, "actions", action, op, allowUndefined);
});
const thingAvailable = computed(() => (thingName) => {
return thingName in thingDescriptions.value;
});
return {
thingDescriptions,
servient,
helpers, // State
thingList,
thingAvailable, // Helpers
thingFormUrl,
thingPropertyUrl,
thingActionUrl,
fetchThingDescription,
fetchThingDescriptions, // Actions
addThingDescription,
removeThingDescription,
removeAllThingDescriptions,
thingAffordanceAvailable,
};
});
const thingAffordanceAvailable = computed(() => (thing, affordanceType, affordance) => {
const td = thingDescriptions.value[thing];
if (!td || !td[affordanceType]) return false;
return affordance in td[affordanceType];
});
const thingFormUrl = computed(
() =>
(thing, affordanceType, affordance, op, allowUndefined = true) => {
// Find the URL for a particular operation
const td = thingDescriptions.value[thing];
if (!td) {
if (allowUndefined) return undefined;
throw `Could not find form for ${affordanceType} ${thing}/${affordance} with op ${op}`;
}
const affordances = td[affordanceType];
if (!affordances || !(affordance in affordances)) {
if (allowUndefined) return undefined;
throw `Could not find form for ${affordanceType} ${thing}/${affordance} with op ${op}`;
}
let href = findFormHref(affordances[affordance], op);
if (href === undefined) {
if (allowUndefined) return undefined;
throw `Could not find form for ${affordanceType} ${thing}/${affordance} with op ${op}`;
}
// If we've found an href, prepend the `base` URL if appropriate
if (href.startsWith("http")) return href;
if ("base" in td) {
let base = td.base;
if (href.startsWith("/")) href = href.slice(1);
if (!base.endsWith("/")) base += "/";
return base + href;
}
return href;
},
);
const thingPropertyUrl = computed(() => (thing, property, op, allowUndefined) => {
// Find the URL for a particular property
return thingFormUrl.value(thing, "properties", property, op, allowUndefined);
});
const thingActionUrl = computed(() => (thing, action, op, allowUndefined) => {
// Find the URL for a particular action
return thingFormUrl.value(thing, "actions", action, op, allowUndefined);
});
return {
thingDescriptions,
servient,
helpers, // State
thingList,
thingAvailable, // Helpers
thingFormUrl,
thingPropertyUrl,
thingActionUrl,
fetchThingDescription,
fetchThingDescriptions, // Actions
addThingDescription,
removeThingDescription,
removeAllThingDescriptions,
thingAffordanceAvailable,
};
},
{
persist: false,
},
);
export function findFormHref(affordance, op) {
// Find the form in the affordance that matches the given operation type