Skip to content

fix(workspace): include caller_role in workspace response and migrate to Svelte 5 runes #83

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.

Sign up for GitHub

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

Merged
victorsoriadrp merged 1 commit into from
May 15, 2026
Merged

fix(workspace): include caller_role in workspace response and migrate to Svelte 5 runes #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
73 changes: 33 additions & 40 deletions cmd/archipulse/ui/src/routes/WorkspaceSettings.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,40 +4,36 @@
import { api } from '../lib/api.js';
import { user } from '../lib/auth.js';

export let params = {};
const { params = {} } = $props();

$: wsId = params.wsId;
const wsId = $derived(params.wsId);

// ── Tabs ──────────────────────────────────────────────────────────────────
let tab = 'members'; // 'general' | 'members'
let tab = $state('members');

// ── Workspace general ─────────────────────────────────────────────────────
let ws = null;
let wsLoading = true;
let wsSaving = false;
let wsError = null;
let wsSuccess = false;
let wsForm = { name: '', purpose: '', description: '' };
let ws = $state(null);
let wsLoading = $state(true);
let wsSaving = $state(false);
let wsError = $state(null);
let wsSuccess = $state(false);
let wsForm = $state({ name: '', purpose: '', description: '' });

const PURPOSES = ['as-is', 'to-be', 'initiative', 'other'];

// ── Members ───────────────────────────────────────────────────────────────
let members = [];
let membersLoading = true;
let membersError = null;
let members = $state([]);
let membersLoading = $state(true);
let membersError = $state(null);

// Add member form
let addEmail = '';
let addRole = 'viewer';
let addSearching = false;
let addError = null;
let addSuccess = false;
let addEmail = $state('');
let addRole = $state('viewer');
let addSearching = $state(false);
let addError = $state(null);
let addSuccess = $state(false);

// Inline role updating
let updatingRole = {}; // userId → true while in flight

// Removing
let removingMember = {}; // userId → true while in flight
let updatingRole = $state({});
let removingMember = $state({});

// ── Load ──────────────────────────────────────────────────────────────────
onMount(async () => {
Expand Down Expand Up @@ -109,9 +105,7 @@
try {
await api.put('/workspaces/' + wsId + '/members/' + member.user_id, { role: newRole });
member.role = newRole;
members = [...members];
} catch (e) {
// silently revert — reload to sync
await loadMembers();
}
updatingRole[member.user_id] = false;
Expand All @@ -138,17 +132,16 @@
viewer: 'bg-gray-100 text-gray-600 border-gray-200',
};

$: currentUserId = $user?.id;
$: myRole = members.find(m => m.user_id === currentUserId)?.role;
$: canManage = $user?.org_role === 'admin' || myRole === 'owner';
$: isOwner = myRole === 'owner';
const currentUserId = $derived($user?.id);
const canManage = $derived($user?.org_role === 'admin' || ws?.caller_role === 'owner');
const isOwner = $derived(ws?.caller_role === 'owner');

// ── Delete workspace ──────────────────────────────────────────────────────
let deleteConfirm = '';
let deleting = false;
let deleteError = null;
let deleteConfirm = $state('');
let deleting = $state(false);
let deleteError = $state(null);

$: deleteReady = ws && deleteConfirm.trim() === ws.name.trim();
const deleteReady = $derived(ws && deleteConfirm.trim() === ws.name.trim());

async function deleteWorkspace() {
if (!deleteReady || deleting) return;
Expand Down Expand Up @@ -176,7 +169,7 @@
<button
class="px-4 py-2 text-[13px] font-medium border-b-2 transition-colors -mb-px
{tab === key ? 'border-primary text-foreground' : 'border-transparent text-muted-foreground hover:text-foreground'}"
on:click={() => tab = key}
onclick={() => tab = key}
>{label}</button>
{/each}
</div>
Expand Down Expand Up @@ -222,7 +215,7 @@
<select
class="text-[12px] border border-border rounded-md px-2 py-1 bg-background cursor-pointer focus:outline-none focus:ring-1 focus:ring-primary"
value={member.role}
on:change={e => updateRole(member, e.target.value)}
onchange={e => updateRole(member, e.target.value)}
>
{#each ROLES as r}
<option value={r}>{ROLE_LABELS[r]}</option>
Expand All @@ -241,7 +234,7 @@
<button
class="text-muted-foreground hover:text-destructive transition-colors ml-1 disabled:opacity-40"
disabled={removingMember[member.user_id]}
on:click={() => removeMember(member)}
onclick={() => removeMember(member)}
title="Remove member"
>
{#if removingMember[member.user_id]}
Expand All @@ -268,7 +261,7 @@
type="email"
placeholder="user@example.com"
bind:value={addEmail}
on:keydown={e => e.key === 'Enter' && addMember()}
onkeydown={e => e.key === 'Enter' && addMember()}
/>
<select
class="text-[13px] border border-border rounded-md px-2 py-1.5 bg-background focus:outline-none focus:ring-1 focus:ring-primary"
Expand All @@ -281,7 +274,7 @@
<button
class="px-3 py-1.5 bg-primary text-primary-foreground text-[13px] font-medium rounded-md hover:bg-primary/90 transition-colors disabled:opacity-50"
disabled={addSearching || !addEmail.trim()}
on:click={addMember}
onclick={addMember}
>
{addSearching ? '…' : 'Add'}
</button>
Expand Down Expand Up @@ -353,7 +346,7 @@
<button
class="px-4 py-1.5 bg-primary text-primary-foreground text-[13px] font-medium rounded-md hover:bg-primary/90 transition-colors disabled:opacity-50"
disabled={wsSaving}
on:click={saveGeneral}
onclick={saveGeneral}
>
{wsSaving ? 'Saving…' : 'Save changes'}
</button>
Expand Down Expand Up @@ -418,7 +411,7 @@
? 'bg-destructive text-destructive-foreground hover:bg-destructive/90'
: 'bg-muted text-muted-foreground cursor-not-allowed opacity-50'}"
disabled={!deleteReady || deleting}
on:click={deleteWorkspace}
onclick={deleteWorkspace}
>
{deleting ? 'Deleting…' : 'Delete workspace'}
</button>
Expand Down
13 changes: 12 additions & 1 deletion internal/api/workspace_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ func (h *workspaceHandler) list(w http.ResponseWriter, r *http.Request) {
respondJSON(w, http.StatusOK, wss)
}

type workspaceResponse struct {
*workspace.Workspace
CallerRole string `json:"caller_role,omitempty"`
}

func (h *workspaceHandler) get(w http.ResponseWriter, r *http.Request) {
id, err := parseUUID(r, "id")
if err != nil {
Expand All @@ -50,7 +55,13 @@ func (h *workspaceHandler) get(w http.ResponseWriter, r *http.Request) {
respondError(w, http.StatusInternalServerError, err)
return
}
respondJSON(w, http.StatusOK, ws)
resp := workspaceResponse{Workspace: ws}
if claims := auth.ClaimsFromCtx(r.Context()); claims != nil {
if role, err := h.svc.Enforcer.WorkspaceRole(claims.UserID, id.String()); err == nil {
resp.CallerRole = role
}
}
respondJSON(w, http.StatusOK, resp)
}

func (h *workspaceHandler) create(w http.ResponseWriter, r *http.Request) {
Expand Down
Loading