From b8eef2990fd753fd084be514b54b866a953d6745 Mon Sep 17 00:00:00 2001 From: sylenien Date: Fri, 2 Sep 2022 14:42:30 +0200 Subject: [PATCH 1/7] fix(ui): fix xray tooltips --- .../components/TimelinePointer/TimelinePointer.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/app/components/Session_/OverviewPanel/components/TimelinePointer/TimelinePointer.tsx b/frontend/app/components/Session_/OverviewPanel/components/TimelinePointer/TimelinePointer.tsx index 6e45b5e99..e4916a14a 100644 --- a/frontend/app/components/Session_/OverviewPanel/components/TimelinePointer/TimelinePointer.tsx +++ b/frontend/app/components/Session_/OverviewPanel/components/TimelinePointer/TimelinePointer.tsx @@ -32,13 +32,14 @@ const TimelinePointer = React.memo((props: Props) => { }; const renderNetworkElement = (item: any) => { + console.log(item.name) return ( {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} From 3ecc184e1a6f7d7a6f72602f41eb376c09f7c416 Mon Sep 17 00:00:00 2001 From: sylenien Date: Fri, 2 Sep 2022 14:43:24 +0200 Subject: [PATCH 2/7] fix(ui): rm console --- .../OverviewPanel/components/TimelinePointer/TimelinePointer.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/app/components/Session_/OverviewPanel/components/TimelinePointer/TimelinePointer.tsx b/frontend/app/components/Session_/OverviewPanel/components/TimelinePointer/TimelinePointer.tsx index e4916a14a..ad179dfea 100644 --- a/frontend/app/components/Session_/OverviewPanel/components/TimelinePointer/TimelinePointer.tsx +++ b/frontend/app/components/Session_/OverviewPanel/components/TimelinePointer/TimelinePointer.tsx @@ -32,7 +32,6 @@ const TimelinePointer = React.memo((props: Props) => { }; const renderNetworkElement = (item: any) => { - console.log(item.name) return ( Date: Fri, 2 Sep 2022 14:56:27 +0100 Subject: [PATCH 3/7] feat(chalice): fixed experimental conflict --- ee/api/chalicelib/core/__init__.py | 8 +++++++- ee/api/env.default | 3 ++- 2 files changed, 9 insertions(+), 2 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 From 38db70eecd3629ff65fedcc8e4bd2203cf354bb5 Mon Sep 17 00:00:00 2001 From: rjshrjndrn Date: Fri, 2 Sep 2022 16:01:48 +0200 Subject: [PATCH 4/7] chore(build): api build script is exiting the flow. so making it as last step. Signed-off-by: rjshrjndrn --- scripts/helmcharts/build_deploy.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 $@ } From 4c1494869fae8cbad4dbf68c6bee9e200d24f8c9 Mon Sep 17 00:00:00 2001 From: Shekar Siri Date: Thu, 1 Sep 2022 22:00:15 +0530 Subject: [PATCH 5/7] fix(ui) - share tooltip open handler --- .../shared/SharePopup/SharePopup.js | 174 ++++++++++-------- 1 file changed, 95 insertions(+), 79 deletions(-) diff --git a/frontend/app/components/shared/SharePopup/SharePopup.js b/frontend/app/components/shared/SharePopup/SharePopup.js index fc379deb7..d4c5ecd98 100644 --- a/frontend/app/components/shared/SharePopup/SharePopup.js +++ b/frontend/app/components/shared/SharePopup/SharePopup.js @@ -1,7 +1,7 @@ import React from 'react'; import { connect } from 'react-redux'; import { toast } from 'react-toastify'; -import { connectPlayer } from 'Player' +import { connectPlayer } from 'Player'; import withRequest from 'HOCs/withRequest'; import { Icon, Button } from 'UI'; import styles from './sharePopup.module.css'; @@ -11,25 +11,29 @@ import Select from 'Shared/Select'; import { Tooltip } from 'react-tippy'; import cn from 'classnames'; import { fetchList, init } from 'Duck/integrations/slack'; +import OutsideClickDetectingDiv from 'Shared/OutsideClickDetectingDiv'; -@connectPlayer(state => ({ +@connectPlayer((state) => ({ time: state.time, })) -@connect(state => ({ - channels: state.getIn([ 'slack', 'list' ]), - tenantId: state.getIn([ 'user', 'account', 'tenantId' ]), -}), { fetchList }) +@connect( + (state) => ({ + channels: state.getIn(['slack', 'list']), + tenantId: state.getIn(['user', 'account', 'tenantId']), + }), + { fetchList } +) @withRequest({ endpoint: ({ id, entity }, integrationId) => - `/integrations/slack/notify/${ integrationId }/${entity}/${ id }`, - method: "POST", + `/integrations/slack/notify/${integrationId}/${entity}/${id}`, + method: 'POST', }) export default class SharePopup extends React.PureComponent { state = { comment: '', isOpen: false, - channelId: this.props.channels.getIn([ 0, 'webhookId' ]), - } + channelId: this.props.channels.getIn([0, 'webhookId']), + }; componentDidMount() { if (this.props.channels.size === 0) { @@ -37,104 +41,116 @@ export default class SharePopup extends React.PureComponent { } } - editMessage = e => this.setState({ comment: e.target.value }) - share = () => this.props.request({ comment: this.state.comment }, this.state.channelId) - .then(this.handleSuccess) + editMessage = (e) => this.setState({ comment: e.target.value }); + share = () => + this.props + .request({ comment: this.state.comment }, this.state.channelId) + .then(this.handleSuccess); handleOpen = () => { - setTimeout(function() { + setTimeout(function () { document.getElementById('message').focus(); - }, 100) - } + }, 100); + }; handleClose = () => { this.setState({ comment: '' }); - } + }; handleSuccess = () => { + this.setState({ isOpen: false, comment: '' }) toast.success('Sent to Slack.'); - } + }; - changeChannel = ({ value }) => this.setState({ channelId: value }) + changeChannel = ({ value }) => this.setState({ channelId: value }); + + onClickHandler = () => { + this.setState({ isOpen: true }); + }; render() { const { trigger, loading, channels, showCopyLink = false, time } = this.props; - const { comment, channelId } = this.state; + const { comment, channelId, isOpen } = this.state; - const options = channels.map(({ webhookId, name }) => ({ value: webhookId, label: name })).toJS(); + const options = channels + .map(({ webhookId, name }) => ({ value: webhookId, label: name })) + .toJS(); return ( -
-
Share this session link to Slack
-
- { options.length === 0 ? - <> -
- -
- { showCopyLink && ( + { + this.setState({ isOpen: false }) + }} + > +
+
+
Share this session link to Slack
+
+ {options.length === 0 ? ( + <> +
+ +
+ {showCopyLink && ( +
+ +
+ )} + + ) : ( +
+
+