From 42c13db380b8e359ef6da664c67feacd523410b5 Mon Sep 17 00:00:00 2001 From: "yosong.heo" Date: Tue, 30 Mar 2021 13:54:18 +0900 Subject: [PATCH 1/2] =?UTF-8?q?:bug:=20XLog=20Flow=20Detail=20view=20?= =?UTF-8?q?=EC=9D=B4=EB=B2=A4=ED=8A=B8=20=EC=98=A4=EB=A5=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/.env | 2 +- docker/Dockerfile-Dev | 2 +- src/common/ElementType.js | 14 ++++++++++++++ .../XlogFlow/XlogFlowChart/XlogFlowGraph.js | 8 +++++--- 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/docker/.env b/docker/.env index 2190418..9ea9361 100644 --- a/docker/.env +++ b/docker/.env @@ -1 +1 @@ -PAPER_VERSION=2.6.4-dev +PAPER_VERSION=2.6.5-snapshot diff --git a/docker/Dockerfile-Dev b/docker/Dockerfile-Dev index 6684cc9..386287d 100644 --- a/docker/Dockerfile-Dev +++ b/docker/Dockerfile-Dev @@ -7,4 +7,4 @@ COPY default.conf /etc/nginx/conf.d/default.conf WORKDIR /var/www COPY ./scouter-paper.zip ./ ## install -RUN apk add -U tzdata wget unzip;cp /usr/share/zoneinfo/Asia/Seoul /etc/localtime; wget ${INSTALL_URL};unzip scouter-paper.zip;rm -f scouter-paper.zip +RUN apk add -U tzdata wget unzip;cp /usr/share/zoneinfo/Asia/Seoul /etc/localtime;unzip scouter-paper.zip;rm -f scouter-paper.zip diff --git a/src/common/ElementType.js b/src/common/ElementType.js index aaf8f46..5449c84 100644 --- a/src/common/ElementType.js +++ b/src/common/ElementType.js @@ -8,6 +8,20 @@ export default class ElementType { DISPATCH : "4", THREAD : "5", + isDetailSupport(value) { + switch(value){ + case this.SERVICE: + case this.SQL : + case this.DISPATCH : + case this.THREAD : + return true; + case this.API_CALL : + case this.USER : + default: + return false; + } + }, + toString(value) { switch(value){ case this.USER : return "USER"; diff --git a/src/components/Paper/XLog/Profiler/FrameProfile/XlogFlow/XlogFlowChart/XlogFlowGraph.js b/src/components/Paper/XLog/Profiler/FrameProfile/XlogFlow/XlogFlowChart/XlogFlowGraph.js index 2a286fa..583afab 100644 --- a/src/components/Paper/XLog/Profiler/FrameProfile/XlogFlow/XlogFlowChart/XlogFlowGraph.js +++ b/src/components/Paper/XLog/Profiler/FrameProfile/XlogFlow/XlogFlowChart/XlogFlowGraph.js @@ -164,9 +164,11 @@ class XlogFlowGraph extends Component { that.tip.hide(d,this); }) .on('click', (d)=> { - that.tip.hide(d,this); - d3.event.stopPropagation(); - this.props.clickContent(d.data); + if(ElementType.defaultProps.isDetailSupport(d.data.type)) { + that.tip.hide(d, this); + d3.event.stopPropagation(); + this.props.clickContent(d.data); + } // that.scope.handleSelectSpan(d); }); From afdb9c938a18fc8bc5016f01ebb2358dd9d17886 Mon Sep 17 00:00:00 2001 From: "yosong.heo" Date: Tue, 30 Mar 2021 13:54:56 +0900 Subject: [PATCH 2/2] =?UTF-8?q?:bug:=20XLog=20Flow=20Detail=20view=20?= =?UTF-8?q?=EC=9D=B4=EB=B2=A4=ED=8A=B8=20=EC=98=A4=EB=A5=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/common.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/common.js b/src/common/common.js index 50c6777..bce889a 100644 --- a/src/common/common.js +++ b/src/common/common.js @@ -2,7 +2,7 @@ import moment from "moment"; import {Dictionary, DictType} from "./dictionary"; -export const version = "2.6.4"; +export const version = "2.6.5-snapshot"; export function getData(key) { let ls = null;