Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .codex/environments/environment.toml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ echo "Removing repo-local temp/test output only..."

rm -rf .cache/tmp
rm -rf .aspire
rm -rf .aspire-home
rm -rf TestResults

find . -type d \( -name TestResults -o -name .vite -o -name .svelte-kit \) -exec rm -rf {} +
Expand All @@ -80,9 +81,13 @@ cd "${CODEX_WORKTREE_PATH:?CODEX_WORKTREE_PATH is required}"
export AppMode=Development
export DOTNET_ENVIRONMENT=Development
export ASPNETCORE_ENVIRONMENT=Development
export ASPIRE_HOME="${CODEX_WORKTREE_PATH}/.aspire-home"
mkdir -p "${ASPIRE_HOME}"
export HOME="${ASPIRE_HOME}"
export DOTNET_CLI_HOME="${ASPIRE_HOME}/.dotnet"

if command -v aspire >/dev/null 2>&1; then
aspire run
aspire run --nologo --non-interactive -- --allow-unsecured-transport --skip-trust-developer-certificate
else
dotnet run --project src/Exceptionless.AppHost/Exceptionless.AppHost.csproj
fi
Expand Down
9 changes: 6 additions & 3 deletions aspire.config.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"appHost": {
"path": "src/Exceptionless.AppHost/Exceptionless.AppHost.csproj"
}
"appHost": {
"path": "src/Exceptionless.AppHost/Exceptionless.AppHost.csproj"
},
"features": {
"updateNotificationsEnabled": "false"
}
}
8 changes: 7 additions & 1 deletion src/Exceptionless.AppHost/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,13 @@
string? scope = WorktreeScope.Resolve();
bool isScoped = !String.IsNullOrWhiteSpace(scope);
var worktreePorts = isScoped ? WorktreeScope.AssignFreePorts() : null;
var builder = DistributedApplication.CreateBuilder(args);
var builderOptions = new DistributedApplicationOptions
{
TrustDeveloperCertificate = !HasArgument("--skip-trust-developer-certificate"),
AllowUnsecuredTransport = HasArgument("--allow-unsecured-transport"),
DisableDashboard = HasArgument("--disable-dashboard")
};
Comment thread
niemyjski marked this conversation as resolved.
Outdated
var builder = DistributedApplication.CreateBuilder(builderOptions);
bool servicesOnly = HasArgument("--services-only");
bool ciE2E = HasArgument("--ci-e2e");
bool includeDevTools = !ciE2E;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import type { NewToken, ViewToken } from '$features/tokens/models';

import { page } from '$app/state';
import { resolve } from '$app/paths';

Check failure on line 5 in src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/api-keys/+page.svelte

View workflow job for this annotation

GitHub Actions / test-client

Expected "$app/paths" to come before "$app/state"
import DataTableViewOptions from '$comp/data-table/data-table-view-options.svelte';
import { Muted } from '$comp/typography';
import { Button } from '$comp/ui/button';
Expand All @@ -11,6 +12,7 @@
import { getTableOptions } from '$features/tokens/components/table/options.svelte';
import TokensDataTable from '$features/tokens/components/table/tokens-data-table.svelte';
import Plus from '@lucide/svelte/icons/plus';
import Send from '@lucide/svelte/icons/send';
import { createTable } from '@tanstack/svelte-table';
import { queryParamsState } from 'kit-query-params';
import { toast } from 'svelte-sonner';
Expand Down Expand Up @@ -85,6 +87,10 @@
{#snippet toolbarChildren()}
<div class="flex-1"></div>
<DataTableViewOptions size="icon-lg" {table} />
<Button size="icon-lg" href={resolve('/(app)/project/[projectId]/configure', { projectId })} title="Client Setup">
<Send class="size-4" aria-hidden="true" />
<span class="sr-only">Client Setup</span>
</Button>
<Button size="icon-lg" onclick={addApiKey} title="Add API Key">
<Plus class="size-4" aria-hidden="true" />
<span class="sr-only">Add API Key</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import { getProjectDefaultTokenQuery, patchToken } from '$features/tokens/api.svelte';
import EnableTokenDialog from '$features/tokens/components/dialogs/enable-token-dialog.svelte';
import { ChangeType, type WebSocketMessageValue } from '$features/websockets/models';
import ArrowLeft from '@lucide/svelte/icons/arrow-left';
import Events from '@lucide/svelte/icons/calendar-days';
import Database from '@lucide/svelte/icons/database';
import NotificationSettings from '@lucide/svelte/icons/mail';
Expand Down Expand Up @@ -348,6 +349,21 @@ public partial class App : Application {

<div class="space-y-6">
<Muted>The Exceptionless client can be integrated into your project in just a few easy steps</Muted>
<section class="border-border bg-muted/30 rounded-lg border p-4">
<P class="mb-2 font-medium">Quick values for your client setup</P>
<div class="space-y-2">
<div class="flex flex-wrap items-center gap-2">
<span class="text-muted-foreground w-28 shrink-0">Server URL</span>
<code class="bg-background max-w-full shrink overflow-x-auto rounded px-2 py-1 text-xs">{serverUrl}</code>
<CopyToClipboardButton value={serverUrl} size="icon" />
</div>
<div class="flex flex-wrap items-center gap-2">
<span class="text-muted-foreground w-28 shrink-0">API key</span>
<code class="bg-background max-w-full shrink overflow-x-auto rounded px-2 py-1 text-xs">{apiKey}</code>
<CopyToClipboardButton value={apiKey} size="icon" />
</div>
</div>
</section>

{#if isTokenDisabled}
<Notification variant="destructive">
Expand Down Expand Up @@ -725,6 +741,9 @@ public partial class App : Application {
{/if}

<div class="border-border flex flex-col-reverse gap-2 border-t pt-4 sm:flex-row sm:justify-end">
<Button variant="secondary" href={resolve('/(app)/project/[projectId]/manage', { projectId })}>
<ArrowLeft class="mr-2 size-4" aria-hidden="true" /> Back to Project Settings
</Button>
<Button variant="secondary" href={`${resolve('/(app)/account/notifications')}?project=${projectId}`}>
<NotificationSettings class="mr-2 size-4" aria-hidden="true" /> Notifications
</Button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
import Usage from '@lucide/svelte/icons/bar-chart';
import ClientConfig from '@lucide/svelte/icons/braces';
import ApiKey from '@lucide/svelte/icons/key';
import Send from '@lucide/svelte/icons/send';
import Stacks from '@lucide/svelte/icons/layers';

Check failure on line 7 in src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/routes.svelte.ts

View workflow job for this annotation

GitHub Actions / test-client

Expected "@lucide/svelte/icons/layers" to come before "@lucide/svelte/icons/send"
import Integration from '@lucide/svelte/icons/plug-2';
import Settings from '@lucide/svelte/icons/settings';

Expand All @@ -21,6 +22,12 @@
icon: Settings,
title: 'General'
},
{
group: 'Project Settings',
href: resolve('/(app)/project/[projectId]/configure', { projectId: page.params.projectId }),
icon: Send,
title: 'Client Setup'
},
{
group: 'Project Settings',
href: resolve('/(app)/project/[projectId]/usage', { projectId: page.params.projectId }),
Expand Down
Loading