windmill-components 1.558.4 → 1.596.0

package/package/components/workspaceSettings/DucklakeSettings.svelte

@@ -30,7 +30,7 @@ export function convertDucklakeSettingsToBackend(settings) {
 </script>
 
 <script>
-	import { ArrowRight, TriangleAlert, Plus } from 'lucide-svelte'
+	import { Plus } from 'lucide-svelte'
 
 	import Button from '../common/button/Button.svelte'
 
@@ -42,15 +42,14 @@ export function convertDucklakeSettingsToBackend(settings) {
 	import Select from '../select/Select.svelte'
 	import ResourcePicker from '../ResourcePicker.svelte'
 	import { usePromise } from '../../svelte5Utils.svelte'
-	import { SettingService, WorkspaceService, type DucklakeInstanceCatalogDbStatus } from '../../gen'
+	import { SettingService, WorkspaceService } from '../../gen'
 	import { type GetSettingsResponse } from '../../gen'
 
-	import { superadmin, workspaceStore } from '../../stores'
+	import { workspaceStore } from '../../stores'
 	import { sendUserToast } from '../../toast'
 	import ExploreAssetButton from '../ExploreAssetButton.svelte'
 	import DbManagerDrawer from '../DBManagerDrawer.svelte'
 	import Tooltip from '../Tooltip.svelte'
-	import { isCloudHosted } from '../../cloud'
 	import ConfirmationModal from '../common/confirmationModal/ConfirmationModal.svelte'
 	import { createAsyncConfirmationModal } from '../common/confirmationModal/asyncConfirmationModal.svelte'
 	import { clone } from '../../utils'
@@ -58,19 +57,23 @@ export function convertDucklakeSettingsToBackend(settings) {
 	import { deepEqual } from 'fast-equals'
 	import Popover from '../meltComponents/Popover.svelte'
 	import TextInput from '../text_input/TextInput.svelte'
-	import LoggedWizardResult, { firstEmptyStepIsError } from '../wizards/LoggedWizardResult.svelte'
-	import { safeSelectItems } from '../select/utils.svelte'
 	import { slide } from 'svelte/transition'
+	import { isCustomInstanceDbEnabled } from './utils.svelte'
+	import { resource } from 'runed'
+	import CustomInstanceDbSelect from './CustomInstanceDbSelect.svelte'
 
 	const DEFAULT_DUCKLAKE_CATALOG_NAME = 'ducklake_catalog'
 
 	type Props = {
 		ducklakeSettings: DucklakeSettingsType
 		ducklakeSavedSettings: DucklakeSettingsType
+		onSave?: () => void
 	}
-	let { ducklakeSettings = $bindable(), ducklakeSavedSettings = $bindable() }: Props = $props()
-
-	let isInstanceCatalogEnabled = $derived($superadmin && !isCloudHosted())
+	let {
+		ducklakeSettings = $bindable(),
+		ducklakeSavedSettings = $bindable(),
+		onSave: onSaveProp = undefined
+	}: Props = $props()
 
 	function onNewDucklake() {
 		const name = ducklakeSettings.ducklakes.some((d) => d.name === 'main')
@@ -79,8 +82,8 @@ export function convertDucklakeSettingsToBackend(settings) {
 		ducklakeSettings.ducklakes.push({
 			name,
 			catalog: {
-				resource_type: isInstanceCatalogEnabled ? 'instance' : 'postgresql',
-				resource_path: isInstanceCatalogEnabled ? DEFAULT_DUCKLAKE_CATALOG_NAME : undefined
+				resource_type: $isCustomInstanceDbEnabled ? 'instance' : 'postgresql',
+				resource_path: $isCustomInstanceDbEnabled ? DEFAULT_DUCKLAKE_CATALOG_NAME : undefined
 			},
 			storage: {
 				storage: undefined,
@@ -102,23 +105,20 @@ export function convertDucklakeSettingsToBackend(settings) {
 		)
 	)
 
-	let instanceCatalogSetupIsRunning = $state(false)
-	const instanceCatalogStatuses = usePromise(SettingService.getDucklakeInstanceCatalogDbStatus, {
-		clearValueOnRefresh: false
-	})
+	const customInstanceDbs = resource([], SettingService.listCustomInstanceDbs)
 
 	async function onSave() {
 		try {
 			if (
-				isInstanceCatalogEnabled &&
+				$isCustomInstanceDbEnabled &&
 				ducklakeSettings.ducklakes.some(
 					(d) =>
 						d.catalog.resource_type === 'instance' &&
-						!instanceCatalogStatuses.value?.[d.catalog.resource_path ?? '']?.success
+						!customInstanceDbs.current?.[d.catalog.resource_path ?? '']?.success
 				)
 			) {
 				let confirm = await confirmationModal.ask({
-					title: 'Some instance catalogs are not setup',
+					title: 'Some instance databases are not setup',
 					children: 'Are you sure you want to save without setting them up ?',
 					confirmationText: 'Save anyway'
 				})
@@ -131,6 +131,7 @@ export function convertDucklakeSettingsToBackend(settings) {
 			})
 			ducklakeSavedSettings = clone(ducklakeSettings)
 			sendUserToast('Ducklake settings saved successfully')
+			onSaveProp?.()
 		} catch (e) {
 			sendUserToast(e, true)
 			console.error('Error saving ducklake settings', e)
@@ -156,14 +157,13 @@ export function convertDucklakeSettingsToBackend(settings) {
 	}
 
 	let dbManagerDrawer: DbManagerDrawer | undefined = $state()
-	let instanceCatalogPopover: Popover | undefined = $state()
 	let confirmationModal = createAsyncConfirmationModal()
 </script>
 
 <div class="flex flex-col gap-4 mb-8 mt-20">
 	<div class="flex flex-col gap-1">
 		<div class="text-primary text-lg font-semibold">Ducklake</div>
-		<Description link="https://www.windmill.dev/docs/core_concepts/ducklake">
+		<Description link="https://www.windmill.dev/docs/core_concepts/persistent_storage/ducklake">
 			Windmill has first class support for Ducklake. You can use and explore ducklakes like a normal
 			SQL database, even though the data is actually stored in parquet files in S3 !
 		</Description>
@@ -172,8 +172,8 @@ export function convertDucklakeSettingsToBackend(settings) {
 
 {#if ducklakeSettings.ducklakes.some((d) => d.catalog.resource_type === 'instance')}
 	<div transition:slide={{ duration: 200 }} class="mb-4">
-		<Alert title="Instance catalogs use the Windmill database" type="info">
-			Using an instance catalog is the fastest way to get started with Ducklake. They are public to
+		<Alert title="Instance databases use the Windmill database" type="info">
+			Using an instance database is the fastest way to get started with Ducklake. They are public to
 			the instance and can be re-used in other workspaces' Ducklake settings.
 		</Alert>
 	</div>
@@ -197,7 +197,7 @@ export function convertDucklakeSettingsToBackend(settings) {
 	<tbody class="divide-y bg-surface">
 		{#if ducklakeSettings.ducklakes.length == 0}
 			<Row>
-				<Cell colspan={tableHeadNames.length} class="text-center">
+				<Cell colspan={tableHeadNames.length} class="text-center py-6">
 					No ducklake in this workspace yet
 				</Cell>
 			</Row>
@@ -206,7 +206,7 @@ export function convertDucklakeSettingsToBackend(settings) {
 			<Row>
 				<Cell first class="w-48 relative">
 					{#if ducklake.name === 'main'}
-						<Tooltip wrapperClass="absolute mt-3 right-4" placement="bottom-start">
+						<Tooltip wrapperClass="absolute mt-[0.6rem] right-4" placement="bottom-start">
 							The <i>main</i> ducklake can be accessed with the
 							<br />
 							<code class="px-1 py-0.5 border rounded-md">ATTACH 'ducklake' AS dl;</code> shorthand
@@ -218,7 +218,7 @@ export function convertDucklakeSettingsToBackend(settings) {
 					<div class="flex gap-2">
 						<div class="relative">
 							{#if ducklake.catalog.resource_type === 'instance'}
-								<Tooltip wrapperClass="absolute mt-3 right-2 z-20" placement="bottom-start">
+								<Tooltip wrapperClass="absolute mt-[0.6rem] right-2 z-20" placement="bottom-start">
 									Use Windmill's PostgreSQL instance as a catalog
 								</Tooltip>
 							{/if}
@@ -229,7 +229,7 @@ export function convertDucklakeSettingsToBackend(settings) {
 									{
 										value: 'instance',
 										label: 'Instance',
-										subtitle: isInstanceCatalogEnabled ? undefined : 'Superadmin only'
+										subtitle: $isCustomInstanceDbEnabled ? undefined : 'Superadmin only'
 									}
 								]}
 								bind:value={
@@ -245,54 +245,28 @@ export function convertDucklakeSettingsToBackend(settings) {
 								class="w-28"
 							/>
 						</div>
-						<div class="flex items-center gap-1 w-80 relative">
+						<div class="flex flex-1">
 							{#if ducklake.catalog.resource_type !== 'instance'}
 								<ResourcePicker
+									class="flex-1"
 									bind:value={ducklake.catalog.resource_path}
 									resourceType={ducklake.catalog.resource_type}
-									selectInputClass="min-h-9"
-									class="min-h-9"
 								/>
 							{:else}
-								{@const status =
-									instanceCatalogStatuses.value?.[ducklake.catalog.resource_path ?? '']}
-								<Select
+								<CustomInstanceDbSelect
 									class="flex-1"
-									inputClass="pr-20"
 									bind:value={ducklake.catalog.resource_path}
-									onCreateItem={(i) => (ducklake.catalog.resource_path = i)}
-									placeholder="PostgreSQL database name"
-									items={safeSelectItems(Object.keys(instanceCatalogStatuses.value ?? {}))}
-									disabled={!isInstanceCatalogEnabled}
-								/>
-
-								<Popover
-									class="absolute right-1.5"
-									enableFlyTransition
-									contentClasses="py-5 px-6 w-[34rem] bg-surface-secondary -translate-y-2"
-									closeOnOtherPopoverOpen
-									closeOnOutsideClick
-									bind:this={instanceCatalogPopover}
+									{customInstanceDbs}
+									{confirmationModal}
+									{dbManagerDrawer}
+									tag="ducklake"
 								>
-									<svelte:fragment slot="trigger">
-										<Button spacingSize="xs2" variant="border" color="light" btnClasses="h-6">
-											{#if !status}
-												<span class="text-yellow-600 dark:text-yellow-400">
-													Setup <ArrowRight class="inline" size={14} />
-												</span>
-											{:else if !status.success}
-												<span class="text-red-400 flex gap-1">
-													Error <TriangleAlert class="inline" size={16} />
-												</span>
-											{:else}
-												<div class="w-1.5 h-1.5 rounded-full bg-green-400"></div>
-											{/if}
-										</Button>
-									</svelte:fragment>
-									<svelte:fragment slot="content">
-										{@render instanceCatalogWizard(status, ducklake.catalog.resource_path ?? '')}
-									</svelte:fragment>
-								</Popover>
+									{#snippet wizardBottomHint()}
+										Note: this is different from the Manage Ducklake button. This will show you the
+										content of the PostgreSQL database used as a catalog, while the other button
+										shows you the content of the ducklake (the parquet files).
+									{/snippet}
+								</CustomInstanceDbSelect>
 							{/if}
 						</div>
 					</div>
@@ -354,7 +328,7 @@ export function convertDucklakeSettingsToBackend(settings) {
 		<Row class="!border-0">
 			<Cell colspan={tableHeadNames.length} class="pt-0 pb-2">
 				<div class="flex justify-center">
-					<Button size="sm" btnClasses="max-w-fit" variant="border" on:click={onNewDucklake}>
+					<Button size="sm" btnClasses="max-w-fit" variant="default" on:click={onNewDucklake}>
 						<Plus /> New ducklake
 					</Button>
 				</div>
@@ -364,6 +338,7 @@ export function convertDucklakeSettingsToBackend(settings) {
 </DataTable>
 <Button
 	wrapperClasses="mt-4 mb-16 max-w-fit"
+	variant="accent"
 	on:click={onSave}
 	disabled={ducklakeSavedSettings.ducklakes.length === ducklakeSettings.ducklakes.length &&
 		Object.values(ducklakeIsDirty).every((v) => v === false)}
@@ -373,142 +348,3 @@ export function convertDucklakeSettingsToBackend(settings) {
 <DbManagerDrawer bind:this={dbManagerDrawer} />
 
 <ConfirmationModal {...confirmationModal.props} />
-
-{#snippet instanceCatalogWizard(
-	status: DucklakeInstanceCatalogDbStatus | undefined,
-	dbname: string
-)}
-	{@const showManageCatalogButton =
-		status?.logs.created_database === 'OK' || status?.logs.created_database === 'SKIP'}
-	{#if !status}
-		<div class="mb-4 text-secondary text-sm">
-			{dbname} needs to be configured in the Windmill postgres instance
-		</div>
-	{/if}
-
-	{#if status?.error}
-		<div transition:slide={{ duration: 200 }} class="mb-4">
-			<Alert title="Error setting up ducklake instance catalog" type="error">
-				{status.error}
-			</Alert>
-		</div>
-	{/if}
-
-	<LoggedWizardResult
-		class="max-h-[24rem] overflow-y-auto"
-		steps={firstEmptyStepIsError(
-			[
-				{
-					title: 'Super admin required',
-					status: status?.logs.super_admin,
-					description:
-						'You need to be a super admin to setup an instance catalog, as it requires creating a new database in the Windmill PostgreSQL instance'
-				},
-				{
-					title: 'Retrieve and parse database credentials',
-					status: status?.logs.database_credentials,
-					description:
-						'Windmill uses the DATABASE_URL or DATABASE_URL_FILE environment variable to connect to the PostgreSQL instance. Make sure it is correctly set'
-				},
-				{
-					title: 'Catalog name is valid',
-					status: status?.logs.valid_dbname,
-					description:
-						'The catalog name must be alphanumeric (underscores allowed) and cannot be named the same as the Windmill database (usually "windmill")'
-				},
-				{
-					title:
-						'Create database' +
-						(status?.logs.created_database === 'SKIP' ? ' (already exists, skipped)' : ''),
-					status: status?.logs.created_database,
-					description: `In the Windmill PostgreSQL instance, run: CREATE DATABASE "${dbname}".`
-				},
-				{
-					title: `Connect to the ${dbname} database`,
-					status: status?.logs.db_connect,
-					description:
-						"Connect to the newly created database with the default admin user (the one in DATABASE_URL, usually 'postgres') to run the next commands"
-				},
-				{
-					title: 'Grant permissions to ducklake_user',
-					status: status?.logs.grant_permissions,
-					description:
-						'Gives ducklake_user the required permissions to use the database as a Ducklake catalog. ducklake_user is already created during a migration and has an auto-generated password stored in global_settings.ducklake_settings.ducklake_user_pg_pwd. These are the commands : \n\n' +
-						`GRANT CONNECT ON DATABASE "${dbname}" TO ducklake_user;\n` +
-						'GRANT USAGE ON SCHEMA public TO ducklake_user;\n' +
-						'GRANT CREATE ON SCHEMA public TO ducklake_user;\n' +
-						'ALTER DEFAULT PRIVILEGES IN SCHEMA public \n' +
-						'  	GRANT SELECT, INSERT, UPDATE, DELETE ON TABLES\n    TO ducklake_user;'
-				}
-			],
-			status?.error ?? undefined
-		)}
-	/>
-	{#if showManageCatalogButton}
-		<div class="text-tertiary text-xs mt-6">
-			Note: the 'Manage catalog' button below is different from the Manage Ducklake button. This
-			will show you the content of the PostgreSQL database used as a catalog, while the other button
-			shows you the actual content of the ducklake (the parquet files).
-		</div>
-	{/if}
-	<div class="flex gap-2 mt-2">
-		<Button
-			wrapperClasses="flex-1"
-			size="sm"
-			disabled={!isInstanceCatalogEnabled}
-			onClick={async () => {
-				if (instanceCatalogSetupIsRunning) return
-
-				let wasAlreadySuccessful = status?.success ?? false
-				if (status?.logs.created_database != 'OK' && status?.logs.created_database != 'SKIP') {
-					instanceCatalogPopover?.close()
-					let confirm = await confirmationModal.ask({
-						title: 'Confirm setup',
-						children: `This will create a new database ${dbname} in the Windmill PostgreSQL instance`,
-						confirmationText: 'Setup catalog'
-					})
-					instanceCatalogPopover?.open()
-					if (!confirm) return
-				}
-
-				try {
-					instanceCatalogSetupIsRunning = true
-					let result = await SettingService.setupDucklakeCatalogDb({ name: dbname })
-					await instanceCatalogStatuses.refresh()
-					if (result.success) {
-						if (!wasAlreadySuccessful) sendUserToast('Setup successful')
-						else sendUserToast('Everything OK')
-					} else {
-						sendUserToast(result.error ?? 'An error occured', true)
-					}
-				} catch (e) {
-					sendUserToast('Unexpected error, check console for details', true)
-					console.error('Error setting up ducklake instance catalog', e)
-				} finally {
-					instanceCatalogSetupIsRunning = false
-				}
-			}}
-			loading={instanceCatalogSetupIsRunning}
-		>
-			{#if !isInstanceCatalogEnabled}
-				Only superadmins can setup instance catalogs
-			{:else if status?.success}
-				Check again
-			{:else if status?.error}
-				Try again
-			{:else}
-				Setup {dbname}
-			{/if}
-		</Button>
-		{#if showManageCatalogButton}
-			<ExploreAssetButton
-				class="flex-1"
-				asset={{ kind: 'resource', path: 'INSTANCE_DUCKLAKE_CATALOG/' + dbname }}
-				_resourceMetadata={{ resource_type: 'postgresql' }}
-				{dbManagerDrawer}
-				disabled={!isInstanceCatalogEnabled}
-				onClick={() => instanceCatalogPopover?.close()}
-			/>
-		{/if}
-	</div>
-{/snippet}

package/package/components/workspaceSettings/DucklakeSettings.svelte.d.ts

@@ -17,6 +17,7 @@ import { type GetSettingsResponse } from '../../gen';
 type Props = {
     ducklakeSettings: DucklakeSettingsType;
     ducklakeSavedSettings: DucklakeSettingsType;
+    onSave?: () => void;
 };
 declare const DucklakeSettings: import("svelte").Component<Props, {}, "ducklakeSettings" | "ducklakeSavedSettings">;
 type DucklakeSettings = ReturnType<typeof DucklakeSettings>;

package/package/components/workspaceSettings/GitSyncFilterSettings.svelte

@@ -4,7 +4,7 @@ import Tooltip from '../Tooltip.svelte';
 import FilterList from './FilterList.svelte';
 import { Tabs, Tab } from '../common';
 import { workspaceStore } from '../../stores';
-let { git_repo_resource_path = $bindable(''), include_path = $bindable(['f/**']), include_type = $bindable(['script', 'flow', 'app', 'folder']), exclude_types_override = $bindable([]), isLegacyRepo = false, excludes = $bindable([]), extraIncludes = $bindable([]), isInitialSetup = false, requiresMigration = false, actions = undefined, useIndividualBranch = false, } = $props();
+let { git_repo_resource_path = $bindable(''), include_path = $bindable(['f/**']), include_type = $bindable(['script', 'flow', 'app', 'folder']), exclude_types_override = $bindable([]), isLegacyRepo = false, excludes = $bindable([]), extraIncludes = $bindable([]), isInitialSetup = false, requiresMigration = false, actions = undefined, useIndividualBranch = false } = $props();
 // Component state
 let collapsed = $state(false);
 let showCliInstructions = $state(false);
@@ -75,11 +75,14 @@ function capitalize(str) {
 			<span class="font-semibold text-sm">Git Sync filter settings</span>
 			{#if isLegacyRepo}
 				<Tooltip>
-					This repository uses legacy configuration format and inherits settings from workspace-level defaults. Excluded types are filtered out from inherited types. Save to migrate to the new format.
+					This repository uses legacy configuration format and inherits settings from
+					workspace-level defaults. Excluded types are filtered out from inherited types. Save to
+					migrate to the new format.
 				</Tooltip>
 			{:else if !isEditable}
 				<Tooltip documentationLink="https://www.windmill.dev/docs/advanced/cli/sync#wmillyaml">
-					These settings are controlled by the wmill.yaml file in your git repository. Click "Pull from repo" to check for settings drift and pull settings from repo.
+					These settings are controlled by the wmill.yaml file in your git repository. Click "Pull
+					from repo" to check for settings drift and pull settings from repo.
 				</Tooltip>
 			{/if}
 		</div>
@@ -130,8 +133,8 @@ function capitalize(str) {
 				<div class="grid grid-cols-1 md:grid-cols-2 md:gap-32">
 					<div class="flex flex-col gap-2">
 						<Tabs bind:selected={filtersTab}>
-							<Tab value="includes">Includes</Tab>
-							<Tab value="excludes">Excludes</Tab>
+							<Tab value="includes" label="Includes"></Tab>
+							<Tab value="excludes" label="Excludes"></Tab>
 						</Tabs>
 
 						{#if filtersTab === 'includes'}
@@ -292,7 +295,7 @@ function capitalize(str) {
 				</div>
 			</div>
 			<div class="mt-6 p-2 border-t">
-				<div class="text-xs text-tertiary mb-2">
+				<div class="text-xs text-primary mb-2">
 					{isInitialSetup ? 'Configure initial sync settings' : 'Review migration settings'}
 				</div>
 			</div>
@@ -306,11 +309,13 @@ function capitalize(str) {
 							{#if include_path.length > 0}
 								<div class="flex flex-wrap gap-1 text-xs">
 									{#each include_path as path}
-										<span class="bg-surface-secondary text-primary rounded-full px-2 py-1">{path}</span>
+										<span class="bg-surface-secondary text-primary rounded-full px-2 py-1"
+											>{path}</span
+										>
 									{/each}
 								</div>
 							{:else}
-								<div class="text-tertiary text-xs">No include paths configured</div>
+								<div class="text-primary text-xs">No include paths configured</div>
 							{/if}
 						</div>
 
@@ -323,7 +328,7 @@ function capitalize(str) {
 									{/each}
 								</div>
 							{:else}
-								<div class="text-tertiary text-xs">No exclude paths configured</div>
+								<div class="text-primary text-xs">No exclude paths configured</div>
 							{/if}
 						</div>
 					</div>
@@ -336,7 +341,7 @@ function capitalize(str) {
 									<div class={enabled ? 'text-green-600' : 'text-gray-400'}>
 										{enabled ? '✓' : '✗'}
 									</div>
-									<span class={enabled ? 'text-primary' : 'text-tertiary'}>
+									<span class={enabled ? 'text-primary' : 'text-primary'}>
 										{capitalize(key)}
 									</span>
 								</div>
@@ -356,11 +361,11 @@ function capitalize(str) {
 				<div class="border-t pt-2 mt-4">
 					<button
 						class="flex items-center gap-2 text-sm text-secondary hover:text-primary transition-colors"
-						onclick={() => showCliInstructions = !showCliInstructions}
+						onclick={() => (showCliInstructions = !showCliInstructions)}
 					>
 						<Terminal size={16} />
 						<span>Update settings with CLI</span>
-						<Edit3 size={14} class="text-tertiary" />
+						<Edit3 size={14} class="text-primary" />
 						{#if showCliInstructions}
 							<ChevronUp size={16} />
 						{:else}
@@ -370,11 +375,20 @@ function capitalize(str) {
 
 					{#if showCliInstructions}
 						<div class="mt-3 bg-surface-secondary rounded-lg p-3">
-							<div class="text-xs text-tertiary mb-2">
-								These filter settings are sourced from the <code class="bg-surface px-1 py-0.5 rounded">wmill.yaml</code> file in your git repository.
-								To modify them, edit the file in your repository, commit the changes, and sync using the commands below. Learn more about <a href="https://www.windmill.dev/docs/advanced/cli/sync#wmillyaml" target="_blank" rel="noopener noreferrer">the wmill.yaml format</a>
+							<div class="text-xs text-primary mb-2">
+								These filter settings are sourced from the <code
+									class="bg-surface px-1 py-0.5 rounded">wmill.yaml</code
+								>
+								file in your git repository. To modify them, edit the file in your repository, commit
+								the changes, and sync using the commands below. Learn more about
+								<a
+									href="https://www.windmill.dev/docs/advanced/cli/sync#wmillyaml"
+									target="_blank"
+									rel="noopener noreferrer">the wmill.yaml format</a
+								>
 							</div>
-							<pre class="text-xs bg-surface p-3 rounded overflow-x-auto whitespace-pre-wrap break-all">
+							<pre
+								class="text-xs bg-surface p-3 rounded overflow-x-auto whitespace-pre-wrap break-all">
 # Make sure your repo is up to date
 git pull
 
@@ -388,15 +402,22 @@ git push
 
 # Push changes to workspace or click the pull settings button above{#if useIndividualBranch}
 wmill gitsync-settings push --workspace {$workspaceStore} --repository {git_repo_resource_path} --promotion main{:else}
-wmill gitsync-settings push --workspace {$workspaceStore} --repository {git_repo_resource_path}{/if}</pre>
+wmill gitsync-settings push --workspace {$workspaceStore} --repository {git_repo_resource_path}{/if}</pre
+							>
 							{#if useIndividualBranch}
-								<div class="text-xs text-tertiary mt-3">
+								<div class="text-xs text-primary mt-3">
 									<div class="font-medium mb-1">Promotion Mode Configuration:</div>
-									<div>You can add promotion-specific overrides in your <code class="bg-surface px-1 py-0.5 rounded">wmill.yaml</code> file:</div>
-									<pre class="text-xs bg-surface p-2 rounded mt-2 overflow-x-auto">git_branches:
+									<div
+										>You can add promotion-specific overrides in your <code
+											class="bg-surface px-1 py-0.5 rounded">wmill.yaml</code
+										> file:</div
+									>
+									<pre class="text-xs bg-surface p-2 rounded mt-2 overflow-x-auto"
+										>gitBranches:
   main:
     promotionOverrides:
-      # Add your promotion-specific settings here</pre>
+      # Add your promotion-specific settings here</pre
+									>
 								</div>
 							{/if}
 						</div>

package/package/components/workspaceSettings/ModelTokenLimits.svelte

@@ -136,7 +136,7 @@ $effect(() => {
 											</div>
 										</div>
 										{#if !isAtDefault}
-											<div class="text-xs text-tertiary flex flex-row items-center gap-1">
+											<div class="text-xs text-primary flex flex-row items-center gap-1">
 												<span>Default: {defaultTokens} tokens</span>
 												<button
 													type="button"