From 5e9e52f83112c66da62426c9d42827cd6c6681c6 Mon Sep 17 00:00:00 2001 From: Peter Olu Date: Thu, 19 May 2022 09:06:23 +0100 Subject: [PATCH 01/43] modifeid log colum variale to have a prop of visible --- src/views/dashboard/related/components/LogTable/data.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/views/dashboard/related/components/LogTable/data.ts b/src/views/dashboard/related/components/LogTable/data.ts index 58009b25..23da65e2 100644 --- a/src/views/dashboard/related/components/LogTable/data.ts +++ b/src/views/dashboard/related/components/LogTable/data.ts @@ -19,34 +19,42 @@ export const ServiceLogConstants = [ { label: "serviceName", value: "service", + isVisible: true }, { label: "serviceInstanceName", value: "instance", + isVisible: true }, { label: "endpointName", value: "endpoint", + isVisible: false }, { label: "timestamp", value: "time", + isVisible: true }, { label: "contentType", value: "contentType", + isVisible: true }, { label: "tags", value: "tags", + isVisible: false }, { label: "content", value: "content", + isVisible: true }, { label: "traceId", value: "traceID", + isVisible: false }, ]; export const ServiceLogDetail = [ From 650038f06909a2dbc055bc38bbde391d53bf0cdb Mon Sep 17 00:00:00 2001 From: Peter Olu Date: Thu, 19 May 2022 09:07:22 +0100 Subject: [PATCH 02/43] render rows in respect to computed columns --- src/views/dashboard/related/components/LogTable/Index.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/dashboard/related/components/LogTable/Index.vue b/src/views/dashboard/related/components/LogTable/Index.vue index c6d6fd90..6eff5eb0 100644 --- a/src/views/dashboard/related/components/LogTable/Index.vue +++ b/src/views/dashboard/related/components/LogTable/Index.vue @@ -17,7 +17,8 @@ limitations under the License. -->
From 0ae9c8f9697221c0b0e47fe79e798fc41c17602e Mon Sep 17 00:00:00 2001 From: Peter Olu Date: Thu, 19 May 2022 09:08:19 +0100 Subject: [PATCH 03/43] modified display of rows to show data based on colum isVisble prop --- src/views/dashboard/related/components/LogTable/LogService.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/dashboard/related/components/LogTable/LogService.vue b/src/views/dashboard/related/components/LogTable/LogService.vue index c91b1efe..bcaa41e0 100644 --- a/src/views/dashboard/related/components/LogTable/LogService.vue +++ b/src/views/dashboard/related/components/LogTable/LogService.vue @@ -15,7 +15,7 @@ limitations under the License. --> From d00b36eefc291fbdea1227eea09c297f467c7d86 Mon Sep 17 00:00:00 2001 From: Peter Olu Date: Tue, 24 May 2022 13:54:26 +0100 Subject: [PATCH 21/43] current updates --- src/views/dashboard/related/log/Header.vue | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/views/dashboard/related/log/Header.vue b/src/views/dashboard/related/log/Header.vue index 2ec877a6..f0961e58 100644 --- a/src/views/dashboard/related/log/Header.vue +++ b/src/views/dashboard/related/log/Header.vue @@ -21,6 +21,7 @@ limitations under the License. --> clearable multiple collapse-tags + automatic-dropdown collapse-tags-tooltip placeholder="Select" style="width: 240px" @@ -32,12 +33,12 @@ limitations under the License. --> :label="item.label" :value="item.value" > -
+
{{ item.value }} -
+
> - + @@ -718,4 +723,7 @@ watch( .space-between { justify-content: space-between !important; } +.el-select-dropdown.is-multiple .el-select-dropdown__item.selected { + background: transparent; +} From 157f60dee1181707c32908260082b50d93bd98de Mon Sep 17 00:00:00 2001 From: Peter Olu Date: Tue, 24 May 2022 16:21:29 +0100 Subject: [PATCH 22/43] added a class and a determinat to make log colum header fill availaible space when number of visible column is less than 6 --- .../dashboard/related/components/LogTable/LogService.vue | 6 +++++- src/views/dashboard/related/log/Header.vue | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/views/dashboard/related/components/LogTable/LogService.vue b/src/views/dashboard/related/components/LogTable/LogService.vue index 1ca7e275..89434c71 100644 --- a/src/views/dashboard/related/components/LogTable/LogService.vue +++ b/src/views/dashboard/related/components/LogTable/LogService.vue @@ -14,7 +14,11 @@ See the License for the specific language governing permissions and limitations under the License. -->