From a711ead9f5c0825fcbf8ad7ec869a211dcc87d3c Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Sat, 4 Dec 2021 01:02:39 +0100 Subject: [PATCH 1/6] feat(api): changed FOSS GET /signup --- api/chalicelib/blueprints/bp_core_dynamic.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/api/chalicelib/blueprints/bp_core_dynamic.py b/api/chalicelib/blueprints/bp_core_dynamic.py index 4beb73deb..b494ea953 100644 --- a/api/chalicelib/blueprints/bp_core_dynamic.py +++ b/api/chalicelib/blueprints/bp_core_dynamic.py @@ -1,18 +1,17 @@ from chalice import Blueprint, Response from chalicelib import _overrides +from chalicelib.core import assist from chalicelib.core import boarding from chalicelib.core import errors from chalicelib.core import license -from chalicelib.core import metadata, errors_favorite_viewed, slack, alerts, sessions, integrations_manager, assist +from chalicelib.core import metadata, errors_favorite_viewed, slack, alerts, sessions, integrations_manager from chalicelib.core import notifications from chalicelib.core import projects from chalicelib.core import signup from chalicelib.core import tenants from chalicelib.core import users from chalicelib.core import webhook -from chalicelib.core import license -from chalicelib.core import assist from chalicelib.core.collaboration_slack import Slack from chalicelib.utils import captcha from chalicelib.utils import helper @@ -143,7 +142,10 @@ def put_client(context): @app.route('/signup', methods=['GET'], authorizer=None) def get_all_signup(): - return {"data": tenants.tenants_exists()} + return {"data": {"tenants": tenants.tenants_exists(), + "sso": None, + "ssoProvider": None, + "edition": helper.get_edition()}} @app.route('/signup', methods=['POST', 'PUT'], authorizer=None) From 2642d3e61ef22db9243a54ddfa78273b99c1df9e Mon Sep 17 00:00:00 2001 From: Shekar Siri Date: Sat, 4 Dec 2021 04:23:49 +0530 Subject: [PATCH 2/6] change - version number --- 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 12e2fcac9..fd7630965 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.3.5" -openreplay_version: "v1.3.5" +image_tag: "v1.3.6" +openreplay_version: "v1.3.6" # Nginx ssl certificates. # in cert format diff --git a/scripts/helm/vars_template.yaml b/scripts/helm/vars_template.yaml index dc63067f1..d20d8aaa0 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.3.5" -openreplay_version: "v1.3.5" +image_tag: "v1.3.6" +openreplay_version: "v1.3.6" # Nginx ssl certificates. # in cert format From 0eb4e00a3e2899bc1137c2818d3d8d09863217b7 Mon Sep 17 00:00:00 2001 From: Shekar Siri Date: Sat, 4 Dec 2021 06:24:02 +0530 Subject: [PATCH 3/6] fix(ui) - metadata text --- .../app/components/Session_/EventsBlock/Metadata/Metadata.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/app/components/Session_/EventsBlock/Metadata/Metadata.js b/frontend/app/components/Session_/EventsBlock/Metadata/Metadata.js index 8b26459f3..03171cdd0 100644 --- a/frontend/app/components/Session_/EventsBlock/Metadata/Metadata.js +++ b/frontend/app/components/Session_/EventsBlock/Metadata/Metadata.js @@ -27,7 +27,7 @@ export default connect(state => ({ } content={
- Metadata must be explicitly specified from the dashboard from Preferences > Metadata. + Check how to use Metadata if you haven’t yet done so.
} on="click" From 789e0362ea51e16d16b65ef1b75aa8e082ecd019 Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Sat, 4 Dec 2021 02:31:23 +0100 Subject: [PATCH 4/6] feat(workers): fixed KAFKA_USE_SSL --- scripts/helm/vars.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/helm/vars.yaml b/scripts/helm/vars.yaml index fd7630965..5941894be 100644 --- a/scripts/helm/vars.yaml +++ b/scripts/helm/vars.yaml @@ -94,7 +94,7 @@ assets_bucket: sessions-assets recordings_bucket: mobs sourcemaps_bucket: sourcemaps kafka_endpoint: kafka.db.svc.cluster.local:9042 -kafka_ssl: false +kafka_ssl: 'false' postgres_endpoint: postgresql.db.svc.cluster.local postgres_port: 5432 postgres_db_name: postgres From 222177e35f72c9ac7b69da3ce612da6ecd7fa0f8 Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Sat, 4 Dec 2021 02:45:57 +0100 Subject: [PATCH 5/6] feat(frontend): changed SMTP message --- frontend/app/components/Client/ManageUsers/ManageUsers.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/app/components/Client/ManageUsers/ManageUsers.js b/frontend/app/components/Client/ManageUsers/ManageUsers.js index e7936d35b..e70157cd0 100644 --- a/frontend/app/components/Client/ManageUsers/ManageUsers.js +++ b/frontend/app/components/Client/ManageUsers/ManageUsers.js @@ -116,7 +116,7 @@ class ManageUsers extends React.PureComponent { { !account.smtp &&
- 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. + SMTP is not configured (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.
}
From 9d7d8a997f6bb1f3bc2c9512bf257d2ad99ff2dc Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Sat, 4 Dec 2021 03:09:51 +0100 Subject: [PATCH 6/6] feat(db): fixed init_schema.sql --- ee/scripts/helm/db/init_dbs/postgresql/init_schema.sql | 7 +++++++ scripts/helm/db/init_dbs/postgresql/init_schema.sql | 7 ++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ee/scripts/helm/db/init_dbs/postgresql/init_schema.sql b/ee/scripts/helm/db/init_dbs/postgresql/init_schema.sql index bfd7177ce..0b7e8fa40 100644 --- a/ee/scripts/helm/db/init_dbs/postgresql/init_schema.sql +++ b/ee/scripts/helm/db/init_dbs/postgresql/init_schema.sql @@ -221,6 +221,7 @@ $$ role_id integer REFERENCES roles (role_id) ON DELETE SET NULL, internal_id text NULL DEFAULT NULL ); + CREATE INDEX users_tenant_id_deleted_at_N_idx ON users (tenant_id) WHERE deleted_at ISNULL; CREATE TABLE basic_authentication @@ -462,6 +463,7 @@ $$ ); CREATE INDEX ON issues (issue_id, type); CREATE INDEX issues_context_string_gin_idx ON public.issues USING GIN (context_string gin_trgm_ops); + CREATE INDEX issues_project_id_issue_id_idx ON public.issues (project_id, issue_id); -- --- errors.sql --- @@ -590,6 +592,8 @@ $$ CREATE INDEX ON sessions (project_id, user_country); CREATE INDEX ON sessions (project_id, user_browser); CREATE INDEX sessions_session_id_project_id_start_ts_durationNN_idx ON sessions (session_id, project_id, start_ts) WHERE duration IS NOT NULL; + CREATE INDEX sessions_user_id_useridNN_idx ON sessions (user_id) WHERE user_id IS NOT NULL; + CREATE INDEX sessions_uid_projectid_startts_sessionid_uidNN_durGTZ_idx ON sessions (user_id, project_id, start_ts, session_id) WHERE user_id IS NOT NULL AND duration > 0; ALTER TABLE public.sessions @@ -664,6 +668,8 @@ $$ payload jsonb DEFAULT NULL, PRIMARY KEY (session_id, timestamp, seq_index) ); + CREATE INDEX issues_issue_id_timestamp_idx ON events_common.issues (issue_id, timestamp); + CREATE INDEX issues_timestamp_idx ON events_common.issues (timestamp); CREATE TABLE events_common.requests @@ -739,6 +745,7 @@ $$ CREATE INDEX pages_load_time_idx ON events.pages (load_time) WHERE load_time > 0; CREATE INDEX pages_base_path_session_id_timestamp_idx ON events.pages (base_path, session_id, timestamp); CREATE INDEX pages_session_id_timestamp_idx ON events.pages (session_id, timestamp); + CREATE INDEX pages_base_path_base_pathLNGT2_idx ON events.pages (base_path) WHERE length(base_path) > 2; CREATE TABLE events.clicks ( diff --git a/scripts/helm/db/init_dbs/postgresql/init_schema.sql b/scripts/helm/db/init_dbs/postgresql/init_schema.sql index 8458199cb..80b2a9135 100644 --- a/scripts/helm/db/init_dbs/postgresql/init_schema.sql +++ b/scripts/helm/db/init_dbs/postgresql/init_schema.sql @@ -460,6 +460,7 @@ $$ CREATE INDEX errors_project_id_error_id_js_exception_idx ON public.errors (project_id, error_id) WHERE source = 'js_exception'; CREATE INDEX errors_project_id_error_id_idx ON public.errors (project_id, error_id); CREATE INDEX errors_project_id_error_id_integration_idx ON public.errors (project_id, error_id) WHERE source != 'js_exception'; + CREATE INDEX errors_error_id_idx ON errors (error_id); CREATE TABLE user_favorite_errors ( @@ -642,7 +643,9 @@ $$ payload jsonb DEFAULT NULL, PRIMARY KEY (session_id, timestamp, seq_index) ); - + CREATE INDEX issues_issue_id_timestamp_idx ON events_common.issues (issue_id, timestamp); + CREATE INDEX issues_timestamp_idx ON events_common.issues (timestamp); + CREATE INDEX issues_project_id_issue_id_idx ON public.issues (project_id, issue_id); CREATE TABLE events_common.requests ( @@ -751,6 +754,7 @@ $$ CREATE INDEX clicks_url_idx ON events.clicks (url); CREATE INDEX clicks_url_gin_idx ON events.clicks USING GIN (url gin_trgm_ops); CREATE INDEX clicks_url_session_id_timestamp_selector_idx ON events.clicks (url, session_id, timestamp, selector); + CREATE INDEX clicks_session_id_timestamp_idx ON events.clicks (session_id, timestamp); CREATE TABLE events.inputs @@ -782,6 +786,7 @@ $$ CREATE INDEX errors_error_id_timestamp_idx ON events.errors (error_id, timestamp); CREATE INDEX errors_timestamp_error_id_session_id_idx ON events.errors (timestamp, error_id, session_id); CREATE INDEX errors_error_id_timestamp_session_id_idx ON events.errors (error_id, timestamp, session_id); + CREATE INDEX errors_error_id_idx ON events.errors (error_id); CREATE TABLE events.graphql (