Skip to content

Commit 8d33891

Browse files
rbjornstadrbjornstad
committed
refactor: update environment property to teamEnvironment in GraphQL queries and components
1 parent 4be9436 commit 8d33891

Some content is hidden

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

54 files changed

+392
-222
lines changed

‎src/lib/components/Deployments.svelte

+4-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@
2222
team {
2323
slug
2424
}
25-
environment {
26-
name
25+
teamEnvironment {
26+
environment {
27+
name
28+
}
2729
}
2830
deployments {
2931
nodes {

‎src/lib/components/NetworkPolicy.svelte

+14-8
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,10 @@
2121
fragment NetworkPolicy on Workload {
2222
__typename
2323
name
24-
environment {
25-
name
24+
teamEnvironment {
25+
environment {
26+
name
27+
}
2628
}
2729
team {
2830
slug
@@ -39,8 +41,10 @@
3941
team {
4042
slug
4143
}
42-
environment {
43-
name
44+
teamEnvironment {
45+
environment {
46+
name
47+
}
4448
}
4549
}
4650
}
@@ -56,8 +60,10 @@
5660
team {
5761
slug
5862
}
59-
environment {
60-
name
63+
teamEnvironment {
64+
environment {
65+
name
66+
}
6167
}
6268
}
6369
}
@@ -84,8 +90,8 @@
8490
{:else}
8591
in {rule.targetTeamSlug}
8692
{/if}
87-
in <Tag size="small" variant={envTagVariant($data.environment.name)}
88-
>{$data.environment.name}</Tag
93+
in <Tag size="small" variant={envTagVariant($data.teamEnvironment.environment.name)}
94+
>{$data.teamEnvironment.environment.name}</Tag
8995
> can access {$data.name}.
9096
{:else if !rule.mutual && rule.targetWorkload}
9197
<WorkloadLink

‎src/lib/components/TeamUtilizationAndOverage.svelte

+8-4
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,10 @@
2929
used
3030
workload {
3131
name
32-
environment {
33-
name
32+
teamEnvironment {
33+
environment {
34+
name
35+
}
3436
}
3537
}
3638
}
@@ -39,8 +41,10 @@
3941
used
4042
workload {
4143
name
42-
environment {
43-
name
44+
teamEnvironment {
45+
environment {
46+
name
47+
}
4448
}
4549
}
4650
}

‎src/lib/components/WorkloadLink.svelte

+7-6
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
workload: {
1010
name: string;
1111
__typename: string | null;
12-
environment: { name: string };
12+
teamEnvironment: {
13+
environment: { name: string };
14+
};
1315
team: { slug: string };
1416
};
1517
hideTeam?: boolean;
@@ -25,12 +27,11 @@
2527
tag={hideEnv
2628
? undefined
2729
: {
28-
label: workload.environment.name,
29-
variant: envTagVariant(workload.environment.name)
30+
label: workload.teamEnvironment.environment.name,
31+
variant: envTagVariant(workload.teamEnvironment.environment.name)
3032
}}
31-
href="/team/{workload.team.slug}/{workload.environment.name}/{workload.__typename === 'Job'
32-
? 'job'
33-
: 'app'}/{workload.name}"
33+
href="/team/{workload.team.slug}/{workload.teamEnvironment.environment
34+
.name}/{workload.__typename === 'Job' ? 'job' : 'app'}/{workload.name}"
3435
>
3536
{#snippet icon()}
3637
{#if warning}

‎src/lib/components/WorkloadsWithSBOM.svelte

+10-8
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,10 @@
8787
__typename
8888
id
8989
name
90-
environment {
91-
id
92-
name
90+
teamEnvironment {
91+
environment {
92+
name
93+
}
9394
}
9495
team {
9596
slug
@@ -144,15 +145,16 @@
144145
readonly __typename: string | null;
145146
readonly id: string;
146147
readonly name: string;
147-
readonly environment: {
148-
readonly id: string;
149-
readonly name: string;
148+
readonly teamEnvironment: {
149+
readonly environment: {
150+
readonly name: string;
151+
};
150152
};
151153
readonly team: {
152154
readonly slug: string;
153155
};
154156
}) => {
155-
return `/team/${workload.team.slug}/${workload.environment.name}/${workload.__typename === 'Application' ? 'app' : 'job'}/${workload.name}/image`;
157+
return `/team/${workload.team.slug}/${workload.teamEnvironment.environment.name}/${workload.__typename === 'Application' ? 'app' : 'job'}/${workload.name}/image`;
156158
};
157159
158160
export function severityToColorWithHover(severity: string): string {
@@ -237,7 +239,7 @@
237239
<WorkloadLink {workload} />
238240
</Td>
239241
<Td>
240-
{workload.environment.name}
242+
{workload.teamEnvironment.environment.name}
241243
</Td>
242244
<Td>
243245
<div class="vulnerability">

‎src/lib/components/image/ImageVulnerabilities.svelte

+4-2
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,10 @@
8888
team {
8989
slug
9090
}
91-
environment {
92-
name
91+
teamEnvironment {
92+
environment {
93+
name
94+
}
9395
}
9496
name
9597
}

‎src/lib/components/image/ImageWorkloadReferences.svelte

+4-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@
2424
team {
2525
slug
2626
}
27-
environment {
28-
name
27+
teamEnvironment {
28+
environment {
29+
name
30+
}
2931
}
3032
name
3133
deployments(first: 1) {

‎src/lib/components/image/SuppressFinding.svelte

+2-4
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,7 @@
6060
readonly team: {
6161
readonly slug: string;
6262
};
63-
readonly environment: {
64-
readonly name: string;
65-
};
63+
readonly teamEnvironment: { readonly environment: { readonly name: string } };
6664
readonly name: string;
6765
}[];
6866
authorized: boolean;
@@ -218,7 +216,7 @@
218216
<Tbody>
219217
{#each workloads as workload (workload.id)}
220218
<Tr>
221-
<Td>{workload.environment.name}</Td>
219+
<Td>{workload.teamEnvironment.environment.name}</Td>
222220
<Td>{workload.team.slug}</Td>
223221
<Td>{workload.name}</Td>
224222
</Tr>

‎src/lib/components/image/TrailFinding.svelte

+5-3
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,10 @@
2525
readonly team: {
2626
readonly slug: string;
2727
};
28-
readonly environment: {
29-
readonly name: string;
28+
readonly teamEnvironment: {
29+
readonly environment: {
30+
readonly name: string;
31+
};
3032
};
3133
readonly name: string;
3234
}[];
@@ -77,7 +79,7 @@
7779
<Tbody>
7880
{#each workloads as workload (workload.id)}
7981
<Tr>
80-
<Td>{workload.environment.name}</Td>
82+
<Td>{workload.teamEnvironment.environment.name}</Td>
8183
<Td>{workload.team.slug}</Td>
8284
<Td>{workload.name}</Td>
8385
</Tr>

‎src/lib/components/list/AppListItem.svelte

+6-4
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
app: {
1616
__typename: string | null;
1717
name: string;
18-
environment: { name: string };
18+
teamEnvironment: {
19+
environment: { name: string };
20+
};
1921
team: { slug: string };
2022
status: {
2123
state: string;
@@ -36,12 +38,12 @@
3638
<ListItem>
3739
<IconLabel
3840
level="4"
39-
href="/team/{app.team.slug}/{app.environment.name}/app/{app.name}"
41+
href="/team/{app.team.slug}/{app.teamEnvironment.environment.name}/app/{app.name}"
4042
size="large"
4143
label={app.name}
4244
tag={{
43-
label: app.environment.name,
44-
variant: envTagVariant(app.environment.name)
45+
label: app.teamEnvironment.environment.name,
46+
variant: envTagVariant(app.teamEnvironment.environment.name)
4547
}}
4648
>
4749
{#snippet icon()}

‎src/lib/components/list/JobListItem.svelte

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
job: {
1919
__typename: string | null;
2020
name: string;
21-
environment: { name: string };
21+
teamEnvironment: { environment: { name: string } };
2222
team: { slug: string };
2323
status: { state: string };
2424
deployments: { nodes: { createdAt: Date }[] };
@@ -36,11 +36,11 @@
3636
<IconLabel
3737
level="4"
3838
label={job.name}
39-
href="/team/{job.team.slug}/{job.environment.name}/job/{job.name}"
39+
href="/team/{job.team.slug}/{job.teamEnvironment.environment.name}/job/{job.name}"
4040
size="large"
4141
tag={{
42-
label: job.environment.name,
43-
variant: envTagVariant(job.environment.name)
42+
label: job.teamEnvironment.environment.name,
43+
variant: envTagVariant(job.teamEnvironment.environment.name)
4444
}}
4545
>
4646
{#snippet icon()}

‎src/lib/components/list/List.stories.svelte

+12-12
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
{
7878
__typename: 'Application',
7979
name: 'behovsakkumulator',
80-
environment: { name: 'prod-fss' },
80+
teamEnvironment: { environment: { name: 'prod-fss' } },
8181
team: { slug: 'tbd' },
8282
status: { state: 'NAIS' },
8383
deployments: { nodes: [{ createdAt: new Date('2025-01-27T12:22:24.210001Z') }] },
@@ -95,7 +95,7 @@
9595
__typename: 'Application',
9696
9797
name: 'behovsakkumulator',
98-
environment: { name: 'dev-gcp' },
98+
teamEnvironment: { environment: { name: 'dev-gcp' } },
9999
team: { slug: 'tbd' },
100100
status: { state: 'FAILING' },
101101
deployments: { nodes: [{ createdAt: new Date('2025-01-27T12:22:22.26412Z') }] },
@@ -107,7 +107,7 @@
107107
{
108108
__typename: 'Application',
109109
name: 'dataprodukt-annulleringer',
110-
environment: { name: 'dev-gcp' },
110+
teamEnvironment: { environment: { name: 'dev-gcp' } },
111111
team: { slug: 'tbd' },
112112
status: { state: 'NOT_NAIS' },
113113
deployments: { nodes: [{ createdAt: new Date('2025-01-27T12:21:26.10995Z') }] },
@@ -119,7 +119,7 @@
119119
{
120120
__typename: 'Application',
121121
name: 'dataprodukt-annulleringer',
122-
environment: { name: 'prod-fss' },
122+
teamEnvironment: { environment: { name: 'prod-fss' } },
123123
team: { slug: 'tbd' },
124124
status: { state: 'UNKNOWN' },
125125
deployments: { nodes: [{ createdAt: new Date('2025-01-27T12:21:20.156954Z') }] },
@@ -131,7 +131,7 @@
131131
{
132132
__typename: 'Application',
133133
name: 'dataprodukt-arbeidsgiveropplysninger',
134-
environment: { name: 'prod-gcp' },
134+
teamEnvironment: { environment: { name: 'prod-gcp' } },
135135
team: { slug: 'tbd' },
136136
status: { state: 'NAIS' },
137137
deployments: { nodes: [{ createdAt: new Date('2025-01-27T12:21:31.81996Z') }] },
@@ -143,7 +143,7 @@
143143
{
144144
__typename: 'Application',
145145
name: 'dataprodukt-arbeidsgiveropplysninger',
146-
environment: { name: 'dev-fss' },
146+
teamEnvironment: { environment: { name: 'dev-fss' } },
147147
team: { slug: 'tbd' },
148148
status: { state: 'NAIS' },
149149
deployments: { nodes: [{ createdAt: new Date('2025-01-27T12:21:28.74535Z') }] },
@@ -155,7 +155,7 @@
155155
{
156156
__typename: 'Application',
157157
name: 'dataprodukt-forstegangsbehandling',
158-
environment: { name: 'dev-fss' },
158+
teamEnvironment: { environment: { name: 'dev-fss' } },
159159
team: { slug: 'tbd' },
160160
status: { state: 'NAIS' },
161161
deployments: { nodes: [{ createdAt: new Date('2025-01-27T12:21:38.095107Z') }] },
@@ -167,7 +167,7 @@
167167
{
168168
__typename: 'Application',
169169
name: 'dataprodukt-forstegangsbehandling',
170-
environment: { name: 'prod-fss' },
170+
teamEnvironment: { environment: { name: 'prod-fss' } },
171171
team: { slug: 'tbd' },
172172
status: { state: 'NAIS' },
173173
deployments: { nodes: [{ createdAt: new Date('2025-01-27T12:21:44.186683Z') }] },
@@ -179,7 +179,7 @@
179179
{
180180
__typename: 'Application',
181181
name: 'helse-spane',
182-
environment: { name: 'dev-fss' },
182+
teamEnvironment: { environment: { name: 'dev-fss' } },
183183
team: { slug: 'tbd' },
184184
status: { state: 'NAIS' },
185185
deployments: { nodes: [{ createdAt: new Date('2025-01-27T20:37:08.725562Z') }] },
@@ -191,7 +191,7 @@
191191
{
192192
__typename: 'Application',
193193
name: 'helse-spleis',
194-
environment: { name: 'dev-gcp' },
194+
teamEnvironment: { environment: { name: 'dev-gcp' } },
195195
team: { slug: 'tbd' },
196196
status: { state: 'NAIS' },
197197
deployments: { nodes: [{ createdAt: new Date('2025-02-13T14:44:41.989308Z') }] },
@@ -203,7 +203,7 @@
203203
{
204204
__typename: 'Application',
205205
name: 'red-team',
206-
environment: { name: 'prod-gcp' },
206+
teamEnvironment: { environment: { name: 'prod-gcp' } },
207207
team: { slug: 'tbd' },
208208
status: { state: 'NAIS' },
209209
deployments: { nodes: [{ createdAt: new Date('2025-02-03T15:12:17.565089Z') }] },
@@ -215,7 +215,7 @@
215215
{
216216
__typename: 'Application',
217217
name: 'risk-mock',
218-
environment: { name: 'dev-gcp' },
218+
teamEnvironment: { environment: { name: 'dev-gcp' } },
219219
team: { slug: 'tbd' },
220220
status: { state: 'NAIS' },
221221
deployments: { nodes: [{ createdAt: new Date('2025-01-27T19:32:15.70328Z') }] },

0 commit comments

Comments
 (0)