diff --git a/frontend/app/Router.js b/frontend/app/Router.js index ab41173bd..dc1ee6ad6 100644 --- a/frontend/app/Router.js +++ b/frontend/app/Router.js @@ -26,7 +26,6 @@ import { fetchList as fetchMetadata } from 'Duck/customField'; import { fetchList as fetchSiteList } from 'Duck/site'; import { fetchList as fetchAnnouncements } from 'Duck/announcements'; import { fetchList as fetchAlerts } from 'Duck/alerts'; -import { fetchWatchdogStatus } from 'Duck/watchdogs'; import { dashboardService } from "App/services"; import { withStore } from 'App/mstore' @@ -107,7 +106,6 @@ const ONBOARDING_REDIRECT_PATH = routes.onboarding(OB_DEFAULT_TAB); fetchSiteList, fetchAnnouncements, fetchAlerts, - fetchWatchdogStatus, }) class Router extends React.Component { state = { @@ -132,7 +130,6 @@ class Router extends React.Component { this.props.fetchMetadata() this.props.fetchAnnouncements(); this.props.fetchAlerts(); - this.props.fetchWatchdogStatus(); }, 100); }) }) diff --git a/frontend/app/components/BugFinder/SessionsMenu/SessionsMenu.js b/frontend/app/components/BugFinder/SessionsMenu/SessionsMenu.js index 36dd5f83f..d81ff1a7f 100644 --- a/frontend/app/components/BugFinder/SessionsMenu/SessionsMenu.js +++ b/frontend/app/components/BugFinder/SessionsMenu/SessionsMenu.js @@ -1,9 +1,8 @@ -import React, { useEffect } from 'react' +import React from 'react' import { connect } from 'react-redux'; import cn from 'classnames'; import { SideMenuitem, SavedSearchList, Progress, Popup } from 'UI' import stl from './sessionMenu.css'; -import { fetchWatchdogStatus } from 'Duck/watchdogs'; import { clearEvents } from 'Duck/filters'; import { issues_types } from 'Types/session/issue' import { fetchList as fetchSessionList } from 'Duck/sessions'; @@ -11,18 +10,12 @@ import { useModal } from 'App/components/Modal'; import SessionSettings from 'Shared/SessionSettings/SessionSettings' function SessionsMenu(props) { - const { activeTab, keyMap, wdTypeCount, toggleRehydratePanel } = props; - const { hideModal, showModal } = useModal(); + const { activeTab } = props; + const { showModal } = useModal(); const onMenuItemClick = (filter) => { props.onMenuItemClick(filter) } - - const capturingAll = props.captureRate && props.captureRate.get('captureAll'); - - // useEffect(() => { - // showModal(, {}); - // }, []) return (
@@ -49,9 +42,6 @@ function SessionsMenu(props) { /> )} */}
- {/*
showModal(, {})}> - Capture, Listing, and Timezone Settings -
*/}
({ filters: state.getIn([ 'filters', 'appliedFilter' ]), sessionsLoading: state.getIn([ 'sessions', 'fetchLiveListRequest', 'loading' ]), }), { - fetchWatchdogStatus, clearEvents, fetchSessionList + clearEvents, fetchSessionList })(SessionsMenu); diff --git a/frontend/app/components/Header/SiteDropdown.js b/frontend/app/components/Header/SiteDropdown.js index 38fe6ec57..5e560567f 100644 --- a/frontend/app/components/Header/SiteDropdown.js +++ b/frontend/app/components/Header/SiteDropdown.js @@ -12,7 +12,6 @@ import NewSiteForm from '../Client/Sites/NewSiteForm'; import { clearSearch } from 'Duck/search'; import { fetchList as fetchIntegrationVariables } from 'Duck/customField'; import { fetchList as fetchAlerts } from 'Duck/alerts'; -import { fetchWatchdogStatus } from 'Duck/watchdogs'; import { withStore } from 'App/mstore' @withStore @@ -28,7 +27,6 @@ import { withStore } from 'App/mstore' clearSearch, fetchIntegrationVariables, fetchAlerts, - fetchWatchdogStatus, }) export default class SiteDropdown extends React.PureComponent { state = { showProductModal: false } @@ -54,7 +52,6 @@ export default class SiteDropdown extends React.PureComponent { this.props.clearSearch(); this.props.fetchIntegrationVariables(); this.props.fetchAlerts(); - this.props.fetchWatchdogStatus(); mstore.initClient(); } diff --git a/frontend/app/components/shared/SessionSettings/SessionSettings.tsx b/frontend/app/components/shared/SessionSettings/SessionSettings.tsx index 52e3d9ce8..409ede776 100644 --- a/frontend/app/components/shared/SessionSettings/SessionSettings.tsx +++ b/frontend/app/components/shared/SessionSettings/SessionSettings.tsx @@ -8,14 +8,10 @@ import DefaultTimezone from './components/DefaultTimezone'; import CaptureRate from './components/CaptureRate'; function SessionSettings(props) { - const { settingsStore } = useStore(); - const sessionSettings = useObserver(() => settingsStore.sessionSettings) - - return useObserver(() => (
-

Session Settings

+

Sessions Settings

diff --git a/frontend/app/mstore/settingsStore.ts b/frontend/app/mstore/settingsStore.ts index 0a666f75d..d3da8fd10 100644 --- a/frontend/app/mstore/settingsStore.ts +++ b/frontend/app/mstore/settingsStore.ts @@ -6,6 +6,7 @@ import { toast } from 'react-toastify'; export default class SettingsStore { loadingCaptureRate: boolean = false; sessionSettings: SessionSettings = new SessionSettings() + captureRateFetched: boolean = false; constructor() { makeAutoObservable(this, { sessionSettings: observable, @@ -33,6 +34,7 @@ export default class SettingsStore { captureRate: data.rate, captureAll: data.captureAll }) + this.captureRateFetched = true; }).finally(() => { this.loadingCaptureRate = false; })