From 1083066b3cc4e066cd33cbaa653df1e9441c03a2 Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Mon, 6 Feb 2023 18:06:37 +0100 Subject: [PATCH 1/4] feat(chalice): changed change-password response --- api/chalicelib/core/users.py | 18 +----------------- ee/api/chalicelib/core/users.py | 18 +----------------- 2 files changed, 2 insertions(+), 34 deletions(-) diff --git a/api/chalicelib/core/users.py b/api/chalicelib/core/users.py index 5732e2760..e5ae6e72b 100644 --- a/api/chalicelib/core/users.py +++ b/api/chalicelib/core/users.py @@ -481,24 +481,8 @@ def change_password(tenant_id, user_id, email, old_password, new_password): user = update(tenant_id=tenant_id, user_id=user_id, changes=changes) r = authenticate(user['email'], new_password) - tenant_id = r.pop("tenantId") - r["limits"] = { - "teamMember": -1, - "projects": -1, - "metadata": metadata.get_remaining_metadata_with_count(tenant_id)} - - c = tenants.get_by_tenant_id(tenant_id) - c.pop("createdAt") - c["projects"] = projects.get_projects(tenant_id=tenant_id, recording_state=True, recorded=True, - stack_integrations=True) - c["smtp"] = helper.has_smtp() - c["iceServers"] = assist.get_ice_servers() return { - 'jwt': r.pop('jwt'), - 'data': { - "user": r, - "client": c - } + 'jwt': r.pop('jwt') } diff --git a/ee/api/chalicelib/core/users.py b/ee/api/chalicelib/core/users.py index 0bd991aab..f050811ab 100644 --- a/ee/api/chalicelib/core/users.py +++ b/ee/api/chalicelib/core/users.py @@ -558,24 +558,8 @@ def change_password(tenant_id, user_id, email, old_password, new_password): user = update(tenant_id=tenant_id, user_id=user_id, changes=changes) r = authenticate(user['email'], new_password) - tenant_id = r.pop("tenantId") - r["limits"] = { - "teamMember": -1, - "projects": -1, - "metadata": metadata.get_remaining_metadata_with_count(tenant_id)} - - c = tenants.get_by_tenant_id(tenant_id) - c.pop("createdAt") - c["projects"] = projects.get_projects(tenant_id=tenant_id, recording_state=True, recorded=True, - stack_integrations=True, user_id=user_id) - c["smtp"] = helper.has_smtp() - c["iceServers"] = assist.get_ice_servers() return { - 'jwt': r.pop('jwt'), - 'data': { - "user": r, - "client": c, - } + 'jwt': r.pop('jwt') } From f6160e7288e6b9061dd13d709d29db05dc26bd77 Mon Sep 17 00:00:00 2001 From: Shekar Siri Date: Mon, 6 Feb 2023 17:30:47 +0100 Subject: [PATCH 2/4] fix(ui) - viewtype change for sessions and jsErrors --- frontend/app/mstore/metricStore.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/frontend/app/mstore/metricStore.ts b/frontend/app/mstore/metricStore.ts index 3ff0dbe97..366a6982b 100644 --- a/frontend/app/mstore/metricStore.ts +++ b/frontend/app/mstore/metricStore.ts @@ -101,6 +101,8 @@ export default class MetricStore { merge(obj: any, updateChangeFlag: boolean = true) { const type = obj.metricType; + console.log('iobj', obj) + // handle metricType change if (obj.hasOwnProperty('metricType') && type !== this.instance.metricType) { this.instance.series.forEach((s: any, i: number) => { @@ -109,6 +111,10 @@ export default class MetricStore { this.changeType(type); } + if (obj.hasOwnProperty('metricOf') && obj.metricOf !== this.instance.metricOf && (obj.metricOf === 'sessions' || obj.metricOf === 'jsErrors')) { + obj.viewType = 'table' + } + // handle metricValue change if (obj.hasOwnProperty('metricValue') && obj.metricValue !== this.instance.metricValue) { if (Array.isArray(obj.metricValue) && obj.metricValue.length > 1) { From 6d5400275e652ecbfbdcb3bd15a76bba068119fd Mon Sep 17 00:00:00 2001 From: Shekar Siri Date: Mon, 6 Feb 2023 17:32:47 +0100 Subject: [PATCH 3/4] fix(ui) - viewtype change for sessions and jsErrors --- frontend/app/mstore/metricStore.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/frontend/app/mstore/metricStore.ts b/frontend/app/mstore/metricStore.ts index 366a6982b..9ef49759d 100644 --- a/frontend/app/mstore/metricStore.ts +++ b/frontend/app/mstore/metricStore.ts @@ -101,8 +101,6 @@ export default class MetricStore { merge(obj: any, updateChangeFlag: boolean = true) { const type = obj.metricType; - console.log('iobj', obj) - // handle metricType change if (obj.hasOwnProperty('metricType') && type !== this.instance.metricType) { this.instance.series.forEach((s: any, i: number) => { From 872aadace3a298f41e9dc490f313605ce5309b62 Mon Sep 17 00:00:00 2001 From: Shekar Siri Date: Mon, 6 Feb 2023 17:59:18 +0100 Subject: [PATCH 4/4] change(ui) - ignore the response on password change --- frontend/app/duck/user.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/app/duck/user.js b/frontend/app/duck/user.js index f9cee9a34..691e72e41 100644 --- a/frontend/app/duck/user.js +++ b/frontend/app/duck/user.js @@ -59,12 +59,12 @@ const reducer = (state = initialState, action = {}) => { return state.set('jwt', action.data); case LOGIN.REQUEST: return state.set('loginRequest', { loading: true, errors: [] }) - case UPDATE_PASSWORD.REQUEST: - return state.set('passwordErrors', List()) case RESET_PASSWORD.SUCCESS: - case UPDATE_PASSWORD.SUCCESS: case LOGIN.SUCCESS: return state.set('account', Account({...action.data.user })).set('loginRequest', { loading: false, errors: [] }) + case UPDATE_PASSWORD.REQUEST: + case UPDATE_PASSWORD.SUCCESS: + return state.set('passwordErrors', List()) case SIGNUP.SUCCESS: state.set('account', Account(action.data.user)).set('onboarding', true); case REQUEST_RESET_PASSWORD.SUCCESS: