diff options
| -rw-r--r-- | CHANGELOG.md | 7 | ||||
| -rw-r--r-- | src/zenserver/frontend/html.zip | bin | 161397 -> 161943 bytes | |||
| -rw-r--r-- | src/zenserver/frontend/html/pages/start.js | 9 | ||||
| -rw-r--r-- | src/zenserver/frontend/html/util/fetcher.js | 9 | ||||
| -rw-r--r-- | src/zenserver/frontend/html/zen.css | 10 |
5 files changed, 30 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 4691a9167..8dc7b6716 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ ## - Improvement: Sentry is now disabled by default when building locally, to avoid uploading crashes due to local changes. CI builds still enable it just like before +- Improvement: Include the server version on the dashboard's start page - Bugfix: Wildcard matching could cause out of bound read error ## 5.7.9 @@ -201,7 +202,7 @@ kOutOfDisk = 17, kAssertError = 70, - + kHttpOtherClientError = 80, kHttpCantConnectError = 81, kHttpNotFound = 66, // NotFound(404) @@ -211,7 +212,7 @@ kHttpTimeout = 84, // RequestTimeout(408) kHttpConflict = 85, // Conflict(409) kHttpNoHost = 86, - + kHttpOtherServerError = 90, kHttpInternalServerError = 91, // InternalServerError(500) kHttpServiceUnavailable = 69, // ServiceUnavailable(503) @@ -1774,7 +1775,7 @@ - Feature: Build scripts and tooling to build zen compliant with VFX reference platform CY2022/2021 matching UE linux builds - Feature: added `xmake sln` task which replaces `generate_projects.bat` - Feature: Zen server endpoint `prj/{project}/oplog/{log}/chunks` to post multiple attachments in one request. -- Feature: Zen server endpoint `prj/{project}/oplog/{log}/save` to save an oplog container. Accepts `CbObject` containing a compressed oplog and attachment references organized in blocks. +- Feature: Zen server endpoint `prj/{project}/oplog/{log}/save` to save an oplog container. Accepts `CbObject` containing a compressed oplog and attachment references organized in blocks. - Feature: Zen server endpoint `prj/{project}/oplog/{log}/load` to request an oplog container. Responds with an `CbObject` containing a compressed oplog and attachment references organized in blocks. - Feature: Zen server endpoint `{project}/oplog/{log}/rpc` to initiate an import to or export from an external location and other operations. Use either JSon or CbPackage as payload. - CbObject/JSon RPC format for `import` and `export` methods: diff --git a/src/zenserver/frontend/html.zip b/src/zenserver/frontend/html.zip Binary files differindex 4d6766579..38d3a73f2 100644 --- a/src/zenserver/frontend/html.zip +++ b/src/zenserver/frontend/html.zip diff --git a/src/zenserver/frontend/html/pages/start.js b/src/zenserver/frontend/html/pages/start.js index fd3778e0a..28f4a20d9 100644 --- a/src/zenserver/frontend/html/pages/start.js +++ b/src/zenserver/frontend/html/pages/start.js @@ -13,9 +13,8 @@ export class Page extends ZenPage { async main() { - var section = this.add_section("projects"); - // project list + var section = this.add_section("projects"); var columns = [ "name", "project_dir", @@ -107,6 +106,12 @@ export class Page extends ZenPage row = stats_table.add_row(...values); row.get_cell(0).tag().text(provider).on_click((x) => this.view_stat(x), provider); } + + // version + var ver_tag = this.tag().id("version"); + var version = new Fetcher().resource("health", "version"); + version.param("detailed", "true"); + version.text().then((data) => ver_tag.text(data)); } view_stat(provider) diff --git a/src/zenserver/frontend/html/util/fetcher.js b/src/zenserver/frontend/html/util/fetcher.js index 45f597404..9d464ecf4 100644 --- a/src/zenserver/frontend/html/util/fetcher.js +++ b/src/zenserver/frontend/html/util/fetcher.js @@ -45,6 +45,15 @@ export class Fetcher return new CbObject(data); } + async text() + { + const response = await this._get("text/plain"); + if (!response) + return null; + + return await response.text(); + } + async delete() { const resource = this._build_uri(); diff --git a/src/zenserver/frontend/html/zen.css b/src/zenserver/frontend/html/zen.css index 532b71571..0c4f324e4 100644 --- a/src/zenserver/frontend/html/zen.css +++ b/src/zenserver/frontend/html/zen.css @@ -408,6 +408,16 @@ a { min-width: 15%; } +/* start -------------------------------------------------------------------- */ + +#start { + #version { + color: var(--theme_g1); + text-align: center; + font-size: 0.85em; + } +} + /* entry -------------------------------------------------------------------- */ #entry { |