diff --git a/apps/client/src/common/api/apiConstants.ts b/apps/client/src/common/api/apiConstants.ts index 714af6c81..6e86b7cfb 100644 --- a/apps/client/src/common/api/apiConstants.ts +++ b/apps/client/src/common/api/apiConstants.ts @@ -12,9 +12,12 @@ export const APP_SETTINGS = ['appSettings']; export const VIEW_SETTINGS = ['viewSettings']; export const RUNTIME = ['runtimeStore']; -export const serverPort = import.meta.env.DEV ? STATIC_PORT : window.location.port; -export const serverURL = import.meta.env.DEV ? `http://localhost:${serverPort}` : window.location.origin; -export const websocketUrl = `${window.location.protocol === "https:" ? "wss" : "ws"}://${window.location.hostname}:${serverPort}/ws`; +const location = window.location; +const socketProtocol = location.protocol === 'https:' ? 'wss' : 'ws'; + +export const serverPort = import.meta.env.DEV ? STATIC_PORT : location.port; +export const serverURL = import.meta.env.DEV ? `http://${location.hostname}:${serverPort}` : location.origin; +export const websocketUrl = `${socketProtocol}://${location.hostname}:${serverPort}/ws`; export const eventURL = `${serverURL}/eventdata`; export const rundownURL = `${serverURL}/events`; diff --git a/apps/client/src/common/components/view-params-editor/ParamInput.tsx b/apps/client/src/common/components/view-params-editor/ParamInput.tsx index 73af5dab6..54fb5a183 100644 --- a/apps/client/src/common/components/view-params-editor/ParamInput.tsx +++ b/apps/client/src/common/components/view-params-editor/ParamInput.tsx @@ -15,12 +15,12 @@ export default function ParamInput({ paramField }: EditFormInputProps) { if (type === 'option') { const optionFromParams = searchParams.get(id); - const defaultOptionValue = paramField.values.find((value) => value === optionFromParams); + const defaultOptionValue = optionFromParams || undefined; return (