From 1f0e2f3de0f52edf7ad2fdbd19e96ceb4576c3f1 Mon Sep 17 00:00:00 2001 From: Chengxun Lee <24319042+bclswl0827@users.noreply.github.com> Date: Tue, 9 Apr 2024 23:44:27 +0800 Subject: [PATCH] Fix intensity calculation issue of CSIS in frontend --- CHANGELOG.md | 6 + VERSION | 2 +- driver/serial/read.go | 2 +- frontend/dist/asset-manifest.json | 8 +- frontend/dist/index.html | 2 +- ...a6c3fcd.chunk.js => 154.cebd5677.chunk.js} | 2 +- ...a84b829.chunk.js => 600.23a606ea.chunk.js} | 2 +- frontend/dist/static/js/main.6ea9d68f.js | 2 - frontend/dist/static/js/main.9e9bedf8.js | 2 + ...CENSE.txt => main.9e9bedf8.js.LICENSE.txt} | 0 frontend/src/.env | 4 +- frontend/src/package-lock.json | 1421 ++++++++++++++--- frontend/src/package.json | 2 +- .../src/src/helpers/i18n/getCurrentLocale.tsx | 10 +- .../src/helpers/seismic/intensityStandard.tsx | 3 + .../src/src/views/Export/handleSetTable.tsx | 2 +- frontend/src/src/views/History/index.tsx | 24 +- utils/resample/interpolate.go | 6 - utils/resample/resample.go | 28 - 19 files changed, 1267 insertions(+), 261 deletions(-) rename frontend/dist/static/js/{154.fa6c3fcd.chunk.js => 154.cebd5677.chunk.js} (83%) rename frontend/dist/static/js/{600.0a84b829.chunk.js => 600.23a606ea.chunk.js} (63%) delete mode 100644 frontend/dist/static/js/main.6ea9d68f.js create mode 100644 frontend/dist/static/js/main.9e9bedf8.js rename frontend/dist/static/js/{main.6ea9d68f.js.LICENSE.txt => main.9e9bedf8.js.LICENSE.txt} (100%) delete mode 100644 utils/resample/interpolate.go delete mode 100644 utils/resample/resample.go diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f15c2d7..ac9a007a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ Starting from v2.2.5, all notable changes to this project will be documented in this file. +## v2.12.1 + +- Sort earthquake event source API by name in frontend +- Fix intensity calculation issue of CSIS in frontend +- Removal of unused utility functions + ## v2.12.0 - Support lifecycle configuration for records in database diff --git a/VERSION b/VERSION index 9f94b801..ba6ff6bf 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.12.0 +v2.12.1 diff --git a/driver/serial/read.go b/driver/serial/read.go index 1341a609..0efe7fd1 100644 --- a/driver/serial/read.go +++ b/driver/serial/read.go @@ -14,7 +14,7 @@ func Read(r io.Reader, buf []byte, timeout time.Duration) (n int, err error) { } start := time.Now() - for n < min && err == nil { + for n < min { if time.Since(start) > timeout { return 0, fmt.Errorf("timeout due to no response") } diff --git a/frontend/dist/asset-manifest.json b/frontend/dist/asset-manifest.json index d687eb08..983bdc69 100644 --- a/frontend/dist/asset-manifest.json +++ b/frontend/dist/asset-manifest.json @@ -1,12 +1,12 @@ { "files": { "main.css": "./static/css/main.7a040865.css", - "main.js": "./static/js/main.6ea9d68f.js", + "main.js": "./static/js/main.9e9bedf8.js", "static/css/594.d6bfd15f.chunk.css": "./static/css/594.d6bfd15f.chunk.css", "static/js/594.7755917b.chunk.js": "./static/js/594.7755917b.chunk.js", "static/js/846.88ce4ddb.chunk.js": "./static/js/846.88ce4ddb.chunk.js", - "static/js/154.fa6c3fcd.chunk.js": "./static/js/154.fa6c3fcd.chunk.js", - "static/js/600.0a84b829.chunk.js": "./static/js/600.0a84b829.chunk.js", + "static/js/154.cebd5677.chunk.js": "./static/js/154.cebd5677.chunk.js", + "static/js/600.23a606ea.chunk.js": "./static/js/600.23a606ea.chunk.js", "static/js/708.22872728.chunk.js": "./static/js/708.22872728.chunk.js", "static/js/699.e75d4402.chunk.js": "./static/js/699.e75d4402.chunk.js", "static/js/303.28dd2180.chunk.js": "./static/js/303.28dd2180.chunk.js", @@ -49,6 +49,6 @@ }, "entrypoints": [ "static/css/main.7a040865.css", - "static/js/main.6ea9d68f.js" + "static/js/main.9e9bedf8.js" ] } \ No newline at end of file diff --git a/frontend/dist/index.html b/frontend/dist/index.html index 69260c49..5df88805 100644 --- a/frontend/dist/index.html +++ b/frontend/dist/index.html @@ -1 +1 @@ -