From 98639860975233f5eb889f559ddac40cbcafcbe6 Mon Sep 17 00:00:00 2001 From: Junhao Liao Date: Wed, 23 Oct 2024 02:35:15 -0400 Subject: [PATCH 1/3] Update `yscope-log-viewer` to the latest version. --- components/log-viewer-webui/client/src/App.jsx | 2 +- .../log-viewer-webui/client/src/typings/LOCAL_STORAGE_KEY.js | 2 +- components/log-viewer-webui/client/src/ui/QueryStatus.jsx | 2 +- components/log-viewer-webui/yscope-log-viewer | 2 +- deps-tasks.yml | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/components/log-viewer-webui/client/src/App.jsx b/components/log-viewer-webui/client/src/App.jsx index 6d7a65e45..ef032f85c 100644 --- a/components/log-viewer-webui/client/src/App.jsx +++ b/components/log-viewer-webui/client/src/App.jsx @@ -11,7 +11,7 @@ import QueryStatus from "./ui/QueryStatus.jsx"; */ const App = () => { return ( - + ); diff --git a/components/log-viewer-webui/client/src/typings/LOCAL_STORAGE_KEY.js b/components/log-viewer-webui/client/src/typings/LOCAL_STORAGE_KEY.js index c1dc19979..3218b9f48 100644 --- a/components/log-viewer-webui/client/src/typings/LOCAL_STORAGE_KEY.js +++ b/components/log-viewer-webui/client/src/typings/LOCAL_STORAGE_KEY.js @@ -2,7 +2,7 @@ * Enum of `window.localStorage` keys. */ const LOCAL_STORAGE_KEY = Object.freeze({ - UI_THEME: "uiTheme", + THEME: "theme", }); export default LOCAL_STORAGE_KEY; diff --git a/components/log-viewer-webui/client/src/ui/QueryStatus.jsx b/components/log-viewer-webui/client/src/ui/QueryStatus.jsx index 84f367d0e..c1ad9eb9e 100644 --- a/components/log-viewer-webui/client/src/ui/QueryStatus.jsx +++ b/components/log-viewer-webui/client/src/ui/QueryStatus.jsx @@ -52,7 +52,7 @@ const QueryStatus = () => { const innerLogEventNum = logEventIdx - data.begin_msg_ix + 1; window.location = `/log-viewer/index.html?filePath=/ir/${data.path}` + - `#logEventIdx=${innerLogEventNum}`; + `#logEventNum=${innerLogEventNum}`; }) .catch((e) => { let msg = "Unknown error."; diff --git a/components/log-viewer-webui/yscope-log-viewer b/components/log-viewer-webui/yscope-log-viewer index c939f7b55..f15a846f6 160000 --- a/components/log-viewer-webui/yscope-log-viewer +++ b/components/log-viewer-webui/yscope-log-viewer @@ -1 +1 @@ -Subproject commit c939f7b55b55b42f65226470d5277b15ac484665 +Subproject commit f15a846f6edfb47656a537aceeb1ebe579f083b7 diff --git a/deps-tasks.yml b/deps-tasks.yml index bfe80d8b5..3028b45e8 100644 --- a/deps-tasks.yml +++ b/deps-tasks.yml @@ -421,8 +421,8 @@ tasks: vars: DEST: "{{.DEST}}" FLAGS: "--extract" - SRC_NAME: "yscope-log-viewer-c939f7b55b55b42f65226470d5277b15ac484665" - SRC_URL: "https://github.com/y-scope/yscope-log-viewer/archive/c939f7b.zip" + SRC_NAME: "yscope-log-viewer-f15a846f6edfb47656a537aceeb1ebe579f083b7" + SRC_URL: "https://github.com/junhaoliao/yscope-log-viewer/archive/f15a846.zip" # This command must be last - task: ":utils:compute-checksum" vars: From 57072183cfd3553055900f832f68da09ec9811f3 Mon Sep 17 00:00:00 2001 From: Junhao Liao Date: Wed, 23 Oct 2024 22:05:09 -0400 Subject: [PATCH 2/3] Update yscope-log-viewer commit id to latest. --- components/log-viewer-webui/yscope-log-viewer | 2 +- deps-tasks.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/log-viewer-webui/yscope-log-viewer b/components/log-viewer-webui/yscope-log-viewer index f15a846f6..bc8109f9f 160000 --- a/components/log-viewer-webui/yscope-log-viewer +++ b/components/log-viewer-webui/yscope-log-viewer @@ -1 +1 @@ -Subproject commit f15a846f6edfb47656a537aceeb1ebe579f083b7 +Subproject commit bc8109f9f371c3327070000dee3537bdaf535428 diff --git a/deps-tasks.yml b/deps-tasks.yml index 3028b45e8..185691ad4 100644 --- a/deps-tasks.yml +++ b/deps-tasks.yml @@ -421,8 +421,8 @@ tasks: vars: DEST: "{{.DEST}}" FLAGS: "--extract" - SRC_NAME: "yscope-log-viewer-f15a846f6edfb47656a537aceeb1ebe579f083b7" - SRC_URL: "https://github.com/junhaoliao/yscope-log-viewer/archive/f15a846.zip" + SRC_NAME: "yscope-log-viewer-bc8109f9f371c3327070000dee3537bdaf535428" + SRC_URL: "https://github.com/junhaoliao/yscope-log-viewer/archive/bc8109f.zip" # This command must be last - task: ":utils:compute-checksum" vars: From c73bcd69fb2cc467727e659a12e368919c05312e Mon Sep 17 00:00:00 2001 From: Junhao Liao Date: Wed, 23 Oct 2024 22:07:54 -0400 Subject: [PATCH 3/3] Replace repo owner with `y-scope` in `yscope-log-viewer` `SRC_URL`. --- deps-tasks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps-tasks.yml b/deps-tasks.yml index 185691ad4..eac7b6509 100644 --- a/deps-tasks.yml +++ b/deps-tasks.yml @@ -422,7 +422,7 @@ tasks: DEST: "{{.DEST}}" FLAGS: "--extract" SRC_NAME: "yscope-log-viewer-bc8109f9f371c3327070000dee3537bdaf535428" - SRC_URL: "https://github.com/junhaoliao/yscope-log-viewer/archive/bc8109f.zip" + SRC_URL: "https://github.com/y-scope/yscope-log-viewer/archive/bc8109f.zip" # This command must be last - task: ":utils:compute-checksum" vars: