-
-
Notifications
You must be signed in to change notification settings - Fork 3
feat: add edit page for version families, add delete button for versions #26
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
kennytv
wants to merge
2
commits into
main
Choose a base branch
from
feature/delete-button
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,19 @@ | ||
| <script lang="ts"> | ||
| import { goto } from "$app/navigation"; | ||
| import { resolve } from "$app/paths"; | ||
| import { page } from "$app/state"; | ||
| import { AUTH_CTX } from "$lib/auth.svelte"; | ||
| import FlagsDisplay from "$lib/components/FlagsDisplay.svelte"; | ||
| import * as AlertDialog from "$lib/components/ui/alert-dialog"; | ||
| import { Button } from "$lib/components/ui/button"; | ||
| import * as Input from "$lib/components/ui/input"; | ||
| import { Label } from "$lib/components/ui/label"; | ||
| import type { Java } from "$lib/gql/graphql"; | ||
| import { splitFlags } from "$lib/utils"; | ||
| import { getContextClient, mutationStore } from "@urql/svelte"; | ||
| import { watch } from "runed"; | ||
|
|
||
| const auth = AUTH_CTX.get(); | ||
|
|
||
| type Family = { | ||
| key: string; | ||
|
|
@@ -9,15 +22,186 @@ | |
|
|
||
| interface Props { | ||
| family: Family; | ||
| versionCount: number; | ||
| editMode?: boolean; | ||
| } | ||
|
|
||
| interface EditState { | ||
| minimum?: number; | ||
| flags?: string[]; | ||
| } | ||
|
|
||
| let { family, versionCount, editMode = $bindable(false) }: Props = $props(); | ||
|
|
||
| function createEditState(): EditState { | ||
| return { | ||
| minimum: family.java.version.minimum, | ||
| flags: family.java.flags.recommended, | ||
| }; | ||
| } | ||
|
|
||
| let editState: EditState = $state(createEditState()); | ||
|
|
||
| function resetEditState() { | ||
| editState = createEditState(); | ||
| } | ||
|
|
||
| const client = getContextClient(); | ||
| let saving = $state(false); | ||
| let deleting = $state(false); | ||
| let deleteDialogOpen = $state(false); | ||
| let deleteConfirmation = $state(""); | ||
| let canDelete = $derived(versionCount === 0); | ||
|
|
||
| watch( | ||
| () => deleteDialogOpen, | ||
| (open) => { | ||
| if (!open) { | ||
| deleteConfirmation = ""; | ||
| } | ||
| }, | ||
| ); | ||
|
|
||
| function saveChanges() { | ||
| if (saving || deleting) return; | ||
| if (editState.minimum == null) { | ||
| alert("Please set a minimum Java version."); | ||
| return; | ||
| } | ||
|
|
||
| saving = true; | ||
|
|
||
| const result = mutationStore({ | ||
| client, | ||
| query: ` | ||
| mutation UpdateFamily($input: UpdateFamilyInput!) { | ||
| updateFamily(input: $input) { | ||
| family { | ||
| id | ||
| key | ||
| java { | ||
| version { | ||
| minimum | ||
| } | ||
| flags { | ||
| recommended | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| `, | ||
| variables: { | ||
| input: { | ||
| project: page.params.project!, | ||
| key: family.key, | ||
| java: { | ||
| version: { | ||
| minimum: editState.minimum, | ||
| }, | ||
| flags: { | ||
| recommended: editState.flags || [], | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }); | ||
|
|
||
| result.subscribe(({ data, error, fetching }) => { | ||
| if (!fetching) { | ||
| saving = false; | ||
| if (error) { | ||
| alert(`Error updating family: ${error.message}`); | ||
| return; | ||
| } | ||
|
|
||
| const updated = (data as { updateFamily?: { family?: { key?: string } } } | undefined)?.updateFamily?.family; | ||
| if (!updated?.key) { | ||
| alert("Error updating family: The server did not confirm the update."); | ||
| return; | ||
| } | ||
|
|
||
| editMode = false; | ||
| goto( | ||
| resolve("/projects/[project]/family/[family]", { | ||
| project: page.params.project!, | ||
| family: updated.key, | ||
| }), | ||
| { | ||
| invalidateAll: true, | ||
| keepFocus: true, | ||
| noScroll: true, | ||
| replaceState: true, | ||
| }, | ||
| ); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| let { family }: Props = $props(); | ||
| function deleteFamily() { | ||
| if (deleting || saving || !canDelete || deleteConfirmation !== "delete") return; | ||
|
|
||
| deleting = true; | ||
|
|
||
| const result = mutationStore({ | ||
| client, | ||
| query: ` | ||
| mutation DeleteFamily($input: DeleteFamilyInput!) { | ||
| deleteFamily(input: $input) { | ||
| ok | ||
| } | ||
| } | ||
| `, | ||
| variables: { | ||
| input: { | ||
| project: page.params.project!, | ||
| key: family.key, | ||
| }, | ||
| }, | ||
| }); | ||
|
|
||
| result.subscribe(({ data, error, fetching }) => { | ||
| if (!fetching) { | ||
| deleting = false; | ||
| if (error) { | ||
| alert(`Error deleting family: ${error.message}`); | ||
| return; | ||
| } | ||
|
|
||
| const deleted = (data as { deleteFamily?: { ok?: boolean | null } } | undefined)?.deleteFamily?.ok; | ||
| if (!deleted) { | ||
| alert("Error deleting family: The server did not confirm the deletion."); | ||
| return; | ||
| } | ||
|
|
||
| deleteDialogOpen = false; | ||
| editMode = false; | ||
| goto(resolve("/projects/[project]", { project: page.params.project! })); | ||
| } | ||
|
Comment on lines
+163
to
+180
|
||
| }); | ||
| } | ||
| </script> | ||
|
|
||
| <section class="space-y-4"> | ||
| <div class="flex items-center justify-between"> | ||
| <div class="flex items-center gap-2"> | ||
| <h2 class="flex items-center text-lg font-medium">Metadata</h2> | ||
| {#if auth.getUsername()} | ||
| <Button | ||
| size="icon" | ||
| variant="ghost" | ||
| disabled={editMode} | ||
| class="size-6" | ||
| onclick={() => { | ||
| editMode = true; | ||
| resetEditState(); | ||
| }} | ||
| title={editMode ? "Editing metadata" : "Edit metadata"} | ||
| > | ||
| <span class="iconify size-4 lucide--pencil"></span> | ||
| </Button> | ||
| {/if} | ||
| </div> | ||
|
|
||
| <div class="space-y-2 rounded-lg border p-4"> | ||
| <h3 class="text-lg font-medium">General</h3> | ||
| <div class="text-sm"> | ||
|
|
@@ -26,14 +210,114 @@ | |
| </div> | ||
|
|
||
| <h3 class="mt-4 text-lg font-medium">Java</h3> | ||
| <div class="text-sm"> | ||
| <div class="flex items-center gap-2 font-medium">Minimum Version</div> | ||
| <div class="mt-0.5">{family.java.version.minimum}</div> | ||
| </div> | ||
| {#if editMode} | ||
| <div class="space-y-2 text-sm"> | ||
| <div class="space-y-1"> | ||
| <Label for="family-min-java">Minimum Version</Label> | ||
| <Input.Root id="family-min-java" type="number" min="1" step="1" bind:value={editState.minimum} /> | ||
| </div> | ||
|
|
||
| <div class="space-y-1 text-sm"> | ||
| <div class="flex items-center gap-2 font-medium">Recommended Flags</div> | ||
| <FlagsDisplay flags={family.java.flags.recommended.length > 0 ? family.java.flags.recommended : ["None"]} /> | ||
| </div> | ||
| <div class="space-y-1"> | ||
| <Label for="family-flags">Recommended Flags</Label> | ||
| <Input.Root | ||
| id="family-flags" | ||
| bind:value={() => editState.flags?.join(" ") || "", (value) => (editState.flags = value ? splitFlags(value) : [])} | ||
| placeholder="-Xms4G -Xmx4G" | ||
| /> | ||
| </div> | ||
| </div> | ||
| {:else} | ||
| <div class="text-sm"> | ||
| <div class="flex items-center gap-2 font-medium">Minimum Version</div> | ||
| <div class="mt-0.5">{family.java.version.minimum}</div> | ||
| </div> | ||
|
|
||
| <div class="space-y-1 text-sm"> | ||
| <div class="flex items-center gap-2 font-medium">Recommended Flags</div> | ||
| <FlagsDisplay flags={family.java.flags.recommended.length > 0 ? family.java.flags.recommended : ["None"]} /> | ||
| </div> | ||
| {/if} | ||
| </div> | ||
|
|
||
| {#if editMode} | ||
| <div class="flex flex-wrap items-center gap-2"> | ||
| <Button | ||
| variant="secondary" | ||
| onclick={() => { | ||
| editMode = false; | ||
| deleteDialogOpen = false; | ||
| resetEditState(); | ||
| }} | ||
| disabled={saving || deleting} | ||
| > | ||
| <span class="iconify lucide--x"></span> | ||
| Cancel | ||
| </Button> | ||
|
|
||
| <Button disabled={saving || deleting} onclick={saveChanges}> | ||
| {#if saving} | ||
| <span class="iconify animate-spin lucide--loader-2"></span> | ||
| Saving Changes... | ||
| {:else} | ||
| <span class="iconify lucide--check"></span> | ||
| Save Changes | ||
| {/if} | ||
| </Button> | ||
|
|
||
| <AlertDialog.Root bind:open={deleteDialogOpen}> | ||
| <AlertDialog.Trigger> | ||
| {#snippet child({ props })} | ||
| <Button variant="destructive" disabled={saving || deleting || !canDelete} title={!canDelete ? "Families with versions cannot be deleted." : undefined} {...props}> | ||
| {#if deleting} | ||
| <span class="iconify animate-spin lucide--loader-2"></span> | ||
| Deleting... | ||
| {:else} | ||
| <span class="iconify lucide--trash-2"></span> | ||
| Delete | ||
| {/if} | ||
| </Button> | ||
| {/snippet} | ||
| </AlertDialog.Trigger> | ||
| <AlertDialog.Content> | ||
| <AlertDialog.Header> | ||
| <AlertDialog.Title>Delete Family</AlertDialog.Title> | ||
| <AlertDialog.Description> | ||
| Type <code>delete</code> to confirm deleting family <code>{family.key}</code>. This cannot be undone. | ||
| </AlertDialog.Description> | ||
| </AlertDialog.Header> | ||
|
|
||
| <div class="space-y-2"> | ||
| <Label for="delete-family-confirmation">Confirmation</Label> | ||
| <Input.Root | ||
| id="delete-family-confirmation" | ||
| bind:value={deleteConfirmation} | ||
| placeholder="type 'delete'" | ||
| autocomplete="off" | ||
| autocapitalize="off" | ||
| autocorrect="off" | ||
| spellcheck={false} | ||
| disabled={deleting} | ||
| /> | ||
| </div> | ||
|
|
||
| <AlertDialog.Footer> | ||
| <AlertDialog.Cancel disabled={deleting}>Cancel</AlertDialog.Cancel> | ||
| <Button variant="destructive" disabled={deleting || !canDelete || deleteConfirmation !== "delete"} onclick={deleteFamily}> | ||
| {#if deleting} | ||
| <span class="iconify animate-spin lucide--loader-2"></span> | ||
| Deleting... | ||
| {:else} | ||
| <span class="iconify lucide--trash-2"></span> | ||
| Delete Family | ||
| {/if} | ||
| </Button> | ||
| </AlertDialog.Footer> | ||
| </AlertDialog.Content> | ||
| </AlertDialog.Root> | ||
| </div> | ||
|
|
||
| {#if !canDelete} | ||
| <p class="text-sm text-neutral-500">Delete is only available for empty families. Remove or move all versions first.</p> | ||
| {/if} | ||
| {/if} | ||
| </section> | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These mutations are passed as raw query strings. Elsewhere in the repo,
mutationStoretypically uses the generatedgraphql(...)helper (typed documents / codegen), e.g.src/routes/projects/[project]/family/new/+page.svelte:38-58. Using raw strings here forces manual casting ofdataand makes it easier to drift from the schema.Suggestion: import
graphqlfrom$lib/gqland wrap bothUpdateFamilyandDeleteFamilyoperations with it, then rely on the generated types instead of(data as ...)casts.