From 187c12bfb812de3bac6956f5960b2e06078f7f9c Mon Sep 17 00:00:00 2001 From: Delirium Date: Fri, 2 Sep 2022 15:04:06 +0100 Subject: [PATCH] fix(ui): fix xray tooltips (#711) * fix(ui): fix xray tooltips * fix(ui): rm console * feat(chalice): fixed experimental conflict * chore(build): api build script is exiting the flow. so making it as last step. Signed-off-by: rjshrjndrn Signed-off-by: rjshrjndrn Co-authored-by: Taha Yassine Kraiem Co-authored-by: rjshrjndrn --- ee/api/chalicelib/core/__init__.py | 8 +++++++- ee/api/env.default | 3 ++- .../components/TimelinePointer/TimelinePointer.tsx | 2 +- scripts/helmcharts/build_deploy.sh | 6 +++--- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ee/api/chalicelib/core/__init__.py b/ee/api/chalicelib/core/__init__.py index 602a54998..4f6268b65 100644 --- a/ee/api/chalicelib/core/__init__.py +++ b/ee/api/chalicelib/core/__init__.py @@ -34,5 +34,11 @@ if config("EXP_ALERTS", cast=bool, default=False): else: from . import alerts_processor as alerts_processor +if config("EXP_FUNNELS", cast=bool, default=False): + print(">>> Using experimental funnels") + if not config("EXP_SESSIONS_SEARCH", cast=bool, default=False): + from . import sessions as sessions_legacy -from . import significance_exp as significance + from . import significance_exp as significance +else: + from . import significance as significance diff --git a/ee/api/env.default b/ee/api/env.default index 49cd649de..2d4a4c1e6 100644 --- a/ee/api/env.default +++ b/ee/api/env.default @@ -65,4 +65,5 @@ EXP_AUTOCOMPLETE=false EXP_ERRORS_SEARCH=false EXP_METRICS=false EXP_7D_MV=false -EXP_ALERTS=false \ No newline at end of file +EXP_ALERTS=false +EXP_FUNNELS=false \ No newline at end of file diff --git a/frontend/app/components/Session_/OverviewPanel/components/TimelinePointer/TimelinePointer.tsx b/frontend/app/components/Session_/OverviewPanel/components/TimelinePointer/TimelinePointer.tsx index 6e45b5e99..ad179dfea 100644 --- a/frontend/app/components/Session_/OverviewPanel/components/TimelinePointer/TimelinePointer.tsx +++ b/frontend/app/components/Session_/OverviewPanel/components/TimelinePointer/TimelinePointer.tsx @@ -38,7 +38,7 @@ const TimelinePointer = React.memo((props: Props) => {
{item.success ? 'Slow resource: ' : 'Missing resource:'}
- {item.name} + {item.name.length > 200 ? (item.name.slice(0, 100) + ' ... ' + item.name.slice(-50)) : item.name}
} delay={0} diff --git a/scripts/helmcharts/build_deploy.sh b/scripts/helmcharts/build_deploy.sh index 4825f9866..c3fd89c0e 100644 --- a/scripts/helmcharts/build_deploy.sh +++ b/scripts/helmcharts/build_deploy.sh @@ -11,9 +11,7 @@ echo $DOCKER_REPO exit 1 } || { docker login $DOCKER_REPO - cd ../../api - PUSH_IMAGE=1 bash build.sh $@ - cd ../backend + cd ../../backend PUSH_IMAGE=1 bash build.sh $@ cd ../utilities PUSH_IMAGE=1 bash build.sh $@ @@ -21,4 +19,6 @@ echo $DOCKER_REPO PUSH_IMAGE=1 bash build.sh $@ cd ../frontend PUSH_IMAGE=1 bash build.sh $@ + cd ../api + PUSH_IMAGE=1 bash build.sh $@ }