From 92f3e8a0b528858e27f9f75c5edb7a684a9c9285 Mon Sep 17 00:00:00 2001 From: nick-delirium Date: Thu, 12 Dec 2024 10:45:31 +0100 Subject: [PATCH] spot: fix ingest resetting --- spot/entrypoints/popup/Settings.tsx | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/spot/entrypoints/popup/Settings.tsx b/spot/entrypoints/popup/Settings.tsx index 4f0cfb049..edf0bc113 100644 --- a/spot/entrypoints/popup/Settings.tsx +++ b/spot/entrypoints/popup/Settings.tsx @@ -2,26 +2,29 @@ import { createSignal, onMount } from "solid-js"; import orLogo from "~/assets/orSpot.svg"; import arrowLeft from "~/assets/arrow-left.svg"; +const defaultIngest = "https://app.openreplay.com"; + function Settings({ goBack }: { goBack: () => void }) { const [includeDevTools, setIncludeDevTools] = createSignal(true); const [openInNewTab, setOpenInNewTab] = createSignal(true); const [showIngest, setShowIngest] = createSignal(false); - const [ingest, setIngest] = createSignal("https://app.openreplay.com"); + const [ingest, setIngest] = createSignal(defaultIngest); const [editIngest, setEditIngest] = createSignal(false); const [tempIngest, setTempIngest] = createSignal(""); onMount(() => { chrome.storage.local.get("settings", (data: any) => { if (data.settings) { + console.log('update state', data.settings) const ingest = - data.settings.ingestPoint || "https://app.openreplay.com"; + data.settings.ingestPoint || defaultIngest; const devToolsEnabled = data.settings.consoleLogs && data.settings.networkLogs; setOpenInNewTab(data.settings.openInNewTab ?? false); setIncludeDevTools(devToolsEnabled); setIngest(ingest); setTempIngest(ingest); - setShowIngest(ingest !== "https://app.openreplay.com"); + setShowIngest(ingest !== defaultIngest); setEditIngest(!data.settings.ingestPoint); } }); @@ -38,15 +41,19 @@ function Settings({ goBack }: { goBack: () => void }) { }); }; - const toggleShowIngest = (e: Event) => { + const toggleShowIngest = (e: any) => { e.preventDefault(); e.stopPropagation(); - const value = showIngest(); - setShowIngest(!value); + const value = e.target.checked + const newSettings = { showIngest: value } + if (!value) { + newSettings['ingestPoint'] = defaultIngest + } chrome.runtime.sendMessage({ type: "ort:settings", - settings: { showIngest: !value }, + settings: newSettings, }); + setShowIngest(value); }; const applyIngest = () => {