diff --git a/frontend/src/lib/components/Dev.svelte b/frontend/src/lib/components/Dev.svelte
index 3f92e9a613..0fc5866967 100644
--- a/frontend/src/lib/components/Dev.svelte
+++ b/frontend/src/lib/components/Dev.svelte
@@ -12,10 +12,9 @@
Preview,
type OpenFlow,
type FlowModule,
- SettingsService
} from '$lib/gen'
import { inferArgs } from '$lib/infer'
- import { enterpriseLicense, userStore, workspaceStore } from '$lib/stores'
+ import { userStore, workspaceStore } from '$lib/stores'
import { emptySchema, getModifierKey, sendUserToast } from '$lib/utils'
import { Pane, Splitpanes } from 'svelte-splitpanes'
import { onDestroy, onMount, setContext } from 'svelte'
@@ -34,6 +33,7 @@
import { loadSchemaFromModule } from './flows/flowInfers'
import { Play } from 'lucide-svelte'
import Toggle from './Toggle.svelte'
+ import { setLicense } from '$lib/enterpriseUtils'
$: token = $page.url.searchParams.get('wm_token') ?? undefined
$: workspace = $page.url.searchParams.get('workspace') ?? undefined
@@ -127,13 +127,9 @@
}
}
- async function setEnterpriseLicense() {
- if (!$enterpriseLicense) {
- $enterpriseLicense = await SettingsService.getLicenseId()
- }
- }
+ setLicense()
+
onMount(() => {
- setEnterpriseLicense()
window.addEventListener('message', el, false)
document.addEventListener('keydown', (e) => {
const obj = {
diff --git a/frontend/src/lib/components/InstanceSettings.svelte b/frontend/src/lib/components/InstanceSettings.svelte
index 1f46f81a60..3260b5806c 100644
--- a/frontend/src/lib/components/InstanceSettings.svelte
+++ b/frontend/src/lib/components/InstanceSettings.svelte
@@ -176,6 +176,7 @@
+
{#each settingsKeys as category}
{category}
diff --git a/frontend/src/lib/components/ScriptEditor.svelte b/frontend/src/lib/components/ScriptEditor.svelte
index a9203d4446..7d6fde92d7 100644
--- a/frontend/src/lib/components/ScriptEditor.svelte
+++ b/frontend/src/lib/components/ScriptEditor.svelte
@@ -2,7 +2,7 @@
import { BROWSER } from 'esm-env'
import type { Schema, SupportedLanguage } from '$lib/common'
- import { CompletedJob, Job, JobService, SettingsService } from '$lib/gen'
+ import { CompletedJob, Job, JobService } from '$lib/gen'
import { enterpriseLicense, userStore, workspaceStore } from '$lib/stores'
import { copyToClipboard, emptySchema, getModifierKey, sendUserToast } from '$lib/utils'
import Editor from './Editor.svelte'
@@ -23,6 +23,7 @@
import Modal from './common/modal/Modal.svelte'
import DiffEditor from './DiffEditor.svelte'
import { Clipboard, Github, Play } from 'lucide-svelte'
+ import { setLicense } from '$lib/enterpriseUtils'
// Exported
export let schema: Schema | any = emptySchema()
@@ -120,11 +121,8 @@
loadPastTests()
})
+ setLicense()
export async function setCollaborationMode() {
- if (!$enterpriseLicense) {
- $enterpriseLicense = await SettingsService.getLicenseId()
- }
-
if (!$enterpriseLicense) {
sendUserToast(`Multiplayer is an enterprise feature`, true, [
{
diff --git a/frontend/src/lib/components/apps/editor/settingsPanel/ComponentPanel.svelte b/frontend/src/lib/components/apps/editor/settingsPanel/ComponentPanel.svelte
index 718b2ee02c..95e1515500 100644
--- a/frontend/src/lib/components/apps/editor/settingsPanel/ComponentPanel.svelte
+++ b/frontend/src/lib/components/apps/editor/settingsPanel/ComponentPanel.svelte
@@ -276,7 +276,7 @@
id={component.id}
bind:componentInput={componentSettings.item.data.componentInput}
/>
-
+
transform to a frontend script
{:else if componentSettings.item.data.componentInput?.type === 'runnable' && component.componentInput !== undefined}
diff --git a/frontend/src/routes/(root)/(logged)/user/(user)/login/+page.svelte b/frontend/src/routes/(root)/(logged)/user/(user)/login/+page.svelte
index 55276004ae..17a4069a57 100644
--- a/frontend/src/routes/(root)/(logged)/user/(user)/login/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/user/(user)/login/+page.svelte
@@ -7,9 +7,8 @@
import Microsoft from '$lib/components/icons/brands/Microsoft.svelte'
import Okta from '$lib/components/icons/brands/Okta.svelte'
- import { onMount } from 'svelte'
import { OauthService, UserService, WorkspaceService } from '$lib/gen'
- import { usersWorkspaceStore, workspaceStore, userStore } from '$lib/stores'
+ import { usersWorkspaceStore, workspaceStore, userStore, enterpriseLicense } from '$lib/stores'
import { classNames, emptyString, parseQueryParams } from '$lib/utils'
import { getUserExt } from '$lib/user'
import { Button, Skeleton } from '$lib/components/common'
@@ -20,6 +19,7 @@
import LoginPageHeader from '$lib/components/LoginPageHeader.svelte'
import DarkModeToggle from '$lib/components/sidebar/DarkModeToggle.svelte'
import { clearStores } from '$lib/storeUtils'
+ import { setLicense } from '$lib/enterpriseUtils'
let email = $page.url.searchParams.get('email') ?? ''
let password = $page.url.searchParams.get('password') ?? ''
@@ -148,15 +148,18 @@
showPassword = (logins.length == 0 && !saml) || (email != undefined && email.length > 0)
}
- onMount(async () => {
- try {
- loadLogins()
- await UserService.getCurrentEmail()
- redirectUser()
- } catch {
- clearStores()
- }
- })
+ async function redirectIfNecessary() {
+ await UserService.getCurrentEmail()
+ redirectUser()
+ }
+
+ try {
+ setLicense()
+ loadLogins()
+ redirectIfNecessary()
+ } catch {
+ clearStores()
+ }
function handleKeyUp(event: KeyboardEvent) {
const key = event.key
@@ -189,7 +192,9 @@
-
+ {#if !$enterpriseLicense || !$enterpriseLicense?.endsWith('_whitelabel')}
+
+ {/if}
Log in or sign up
diff --git a/frontend/src/routes/(root)/+layout.svelte b/frontend/src/routes/(root)/+layout.svelte
index 68ceb4fdd2..a43564ad3c 100644
--- a/frontend/src/routes/(root)/+layout.svelte
+++ b/frontend/src/routes/(root)/+layout.svelte
@@ -1,9 +1,9 @@