diff --git a/frontend/app/components/Session_/PlayerBlockHeader.js b/frontend/app/components/Session_/PlayerBlockHeader.js
index e0883cc59..1a0735f5f 100644
--- a/frontend/app/components/Session_/PlayerBlockHeader.js
+++ b/frontend/app/components/Session_/PlayerBlockHeader.js
@@ -29,10 +29,11 @@ const ASSIST_ROUTE = assistRoute();
loading: state.cssLoading || state.messagesLoading,
}))
@connect((state, props) => {
- const isAssist = state.getIn(['sessions', 'activeTab']).type === 'live';
+ const isAssist = window.location.pathname.includes('/assist/');
const hasSessioPath = state.getIn([ 'sessions', 'sessionPath' ]).includes('/sessions');
+ const session = state.getIn([ 'sessions', 'current' ]);
return {
- session: state.getIn([ 'sessions', 'current' ]),
+ session,
sessionPath: state.getIn([ 'sessions', 'sessionPath' ]),
loading: state.getIn([ 'sessions', 'toggleFavoriteRequest', 'loading' ]),
disabled: state.getIn([ 'components', 'targetDefiner', 'inspectorMode' ]) || props.loading,
@@ -43,7 +44,7 @@ const ASSIST_ROUTE = assistRoute();
siteId: state.getIn([ 'user', 'siteId' ]),
hasSessionsPath: hasSessioPath && !isAssist,
metaList: state.getIn(['customFields', 'list']).map(i => i.key),
- closedLive: !!state.getIn([ 'sessions', 'errors' ]),
+ closedLive: !!state.getIn([ 'sessions', 'errors' ]) || (isAssist && !session.live),
}
}, {
toggleFavorite, fetchListIntegration, setSessionPath
diff --git a/frontend/app/components/shared/LiveSessionList/LiveSessionList.tsx b/frontend/app/components/shared/LiveSessionList/LiveSessionList.tsx
index d6325ea00..8ffd256bd 100644
--- a/frontend/app/components/shared/LiveSessionList/LiveSessionList.tsx
+++ b/frontend/app/components/shared/LiveSessionList/LiveSessionList.tsx
@@ -13,6 +13,7 @@ import DropdownPlain from 'Shared/DropdownPlain';
import SortOrderButton from 'Shared/SortOrderButton';
import { TimezoneDropdown } from 'UI';
import { capitalize } from 'App/utils';
+import LiveSessionReloadButton from 'Shared/LiveSessionReloadButton';
const AUTOREFRESH_INTERVAL = .5 * 60 * 1000
const PER_PAGE = 20;
@@ -107,8 +108,6 @@ function LiveSessionList(props: Props) {
}, AUTOREFRESH_INTERVAL);
}
- console.log('srt', sort)
-
return (
@@ -117,6 +116,8 @@ function LiveSessionList(props: Props) {
Live Sessions
{sessions.size}
+
+
diff --git a/frontend/app/components/shared/LiveSessionReloadButton/LiveSessionReloadButton.tsx b/frontend/app/components/shared/LiveSessionReloadButton/LiveSessionReloadButton.tsx
new file mode 100644
index 000000000..ab47fc054
--- /dev/null
+++ b/frontend/app/components/shared/LiveSessionReloadButton/LiveSessionReloadButton.tsx
@@ -0,0 +1,19 @@
+import React from 'react'
+import ReloadButton from '../ReloadButton'
+import { connect } from 'react-redux'
+import { fetchLiveList } from 'Duck/sessions'
+
+interface Props {
+ loading: boolean
+ fetchLiveList: typeof fetchLiveList
+}
+function LiveSessionReloadButton(props: Props) {
+ const { loading } = props
+ return (
+
+ )
+}
+
+export default connect(state => ({
+ loading: state.getIn([ 'sessions', 'fetchLiveListRequest', 'loading' ]),
+}), { fetchLiveList })(LiveSessionReloadButton)
diff --git a/frontend/app/components/shared/LiveSessionReloadButton/index.ts b/frontend/app/components/shared/LiveSessionReloadButton/index.ts
new file mode 100644
index 000000000..59b517a52
--- /dev/null
+++ b/frontend/app/components/shared/LiveSessionReloadButton/index.ts
@@ -0,0 +1 @@
+export { default } from './LiveSessionReloadButton';
\ No newline at end of file
diff --git a/frontend/app/components/shared/ReloadButton/ReloadButton.tsx b/frontend/app/components/shared/ReloadButton/ReloadButton.tsx
new file mode 100644
index 000000000..8ae36a8f1
--- /dev/null
+++ b/frontend/app/components/shared/ReloadButton/ReloadButton.tsx
@@ -0,0 +1,22 @@
+import React from 'react'
+import { CircularLoader, Icon } from 'UI'
+import cn from 'classnames'
+
+interface Props {
+ loading?: boolean
+ onClick: () => void
+ iconSize?: number
+ iconName?: string
+ className?: string
+}
+export default function ReloadButton(props: Props) {
+ const { loading, onClick, iconSize = "14", iconName = "sync-alt", className = '' } = props
+ return (
+
+ { loading ? : }
+
+ )
+}
diff --git a/frontend/app/components/shared/ReloadButton/index.ts b/frontend/app/components/shared/ReloadButton/index.ts
new file mode 100644
index 000000000..cc431c632
--- /dev/null
+++ b/frontend/app/components/shared/ReloadButton/index.ts
@@ -0,0 +1 @@
+export { default } from './ReloadButton';
\ No newline at end of file
diff --git a/frontend/app/player/MessageDistributor/managers/AssistManager.ts b/frontend/app/player/MessageDistributor/managers/AssistManager.ts
index 51895b327..908add195 100644
--- a/frontend/app/player/MessageDistributor/managers/AssistManager.ts
+++ b/frontend/app/player/MessageDistributor/managers/AssistManager.ts
@@ -171,7 +171,8 @@ export default class AssistManager {
this.setStatus(ConnectionStatus.Disconnected)
}, 12000)
- if (getState().remoteControl === RemoteControlStatus.Requesting) {
+ if (getState().remoteControl === RemoteControlStatus.Requesting ||
+ getState().remoteControl === RemoteControlStatus.Enabled) {
this.toggleRemoteControl(false)
}
diff --git a/scripts/helm/db/init_dbs/postgresql/1.5.2/1.5.2.sql b/scripts/helm/db/init_dbs/postgresql/1.5.2/1.5.2.sql
new file mode 100644
index 000000000..f4e26f93a
--- /dev/null
+++ b/scripts/helm/db/init_dbs/postgresql/1.5.2/1.5.2.sql
@@ -0,0 +1,8 @@
+BEGIN;
+CREATE OR REPLACE FUNCTION openreplay_version()
+ RETURNS text AS
+$$
+SELECT 'v1.5.2'
+$$ LANGUAGE sql IMMUTABLE;
+
+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 3d05795e9..e053063c2 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.1'
+SELECT 'v1.5.2'
$$ LANGUAGE sql IMMUTABLE;
-- --- accounts.sql ---