+
this.props.updateCurrentPage(page)}
- limit={PER_PAGE}
+ limit={limit}
debounceRequest={500}
/>
diff --git a/frontend/app/components/Header/SiteDropdown.js b/frontend/app/components/Header/SiteDropdown.js
index d6df6be31..9b3af1f8f 100644
--- a/frontend/app/components/Header/SiteDropdown.js
+++ b/frontend/app/components/Header/SiteDropdown.js
@@ -2,7 +2,7 @@ import React from 'react';
import { connect } from 'react-redux';
import { setSiteId } from 'Duck/site';
import { withRouter } from 'react-router-dom';
-import { hasSiteId, siteChangeAvaliable } from 'App/routes';
+import { hasSiteId, siteChangeAvaliable, isRoute } from 'App/routes';
import { STATUS_COLOR_MAP, GREEN } from 'Types/site';
import { Icon, SlideModal } from 'UI';
import { pushNewSite } from 'Duck/user'
@@ -42,10 +42,10 @@ export default class SiteDropdown extends React.PureComponent {
}
switchSite = (siteId) => {
- const { mstore } = this.props
+ const { mstore, location } = this.props
this.props.setSiteId(siteId);
- this.props.clearSearch();
+ this.props.clearSearch(location.pathname.includes('/sessions'));
this.props.fetchIntegrationVariables();
mstore.initClient();
@@ -59,7 +59,7 @@ export default class SiteDropdown extends React.PureComponent {
const disabled = !siteChangeAvaliable(pathname);
const showCurrent = hasSiteId(pathname) || siteChangeAvaliable(pathname);
// const canAddSites = isAdmin && account.limits.projects && account.limits.projects.remaining !== 0;
-
+
return (
{
diff --git a/frontend/app/components/Onboarding/components/OnboardingTabs/InstallDocs/InstallDocs.js b/frontend/app/components/Onboarding/components/OnboardingTabs/InstallDocs/InstallDocs.js
index 5096f0b16..a89904907 100644
--- a/frontend/app/components/Onboarding/components/OnboardingTabs/InstallDocs/InstallDocs.js
+++ b/frontend/app/components/Onboarding/components/OnboardingTabs/InstallDocs/InstallDocs.js
@@ -30,7 +30,7 @@ function MyApp() {
//...
}`
-function InstallDocs({ siteId, sites }) {
+function InstallDocs({ siteId, sites }) {
const site = sites.find(s => s.id === siteId);
const _usageCode = usageCode.replace('PROJECT_KEY', site.projectKey)
const _usageCodeSST = usageCodeSST.replace('PROJECT_KEY', site.projectKey)
diff --git a/frontend/app/components/shared/LiveSessionList/LiveSessionList.tsx b/frontend/app/components/shared/LiveSessionList/LiveSessionList.tsx
index 190cbfef6..99614b32a 100644
--- a/frontend/app/components/shared/LiveSessionList/LiveSessionList.tsx
+++ b/frontend/app/components/shared/LiveSessionList/LiveSessionList.tsx
@@ -137,7 +137,7 @@ function LiveSessionList(props: Props) {
show={ !loading && list.size === 0}
>
-
+
{list.map(session => (
<>
e.get("errorId") === action.id)) {
return updateItemInList(state, { errorId: action.data.errorId, viewed: true })
@@ -73,15 +74,15 @@ function reducer(state = initialState, action = {}) {
.set("totalCount", data ? data.total : 0)
.set("list", List(data && data.errors).map(ErrorInfo)
.filter(e => e.parentErrorId == null)
- .map(e => e.update("chart", chartWrapper)));
+ .map(e => e.update("chart", chartWrapper)))
case success(RESOLVE):
- updError = { errorId: action.id, status: RESOLVED };
+ updError = { errorId: action.id, status: RESOLVED, disabled: true };
return updateItemInList(updateInstance(state, updError), updError);
case success(UNRESOLVE):
- updError = { errorId: action.id, status: UNRESOLVED };
+ updError = { errorId: action.id, status: UNRESOLVED, disabled: true };
return updateItemInList(updateInstance(state, updError), updError);
case success(IGNORE):
- updError = { errorId: action.id, status: IGNORED };
+ updError = { errorId: action.id, status: IGNORED, disabled: true };
return updateItemInList(updateInstance(state, updError), updError);
case success(TOGGLE_FAVORITE):
return state.mergeIn([ "instance" ], { favorite: !state.getIn([ "instance", "favorite" ]) })
@@ -163,28 +164,43 @@ export function fetchBookmarks() {
}
}
-export function resolve(id) {
- return {
+export const resolve = (id) => (dispatch, getState) => {
+ const list = getState().getIn(['errors', 'list']);
+ const index = list.findIndex(e => e.get('errorId') === id);
+ const error = list.get(index);
+ if (error.get('status') === RESOLVED) return;
+
+ return dispatch({
types: array(RESOLVE),
id,
call: client => client.get(`/errors/${ id }/solve`),
- }
+ })
}
-export function unresolve(id) {
- return {
+export const unresolve = (id) => (dispatch, getState) => {
+ const list = getState().getIn(['errors', 'list']);
+ const index = list.findIndex(e => e.get('errorId') === id);
+ const error = list.get(index);
+ if (error.get('status') === UNRESOLVED) return;
+
+ return dispatch({
types: array(UNRESOLVE),
id,
call: client => client.get(`/errors/${ id }/unsolve`),
- }
+ })
}
-export function ignore(id) {
- return {
+export const ignore = (id) => (dispatch, getState) => {
+ const list = getState().getIn(['errors', 'list']);
+ const index = list.findIndex(e => e.get('errorId') === id);
+ const error = list.get(index);
+ if (error.get('status') === IGNORED) return;
+
+ return dispatch({
types: array(IGNORE),
id,
call: client => client.get(`/errors/${ id }/ignore`),
- }
+ })
}
export function merge(ids) {
diff --git a/frontend/app/duck/search.js b/frontend/app/duck/search.js
index 525e3b005..c49b00b26 100644
--- a/frontend/app/duck/search.js
+++ b/frontend/app/duck/search.js
@@ -180,6 +180,11 @@ export const edit = reduceThenFetchResource((instance) => ({
instance,
}));
+export const editDefault = (instance) => ({
+ type: EDIT,
+ instance,
+});
+
export const setActiveTab = reduceThenFetchResource((tab) => ({
type: SET_ACTIVE_TAB,
tab,
diff --git a/frontend/app/mstore/dashboardStore.ts b/frontend/app/mstore/dashboardStore.ts
index 0a1aca2b3..c4e739fd8 100644
--- a/frontend/app/mstore/dashboardStore.ts
+++ b/frontend/app/mstore/dashboardStore.ts
@@ -108,9 +108,9 @@ export default class DashboardStore implements IDashboardSotre {
isLoading: boolean = true;
isSaving: boolean = false;
isDeleting: boolean = false;
+ loadingTemplates: boolean = false
fetchingDashboard: boolean = false;
sessionsLoading: boolean = false;
-
showAlertModal: boolean = false;
constructor() {
@@ -379,6 +379,7 @@ export default class DashboardStore implements IDashboardSotre {
};
fetchTemplates(hardRefresh): Promise {
+ this.loadingTemplates = true
return new Promise((resolve, reject) => {
if (this.widgetCategories.length > 0 && !hardRefresh) {
resolve(this.widgetCategories);
@@ -389,11 +390,7 @@ export default class DashboardStore implements IDashboardSotre {
const categories: any[] = [];
response.forEach((category: any) => {
const widgets: any[] = [];
- // TODO speed_location is not supported yet
category.widgets
- .filter(
- (w: any) => w.predefinedKey !== "speed_locations"
- )
.forEach((widget: any) => {
const w = new Widget().fromJson(widget);
widgets.push(w);
@@ -409,6 +406,8 @@ export default class DashboardStore implements IDashboardSotre {
})
.catch((error) => {
reject(error);
+ }).finally(() => {
+ this.loadingTemplates = false
});
}
});
diff --git a/frontend/app/mstore/types/filterItem.ts b/frontend/app/mstore/types/filterItem.ts
index 99d91c25a..ce2a1f4db 100644
--- a/frontend/app/mstore/types/filterItem.ts
+++ b/frontend/app/mstore/types/filterItem.ts
@@ -30,7 +30,11 @@ export default class FilterItem {
merge: action
})
-
+ if (Array.isArray(data.filters)) {
+ data.filters = data.filters.map(function (i) {
+ return new FilterItem(i);
+ });
+ }
this.merge(data)
}
diff --git a/frontend/app/player/MessageDistributor/managers/DOMManager.ts b/frontend/app/player/MessageDistributor/managers/DOMManager.ts
index 9f1760df8..43c7a274c 100644
--- a/frontend/app/player/MessageDistributor/managers/DOMManager.ts
+++ b/frontend/app/player/MessageDistributor/managers/DOMManager.ts
@@ -209,9 +209,9 @@ export default class DOMManager extends ListWalker {
case "set_input_value":
node = this.nl[ msg.id ]
if (!node) { logger.error("Node not found", msg); return }
- if (!(node instanceof HTMLInputElement || node instanceof HTMLTextAreaElement)) {
- logger.error("Trying to set value of non-Input element", msg)
- return
+ if (!(node instanceof HTMLInputElement || node instanceof HTMLTextAreaElement)) {
+ logger.error("Trying to set value of non-Input element", msg)
+ return
}
const val = msg.mask > 0 ? '*'.repeat(msg.mask) : msg.value
doc = this.screen.document
@@ -281,7 +281,7 @@ export default class DOMManager extends ListWalker {
logger.warn("No iframe doc", msg, node, node.contentDocument);
return;
}
- this.nl[ msg.id ] = doc
+ this.nl[ msg.id ] = doc.documentElement
return;
} else if (node instanceof Element) { // shadow DOM
try {
diff --git a/frontend/app/types/errorInfo.js b/frontend/app/types/errorInfo.js
index 364fa8e65..db4c2f3a0 100644
--- a/frontend/app/types/errorInfo.js
+++ b/frontend/app/types/errorInfo.js
@@ -37,6 +37,7 @@ const ErrorInfo = Record({
chart30: [],
tags: [],
lastHydratedSession: Session(),
+ disabled: false,
}, {
fromJS: ({ stack, lastHydratedSession, ...other }) => ({
...other,
diff --git a/frontend/app/types/filter/filter.js b/frontend/app/types/filter/filter.js
index d9b73c224..864613678 100644
--- a/frontend/app/types/filter/filter.js
+++ b/frontend/app/types/filter/filter.js
@@ -99,7 +99,7 @@ export default Record({
filters: List(filters)
.map(i => {
const filter = NewFilter(i).toData();
- if (i.hasOwnProperty('filters')) {
+ if (Array.isArray(i.filters)) {
filter.filters = i.filters.map(f => NewFilter({...f, subFilter: i.type}).toData());
}
return filter;
diff --git a/scripts/helmcharts/vars.yaml b/scripts/helmcharts/vars.yaml
index 5ee4f0508..21e753cdd 100644
--- a/scripts/helmcharts/vars.yaml
+++ b/scripts/helmcharts/vars.yaml
@@ -42,7 +42,6 @@ kafka: &kafka
redis: &redis
- # For enterpriseEdition
# enabled: false
redisHost: "redis-master.db.svc.cluster.local"
redisPort: "6379"