Skip to content

Commit 3aa66b9

Browse files
authored
Merge pull request #43 from gdi-be/bug-fix-2
Several minor bugfixes
2 parents 9717da9 + da953af commit 3aa66b9

File tree

6 files changed

+20
-62
lines changed

6 files changed

+20
-62
lines changed

Dockerfile

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ FROM oven/bun:1.1.36-alpine
1616
WORKDIR /app
1717

1818
COPY --from=builder /app/build ./build
19-
COPY --from=builder /app/static ./static
2019
COPY --from=builder /app/node_modules ./node_modules
2120

2221
COPY .env.example .env

src/lib/components/Overview/MetadataCard.svelte

+17-14
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import IconButton, { Icon } from '@smui/icon-button';
55
import { getContext } from 'svelte';
66
import type { Token } from '$lib/models/keycloak';
7-
import RoleTag from '../RoleTag.svelte';
87
import type { MetadataCollection } from '$lib/models/metadata';
98
import { popconfirm } from '$lib/context/PopConfirmContex.svelte';
109
import { Set } from '@smui/chips';
@@ -19,6 +18,7 @@
1918
2019
const { sub: userId } = getContext<Token>('user_token');
2120
const assignedToMe = $derived(metadata.assignedUserId === userId);
21+
const assignedToSomeoneElse = $derived((metadata.assignedUserId && metadata.assignedUserId !== userId) || false);
2222
const isTeamMember = $derived(metadata.teamMemberIds?.includes(userId));
2323
let previewNotAvailable = $state(!metadata.isoMetadata?.preview);
2424
@@ -129,19 +129,22 @@
129129
>
130130
<Icon class="material-icons">preview</Icon>
131131
</IconButton>
132-
<IconButton
133-
toggle
134-
class="assign-button"
135-
aria-label={assignedToMe
136-
? 'Mir zugewiesen.\nKlicken um Zuordnung zu entfernen.'
137-
: 'Mir zuweisen'}
138-
title={assignedToMe ? 'Mir zugeordnet.\nKlicken um Zuordnung zu entfernen.' : 'Mir zuordnen'}
139-
onclick={assignedToMe ? removeAssignment : assignToMe}
140-
pressed={assignedToMe}
141-
>
142-
<Icon class="material-icons-filled assigned-to-me" on>person_remove</Icon>
143-
<Icon class="material-icons-filled">person_check</Icon>
144-
</IconButton>
132+
{#if !assignedToSomeoneElse}
133+
<IconButton
134+
toggle
135+
class="assign-button"
136+
disabled={assignedToSomeoneElse}
137+
aria-label={assignedToMe
138+
? 'Mir zugewiesen.\nKlicken um Zuordnung zu entfernen.'
139+
: 'Mir zuweisen'}
140+
title={assignedToMe ? 'Mir zugeordnet.\nKlicken um Zuordnung zu entfernen.' : 'Mir zuordnen'}
141+
onclick={assignedToMe ? removeAssignment : assignToMe}
142+
pressed={assignedToMe}
143+
>
144+
<Icon class="material-icons-filled assigned-to-me" on>person_remove</Icon>
145+
<Icon class="material-icons-filled">person_check</Icon>
146+
</IconButton>
147+
{/if}
145148
</ActionIcons>
146149
</Card>
147150

src/lib/components/Overview/SearchPagination.svelte

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
const currentUrl = $derived(page.url);
1313
1414
const maxPage = $derived(Math.ceil(totalHitCount / 10));
15-
const currentPage = $derived(Number(currentUrl.searchParams.get('page') || 0));
15+
const currentPage = $derived(Number(currentUrl.searchParams.get('page') || 1));
1616
const hasPrevious = $derived(currentPage > 1);
1717
const hasNext = $derived(maxPage > currentPage);
1818
const pageSize = $derived(currentUrl.searchParams.get('size')?.toString() || '10');

src/lib/components/Overview/TextFilterField.svelte

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
onkeyup={onchange}
2929
>
3030
{#snippet helper()}
31-
<HelperText>Titel und Beschreibung durchsuchen</HelperText>
31+
<HelperText>Titel durchsuchen</HelperText>
3232
{/snippet}
3333
</Textfield>
3434

src/lib/components/ReadOnly/DisplayFieldSnippets.svelte

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
{/snippet}
6464

6565
{#snippet isoMetadataKeywords(value: Keywords)}
66-
{value.default.map(({keyword}) => keyword).join(', ')}
66+
{value?.default?.map(({keyword}) => keyword)?.join(', ')}
6767
{/snippet}
6868

6969
{#snippet isoMetadataPreview(value: string)}

src/lib/components/RoleTag.svelte

-44
This file was deleted.

0 commit comments

Comments
 (0)