From f06a73a86bfb99b1fb27a278449626da61943154 Mon Sep 17 00:00:00 2001 From: estradino Date: Wed, 28 Jul 2021 14:20:45 +0200 Subject: [PATCH 1/6] :bug: Clarified license (buyer-based) --- ee/LICENSE.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ee/LICENSE.md b/ee/LICENSE.md index d0ab5e345..d99b63d76 100644 --- a/ee/LICENSE.md +++ b/ee/LICENSE.md @@ -14,8 +14,8 @@ modify this Software and publish patches to the Software. You agree that OpenRep and/or its licensors (as applicable) retain all right, title and interest in and to all such modifications and/or patches, and all such modifications and/or patches may only be used, copied, modified, displayed, distributed, or otherwise -exploited with a valid OpenReplay Enterprise license for the correct -number of user seats. Notwithstanding the foregoing, you may copy and modify +exploited with a valid OpenReplay Enterprise license for the correct +number of user seats and profiles. Notwithstanding the foregoing, you may copy and modify the Software for development and testing purposes, without requiring a subscription. You agree that OpenReplay and/or its licensors (as applicable) retain all right, title and interest in and to all such modifications. You are not From e8053b15db2c7b6faa5aeef0ef3cb4c683ef4513 Mon Sep 17 00:00:00 2001 From: estradino Date: Wed, 4 Aug 2021 23:32:21 +0200 Subject: [PATCH 2/6] :star: Preparing v1.3.0 --- scripts/helm/vars.yaml | 4 ++-- scripts/helm/vars_template.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/helm/vars.yaml b/scripts/helm/vars.yaml index d264bc5fc..710fbd496 100644 --- a/scripts/helm/vars.yaml +++ b/scripts/helm/vars.yaml @@ -24,8 +24,8 @@ domain_name: "" docker_registry_username: "" docker_registry_password: "" docker_registry_url: "rg.fr-par.scw.cloud/foss" -image_tag: "v1.2.0" -openreplay_version: "v1.2.0" +image_tag: "v1.3.0" +openreplay_version: "v1.3.0" # Nginx ssl certificates. # in cert format diff --git a/scripts/helm/vars_template.yaml b/scripts/helm/vars_template.yaml index e49892a21..6d92b8a66 100644 --- a/scripts/helm/vars_template.yaml +++ b/scripts/helm/vars_template.yaml @@ -24,8 +24,8 @@ domain_name: "{{ domain_name }}" docker_registry_username: "{{ docker_registry_username }}" docker_registry_password: "{{ docker_registry_password }}" docker_registry_url: "{{ docker_registry_url }}" -image_tag: "v1.2.0" -openreplay_version: "v1.2.0" +image_tag: "v1.3.0" +openreplay_version: "v1.3.0" # Nginx ssl certificates. # in cert format From d0f8ec5e736e6634a18fe695b14348920e101ad6 Mon Sep 17 00:00:00 2001 From: Shekar Siri Date: Thu, 5 Aug 2021 20:15:36 +0530 Subject: [PATCH 3/6] fix(ui) - heatmaps path and disable timeline on heatmaps --- .../Session_/PageInsightsPanel/PageInsightsPanel.tsx | 4 ++-- frontend/app/components/Session_/Player/Controls/Timeline.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/app/components/Session_/PageInsightsPanel/PageInsightsPanel.tsx b/frontend/app/components/Session_/PageInsightsPanel/PageInsightsPanel.tsx index ed213d472..81251b38c 100644 --- a/frontend/app/components/Session_/PageInsightsPanel/PageInsightsPanel.tsx +++ b/frontend/app/components/Session_/PageInsightsPanel/PageInsightsPanel.tsx @@ -37,7 +37,7 @@ function PageInsightsPanel({ }, [insights]) useEffect(() => { - const url = insightsFilters.url ? insightsFilters.url : host + '/' + urlOptions[0].value; + const url = insightsFilters.url ? insightsFilters.url : host + urlOptions[0].value; Player.pause(); fetchInsights({ ...insightsFilters, url }) }, [insightsFilters]) @@ -45,7 +45,7 @@ function PageInsightsPanel({ const onPageSelect = (e, { name, value }) => { const event = events.find(item => item.url === value) Player.jump(event.time + JUMP_OFFSET) - setInsightsFilters({ ...insightsFilters, url: host + '/' + value }) + setInsightsFilters({ ...insightsFilters, url: host + value }) markTargets([]) }; diff --git a/frontend/app/components/Session_/Player/Controls/Timeline.js b/frontend/app/components/Session_/Player/Controls/Timeline.js index d3af75d4f..c25101d69 100644 --- a/frontend/app/components/Session_/Player/Controls/Timeline.js +++ b/frontend/app/components/Session_/Player/Controls/Timeline.js @@ -54,7 +54,7 @@ const getPointerIcon = (type) => { events: state.eventList, skip: state.skip, skipToIssue: state.skipToIssue, - disabled: state.cssLoading || state.messagesLoading, + disabled: state.cssLoading || state.messagesLoading || state.markedTargets, endTime: state.endTime, live: state.live, logList: state.logList, From b3a8ff3ed16b4510c198cdba3017ea87d1a20949 Mon Sep 17 00:00:00 2001 From: Shekar Siri Date: Thu, 5 Aug 2021 21:36:08 +0530 Subject: [PATCH 4/6] fix(ui) - heatmaps and reset token --- .../Session_/Player/Overlay/ElementsMarker.tsx | 2 +- .../Player/Overlay/ElementsMarker/Marker.tsx | 4 ++-- frontend/app/duck/user.js | 1 + .../StatedScreen/StatedScreen.ts | 16 +++++++++------- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/frontend/app/components/Session_/Player/Overlay/ElementsMarker.tsx b/frontend/app/components/Session_/Player/Overlay/ElementsMarker.tsx index 0acb7716b..99499cac6 100644 --- a/frontend/app/components/Session_/Player/Overlay/ElementsMarker.tsx +++ b/frontend/app/components/Session_/Player/Overlay/ElementsMarker.tsx @@ -2,7 +2,7 @@ import React from 'react'; import Marker from './ElementsMarker/Marker'; export default function ElementsMarker({ targets, activeIndex }) { - return targets && targets.map(t => ) + return targets && targets.map(t => ) } diff --git a/frontend/app/components/Session_/Player/Overlay/ElementsMarker/Marker.tsx b/frontend/app/components/Session_/Player/Overlay/ElementsMarker/Marker.tsx index 66ed9f2e7..92568ff49 100644 --- a/frontend/app/components/Session_/Player/Overlay/ElementsMarker/Marker.tsx +++ b/frontend/app/components/Session_/Player/Overlay/ElementsMarker/Marker.tsx @@ -18,8 +18,8 @@ export default function Marker({ target, active }: Props) { height: `${ target.boundingRect.height }px`, } return ( -
activeTarget(target.index - 1)}> -
{target.index}
+
activeTarget(target.index)}> +
{target.index + 1}
{ const reducer = (state = initialState, action = {}) => { switch (action.type) { + case RESET_PASSWORD.SUCCESS: case UPDATE_PASSWORD.SUCCESS: case LOGIN.SUCCESS: return setClient( diff --git a/frontend/app/player/MessageDistributor/StatedScreen/StatedScreen.ts b/frontend/app/player/MessageDistributor/StatedScreen/StatedScreen.ts index e5b3c400c..26e2051c5 100644 --- a/frontend/app/player/MessageDistributor/StatedScreen/StatedScreen.ts +++ b/frontend/app/player/MessageDistributor/StatedScreen/StatedScreen.ts @@ -101,21 +101,23 @@ export default class StatedScreen extends Screen { setMarkedTargets(selections: { selector: string, count: number }[] | null) { if (selections) { const targets: MarkedTarget[] = []; - const totalCount = selections.reduce((a, b) => { - return a + b.count - }, 0); - selections.forEach((s, index) => { + let index = 0; + selections.forEach((s) => { const el = this.getElementBySelector(s.selector); if (!el) return; targets.push({ ...s, el, - index, - percent: Math.round((s.count * totalCount) / 100), + index: index++, + percent: 0, boundingRect: this.calculateRelativeBoundingRect(el), }) }); - update({ markedTargets: targets }); + + const totalCount = targets.reduce((a, b) => { + return a + b.count + }, 0); + update({ markedTargets: targets.map(i => ({...i, percent: Math.round((i.count * 100) / totalCount) })) }); } else { update({ markedTargets: null }); } From c8dd9b89d7fee69bc4e49948fc7687ffcbddade5 Mon Sep 17 00:00:00 2001 From: Rajesh Rajendran Date: Sat, 7 Aug 2021 23:46:54 +0530 Subject: [PATCH 5/6] fix(cli): proper return from functions. Signed-off-by: Rajesh Rajendran --- scripts/helm/openreplay-cli | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/helm/openreplay-cli b/scripts/helm/openreplay-cli index 35f865b32..93478e2d6 100755 --- a/scripts/helm/openreplay-cli +++ b/scripts/helm/openreplay-cli @@ -76,6 +76,7 @@ check() { stop() { if [[ $1 == "all" ]]; then kubectl scale deployment -n app --replicas=0 --all + return fi kubectl scale -n app deployment --replicas=0 $1-openreplay } @@ -88,6 +89,7 @@ start() { helm upgrade --install -n app $app openreplay -f $app.yaml done cd $CWD + return fi helm upgrade --install -n app $1 ./app/openreplay -f ./app/$1.yaml } @@ -95,7 +97,8 @@ start() { restart() { if [[ $1 == "all" ]]; then - kubectl rollout restart deployment -n app --all + kubectl rollout restart deployment -n app + return fi kubectl rollout restart -n app deployment $1-openreplay } From 52c1912be4efde678762946a115b43ad52877d5b Mon Sep 17 00:00:00 2001 From: Shekar Siri Date: Mon, 9 Aug 2021 15:03:43 +0530 Subject: [PATCH 6/6] change(ui) - text changes --- .../app/components/Client/ManageUsers/ManageUsers.js | 2 +- .../app/components/ForgotPassword/ForgotPassword.js | 11 ++++++----- .../components/SelectorCard/SelectorCard.tsx | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/frontend/app/components/Client/ManageUsers/ManageUsers.js b/frontend/app/components/Client/ManageUsers/ManageUsers.js index b0dfd32e9..6d291ed1d 100644 --- a/frontend/app/components/Client/ManageUsers/ManageUsers.js +++ b/frontend/app/components/Client/ManageUsers/ManageUsers.js @@ -103,7 +103,7 @@ class ManageUsers extends React.PureComponent {
{ !account.smtp &&
- SMTP is not configured. Please follow these steps to set it up. + SMTP is not configured. Please follow (see here how to set it up). You can still add new users, but you’d have to manually copy then send them the invitation link.
}
diff --git a/frontend/app/components/ForgotPassword/ForgotPassword.js b/frontend/app/components/ForgotPassword/ForgotPassword.js index 6c4b0d476..d117afd6a 100644 --- a/frontend/app/components/ForgotPassword/ForgotPassword.js +++ b/frontend/app/components/ForgotPassword/ForgotPassword.js @@ -22,7 +22,7 @@ const checkDontMatch = (newPassword, newPasswordRepeat) => (state, props) => ({ errors: state.getIn([ 'user', 'requestResetPassowrd', 'errors' ]), resetErrors: state.getIn([ 'user', 'resetPassword', 'errors' ]), - loading: state.getIn([ 'user', 'requestResetPassowrd', 'loading' ]), + loading: state.getIn([ 'user', 'requestResetPassowrd', 'loading' ]) || state.getIn([ 'user', 'resetPassword', 'loading' ]), params: new URLSearchParams(props.location.search) }), { requestResetPassword, resetPassword }, @@ -111,7 +111,7 @@ export default class ForgotPassword extends React.PureComponent {
-

Reset Password

+

{`${resetting ? 'Create' : 'Reset'} Password`}

@@ -168,7 +168,7 @@ export default class ForgotPassword extends React.PureComponent { - { 'Reset' } + { resetting ? 'Create' : 'Reset' }
diff --git a/frontend/app/components/Session_/PageInsightsPanel/components/SelectorCard/SelectorCard.tsx b/frontend/app/components/Session_/PageInsightsPanel/components/SelectorCard/SelectorCard.tsx index 4e39b08e6..0899a8c79 100644 --- a/frontend/app/components/Session_/PageInsightsPanel/components/SelectorCard/SelectorCard.tsx +++ b/frontend/app/components/Session_/PageInsightsPanel/components/SelectorCard/SelectorCard.tsx @@ -12,8 +12,8 @@ interface Props { export default function SelectorCard({ index = 1, target, showContent } : Props) { return ( -
-
activeTarget(index)}> +
activeTarget(index)}> +
{index + 1}
{target.selector}