From 06d13375abbde19172bc4cd363755320c90724e9 Mon Sep 17 00:00:00 2001
From: Henri Courdent <122811744+hcourdent@users.noreply.github.com>
Date: Mon, 13 Jan 2025 18:40:55 +0100
Subject: [PATCH] Workspace settings clarifications, delete workspace message
 (#5052)

---
 .../settings/ChangeWorkspaceColor.svelte      |  5 ++++-
 .../settings/ChangeWorkspaceId.svelte         |  1 +
 .../settings/ChangeWorkspaceName.svelte       |  4 ++++
 .../user/(user)/create_workspace/+page.svelte |  2 +-
 .../(logged)/workspace_settings/+page.svelte  | 19 +++++++++++++++----
 5 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/frontend/src/lib/components/settings/ChangeWorkspaceColor.svelte b/frontend/src/lib/components/settings/ChangeWorkspaceColor.svelte
index 1b79adad28..e4a809a24a 100644
--- a/frontend/src/lib/components/settings/ChangeWorkspaceColor.svelte
+++ b/frontend/src/lib/components/settings/ChangeWorkspaceColor.svelte
@@ -53,7 +53,7 @@
 </script>
 
 <div>
-	<p class="font-semibold text-sm">Workspace Color</p>
+	<p class="font-semibold text-sm">Workspace color</p>
 	<div class="flex flex-row gap-0.5 items-center">
 		{#if savedWorkspaceColor}
 			<div
@@ -76,6 +76,9 @@
 			}}
 		/>
 	</div>
+	<p class="italic text-xs">
+		Color to identify the current workspace in the list of workspaces
+	</p>
 </div>
 
 <Modal bind:open title="Change Workspace Color">
diff --git a/frontend/src/lib/components/settings/ChangeWorkspaceId.svelte b/frontend/src/lib/components/settings/ChangeWorkspaceId.svelte
index 196e912a89..9ad7911c9e 100644
--- a/frontend/src/lib/components/settings/ChangeWorkspaceId.svelte
+++ b/frontend/src/lib/components/settings/ChangeWorkspaceId.svelte
@@ -67,6 +67,7 @@
 			/>
 		{/if}
 	</div>
+	<p class="italic text-xs">Slug to uniquely identify your workspace</p>
 </div>
 
 <Modal bind:open title="Change workspace ID">
diff --git a/frontend/src/lib/components/settings/ChangeWorkspaceName.svelte b/frontend/src/lib/components/settings/ChangeWorkspaceName.svelte
index 303af9711d..52b9dfb2de 100644
--- a/frontend/src/lib/components/settings/ChangeWorkspaceName.svelte
+++ b/frontend/src/lib/components/settings/ChangeWorkspaceName.svelte
@@ -49,6 +49,10 @@
 			}}
 		/>
 	</div>
+
+	<p class="italic text-xs">
+		Displayable name
+	</p>
 </div>
 
 <Modal bind:open title="Change workspace name">
diff --git a/frontend/src/routes/(root)/(logged)/user/(user)/create_workspace/+page.svelte b/frontend/src/routes/(root)/(logged)/user/(user)/create_workspace/+page.svelte
index b57b5d2fb8..11697cad39 100644
--- a/frontend/src/routes/(root)/(logged)/user/(user)/create_workspace/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/user/(user)/create_workspace/+page.svelte
@@ -198,7 +198,7 @@
 	</label>
 	<label class="block pb-4">
 		<span class="text-secondary text-sm">Workspace color</span>
-		<span class="ml-5 text-tertiary text-xs">Color to identify the current workspace</span>
+		<span class="ml-5 text-tertiary text-xs">Color to identify the current workspace in the list of workspaces</span>
 		<div class="flex items-center gap-2">
 			<Toggle bind:checked={colorEnabled} options={{ right: 'Enable' }} />
 			{#if colorEnabled}<input class="w-10" type="color" bind:value={workspaceColor} disabled={!colorEnabled} />{/if}
diff --git a/frontend/src/routes/(root)/(logged)/workspace_settings/+page.svelte b/frontend/src/routes/(root)/(logged)/workspace_settings/+page.svelte
index d303e92e04..cfa105bbb1 100644
--- a/frontend/src/routes/(root)/(logged)/workspace_settings/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/workspace_settings/+page.svelte
@@ -813,7 +813,12 @@
 			</div>
 		{:else if tab == 'general'}
 			<div class="flex flex-col gap-4 my-8">
-				<div class=" text-primary text-lg font-semibold">General</div>
+				<div class="flex flex-col gap-1">
+					<div class=" text-primary text-lg font-semibold">General</div>
+					<Description link="https://www.windmill.dev/docs/core_concepts/workspace_settings">
+						Configure general workspace settings.
+					</Description>
+				</div>
 			</div>
 
 			<div class="flex flex-col gap-10">
@@ -835,9 +840,15 @@
 
 			<div class="mt-20" />
 			<PageHeader title="Delete workspace" primary={false} />
-			<p class="italic text-xs">
-				The workspace will be archived for a short period of time and then permanently deleted
-			</p>
+			{#if $superadmin}
+				<p class="italic text-xs">
+					When deleting the workspace, it will be archived for a short period of time and then permanently deleted.
+				</p>
+			{:else}
+				<p class="italic text-xs">
+					Only instance superadmins can delete a workspace.
+				</p>
+			{/if}
 			{#if $workspaceStore === 'admins' || $workspaceStore === 'starter'}
 				<p class="italic text-xs">
 					This workspace cannot be deleted as it has a special function. Consult the documentation