Skip to content

Commit ec56f18

Browse files
authored
Merge pull request #2318 from appwrite/feat-add-view-certiicate-logs
2 parents caaf8e3 + 3f959cb commit ec56f18

File tree

3 files changed

+57
-3
lines changed

3 files changed

+57
-3
lines changed

src/lib/components/domains/dnsRecordsAction.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@
3232

3333
{#if dnsData}
3434
<ActionMenu.Item.Anchor leadingIcon={IconDocumentText} href={dnsData}>
35-
DNS Records
35+
DNS records
3636
</ActionMenu.Item.Anchor>
3737
{/if}

src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/table.svelte

Lines changed: 38 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,25 @@
33
import { Link } from '$lib/elements';
44
import { Button } from '$lib/elements/forms';
55
import type { Models } from '@appwrite.io/console';
6-
import { IconDotsHorizontal, IconRefresh, IconTrash } from '@appwrite.io/pink-icons-svelte';
6+
import {
7+
IconDotsHorizontal,
8+
IconRefresh,
9+
IconTrash,
10+
IconTerminal
11+
} from '@appwrite.io/pink-icons-svelte';
712
import {
813
ActionMenu,
914
Badge,
1015
Icon,
1116
Layout,
1217
Popover,
1318
Table,
14-
Typography
19+
Typography,
20+
Divider
1521
} from '@appwrite.io/pink-svelte';
1622
import DeleteDomainModal from './deleteDomainModal.svelte';
1723
import RetryDomainModal from './retryDomainModal.svelte';
24+
import ViewLogsModal from './viewLogsModal.svelte';
1825
import { columns } from './store';
1926
import { regionalProtocol } from '$routes/(console)/project-[region]-[project]/store';
2027
import DnsRecordsAction from '$lib/components/domains/dnsRecordsAction.svelte';
@@ -29,6 +36,7 @@
2936
3037
let showDelete = $state(false);
3138
let showRetry = $state(false);
39+
let showLogs = $state(false);
3240
let selectedProxyRule: Models.ProxyRule = $state(null);
3341
3442
const proxyTarget = (proxy: Models.ProxyRule) => {
@@ -94,6 +102,17 @@
94102

95103
<svelte:fragment slot="tooltip" let:toggle>
96104
<ActionMenu.Root>
105+
{#if rule.logs && (rule.status === 'unverified' || rule.status === 'verifying')}
106+
<ActionMenu.Item.Button
107+
leadingIcon={IconTerminal}
108+
on:click={(e) => {
109+
selectedProxyRule = rule;
110+
showLogs = true;
111+
toggle(e);
112+
}}>
113+
View logs
114+
</ActionMenu.Item.Button>
115+
{/if}
97116
{#if rule.status !== 'verified' && rule.status !== 'verifying'}
98117
<ActionMenu.Item.Button
99118
leadingIcon={IconRefresh}
@@ -106,6 +125,11 @@
106125
</ActionMenu.Item.Button>
107126
{/if}
108127
<DnsRecordsAction {rule} {organizationDomains} />
128+
{#if rule.logs && (rule.status === 'unverified' || rule.status === 'verifying')}
129+
<div class="action-menu-divider">
130+
<Divider />
131+
</div>
132+
{/if}
109133
<ActionMenu.Item.Button
110134
status="danger"
111135
leadingIcon={IconTrash}
@@ -135,3 +159,15 @@
135159
{#if showRetry}
136160
<RetryDomainModal bind:show={showRetry} {selectedProxyRule} />
137161
{/if}
162+
163+
{#if showLogs}
164+
<ViewLogsModal bind:show={showLogs} {selectedProxyRule} />
165+
{/if}
166+
167+
<style>
168+
.action-menu-divider {
169+
margin-inline: -1rem;
170+
padding-block-start: 0.25rem;
171+
padding-block-end: 0.25rem;
172+
}
173+
</style>
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<script lang="ts">
2+
import { Modal } from '$lib/components';
3+
import { Logs } from '@appwrite.io/pink-svelte';
4+
import { app } from '$lib/stores/app';
5+
import type { Models } from '@appwrite.io/console';
6+
7+
let {
8+
show = $bindable(false),
9+
selectedProxyRule
10+
}: {
11+
show: boolean;
12+
selectedProxyRule: Models.ProxyRule;
13+
} = $props();
14+
</script>
15+
16+
<Modal title="Certificate logs" bind:show size="m" hideFooter>
17+
<Logs logs={selectedProxyRule.logs} theme={$app.themeInUse} showScrollButton height="250px" />
18+
</Modal>

0 commit comments

Comments
 (0)