From a1b6dda4e16722e9b79292644c3e11ca48fc137c Mon Sep 17 00:00:00 2001 From: samuchila Date: Tue, 13 Feb 2024 13:29:18 +0100 Subject: [PATCH] Fixing Tests and Reverting package updates --- api/src/apps/mod.rs | 4 ++-- frontend/package.json | 2 +- frontend/src/LogsDialog.vue | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api/src/apps/mod.rs b/api/src/apps/mod.rs index 0fb3dbbe..aeb76d79 100644 --- a/api/src/apps/mod.rs +++ b/api/src/apps/mod.rs @@ -756,7 +756,7 @@ Log msg 3 of service-a of app master assert_eq!( log_stream.next().await.unwrap().unwrap(), ( - DateTime::parse_from_rfc3339("2019-07-18T07:25:00.000000000Z").unwrap(), + DateTime::parse_from_rfc3339("2019-07-18T07:30:00.000000000Z").unwrap(), format!( "Log msg 2 of {} of app {app_name}\n", service.service_name() @@ -767,7 +767,7 @@ Log msg 3 of service-a of app master assert_eq!( log_stream.next().await.unwrap().unwrap(), ( - DateTime::parse_from_rfc3339("2019-07-18T07:25:00.000000000Z").unwrap(), + DateTime::parse_from_rfc3339("2019-07-18T07:35:00.000000000Z").unwrap(), format!( "Log msg 3 of {} of app {app_name}\n", service.service_name() diff --git a/frontend/package.json b/frontend/package.json index 49d4e80f..6cb5fd9b 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -18,7 +18,7 @@ "current-script-polyfill": "^1.0.0", "esprima": "^4.0.1", "jquery": "^3.6.0", - "moment": "^2.30.1", + "moment": "^2.29.1", "parse-link-header": "^2.0.0", "popper.js": "^1.16.1", "swagger-ui": "^4.18.2", diff --git a/frontend/src/LogsDialog.vue b/frontend/src/LogsDialog.vue index 8695bbcd..ed9e2481 100644 --- a/frontend/src/LogsDialog.vue +++ b/frontend/src/LogsDialog.vue @@ -119,7 +119,7 @@ }, methods: { fetchLogs(newRequestUri) { - if (newRequestUri == null && requestUri != null) { + if (newRequestUri == null || requestUri != null) { return; } this.logLines = [];