+
{list.slice(maxLength).map(({ label, value }, index) => (
-
+
))}
}
on="click"
position="center center"
- hideOnScroll
/>
)
}
diff --git a/frontend/app/components/shared/SessionItem/SessionMetaList/SessionMetaList.tsx b/frontend/app/components/shared/SessionItem/SessionMetaList/SessionMetaList.tsx
index 96b082e96..d43f920c7 100644
--- a/frontend/app/components/shared/SessionItem/SessionMetaList/SessionMetaList.tsx
+++ b/frontend/app/components/shared/SessionItem/SessionMetaList/SessionMetaList.tsx
@@ -8,7 +8,7 @@ interface Props {
className?: string,
metaList: []
}
-const MAX_LENGTH = 3;
+const MAX_LENGTH = 4;
export default function SessionMetaList(props: Props) {
const { className = '', metaList } = props
return (
diff --git a/frontend/app/duck/liveSearch.js b/frontend/app/duck/liveSearch.js
index 5c9364e96..5a9ffd85b 100644
--- a/frontend/app/duck/liveSearch.js
+++ b/frontend/app/duck/liveSearch.js
@@ -15,14 +15,17 @@ const EDIT = editType(name);
const CLEAR_SEARCH = `${name}/CLEAR_SEARCH`;
const APPLY = `${name}/APPLY`;
const UPDATE_CURRENT_PAGE = `${name}/UPDATE_CURRENT_PAGE`;
-const TOGGLE_SORT_ORDER = `${name}/TOGGLE_SORT_ORDER`;
+const UPDATE_SORT = `${name}/UPDATE_SORT`;
const initialState = Map({
list: List(),
instance: new Filter({ filters: [] }),
filterSearchList: {},
currentPage: 1,
- sortOrder: 'asc',
+ sort: {
+ order: 'asc',
+ field: ''
+ }
});
function reducer(state = initialState, action = {}) {
@@ -31,8 +34,8 @@ function reducer(state = initialState, action = {}) {
return state.mergeIn(['instance'], action.instance);
case UPDATE_CURRENT_PAGE:
return state.set('currentPage', action.page);
- case TOGGLE_SORT_ORDER:
- return state.set('sortOrder', action.order);
+ case UPDATE_SORT:
+ return state.mergeIn(['sort'], action.sort);
}
return state;
}
@@ -103,9 +106,9 @@ export function updateCurrentPage(page) {
};
}
-export function toggleSortOrder (order) {
+export function updateSort(sort) {
return {
- type: TOGGLE_SORT_ORDER,
- order,
+ type: UPDATE_SORT,
+ sort,
};
}
\ No newline at end of file
diff --git a/frontend/app/types/filter/filter.js b/frontend/app/types/filter/filter.js
index 6d3b177f9..25d62c7cc 100644
--- a/frontend/app/types/filter/filter.js
+++ b/frontend/app/types/filter/filter.js
@@ -34,7 +34,7 @@ export default Record({
rangeValue,
startDate,
endDate,
- groupByUser: true,
+ groupByUser: false,
sort: 'startTs',
order: 'desc',
diff --git a/scripts/dockerfiles/nginx/Dockerfile b/scripts/dockerfiles/nginx/Dockerfile
index dd3414240..53da15731 100644
--- a/scripts/dockerfiles/nginx/Dockerfile
+++ b/scripts/dockerfiles/nginx/Dockerfile
@@ -1,9 +1,23 @@
+# Ability to add sticky sessions using any parameters
+FROM openresty/openresty:buster as builder
+workdir /work
+ADD https://github.com/openresty/lua-resty-balancer/archive/refs/heads/master.tar.gz .
+RUN apt update && \
+ apt install gcc make -y && \
+ tar -xf master.tar.gz && \
+ cd lua-resty-balancer-master && \
+ make
+
+
FROM openresty/openresty:buster
# Adding prometheus monitoring support
ADD https://raw.githubusercontent.com/knyar/nginx-lua-prometheus/master/prometheus.lua /usr/local/openresty/lualib/
ADD https://raw.githubusercontent.com/knyar/nginx-lua-prometheus/master/prometheus_keys.lua /usr/local/openresty/lualib/
ADD https://raw.githubusercontent.com/knyar/nginx-lua-prometheus/master/prometheus_resty_counter.lua /usr/local/openresty/lualib/
+COPY --from=builder /work/lua-resty-balancer-master/*.so /usr/local/openresty/lualib/lua-resty-chash/
+COPY --from=builder /work/lua-resty-balancer-master/lib /usr/local/openresty/lualib/lua-resty-chash/lib/
+
RUN chmod 0644 /usr/local/openresty/lualib/*.lua
# Enabling monitoring on port 9145
diff --git a/scripts/helm/db/init_dbs/postgresql/1.5.1/1.5.1.sql b/scripts/helm/db/init_dbs/postgresql/1.5.1/1.5.1.sql
index babe0c705..b7e5f1fa6 100644
--- a/scripts/helm/db/init_dbs/postgresql/1.5.1/1.5.1.sql
+++ b/scripts/helm/db/init_dbs/postgresql/1.5.1/1.5.1.sql
@@ -5,4 +5,36 @@ $$
SELECT 'v1.5.1'
$$ LANGUAGE sql IMMUTABLE;
+ALTER TYPE country ADD VALUE IF NOT EXISTS 'AC';
+ALTER TYPE country ADD VALUE IF NOT EXISTS 'AN';
+ALTER TYPE country ADD VALUE IF NOT EXISTS 'BU';
+ALTER TYPE country ADD VALUE IF NOT EXISTS 'CP';
+ALTER TYPE country ADD VALUE IF NOT EXISTS 'CS';
+ALTER TYPE country ADD VALUE IF NOT EXISTS 'CT';
+ALTER TYPE country ADD VALUE IF NOT EXISTS 'DD';
+ALTER TYPE country ADD VALUE IF NOT EXISTS 'DG';
+ALTER TYPE country ADD VALUE IF NOT EXISTS 'DY';
+ALTER TYPE country ADD VALUE IF NOT EXISTS 'EA';
+ALTER TYPE country ADD VALUE IF NOT EXISTS 'FQ';
+ALTER TYPE country ADD VALUE IF NOT EXISTS 'FX';
+ALTER TYPE country ADD VALUE IF NOT EXISTS 'HV';
+ALTER TYPE country ADD VALUE IF NOT EXISTS 'IC';
+ALTER TYPE country ADD VALUE IF NOT EXISTS 'JT';
+ALTER TYPE country ADD VALUE IF NOT EXISTS 'MI';
+ALTER TYPE country ADD VALUE IF NOT EXISTS 'NH';
+ALTER TYPE country ADD VALUE IF NOT EXISTS 'NQ';
+ALTER TYPE country ADD VALUE IF NOT EXISTS 'NT';
+ALTER TYPE country ADD VALUE IF NOT EXISTS 'PC';
+ALTER TYPE country ADD VALUE IF NOT EXISTS 'PU';
+ALTER TYPE country ADD VALUE IF NOT EXISTS 'PZ';
+ALTER TYPE country ADD VALUE IF NOT EXISTS 'RH';
+ALTER TYPE country ADD VALUE IF NOT EXISTS 'SU';
+ALTER TYPE country ADD VALUE IF NOT EXISTS 'TA';
+ALTER TYPE country ADD VALUE IF NOT EXISTS 'TP';
+ALTER TYPE country ADD VALUE IF NOT EXISTS 'VD';
+ALTER TYPE country ADD VALUE IF NOT EXISTS 'WK';
+ALTER TYPE country ADD VALUE IF NOT EXISTS 'YD';
+ALTER TYPE country ADD VALUE IF NOT EXISTS 'YU';
+ALTER TYPE country ADD VALUE IF NOT EXISTS 'ZR';
+
COMMIT;
\ No newline at end of file
diff --git a/scripts/helm/db/init_dbs/postgresql/init_schema.sql b/scripts/helm/db/init_dbs/postgresql/init_schema.sql
index abf4df15a..3d05795e9 100644
--- a/scripts/helm/db/init_dbs/postgresql/init_schema.sql
+++ b/scripts/helm/db/init_dbs/postgresql/init_schema.sql
@@ -6,7 +6,7 @@ CREATE SCHEMA IF NOT EXISTS events;
CREATE OR REPLACE FUNCTION openreplay_version()
RETURNS text AS
$$
-SELECT 'v1.5.0'
+SELECT 'v1.5.1'
$$ LANGUAGE sql IMMUTABLE;
-- --- accounts.sql ---
@@ -464,7 +464,7 @@ $$
-- --- sessions.sql ---
CREATE TYPE device_type AS ENUM ('desktop', 'tablet', 'mobile', 'other');
- CREATE TYPE country AS ENUM ('UN', 'RW', 'SO', 'YE', 'IQ', 'SA', 'IR', 'CY', 'TZ', 'SY', 'AM', 'KE', 'CD', 'DJ', 'UG', 'CF', 'SC', 'JO', 'LB', 'KW', 'OM', 'QA', 'BH', 'AE', 'IL', 'TR', 'ET', 'ER', 'EG', 'SD', 'GR', 'BI', 'EE', 'LV', 'AZ', 'LT', 'SJ', 'GE', 'MD', 'BY', 'FI', 'AX', 'UA', 'MK', 'HU', 'BG', 'AL', 'PL', 'RO', 'XK', 'ZW', 'ZM', 'KM', 'MW', 'LS', 'BW', 'MU', 'SZ', 'RE', 'ZA', 'YT', 'MZ', 'MG', 'AF', 'PK', 'BD', 'TM', 'TJ', 'LK', 'BT', 'IN', 'MV', 'IO', 'NP', 'MM', 'UZ', 'KZ', 'KG', 'TF', 'HM', 'CC', 'PW', 'VN', 'TH', 'ID', 'LA', 'TW', 'PH', 'MY', 'CN', 'HK', 'BN', 'MO', 'KH', 'KR', 'JP', 'KP', 'SG', 'CK', 'TL', 'RU', 'MN', 'AU', 'CX', 'MH', 'FM', 'PG', 'SB', 'TV', 'NR', 'VU', 'NC', 'NF', 'NZ', 'FJ', 'LY', 'CM', 'SN', 'CG', 'PT', 'LR', 'CI', 'GH', 'GQ', 'NG', 'BF', 'TG', 'GW', 'MR', 'BJ', 'GA', 'SL', 'ST', 'GI', 'GM', 'GN', 'TD', 'NE', 'ML', 'EH', 'TN', 'ES', 'MA', 'MT', 'DZ', 'FO', 'DK', 'IS', 'GB', 'CH', 'SE', 'NL', 'AT', 'BE', 'DE', 'LU', 'IE', 'MC', 'FR', 'AD', 'LI', 'JE', 'IM', 'GG', 'SK', 'CZ', 'NO', 'VA', 'SM', 'IT', 'SI', 'ME', 'HR', 'BA', 'AO', 'NA', 'SH', 'BV', 'BB', 'CV', 'GY', 'GF', 'SR', 'PM', 'GL', 'PY', 'UY', 'BR', 'FK', 'GS', 'JM', 'DO', 'CU', 'MQ', 'BS', 'BM', 'AI', 'TT', 'KN', 'DM', 'AG', 'LC', 'TC', 'AW', 'VG', 'VC', 'MS', 'MF', 'BL', 'GP', 'GD', 'KY', 'BZ', 'SV', 'GT', 'HN', 'NI', 'CR', 'VE', 'EC', 'CO', 'PA', 'HT', 'AR', 'CL', 'BO', 'PE', 'MX', 'PF', 'PN', 'KI', 'TK', 'TO', 'WF', 'WS', 'NU', 'MP', 'GU', 'PR', 'VI', 'UM', 'AS', 'CA', 'US', 'PS', 'RS', 'AQ', 'SX', 'CW', 'BQ', 'SS');
+ CREATE TYPE country AS ENUM ('UN', 'RW', 'SO', 'YE', 'IQ', 'SA', 'IR', 'CY', 'TZ', 'SY', 'AM', 'KE', 'CD', 'DJ', 'UG', 'CF', 'SC', 'JO', 'LB', 'KW', 'OM', 'QA', 'BH', 'AE', 'IL', 'TR', 'ET', 'ER', 'EG', 'SD', 'GR', 'BI', 'EE', 'LV', 'AZ', 'LT', 'SJ', 'GE', 'MD', 'BY', 'FI', 'AX', 'UA', 'MK', 'HU', 'BG', 'AL', 'PL', 'RO', 'XK', 'ZW', 'ZM', 'KM', 'MW', 'LS', 'BW', 'MU', 'SZ', 'RE', 'ZA', 'YT', 'MZ', 'MG', 'AF', 'PK', 'BD', 'TM', 'TJ', 'LK', 'BT', 'IN', 'MV', 'IO', 'NP', 'MM', 'UZ', 'KZ', 'KG', 'TF', 'HM', 'CC', 'PW', 'VN', 'TH', 'ID', 'LA', 'TW', 'PH', 'MY', 'CN', 'HK', 'BN', 'MO', 'KH', 'KR', 'JP', 'KP', 'SG', 'CK', 'TL', 'RU', 'MN', 'AU', 'CX', 'MH', 'FM', 'PG', 'SB', 'TV', 'NR', 'VU', 'NC', 'NF', 'NZ', 'FJ', 'LY', 'CM', 'SN', 'CG', 'PT', 'LR', 'CI', 'GH', 'GQ', 'NG', 'BF', 'TG', 'GW', 'MR', 'BJ', 'GA', 'SL', 'ST', 'GI', 'GM', 'GN', 'TD', 'NE', 'ML', 'EH', 'TN', 'ES', 'MA', 'MT', 'DZ', 'FO', 'DK', 'IS', 'GB', 'CH', 'SE', 'NL', 'AT', 'BE', 'DE', 'LU', 'IE', 'MC', 'FR', 'AD', 'LI', 'JE', 'IM', 'GG', 'SK', 'CZ', 'NO', 'VA', 'SM', 'IT', 'SI', 'ME', 'HR', 'BA', 'AO', 'NA', 'SH', 'BV', 'BB', 'CV', 'GY', 'GF', 'SR', 'PM', 'GL', 'PY', 'UY', 'BR', 'FK', 'GS', 'JM', 'DO', 'CU', 'MQ', 'BS', 'BM', 'AI', 'TT', 'KN', 'DM', 'AG', 'LC', 'TC', 'AW', 'VG', 'VC', 'MS', 'MF', 'BL', 'GP', 'GD', 'KY', 'BZ', 'SV', 'GT', 'HN', 'NI', 'CR', 'VE', 'EC', 'CO', 'PA', 'HT', 'AR', 'CL', 'BO', 'PE', 'MX', 'PF', 'PN', 'KI', 'TK', 'TO', 'WF', 'WS', 'NU', 'MP', 'GU', 'PR', 'VI', 'UM', 'AS', 'CA', 'US', 'PS', 'RS', 'AQ', 'SX', 'CW', 'BQ', 'SS','AC','AN','BU','CP','CS','CT','DD','DG','DY','EA','FQ','FX','HV','IC','JT','MI','NH','NQ','NT','PC','PU','PZ','RH','SU','TA','TP','VD','WK','YD','YU','ZR');
CREATE TYPE platform AS ENUM ('web','ios','android');
CREATE TABLE sessions