From ddd015d696e51cea1fbdbec1c5b1aae867a09564 Mon Sep 17 00:00:00 2001 From: Timo K Date: Mon, 24 Nov 2025 10:04:01 +0100 Subject: [PATCH] fix dev EditInPlace --- locales/en/app.json | 2 +- src/settings/DeveloperSettingsTab.tsx | 106 ++-- .../DeveloperSettingsTab.test.tsx.snap | 519 +++++++++--------- 3 files changed, 316 insertions(+), 311 deletions(-) diff --git a/locales/en/app.json b/locales/en/app.json index 4d3d5d6c..9e8fbbd3 100644 --- a/locales/en/app.json +++ b/locales/en/app.json @@ -65,7 +65,7 @@ "always_show_iphone_earpiece": "Show iPhone earpiece option on all platforms", "crypto_version": "Crypto version: {{version}}", "custom_livekit_url": { - "current_url": "Overwrite: ", + "current_url": "Currently set to: ", "from_config": "Currently, no overwrite is set. Url from well-known or config is used.", "label": "Custom Livekit-url", "reset": "Reset overwrite", diff --git a/src/settings/DeveloperSettingsTab.tsx b/src/settings/DeveloperSettingsTab.tsx index ed022370..254aaf0f 100644 --- a/src/settings/DeveloperSettingsTab.tsx +++ b/src/settings/DeveloperSettingsTab.tsx @@ -96,7 +96,10 @@ export const DeveloperSettingsTab: FC = ({ customLivekitUrlSetting, ); const [customLivekitUrlTextBuffer, setCustomLivekitUrlTextBuffer] = - useState(""); + useState(customLivekitUrl); + useEffect(() => { + setCustomLivekitUrlTextBuffer(customLivekitUrl); + }, [customLivekitUrl]); const [muteAllAudio, setMuteAllAudio] = useSetting(muteAllAudioSetting); @@ -114,7 +117,7 @@ export const DeveloperSettingsTab: FC = ({ }, [livekitRooms]); return ( -
e.preventDefault()}> + <>

{t("developer_mode.hostname", { hostname: window.location.hostname || "unknown", @@ -227,7 +230,6 @@ export const DeveloperSettingsTab: FC = ({ cancelButtonLabel={t("developer_mode.custom_livekit_url.reset")} onSave={useCallback( (e: React.FormEvent) => { - // e.preventDefault(); setCustomLivekitUrl( customLivekitUrlTextBuffer === "" ? null @@ -236,6 +238,7 @@ export const DeveloperSettingsTab: FC = ({ }, [setCustomLivekitUrl, customLivekitUrlTextBuffer], )} + value={customLivekitUrlTextBuffer ?? ""} onChange={useCallback( (event: ChangeEvent): void => { setCustomLivekitUrlTextBuffer(event.target.value); @@ -244,7 +247,6 @@ export const DeveloperSettingsTab: FC = ({ )} onCancel={useCallback( (e: React.FormEvent) => { - // e.preventDefault(); setCustomLivekitUrl(null); }, [setCustomLivekitUrl], @@ -253,52 +255,54 @@ export const DeveloperSettingsTab: FC = ({ {t("developer_mode.matrixRTCMode.title")} - - } - > - - - {t("developer_mode.matrixRTCMode.Legacy.description")} - - - - } - > - - - {t("developer_mode.matrixRTCMode.Comptibility.description")} - - - - } - > - - - {t("developer_mode.matrixRTCMode.Matrix_2_0.description")} - - + + + } + > + + + {t("developer_mode.matrixRTCMode.Legacy.description")} + + + + } + > + + + {t("developer_mode.matrixRTCMode.Comptibility.description")} + + + + } + > + + + {t("developer_mode.matrixRTCMode.Matrix_2_0.description")} + + + {livekitRooms?.map((livekitRoom) => ( <>

@@ -323,6 +327,6 @@ export const DeveloperSettingsTab: FC = ({ 
{JSON.stringify(env, null, 2)}

{t("developer_mode.url_params")}

{JSON.stringify(urlParams, null, 2)}
- + ); }; diff --git a/src/settings/__snapshots__/DeveloperSettingsTab.test.tsx.snap b/src/settings/__snapshots__/DeveloperSettingsTab.test.tsx.snap index ca861eb6..ef3db126 100644 --- a/src/settings/__snapshots__/DeveloperSettingsTab.test.tsx.snap +++ b/src/settings/__snapshots__/DeveloperSettingsTab.test.tsx.snap @@ -2,230 +2,231 @@ exports[`DeveloperSettingsTab > renders and matches snapshot 1`] = `
+

+ Hostname: localhost +

+

+ Element Call version: dev +

+

+ Crypto version: crypto-1.0.0 +

+

+ Matrix ID: @alice:example.org +

+

+ Device ID: DEVICE123 +

+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+ +
+
+ + +
+ +
-

- Hostname: localhost -

-

- Element Call version: dev -

-

- Crypto version: crypto-1.0.0 -

-

- Matrix ID: @alice:example.org -

-

- Device ID: DEVICE123 -

+
-
-
-
-
- - -
+ Currently, no overwrite is set. Url from well-known or config is used. +
-
-
- - -
-
-
-
- - -
-
- -
-
- - -
- -
- -
- -
- -
- - Currently, no overwrite is set. Url from well-known or config is used. - -
-
-

- MatrixRTC mode -

+ +

+ MatrixRTC mode +

+
@@ -347,64 +348,64 @@ exports[`DeveloperSettingsTab > renders and matches snapshot 1`] = `
-

- LiveKit SFU: wss://local-sfu.example.org -

-

- ws-url: - wss://local-sfu.example.org/ -

-

- LiveKit Server Info - ( - local - ) -

- 
-      {
+  
+  

+    LiveKit SFU: wss://local-sfu.example.org
+  

+  

+    ws-url: 
+    wss://local-sfu.example.org/
+  

+  

+    LiveKit Server Info
+    (
+    local
+    )
+  

+  
+    {
   "region": "local",
   "version": "1.2.3"
 }
-      local-metadata
-    

-    

-      LiveKit SFU: wss://remote-sfu.example.org
-    

-    

-      LiveKit Server Info
-      (
-      remote
-      )
-    

-    
-      {
+    local-metadata
+  

+  

+    LiveKit SFU: wss://remote-sfu.example.org
+  

+  

+    LiveKit Server Info
+    (
+    remote
+    )
+  

+  
+    {
   "region": "remote",
   "version": "4.5.6"
 }
-      remote-metadata
-    

-    

-      Environment variables
-    

-    
-      {
+    remote-metadata
+  

+  

+    Environment variables
+  

+  
+    {
   "MY_MOCK_ENV": 10,
   "ENV": "test"
 }
-    

-    

-      URL parameters
-    

-    
-      {
+  

+  

+    URL parameters
+  

+  
+    {
   "mocked": true,
   "answer": 42
 }
-    

-  
+
`;