OwlBoard/web-pwa
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move 'LocationFilter' fetching to API Lib package

Browse Source
This commit is contained in:
Fred Boniface
2026-03-24 12:47:39 +00:00
parent a7c244171c
commit ec4dd5dd3b
6 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
package-lock.json generated
View File

@@ -13,7 +13,8 @@
"devDependencies": { "devDependencies": {
"@eslint/compat": "^2.0.2", "@eslint/compat": "^2.0.2",
"@eslint/js": "^9.39.2", "@eslint/js": "^9.39.2",
"@owlboard/owlboard-ts": "^3.0.0-dev.20260319T2004", "@owlboard/api-schema-types": "^3.0.2-alpha1",
"@owlboard/owlboard-ts": "^3.0.0-dev.20260324T1240",
"@playwright/test": "^1.58.1", "@playwright/test": "^1.58.1",
"@sveltejs/adapter-static": "^3.0.10", "@sveltejs/adapter-static": "^3.0.10",
"@sveltejs/kit": "^2.50.2", "@sveltejs/kit": "^2.50.2",
@@ -780,20 +781,20 @@
} }
}, },
"node_modules/@owlboard/api-schema-types": { "node_modules/@owlboard/api-schema-types": {
"version": "3.0.1-alpha3", "version": "3.0.2-alpha1",
"resolved": "https://git.fjla.uk/api/packages/OwlBoard/npm/%40owlboard%2Fapi-schema-types/-/3.0.1-alpha3/api-schema-types-3.0.1-alpha3.tgz", "resolved": "https://git.fjla.uk/api/packages/OwlBoard/npm/%40owlboard%2Fapi-schema-types/-/3.0.2-alpha1/api-schema-types-3.0.2-alpha1.tgz",
"integrity": "sha512-5CVm1k/C++/VrtAw4NkvclDunH+RmYLnDZZMSWTM1mm+WlEVnmD+MVnTgC/FhcsAmsNHV8swm66RCqkCuhbOnA==", "integrity": "sha512-3yqWw28y2DZQmNXgAz8emCN5avX/upBXrTOXj9XLuay3gdVcdELd7BiYODBWfgtwZnSbT0fCgVXgKeTzbhHoSQ==",
"dev": true, "dev": true,
"license": "MIT" "license": "MIT"
}, },
"node_modules/@owlboard/owlboard-ts": { "node_modules/@owlboard/owlboard-ts": {
"version": "3.0.0-dev.20260319T2004", "version": "3.0.0-dev.20260324T1240",
"resolved": "https://git.fjla.uk/api/packages/OwlBoard/npm/%40owlboard%2Fowlboard-ts/-/3.0.0-dev.20260319T2004/owlboard-ts-3.0.0-dev.20260319t2004.tgz", "resolved": "https://git.fjla.uk/api/packages/OwlBoard/npm/%40owlboard%2Fowlboard-ts/-/3.0.0-dev.20260324T1240/owlboard-ts-3.0.0-dev.20260324t1240.tgz",
"integrity": "sha512-pphq1/l/8eOH4C0O7ocwBOUzt0HkCWGUlhy1itzKnQbmog7oPUEdyaxzS4Evw8onLsxZwkyqsLAyK7okYi+4XA==", "integrity": "sha512-s528RtkKLZmx6jZPdj159eKOBEmDHAjKDV0dSEU8/55JMt+7cSXYEqdXC3Cqs6t39wDxsOaPe8P0Q2z6P+d0jg==",
"dev": true, "dev": true,
"license": "GPL-3.0", "license": "GPL-3.0",
"dependencies": { "dependencies": {
"@owlboard/api-schema-types": "^3.0.1-alpha3" "@owlboard/api-schema-types": "^3.0.2-alpha1"
} }
}, },
"node_modules/@playwright/test": { "node_modules/@playwright/test": {

3
package.json
View File

@@ -19,7 +19,8 @@
"devDependencies": { "devDependencies": {
"@eslint/compat": "^2.0.2", "@eslint/compat": "^2.0.2",
"@eslint/js": "^9.39.2", "@eslint/js": "^9.39.2",
"@owlboard/owlboard-ts": "^3.0.0-dev.20260319T2004", "@owlboard/api-schema-types": "^3.0.2-alpha1",
"@owlboard/owlboard-ts": "^3.0.0-dev.20260324T1240",
"@playwright/test": "^1.58.1", "@playwright/test": "^1.58.1",
"@sveltejs/adapter-static": "^3.0.10", "@sveltejs/adapter-static": "^3.0.10",
"@sveltejs/kit": "^2.50.2", "@sveltejs/kit": "^2.50.2",

5
src/lib/components/ui/LocationSearchBox.svelte
View File

@@ -4,7 +4,8 @@
import { fade } from 'svelte/transition'; import { fade } from 'svelte/transition';
import { goto } from '$app/navigation'; import { goto } from '$app/navigation';
import { LOCATIONS } from '$lib/locations-object.svelte.ts'; import { LOCATIONS } from '$lib/locations-object.svelte';
import type { ApiLocationFilter } from '@owlboard/api-schema-types';
let { value = $bindable() } = $props(); let { value = $bindable() } = $props();
@@ -59,7 +60,7 @@
} }
}); });
function choose(loc: LocationRecord) { function choose(loc: ApiLocationFilter.LocationFilterObject) {
showResults = false; showResults = false;
selectedIndex = -1; selectedIndex = -1;
value = ''; value = '';

18
src/lib/locations-object.svelte.ts
View File

@@ -1,27 +1,23 @@
interface LocationRecord { import { OwlClient } from "./owlClient";
n: string; // name import type { ApiLocationFilter } from "@owlboard/api-schema-types";
t: string; // tiploc
c?: string; // crs
s: string; // search string
}
class LocationStore { class LocationStore {
data = $state<LocationRecord[]>([]); data = $state<ApiLocationFilter.LocationFilterObject[]>([]);
loaded = $state(false); loaded = $state(false);
async init(fetcher = fetch) { async init() {
if (this.loaded) return; if (this.loaded) return;
try { try {
const res = await fetcher('/api/tiplocs'); const fetch = await OwlClient.locationFilter.getLocationFilterData()
this.data = await res.json(); this.data = fetch.data;
this.loaded = true; this.loaded = true;
} catch (err) { } catch (err) {
console.error('Failed to load locations', err); console.error('Failed to load locations', err);
} }
} }
find(id: string | null): LocationRecord | undefined { find(id: string | null): ApiLocationFilter.LocationFilterObject | undefined {
if (!id) return undefined; if (!id) return undefined;
const query = id.toUpperCase().trim(); const query = id.toUpperCase().trim();

4
src/routes/+layout.svelte
View File

@@ -3,7 +3,7 @@
import { slide, fade } from 'svelte/transition'; import { slide, fade } from 'svelte/transition';
import { onMount } from 'svelte'; import { onMount } from 'svelte';
import { LOCATIONS } from '$lib/locations-object.svelte.ts'; import { LOCATIONS } from '$lib/locations-object.svelte';
import '$lib/global.css'; import '$lib/global.css';
@@ -13,7 +13,7 @@
import { IconHome, IconDialpad, IconSettings, IconHelp, IconDots } from '@tabler/icons-svelte'; import { IconHome, IconDialpad, IconSettings, IconHelp, IconDots } from '@tabler/icons-svelte';
onMount(() => LOCATIONS.init(fetch)); onMount(() => LOCATIONS.init());
let { children } = $props(); let { children } = $props();

10
src/routes/pis/+page.svelte
View File

@@ -2,11 +2,11 @@
import PisStartEndCard from '$lib/components/ui/cards/pis/PisStartEndCard.svelte'; import PisStartEndCard from '$lib/components/ui/cards/pis/PisStartEndCard.svelte';
import PisCode from '$lib/components/ui/cards/pis/PisCode.svelte'; import PisCode from '$lib/components/ui/cards/pis/PisCode.svelte';
import Button from '$lib/components/ui/Button.svelte'; import Button from '$lib/components/ui/Button.svelte';
import type { PisObjects } from '@owlboard/api-schema-types'; import type { ApiPisObject } from '@owlboard/api-schema-types';
import { OwlClient, ApiError, ValidationError } from '$lib/owlClient'; import { OwlClient, ApiError, ValidationError } from '$lib/owlClient';
import TocStyle from '$lib/components/ui/TocStyle.svelte'; import TocStyle from '$lib/components/ui/TocStyle.svelte';
let results = $state<PisObjects[]>([]); let results = $state<ApiPisObject.PisObjects[]>([]);
let resultsLoaded = $state<boolean>(false); let resultsLoaded = $state<boolean>(false);
let errorState = $state<{status: number, message: string} | null>(null); let errorState = $state<{status: number, message: string} | null>(null);
@@ -16,7 +16,7 @@
try { try {
const response = await OwlClient.pis.getByStartEndCrs(start, end); const response = await OwlClient.pis.getByStartEndCrs(start, end);
results = await response.data || []; results = response.data || [];
} catch (e) { } catch (e) {
if (e instanceof ValidationError) { if (e instanceof ValidationError) {
errorState = { status: 400, message: e.message }; errorState = { status: 400, message: e.message };
@@ -80,9 +80,9 @@
</tr></thead> </tr></thead>
{#each results as result} {#each results as result}
<tbody><tr> <tbody><tr>
<td><TocStyle toc={result.toc} /></td> <td><TocStyle toc={result.toc || ""} /></td>
<td>{result.code}</td> <td>{result.code}</td>
<td class="locations-row">{result.crsStops.join(' ')}</td> <td class="locations-row">{result.crsStops?.join(' ') || ''}</td>
</tr></tbody> </tr></tbody>
{/each} {/each}
</table> </table>