From 492431af46c3b2cbfeb9f3b33ab86fe72e1b5e3c Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Sat, 4 Dec 2021 23:53:04 +0100 Subject: [PATCH 1/5] feat(api): fixed errors status --- api/chalicelib/core/errors.py | 7 +++++-- ee/api/chalicelib/core/errors.py | 11 +++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/api/chalicelib/core/errors.py b/api/chalicelib/core/errors.py index 06162114f..642501246 100644 --- a/api/chalicelib/core/errors.py +++ b/api/chalicelib/core/errors.py @@ -1,7 +1,7 @@ import json -from chalicelib.utils import pg_client, helper, dev from chalicelib.core import sourcemaps, sessions +from chalicelib.utils import pg_client, helper, dev from chalicelib.utils.TimeUTC import TimeUTC from chalicelib.utils.metrics_helper import __get_step_size @@ -39,7 +39,10 @@ def get_batch(error_ids): FROM error_family;""", {"error_ids": tuple(error_ids)}) cur.execute(query=query) - return helper.list_to_camel_case(cur.fetchall()) + errors = cur.fetchall() + for e in errors: + e["stacktrace_parsed_at"] = TimeUTC.datetime_to_timestamp(e["stacktrace_parsed_at"]) + return helper.list_to_camel_case(errors) def __flatten_sort_key_count_version(data, merge_nested=False): diff --git a/ee/api/chalicelib/core/errors.py b/ee/api/chalicelib/core/errors.py index 98b5620af..0519bb143 100644 --- a/ee/api/chalicelib/core/errors.py +++ b/ee/api/chalicelib/core/errors.py @@ -1,9 +1,9 @@ import json -from chalicelib.utils import pg_client, helper -from chalicelib.utils import ch_client -from chalicelib.core import sourcemaps, sessions from chalicelib.core import dashboard +from chalicelib.core import sourcemaps, sessions +from chalicelib.utils import ch_client +from chalicelib.utils import pg_client, helper from chalicelib.utils.TimeUTC import TimeUTC @@ -40,7 +40,10 @@ def get_batch(error_ids): FROM error_family;""", {"error_ids": tuple(error_ids)}) cur.execute(query=query) - return helper.list_to_camel_case(cur.fetchall()) + errors = cur.fetchall() + for e in errors: + e["stacktrace_parsed_at"] = TimeUTC.datetime_to_timestamp(e["stacktrace_parsed_at"]) + return helper.list_to_camel_case(errors) def __flatten_sort_key_count_version(data, merge_nested=False): From 001b6a53b29398c595488591bea645327eeaafaa Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Sun, 5 Dec 2021 18:41:31 +0100 Subject: [PATCH 2/5] feat(api): return license info in login --- ee/api/chalicelib/blueprints/bp_core_dynamic.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ee/api/chalicelib/blueprints/bp_core_dynamic.py b/ee/api/chalicelib/blueprints/bp_core_dynamic.py index 019da951f..0d5242d0d 100644 --- a/ee/api/chalicelib/blueprints/bp_core_dynamic.py +++ b/ee/api/chalicelib/blueprints/bp_core_dynamic.py @@ -47,7 +47,7 @@ def login(): stack_integrations=True, version=True) c["smtp"] = helper.has_smtp() c["iceServers"] = assist.get_ice_servers() - + c = {**c, **license.get_status(context["tenantId"])} return { 'jwt': r.pop('jwt'), 'data': { From c2a1d2708eea17bba9ed8377bad67e95fda85663 Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Sun, 5 Dec 2021 18:42:30 +0100 Subject: [PATCH 3/5] feat(api): return license info in login --- ee/api/chalicelib/blueprints/bp_core_dynamic.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ee/api/chalicelib/blueprints/bp_core_dynamic.py b/ee/api/chalicelib/blueprints/bp_core_dynamic.py index 0d5242d0d..ab73733b6 100644 --- a/ee/api/chalicelib/blueprints/bp_core_dynamic.py +++ b/ee/api/chalicelib/blueprints/bp_core_dynamic.py @@ -47,7 +47,7 @@ def login(): stack_integrations=True, version=True) c["smtp"] = helper.has_smtp() c["iceServers"] = assist.get_ice_servers() - c = {**c, **license.get_status(context["tenantId"])} + c = {**c, **license.get_status(tenant_id)} return { 'jwt': r.pop('jwt'), 'data': { From 5f3f46d58c1d749380ac2e3f52f0db894842853b Mon Sep 17 00:00:00 2001 From: Shekar Siri Date: Sun, 5 Dec 2021 20:13:33 +0530 Subject: [PATCH 4/5] fix(ui) - check for sso details on logout --- frontend/app/Router.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/frontend/app/Router.js b/frontend/app/Router.js index 643351d67..a4051502c 100644 --- a/frontend/app/Router.js +++ b/frontend/app/Router.js @@ -86,15 +86,11 @@ class Router extends React.Component { } componentDidUpdate(prevProps) { - if (prevProps.email !== this.props.email) { - this.onLoginLogout(); + if (prevProps.email !== this.props.email && !this.props.email) { + this.props.fetchTenants(); } } - onLoginLogout() { - const { email, account, organisation } = this.props; - } - render() { const { isLoggedIn, jwt, siteId, sites, loading, changePassword, location, existingTenant, onboarding } = this.props; const siteIdList = sites.map(({ id }) => id).toJS(); From 762b681f902f48b227221f38f65a6a6ac2b2b3cf Mon Sep 17 00:00:00 2001 From: Shekar Siri Date: Sun, 5 Dec 2021 23:36:25 +0530 Subject: [PATCH 5/5] fix(ui) - remove role errors --- frontend/app/components/Client/Roles/Roles.tsx | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/frontend/app/components/Client/Roles/Roles.tsx b/frontend/app/components/Client/Roles/Roles.tsx index 91ab2fda5..848e9fea0 100644 --- a/frontend/app/components/Client/Roles/Roles.tsx +++ b/frontend/app/components/Client/Roles/Roles.tsx @@ -31,6 +31,14 @@ function Roles(props: Props) { props.fetchList() }, []) + useEffect(() => { + if (removeErrors && removeErrors.size > 0) { + removeErrors.forEach(e => { + toast.error(e) + }) + } + }, [removeErrors]) + const closeModal = () => { setShowmModal(false) setTimeout(() => { @@ -48,13 +56,7 @@ function Roles(props: Props) { header: 'Roles', confirmation: `Are you sure you want to remove this role?` })) { - deleteRole(role.roleId).then(() => { - if (removeErrors && removeErrors.size > 0) { - removeErrors.forEach(e => { - toast.error(e) - }) - } - }) + deleteRole(role.roleId) } }