Skip to content

Commit cd61aa2

Browse files
rbjornstadrbjornstad
committed
refactor: update type imports and props usage in layout and page components
1 parent 86c3173 commit cd61aa2

File tree

58 files changed

+116
-338
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+116
-338
lines changed

‎src/routes/admin/+layout.svelte

+2-4
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@
33
import Tab from '$lib/Tab.svelte';
44
import Tabs from '$lib/Tabs.svelte';
55
import { replacer } from '$lib/replacer';
6-
interface Props {
7-
children?: import('svelte').Snippet;
8-
}
6+
import type { LayoutProps } from './$houdini';
97
10-
let { children }: Props = $props();
8+
let { children }: LayoutProps = $props();
119
1210
let currentRoute = $derived(page.route.id);
1311
const nav = [

‎src/routes/admin/+page.svelte

+2-6
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,9 @@
22
import Card from '$lib/Card.svelte';
33
import Pagination from '$lib/Pagination.svelte';
44
import { Table, Tbody, Td, Th, Thead, Tr } from '@nais/ds-svelte-community';
5-
import type { PageData } from './$houdini';
5+
import type { PageProps } from './$houdini';
66
7-
interface Props {
8-
data: PageData;
9-
}
10-
11-
let { data }: Props = $props();
7+
let { data }: PageProps = $props();
128
139
let { AdminUsers } = $derived(data);
1410
</script>

‎src/routes/admin/reconcilerLogs/[id]/+page.svelte

+2-6
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,9 @@
22
import Pagination from '$lib/Pagination.svelte';
33
import Time from '$lib/Time.svelte';
44
import { Heading, Table, Tbody, Td, Th, Thead, Tr } from '@nais/ds-svelte-community';
5-
import type { PageData } from './$houdini';
5+
import type { PageProps } from './$houdini';
66
7-
interface Props {
8-
data: PageData;
9-
}
10-
11-
let { data }: Props = $props();
7+
let { data }: PageProps = $props();
128
139
let { ReconcilerLogs } = $derived(data);
1410
</script>

‎src/routes/admin/reconcilers/+page.svelte

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
<script lang="ts">
2-
import type { PageData } from './$houdini';
2+
import type { PageProps } from './$houdini';
33
import Reconciler from './Reconciler.svelte';
44
5-
interface Props {
6-
data: PageData;
7-
}
8-
9-
let { data }: Props = $props();
5+
let { data }: PageProps = $props();
106
117
let { AdminReconcilers } = $derived(data);
128
let reconcilers = $derived($AdminReconcilers.data?.reconcilers.nodes);

‎src/routes/admin/userSyncLog/+page.svelte

+2-6
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,9 @@
44
import Pagination from '$lib/Pagination.svelte';
55
import Time from '$lib/Time.svelte';
66
import { Table, Tbody, Td, Th, Thead, Tr } from '@nais/ds-svelte-community';
7-
import type { PageData } from './$houdini';
7+
import type { PageProps } from './$houdini';
88
9-
interface Props {
10-
data: PageData;
11-
}
12-
13-
let { data }: Props = $props();
9+
let { data }: PageProps = $props();
1410
let { UserSyncLogs } = $derived(data);
1511
</script>
1612

‎src/routes/dataproduct/+layout.svelte

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
<script lang="ts">
2-
interface Props {
3-
children?: import('svelte').Snippet;
4-
}
2+
import type { LayoutProps } from './$houdini';
53
6-
let { children }: Props = $props();
4+
let { children }: LayoutProps = $props();
75
</script>
86

97
<div class="page">

‎src/routes/dataproduct/+page.svelte

+2-6
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,9 @@
33
import Card from '$lib/Card.svelte';
44
import EChart from '$lib/chart/EChart.svelte';
55
import type { EChartsOption } from 'echarts';
6-
import type { PageData } from './$houdini';
6+
import type { PageProps } from './$houdini';
77
8-
interface Props {
9-
data: PageData;
10-
}
11-
12-
let { data }: Props = $props();
8+
let { data }: PageProps = $props();
139
1410
let { DataProduct } = $derived(data);
1511

‎src/routes/team/[team]/+layout.svelte

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
11
<script lang="ts">
22
import PageHeader from '$lib/components/UrlBasedPageHeader.svelte';
33
import { Alert } from '@nais/ds-svelte-community';
4-
import type { Snippet } from 'svelte';
5-
import type { LayoutData } from './$houdini';
4+
import type { LayoutProps } from './$houdini';
65
import Menu from './Menu.svelte';
76
8-
interface Props {
9-
data: LayoutData;
10-
children?: Snippet;
11-
}
12-
13-
let { data, children }: Props = $props();
7+
let { data, children }: LayoutProps = $props();
148
let { deletionInProgress, lastSuccessfulSync, teamSlug, UserInfo, viewerIsMember } =
159
$derived(data);
1610
</script>

‎src/routes/team/[team]/[env]/app/[app]/+page.svelte

+2-6
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,12 @@
1313
import Time from '$lib/Time.svelte';
1414
import { Alert, BodyLong, BodyShort, Button, Heading } from '@nais/ds-svelte-community';
1515
import { ArrowCirclepathIcon } from '@nais/ds-svelte-community/icons';
16-
import type { PageData } from './$houdini';
16+
import type { PageProps } from './$houdini';
1717
import Ingresses from './Ingresses.svelte';
1818
import Instances from './Instances.svelte';
1919
import Utilization from './Utilization.svelte';
2020
21-
interface Props {
22-
data: PageData;
23-
}
24-
25-
let { data }: Props = $props();
21+
let { data }: PageProps = $props();
2622
let { App, teamSlug, viewerIsMember } = $derived(data);
2723
2824
const restartAppMutation = () =>

‎src/routes/team/[team]/[env]/app/[app]/cost/+page.svelte

+2-5
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,9 @@
1111
type DailCostType
1212
} from '$lib/chart/cost_transformer';
1313
import { Alert } from '@nais/ds-svelte-community';
14-
import type { PageData } from './$houdini';
15-
interface Props {
16-
data: PageData;
17-
}
14+
import type { PageProps } from './$houdini';
1815
19-
let { data }: Props = $props();
16+
let { data }: PageProps = $props();
2017
2118
let { AppCost } = $derived(data);
2219

‎src/routes/team/[team]/[env]/app/[app]/delete/+page.svelte

+2-6
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,9 @@
77
import Time from '$lib/Time.svelte';
88
import { Button, Heading, HelpText, TextField } from '@nais/ds-svelte-community';
99
import { get } from 'svelte/store';
10-
import type { PageData } from './$houdini';
10+
import type { PageProps } from './$houdini';
1111
12-
interface Props {
13-
data: PageData;
14-
}
15-
16-
let { data }: Props = $props();
12+
let { data }: PageProps = $props();
1713
1814
let { DeleteAppPage } = $derived(data);
1915

‎src/routes/team/[team]/[env]/app/[app]/deploys/+page.svelte

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
<script lang="ts">
22
import Deployments from '$lib/components/Deployments.svelte';
33
import GraphErrors from '$lib/GraphErrors.svelte';
4-
import type { PageData } from './$houdini';
5-
interface Props {
6-
data: PageData;
7-
}
4+
import type { PageProps } from './$houdini';
85
9-
let { data }: Props = $props();
6+
let { data }: PageProps = $props();
107
118
let { AppDeploys } = $derived(data);
129
</script>

‎src/routes/team/[team]/[env]/app/[app]/image/+page.svelte

+2-6
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,9 @@
88
import WarningIcon from '$lib/icons/WarningIcon.svelte';
99
import { parseImage } from '$lib/utils/image';
1010
import { CopyButton, Heading } from '@nais/ds-svelte-community';
11-
import type { PageData } from './$houdini';
11+
import type { PageProps } from './$houdini';
1212
13-
interface Props {
14-
data: PageData;
15-
}
16-
17-
let { data }: Props = $props();
13+
let { data }: PageProps = $props();
1814
1915
let { ApplicationImageDetails, viewerIsMember } = $derived(data);
2016

‎src/routes/team/[team]/[env]/app/[app]/logs/+page.svelte

+2-6
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,12 @@
33
import { Button, Chips, Fieldset, ToggleChip } from '@nais/ds-svelte-community';
44
import { ExternalLinkIcon } from '@nais/ds-svelte-community/icons';
55
import { SvelteSet } from 'svelte/reactivity';
6-
import type { PageData } from './$houdini';
6+
import type { PageProps } from './$houdini';
77
88
let running = $state(true);
99
let fetching = $state(false);
1010
11-
interface Props {
12-
data: PageData;
13-
}
14-
15-
let { data }: Props = $props();
11+
let { data }: PageProps = $props();
1612
let { teamSlug, env, app } = $derived(data);
1713
1814
let Instances = $derived(data.Instances);

‎src/routes/team/[team]/[env]/app/[app]/manifest/+page.svelte

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
<script lang="ts">
22
import Manifest from '$lib/components/Manifest.svelte';
33
import GraphErrors from '$lib/GraphErrors.svelte';
4-
import type { PageData } from './$houdini';
4+
import type { PageProps } from './$houdini';
55
6-
interface Props {
7-
data: PageData;
8-
}
9-
10-
let { data }: Props = $props();
6+
let { data }: PageProps = $props();
117
let { AppManifest } = $derived(data);
128
</script>
139

‎src/routes/team/[team]/[env]/app/[app]/status/+page.svelte

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
<script lang="ts">
22
import AppErrorTypeToMessage from '$lib/AppErrorTypeToMessage.svelte';
33
import { Alert } from '@nais/ds-svelte-community';
4-
import type { PageData } from './$houdini';
4+
import type { PageProps } from './$houdini';
55
6-
interface Props {
7-
data: PageData;
8-
}
9-
10-
let { data }: Props = $props();
6+
let { data }: PageProps = $props();
117
128
let { AppNotificationState } = $derived(data);
139
</script>

‎src/routes/team/[team]/[env]/bigquery/[bigquery]/+page.svelte

+2-6
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,9 @@
1818
Tr
1919
} from '@nais/ds-svelte-community';
2020
import { CheckmarkIcon, XMarkIcon } from '@nais/ds-svelte-community/icons';
21-
import type { PageData } from './$houdini';
21+
import type { PageProps } from './$houdini';
2222
23-
interface Props {
24-
data: PageData;
25-
}
26-
27-
let { data }: Props = $props();
23+
let { data }: PageProps = $props();
2824
let { BigQueryDataset: BigQueryDatasetInstance } = $derived(data);
2925
</script>
3026

‎src/routes/team/[team]/[env]/bucket/[bucket]/+page.svelte

+2-6
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,9 @@
66
import WarningIcon from '$lib/icons/WarningIcon.svelte';
77
import { BodyShort, CopyButton, Heading } from '@nais/ds-svelte-community';
88
import { CheckmarkIcon, ExternalLinkIcon, XMarkIcon } from '@nais/ds-svelte-community/icons';
9-
import type { PageData } from './$houdini';
9+
import type { PageProps } from './$houdini';
1010
11-
interface Props {
12-
data: PageData;
13-
}
14-
15-
let { data }: Props = $props();
11+
let { data }: PageProps = $props();
1612
let { Bucket } = $derived(data);
1713
</script>
1814

‎src/routes/team/[team]/[env]/job/[job]/+page.svelte

+2-6
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,12 @@
1010
import GraphErrors from '$lib/GraphErrors.svelte';
1111
import Time from '$lib/Time.svelte';
1212
import { Alert, BodyLong, BodyShort, Button, Heading } from '@nais/ds-svelte-community';
13-
import type { PageData } from './$houdini';
13+
import type { PageProps } from './$houdini';
1414
import Runs from './Runs.svelte';
1515
import Schedule from './Schedule.svelte';
1616
import TriggerRunModal from './TriggerRunModal.svelte';
1717
18-
interface Props {
19-
data: PageData;
20-
}
21-
22-
let { data }: Props = $props();
18+
let { data }: PageProps = $props();
2319
let { Job, teamSlug, viewerIsMember } = $derived(data);
2420
2521
const triggerRunMutation = () =>

‎src/routes/team/[team]/[env]/job/[job]/cost/+page.svelte

+2-5
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,9 @@
1010
type DailCostType
1111
} from '$lib/chart/cost_transformer';
1212
import { Alert } from '@nais/ds-svelte-community';
13-
import type { PageData } from './$houdini';
14-
interface Props {
15-
data: PageData;
16-
}
13+
import type { PageProps } from './$houdini';
1714
18-
let { data }: Props = $props();
15+
let { data }: PageProps = $props();
1916
2017
let { JobCost } = $derived(data);
2118

‎src/routes/team/[team]/[env]/job/[job]/delete/+page.svelte

+2-6
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,9 @@
77
import Time from '$lib/Time.svelte';
88
import { Button, Heading, HelpText, TextField } from '@nais/ds-svelte-community';
99
import { get } from 'svelte/store';
10-
import type { PageData } from './$houdini';
10+
import type { PageProps } from './$houdini';
1111
12-
interface Props {
13-
data: PageData;
14-
}
15-
16-
let { data }: Props = $props();
12+
let { data }: PageProps = $props();
1713
1814
let { DeleteJobPage } = $derived(data);
1915

‎src/routes/team/[team]/[env]/job/[job]/deploys/+page.svelte

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
<script lang="ts">
22
import Deployments from '$lib/components/Deployments.svelte';
33
import GraphErrors from '$lib/GraphErrors.svelte';
4-
import type { PageData } from './$houdini';
5-
interface Props {
6-
data: PageData;
7-
}
4+
import type { PageProps } from './$houdini';
85
9-
let { data }: Props = $props();
6+
let { data }: PageProps = $props();
107
118
let { JobDeploys } = $derived(data);
129
</script>

‎src/routes/team/[team]/[env]/job/[job]/image/+page.svelte

+2-6
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,9 @@
88
import WarningIcon from '$lib/icons/WarningIcon.svelte';
99
import { parseImage } from '$lib/utils/image';
1010
import { CopyButton, Heading } from '@nais/ds-svelte-community';
11-
import type { PageData } from './$houdini';
11+
import type { PageProps } from './$houdini';
1212
13-
interface Props {
14-
data: PageData;
15-
}
16-
17-
let { data }: Props = $props();
13+
let { data }: PageProps = $props();
1814
1915
let { JobImageDetails, viewerIsMember } = $derived(data);
2016

‎src/routes/team/[team]/[env]/job/[job]/logs/+page.svelte

+2-6
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,12 @@
99
} from '@nais/ds-svelte-community';
1010
import { ExternalLinkIcon } from '@nais/ds-svelte-community/icons';
1111
import { SvelteSet } from 'svelte/reactivity';
12-
import type { PageData } from './$houdini';
12+
import type { PageProps } from './$houdini';
1313
1414
let running = $state(true);
1515
let fetching = $state(false);
1616
17-
interface Props {
18-
data: PageData;
19-
}
20-
21-
let { data }: Props = $props();
17+
let { data }: PageProps = $props();
2218
2319
let { RunsWithPodNames, selected, teamSlug } = $derived(data);
2420

0 commit comments

Comments
 (0)