diff --git a/frontend/src/lib/components/InstanceSetting.svelte b/frontend/src/lib/components/InstanceSetting.svelte
index fe165fa636..90c6719c51 100644
--- a/frontend/src/lib/components/InstanceSetting.svelte
+++ b/frontend/src/lib/components/InstanceSetting.svelte
@@ -5,34 +5,28 @@
import type { Setting } from './instanceSettings'
import { OTEL_TRACING_PROXY_LANGUAGES } from './instanceSettings'
import { LanguageIcon } from './common/languageIcons'
- import Tooltip from './Tooltip.svelte'
import ObjectStoreConfigSettings from './ObjectStoreConfigSettings.svelte'
import { sendUserToast } from '$lib/toast'
- import ConfirmationModal from './common/confirmationModal/ConfirmationModal.svelte'
- import {
- ConfigService,
- IndexSearchService,
- SettingService,
- type ListAvailablePythonVersionsResponse
- } from '$lib/gen'
- import { Button, SecondsInput, Section, Skeleton } from './common'
+ import { ConfigService, SettingService, type ListAvailablePythonVersionsResponse } from '$lib/gen'
+ import { Button, SecondsInput, Skeleton } from './common'
import Password from './Password.svelte'
import { classNames } from '$lib/utils'
import Popover from './Popover.svelte'
- import PopoverMelt from './meltComponents/Popover.svelte'
+ import DropdownV2 from './DropdownV2.svelte'
import Toggle from './Toggle.svelte'
import type { Writable } from 'svelte/store'
- import { createEventDispatcher } from 'svelte'
+ import { createEventDispatcher, untrack } from 'svelte'
import ToggleButtonGroup from './common/toggleButton-v2/ToggleButtonGroup.svelte'
import ToggleButton from './common/toggleButton-v2/ToggleButton.svelte'
import SimpleEditor from './SimpleEditor.svelte'
- import LoadingIcon from './apps/svelte-select/lib/LoadingIcon.svelte'
- import EEOnly from './EEOnly.svelte'
import CriticalAlertChannels from './instanceSettings/CriticalAlertChannels.svelte'
import SmtpSettings from './instanceSettings/SmtpSettings.svelte'
import SecretBackendConfig from './instanceSettings/SecretBackendConfig.svelte'
+ import IndexerMemorySettings from './instanceSettings/IndexerMemorySettings.svelte'
+ import IndexerJobIndexSettings from './instanceSettings/IndexerJobIndexSettings.svelte'
+ import IndexerLogIndexSettings from './instanceSettings/IndexerLogIndexSettings.svelte'
import TextInput from './text_input/TextInput.svelte'
- import Label from './Label.svelte'
+ import SettingCard from './instanceSettings/SettingCard.svelte'
interface Props {
setting: Setting
@@ -46,13 +40,6 @@
let { setting, version, values, loading = true, openSmtpSettings, oauths }: Props = $props()
const dispatch = createEventDispatcher()
- if (
- (setting.fieldType == 'select' || setting.fieldType == 'select_python') &&
- $values[setting.key] == undefined
- ) {
- $values[setting.key] = setting.defaultValue ? setting.defaultValue() : 'default'
- }
-
let latestKeyRenewalAttempt: {
result: string
attempted_at: string
@@ -81,9 +68,11 @@
})
}
- if (setting.key == 'license_key') {
- reloadKeyrenewalAttemptInfo()
- }
+ $effect(() => {
+ if (setting.key == 'license_key') {
+ untrack(() => reloadKeyrenewalAttemptInfo())
+ }
+ })
export async function renewLicenseKey() {
renewing = true
@@ -139,8 +128,6 @@
let pythonAvailableVersions: ListAvailablePythonVersionsResponse = $state([])
let isPyFetching = $state(false)
- let clearJobsIndexModalOpen = $state(false)
- let clearServiceLogsIndexModalOpen = $state(false)
async function fetch_available_python_versions() {
if (isPyFetching) return
isPyFetching = true
@@ -152,35 +139,29 @@
isPyFetching = false
}
}
- if (setting.fieldType == 'select_python') {
- fetch_available_python_versions()
- }
-
-{#snippet LabelSnippet()}
-
-
-
- {setting.label}
- {#if setting.ee_only != undefined && !$enterpriseLicense}
-
- {#if setting.ee_only != ''}{setting.ee_only}{/if}
-
- {/if}
-
- {#if setting.description}
-
- {@html setting.description}
-
- {/if}
-
-{/snippet}
+ $effect(() => {
+ if (setting.fieldType == 'select_python') {
+ untrack(() => fetch_available_python_versions())
+ }
+ })
+
+ $effect(() => {
+ if (
+ (setting.fieldType == 'select' || setting.fieldType == 'select_python') &&
+ $values[setting.key] == undefined
+ ) {
+ untrack(() => {
+ $values[setting.key] = setting.defaultValue ? setting.defaultValue() : 'default'
+ })
+ }
+ })
+
{#if (!setting.cloudonly || isCloudHosted()) && showSetting(setting.key, $values) && !(setting.hiddenIfNull && $values[setting.key] == null) && !(setting.hiddenIfEmpty && !$values[setting.key]) && !(setting.hiddenInEe && $enterpriseLicense)}
{#if setting.fieldType == 'select'}
-
- {@render LabelSnippet()}
+
{#snippet children({ item: toggleButton })}
{#each setting.select_items ?? [] as item}
@@ -193,116 +174,101 @@
{/each}
{/snippet}
-
+
{:else if setting.fieldType == 'select_python'}
-
-
- {@render LabelSnippet()}
-
+
- {#snippet children({ item: toggleButtonn })}
+ {#snippet children({ item: toggleButton })}
{#each setting.select_items ?? [] as item}
- {#snippet trigger()}
+
+
+ pythonAvailableVersions.map((v) => ({
+ displayName: v,
+ action: () => {
+ $values[setting.key] = v
+ }
+ }))}
+ >
+ {#snippet buttonReplacement()}
{#if setting.select_items?.some((e) => e.label == $values[setting.key] || e.value == $values[setting.key])}
- Select Custom Select Custom
{:else}
Custom | {$values[setting.key]}
{/if}
{/snippet}
- {#snippet content()}
- {#if isPyFetching}
-
-
- {:else}
-
- {#snippet children({ item: toggleButtonn })}
- {#each pythonAvailableVersions as item}
-
- {/if}
- {/snippet}
-
+
{/snippet}
-
- {:else}
- {#snippet settingContent()}
-
-
-
-
- {#if setting.fieldType != 'smtp_connect'}
-
- {setting.label}
- {#if setting.ee_only != undefined && !$enterpriseLicense}
- {#if setting.ee_only != ''}
- {setting.ee_only}
- {:else}
-
- {/if}
- {#if setting.actionButton}
-
await setting.actionButton?.onclick($values)}
- >
- {setting.actionButton.label}
-
- {/if}
-
- {#if setting.description}
-
- {@html setting.description}
-
- {/if}
-
+
+ {:else if setting.fieldType == 'indexer_rates'}
+ {#if $values[setting.key]}
+ {@const fieldErrors = setting.validate?.($values[setting.key]) ?? {}}
+
+
+
-
- {#if setting.tooltip}
-
{setting.tooltip}
- {/if}
+
+
+
+
+
+
+
+
+
+ {/if}
+ {:else}
+
{#if $values}
{@const hasError = setting.isValid && !setting.isValid($values[setting.key])}
{#if loading}
@@ -369,7 +335,7 @@
bind:password={$values[setting.key]}
/>
{
@@ -458,7 +424,7 @@
License key cannot be renewed during trial ({attemptedAt})
{:else}
-
+
Latest key renewal failed on {attemptedAt}: {latestKeyRenewalAttempt?.result.replace(
'error: ',
''
@@ -475,7 +441,7 @@
{/if}
{#if licenseKeyChanged && !$enterpriseLicense}
{#if version.startsWith('CE')}
- License key is set but image used is the Community Edition {version}. Switch
image to EE.
@@ -525,229 +491,8 @@
- {#if $values[setting.key]}
-
-
-
- Index writer memory budget (MB)
-
- The allocated memory arena for the indexer. A bigger value means less writing
- to disk and potentially higher indexing throughput
-
-
- {
- if (e.target instanceof HTMLInputElement) {
- if (e.target.valueAsNumber) {
- $values[setting.key].writer_memory_budget =
- e.target.valueAsNumber * (1024 * 1024)
- }
- }
- }
- }}
- value={$values[setting.key].writer_memory_budget / (1024 * 1024)}
- />
-
-
- This buttons will clear the whole index, and the service will start reindexing
- from scratch. Full text search might be down during this time.
-
- {
- clearJobsIndexModalOpen = true
- }}
- >
- Clear jobs index
-
- {
- clearServiceLogsIndexModalOpen = true
- }}
- >
- Clear service logs index
-
-
-
- {
- clearJobsIndexModalOpen = false
- }}
- on:confirmed={async () => {
- const r = await IndexSearchService.clearIndex({
- idxName: 'JobIndex'
- })
- sendUserToast(r)
- clearJobsIndexModalOpen = false
- }}
- >
- Are you sure you want to clear the jobs index? The service will start reindexing
- from scratch. Full text search might be down during this time.
-
- {
- clearServiceLogsIndexModalOpen = false
- }}
- on:confirmed={async () => {
- const r = await IndexSearchService.clearIndex({
- idxName: 'ServiceLogIndex'
- })
- sendUserToast(r)
- clearServiceLogsIndexModalOpen = false
- }}
- >
- Are you sure you want to clear the service logs index? The service will start
- reindexing from scratch. Full text search might be down during this time.
-
-
-
-
-
-
- Commit max batch size
- The max amount of documents (here jobs) per commit. To optimize indexing
- throughput, it is best to keep this as high as possible. However, especially
- when reindexing the whole instance, it can be useful to have a limit on how
- many jobs can be written without being committed. A commit will make the jobs
- available for search, constitute a "checkpoint" state in the indexing and will
- be logged.
-
-
-
-
-
- Refresh index period (s)
- The index will query new jobs periodically and write them on the index. This
- setting sets that period.
-
-
-
-
- Max indexed job log size (KB)
- Job logs are included when indexing, but to avoid the index size growing
- artificially, the logs will be truncated after a size has been reached.
-
-
- {
- if (e.target instanceof HTMLInputElement) {
- if (e.target.valueAsNumber) {
- $values[setting.key].max_indexed_job_log_size =
- e.target.valueAsNumber * 1024
- }
- }
- }
- }}
- value={$values[setting.key].max_indexed_job_log_size / 1024}
- />
-
-
-
-
- {/if}
-
+
{#if $values[setting.key]}
{:else if setting.fieldType == 'object_store_config'}
{:else if setting.fieldType == 'critical_alerts_on_db_oversize'}
{#if $values[setting.key]}
@@ -893,7 +637,6 @@
GB
{/if}
-
{/if}
{:else if setting.fieldType == 'number'}
- {:else if setting.fieldType == 'select'}
- TODO
{:else if setting.fieldType == 'smtp_connect'}
{:else if setting.fieldType == 'secret_backend'}
{/if}
{#if hasError}
-
+
{setting.error ?? ''}
{/if}
{:else}
- {@render settingContent()}
-
+
{/if}
{/if}
diff --git a/frontend/src/lib/components/InstanceSettings.svelte b/frontend/src/lib/components/InstanceSettings.svelte
index 586336d876..b7be3d3759 100644
--- a/frontend/src/lib/components/InstanceSettings.svelte
+++ b/frontend/src/lib/components/InstanceSettings.svelte
@@ -1,6 +1,6 @@
{#if hideTabs}
- {@render tabsContent()}
+ {@render categoryContent(tab)}
{:else}
{#each settingsKeys as category}
@@ -285,138 +401,142 @@
{#snippet content()}
- {@render tabsContent()}
+ {#each Object.keys(settings) as category}
+
+ {@render categoryContent(category)}
+
+ {/each}
{/snippet}
{/if}
- {#snippet tabsContent()}
- {#each Object.keys(settings) as category}
-
- {#if category == 'SMTP'}
-
- Setting SMTP unlocks sending emails upon adding new users to the workspace or the
- instance or sending critical alerts via email.
-
Learn more
-
The indexer service unlocks full text search across jobs and service logs. It requires
- spinning up its own separate container
-
Learn how to
+ Anonymous usage data is collected to help improve Windmill.
+
The following information is collected:
+
+ version of your instances
+ instance base URL
+ job usage (language, total duration, count)
+ login type usage (login type, count)
+ worker usage (worker, worker instance, vCPUs, memory)
+ user usage (author count, operator count)
+ superadmin email addresses
+ vCPU usage
+ memory usage
+ development instance status
+
+
+ On Enterprise Edition, you must send data to check that usage is in line with the terms of
+ the subscription. You can either enable telemetry or regularly send usage data by clicking
+ the button below. For air-gapped instances, you can download the telemetry data and send
+ it manually.
+
+
+
- {:else if category == 'Alerts'}
-
- Critical alerts automatically notify administrators about system events like job crashes,
- license issues, worker failures, and queue delays through email, Slack, or Teams.
-
Learn more
-
- Add private registries for Pip, Bun and npm.
Learn more
-
- Connecting your instance to a Slack workspace enables critical alerts to be sent to a
- Slack channel.
-
Learn more
-
- Setting up SAML and SCIM allows you to authenticate users using your identity provider.
-
Learn more
-
- Enable debug mode to get more detailed logs.
-
- {:else if category == 'Telemetry'}
-
- Anonymous usage data is collected to help improve Windmill.
-
The following information is collected:
-
- version of your instances
- instance base URL
- job usage (language, total duration, count)
- login type usage (login type, count)
- worker usage (worker, worker instance, vCPUs, memory)
- user usage (author count, operator count)
- superadmin email addresses
- vCPU usage
- memory usage
- development instance status
-
-
- On Enterprise Edition, you must send data to check that usage is in line with the
- terms of the subscription. You can either enable telemetry or regularly send usage
- data by clicking the button below. For air-gapped instances, you can download the
- telemetry data and send it manually.
-
-
-
- Send usage
-
-
- Download usage
-
-
- {/if}
- {:else if category == 'Auth/OAuth/SAML'}
-
+
- {#snippet scim()}
-
- {#each scimSamlSetting as setting}
- closeDrawer?.()}
- {loading}
- {setting}
- {values}
- {version}
- {oauths}
- />
- {/each}
-
- {/snippet}
-
- {/if}
-
-
- {#each settings[category] as setting}
-
- {#if setting.fieldType != 'slack_connect'}
+ Download usage
+
+
+ {/if}
+ {:else if category == 'Jobs'}
+
+ {#snippet scim()}
+
+ {#each scimSamlSetting as setting}
closeDrawer?.()}
{loading}
{setting}
@@ -424,15 +544,38 @@
{version}
{oauths}
/>
- {/if}
- {/each}
-
-
- {/each}
+ {/each}
+
+ {#each settings[category] as setting}
+
+ {#if setting.fieldType != 'slack_connect' && !(quickSetup && setting.hideInQuickSetup)}
+ closeDrawer?.()}
+ {loading}
+ {setting}
+ {values}
+ {version}
+ {oauths}
+ />
+ {/if}
+ {/each}
+
+
+ {#if !loading && !quickSetup}
+ saveCategorySettings(category)}
+ onDiscard={() => discardCategory(category)}
+ saveLabel={`Save ${category.toLowerCase()} settings`}
+ class="bg-surface"
+ />
+ {/if}
{/snippet}
Save settings
-
-{/if}
diff --git a/frontend/src/lib/components/IntegerInput.svelte b/frontend/src/lib/components/IntegerInput.svelte
new file mode 100644
index 0000000000..3192c52847
--- /dev/null
+++ b/frontend/src/lib/components/IntegerInput.svelte
@@ -0,0 +1,86 @@
+
+
+Add new user to instance
-
-
+
-
-
Email will be sent if SMTP configured
+
+
+
+
+ Add user to instance
+
+
Email will be sent if SMTP configured
{#if enabled}
-
+
Kanidm Url
{'KANIDM_URL/ui/oauth2'}
@@ -83,6 +84,6 @@
bind:value={value['secret']}
/>
-
+
{/if}
+
Realm Url
-
+
{/if}
diff --git a/frontend/src/lib/components/NextcloudSetting.svelte b/frontend/src/lib/components/NextcloudSetting.svelte
index b8054b6f61..f52ffec7ae 100644
--- a/frontend/src/lib/components/NextcloudSetting.svelte
+++ b/frontend/src/lib/components/NextcloudSetting.svelte
@@ -3,6 +3,7 @@
import IconedResourceType from './IconedResourceType.svelte'
import TextInput from './text_input/TextInput.svelte'
import Toggle from './Toggle.svelte'
+ import SettingCard from './instanceSettings/SettingCard.svelte'
interface Props {
value: any
@@ -59,7 +60,7 @@
/>
{#if enabled}
-
+
Nextcloud Instance Domain
-
{/if}
diff --git a/frontend/src/lib/components/OAuthSetting.svelte b/frontend/src/lib/components/OAuthSetting.svelte
index 35fa2380c7..1d4a386f72 100644
--- a/frontend/src/lib/components/OAuthSetting.svelte
+++ b/frontend/src/lib/components/OAuthSetting.svelte
@@ -7,6 +7,7 @@
import { enterpriseLicense } from '$lib/stores'
import Button from './common/button/Button.svelte'
import TextInput from './text_input/TextInput.svelte'
+ import SettingCard from './instanceSettings/SettingCard.svelte'
interface Props {
name: string
@@ -99,7 +100,7 @@
{/if}
{#if enabled}
-
+
{#if name != 'slack' && name != 'teams'}
Custom Name
@@ -274,7 +275,7 @@
{/if}
-