Skip to content

Commit 15a439b

Browse files
niemyjskiniemyjski
committed
Renamed some queries.
1 parent c0045bd commit 15a439b

File tree

12 files changed

+102
-100
lines changed

12 files changed

+102
-100
lines changed

‎src/Exceptionless.Web/ClientApp/src/lib/features/events/components/events-overview.svelte

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -76,26 +76,26 @@
7676
return tabs;
7777
}
7878
79-
const eventResponse = getEventQuery({
79+
const eventQuery = getEventQuery({
8080
route: {
8181
get id() {
8282
return id;
8383
}
8484
}
8585
});
8686
87-
const projectResponse = getProjectQuery({
87+
const projectQuery = getProjectQuery({
8888
route: {
8989
get id() {
90-
return eventResponse.data?.project_id;
90+
return eventQuery.data?.project_id;
9191
}
9292
}
9393
});
9494
9595
type TabType = 'Environment' | 'Exception' | 'Extended Data' | 'Overview' | 'Request' | 'Trace Log' | string;
9696
9797
let activeTab = $state<TabType>('Overview');
98-
let tabs = $derived<TabType[]>(getTabs(eventResponse.data, projectResponse.data));
98+
let tabs = $derived<TabType[]>(getTabs(eventQuery.data, projectQuery.data));
9999
100100
function onPromoted(title: string): void {
101101
activeTab = title;
@@ -106,39 +106,39 @@
106106
}
107107
108108
$effect(() => {
109-
if (projectResponse.isError) {
110-
handleError(projectResponse.error);
109+
if (projectQuery.isError) {
110+
handleError(projectQuery.error);
111111
}
112112
113-
if (eventResponse.isError) {
114-
handleError(eventResponse.error);
113+
if (eventQuery.isError) {
114+
handleError(eventQuery.error);
115115
}
116116
});
117117
</script>
118118

119-
<StackCard {filterChanged} id={eventResponse.data?.stack_id}></StackCard>
119+
<StackCard {filterChanged} id={eventQuery.data?.stack_id}></StackCard>
120120

121121
<Table.Root class="mt-4">
122122
<Table.Body>
123123
<Table.Row class="group">
124-
{#if eventResponse.isSuccess}
124+
{#if eventQuery.isSuccess}
125125
<Table.Head class="w-40 font-semibold whitespace-nowrap">Occurred On</Table.Head>
126126
<Table.Cell class="w-4 pr-0"></Table.Cell>
127127
<Table.Cell class="flex items-center"
128-
><DateTime value={eventResponse.data.date}></DateTime> (<TimeAgo value={eventResponse.data.date}></TimeAgo>)</Table.Cell
128+
><DateTime value={eventQuery.data.date}></DateTime> (<TimeAgo value={eventQuery.data.date}></TimeAgo>)</Table.Cell
129129
>
130130
{:else}
131131
<Table.Head class="w-40 font-semibold whitespace-nowrap"><Skeleton class="h-[24px] w-full rounded-full" /></Table.Head>
132132
<Table.Cell class="w-4 pr-0"></Table.Cell>
133133
<Table.Cell class="flex items-center"><Skeleton class="h-[24px] w-full rounded-full" /></Table.Cell>{/if}
134134
</Table.Row>
135135
<Table.Row class="group">
136-
{#if projectResponse.isSuccess}
136+
{#if projectQuery.isSuccess}
137137
<Table.Head class="w-40 font-semibold whitespace-nowrap">Project</Table.Head>
138138
<Table.Cell class="w-4 pr-0 opacity-0 group-hover:opacity-100"
139-
><EventsFacetedFilter.ProjectTrigger changed={filterChanged} class="mr-0" value={[projectResponse.data.id!]} /></Table.Cell
139+
><EventsFacetedFilter.ProjectTrigger changed={filterChanged} class="mr-0" value={[projectQuery.data.id!]} /></Table.Cell
140140
>
141-
<Table.Cell>{projectResponse.data.name}</Table.Cell>
141+
<Table.Cell>{projectQuery.data.name}</Table.Cell>
142142
{:else}
143143
<Table.Head class="w-40 font-semibold whitespace-nowrap"><Skeleton class="h-[24px] w-full rounded-full" /></Table.Head>
144144
<Table.Cell class="w-4 pr-0"></Table.Cell>
@@ -148,7 +148,7 @@
148148
</Table.Body>
149149
</Table.Root>
150150

151-
{#if eventResponse.isSuccess}
151+
{#if eventQuery.isSuccess}
152152
<Tabs.Root class="mt-4 mb-4" value={activeTab}>
153153
<Tabs.List class="w-full justify-normal overflow-scroll">
154154
{#each tabs as tab (tab)}
@@ -159,19 +159,19 @@
159159
{#each tabs as tab (tab)}
160160
<Tabs.Content value={tab}>
161161
{#if tab === 'Overview'}
162-
<Overview {filterChanged} event={eventResponse.data}></Overview>
162+
<Overview {filterChanged} event={eventQuery.data}></Overview>
163163
{:else if tab === 'Exception'}
164-
<Error {filterChanged} event={eventResponse.data}></Error>
164+
<Error {filterChanged} event={eventQuery.data}></Error>
165165
{:else if tab === 'Environment'}
166-
<Environment {filterChanged} event={eventResponse.data}></Environment>
166+
<Environment {filterChanged} event={eventQuery.data}></Environment>
167167
{:else if tab === 'Request'}
168-
<Request {filterChanged} event={eventResponse.data}></Request>
168+
<Request {filterChanged} event={eventQuery.data}></Request>
169169
{:else if tab === 'Trace Log'}
170-
<TraceLog logs={eventResponse.data.data?.['@trace']}></TraceLog>
170+
<TraceLog logs={eventQuery.data.data?.['@trace']}></TraceLog>
171171
{:else if tab === 'Extended Data'}
172-
<ExtendedData event={eventResponse.data} project={projectResponse.data} promoted={onPromoted}></ExtendedData>
172+
<ExtendedData event={eventQuery.data} project={projectQuery.data} promoted={onPromoted}></ExtendedData>
173173
{:else}
174-
<PromotedExtendedData demoted={onDemoted} event={eventResponse.data} title={tab + ''}></PromotedExtendedData>
174+
<PromotedExtendedData demoted={onDemoted} event={eventQuery.data} title={tab + ''}></PromotedExtendedData>
175175
{/if}
176176
</Tabs.Content>
177177
{/each}

‎src/Exceptionless.Web/ClientApp/src/lib/features/events/components/filters/project-faceted-filter.svelte

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
1212
// Store the organizationId to prevent loading when switching organizations.
1313
const organizationId = organization.current;
14-
const response = getOrganizationProjectsQuery({
14+
const projectsQuery = getOrganizationProjectsQuery({
1515
route: {
1616
get organizationId() {
1717
return organizationId;
1818
}
1919
}
2020
});
2121
22-
const projects = $derived(response.data?.data ?? []);
22+
const projects = $derived(projectsQuery.data?.data ?? []);
2323
const options = $derived(
2424
projects.map((project) => ({
2525
label: project.name!,
@@ -28,7 +28,7 @@
2828
);
2929
3030
$effect(() => {
31-
if (!response.isSuccess || filter.value.length === 0) {
31+
if (!projectsQuery.isSuccess || filter.value.length === 0) {
3232
return;
3333
}
3434
@@ -45,7 +45,7 @@
4545
filter.value = values;
4646
filterChanged(filter);
4747
}}
48-
loading={response.isLoading}
48+
loading={projectsQuery.isLoading}
4949
noOptionsText="No projects found."
5050
{options}
5151
remove={() => {

‎src/Exceptionless.Web/ClientApp/src/lib/features/events/components/filters/tag-faceted-filter.svelte

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
1313
// Store the organizationId to prevent loading when switching organizations.
1414
const organizationId = organization.current;
15-
const response = getOrganizationCountQuery({
15+
const countQuery = getOrganizationCountQuery({
1616
params: {
1717
aggregations: 'terms:tags'
1818
},
@@ -23,7 +23,7 @@
2323
}
2424
});
2525
26-
const tags = $derived(Array.from(new Set(['Critical', ...(terms(response.data?.aggregations, 'terms_tags')?.buckets?.map((tag) => tag.key) ?? [])])));
26+
const tags = $derived(Array.from(new Set(['Critical', ...(terms(countQuery.data?.aggregations, 'terms_tags')?.buckets?.map((tag) => tag.key) ?? [])])));
2727
const options = $derived(
2828
tags.map((tag) => ({
2929
label: tag,
@@ -32,7 +32,7 @@
3232
);
3333
3434
$effect(() => {
35-
if (!response.isSuccess || filter.value.length === 0) {
35+
if (!countQuery.isSuccess || filter.value.length === 0) {
3636
return;
3737
}
3838

‎src/Exceptionless.Web/ClientApp/src/lib/features/projects/components/project-log-level.svelte

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
}
1515
1616
let { projectId, source }: Props = $props();
17-
const projectConfigResponse = getProjectConfig({
17+
const projectConfigQuery = getProjectConfig({
1818
route: {
1919
get id() {
2020
return projectId;
@@ -54,7 +54,7 @@
5454
toast.success(`Successfully reverted to default (${defaultLevelDisplayName}) log level`);
5555
}
5656
57-
const configSettings = $derived(projectConfigResponse.data?.settings ?? {});
57+
const configSettings = $derived(projectConfigQuery.data?.settings ?? {});
5858
const level = $derived(getLogLevel(configSettings[`@@log:${source ?? ''}`]));
5959
const defaultLevel = $derived(getDefaultLogLevel(configSettings, source ?? ''));
6060
const defaultLevelDisplayName = $derived(getLogLevelDisplayName(defaultLevel));
@@ -128,7 +128,7 @@
128128
}
129129
</script>
130130

131-
{#if projectConfigResponse.isSuccess}
131+
{#if projectConfigQuery.isSuccess}
132132
<DropdownMenu.Root>
133133
<DropdownMenu.Trigger>
134134
<Button variant="outline">

‎src/Exceptionless.Web/ClientApp/src/lib/features/stacks/components/stack-card.svelte

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,27 +33,27 @@
3333
3434
let { filterChanged, id }: Props = $props();
3535
36-
const stackResponse = getStackQuery({
36+
const stackQuery = getStackQuery({
3737
route: {
3838
get id() {
3939
return id;
4040
}
4141
}
4242
});
4343
44-
const projectCountResponse = getProjectCountQuery({
44+
const projectCountQuery = getProjectCountQuery({
4545
params: {
4646
aggregations: 'cardinality:user'
4747
},
4848
route: {
4949
get projectId() {
50-
return stackResponse.data?.project_id;
50+
return stackQuery.data?.project_id;
5151
}
5252
}
5353
});
5454
5555
// TODO: Add stack charts for Occurrences, Average Value, Value Sum
56-
const stackCountResponse = getStackCountQuery({
56+
const stackCountQuery = getStackCountQuery({
5757
params: {
5858
aggregations: `date:(date${DEFAULT_OFFSET ? '^' + DEFAULT_OFFSET : ''} cardinality:user sum:count~1) min:date max:date cardinality:user sum:count~1`
5959
},
@@ -65,16 +65,16 @@
6565
});
6666
6767
// TODO: Log Level
68-
const stack = $derived(stackResponse.data!);
69-
const eventOccurrences = $derived(sum(stackCountResponse?.data?.aggregations, 'sum_count')?.value ?? 0);
68+
const stack = $derived(stackQuery.data!);
69+
const eventOccurrences = $derived(sum(stackCountQuery?.data?.aggregations, 'sum_count')?.value ?? 0);
7070
const totalOccurrences = $derived(stack && stack.total_occurrences > eventOccurrences ? stack.total_occurrences : eventOccurrences);
71-
const userCount = $derived(sum(stackCountResponse?.data?.aggregations, 'cardinality_user')?.value ?? 0);
72-
const totalUserCount = $derived(cardinality(projectCountResponse?.data?.aggregations, 'cardinality_user')?.value ?? 0);
73-
const firstOccurrence = $derived(min<string>(stackCountResponse?.data?.aggregations, 'min_date')?.value ?? stack?.first_occurrence);
74-
const lastOccurrence = $derived(max<string>(stackCountResponse?.data?.aggregations, 'max_date')?.value ?? stack?.last_occurrence);
71+
const userCount = $derived(sum(stackCountQuery?.data?.aggregations, 'cardinality_user')?.value ?? 0);
72+
const totalUserCount = $derived(cardinality(projectCountQuery?.data?.aggregations, 'cardinality_user')?.value ?? 0);
73+
const firstOccurrence = $derived(min<string>(stackCountQuery?.data?.aggregations, 'min_date')?.value ?? stack?.first_occurrence);
74+
const lastOccurrence = $derived(max<string>(stackCountQuery?.data?.aggregations, 'max_date')?.value ?? stack?.last_occurrence);
7575
</script>
7676

77-
{#if stackResponse.isSuccess}
77+
{#if stackQuery.isSuccess}
7878
<Card.Root>
7979
<Card.Header>
8080
<Card.Title class="flex flex-row items-center justify-between text-lg font-semibold">

‎src/Exceptionless.Web/ClientApp/src/routes/(app)/+layout.svelte

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -159,28 +159,28 @@
159159
};
160160
});
161161
162-
const userResponse = getMeQuery();
163-
const gravatar = getGravatarFromCurrentUser(userResponse);
162+
const meQuery = getMeQuery();
163+
const gravatar = getGravatarFromCurrentUser(meQuery);
164164
165-
const organizationsResponse = getOrganizationQuery({});
165+
const organizationsQuery = getOrganizationQuery({});
166166
$effect(() => {
167-
if (!organizationsResponse.isSuccess) {
167+
if (!organizationsQuery.isSuccess) {
168168
return;
169169
}
170170
171-
if (organizationsResponse.data.length === 0) {
171+
if (organizationsQuery.data.length === 0) {
172172
// TODO: Redirect to create organization page.
173173
organization.current = undefined;
174174
return;
175175
}
176176
177-
if (!organizationsResponse.data.find((org) => org.id === organization.current)) {
178-
organization.current = organizationsResponse.data[0]!.id;
177+
if (!organizationsQuery.data.find((org) => org.id === organization.current)) {
178+
organization.current = organizationsQuery.data[0]!.id;
179179
}
180180
});
181181
182182
const filteredRoutes = $derived.by(() => {
183-
const context: NavigationItemContext = { authenticated: isAuthenticated, user: userResponse.data };
183+
const context: NavigationItemContext = { authenticated: isAuthenticated, user: meQuery.data };
184184
return routes().filter((route) => (route.show ? route.show(context) : true));
185185
});
186186
</script>
@@ -191,14 +191,14 @@
191191
{#snippet header()}
192192
<SidebarOrganizationSwitcher
193193
class="pt-2"
194-
isLoading={organizationsResponse.isLoading}
195-
organizations={organizationsResponse.data}
194+
isLoading={organizationsQuery.isLoading}
195+
organizations={organizationsQuery.data}
196196
bind:selected={organization.current}
197197
/>
198198
{/snippet}
199199

200200
{#snippet footer()}
201-
<SidebarUser isLoading={userResponse.isLoading} user={userResponse.data} {gravatar} />
201+
<SidebarUser isLoading={meQuery.isLoading} user={meQuery.data} {gravatar} />
202202
{/snippet}
203203
</Sidebar>
204204
<div class="flex w-full overflow-hidden pt-16">

‎src/Exceptionless.Web/ClientApp/src/routes/(app)/account/+layout.svelte

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
1313
let { children } = $props();
1414
15-
const userResponse = getMeQuery();
15+
const meQuery = getMeQuery();
1616
let isAuthenticated = $derived(accessToken.current !== null);
1717
const filteredRoutes = $derived.by(() => {
18-
const context: NavigationItemContext = { authenticated: isAuthenticated, user: userResponse.data };
18+
const context: NavigationItemContext = { authenticated: isAuthenticated, user: meQuery.data };
1919
return routes().filter((route) => (route.show ? route.show(context) : true));
2020
});
2121
</script>

0 commit comments

Comments
 (0)