From c37708db6c5be0227e01c91d0d917f9067c7f8af Mon Sep 17 00:00:00 2001 From: Shekar Siri Date: Mon, 13 Dec 2021 18:06:11 +0530 Subject: [PATCH 1/6] change(ui) - disable deleting item --- .../components/Client/CustomFields/CustomFields.js | 11 ++++++----- .../app/components/Client/CustomFields/ListItem.js | 4 ++-- .../app/components/Client/CustomFields/listItem.css | 5 +++++ 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/frontend/app/components/Client/CustomFields/CustomFields.js b/frontend/app/components/Client/CustomFields/CustomFields.js index 2b875e439..081f11a58 100644 --- a/frontend/app/components/Client/CustomFields/CustomFields.js +++ b/frontend/app/components/Client/CustomFields/CustomFields.js @@ -23,7 +23,7 @@ import { confirm } from 'UI/Confirmation'; }) @withPageTitle('Metadata - OpenReplay Preferences') class CustomFields extends React.Component { - state = { showModal: false, currentSite: this.props.sites.get(0) }; + state = { showModal: false, currentSite: this.props.sites.get(0), deletingItem: null }; componentWillMount() { const activeSite = this.props.sites.get(0); @@ -60,15 +60,15 @@ class CustomFields extends React.Component { confirmation: `Are you sure you want to remove?` })) { const { currentSite } = this.state; - this.props.remove(currentSite.id, field.index).then(() => { - - }); + this.setState({ deletingItem: field.index }); + this.props.remove(currentSite.id, field.index) + .then(() => this.setState({ deletingItem: null })); } } render() { const { fields, field, loading } = this.props; - const { showModal, currentSite } = this.state; + const { showModal, currentSite, deletingItem } = this.state; return (
{ fields.filter(i => i.index).map(field => ( { +const ListItem = ({ field, onEdit, onDelete, disabled }) => { return ( -
field.index != 0 && onEdit(field) } > +
field.index != 0 && onEdit(field) } > { field.key }
{ e.stopPropagation(); onDelete(field) } }> diff --git a/frontend/app/components/Client/CustomFields/listItem.css b/frontend/app/components/Client/CustomFields/listItem.css index a46ac7a73..cc1b0806f 100644 --- a/frontend/app/components/Client/CustomFields/listItem.css +++ b/frontend/app/components/Client/CustomFields/listItem.css @@ -47,4 +47,9 @@ border-radius: 10px; background-color: $gray-lightest; box-shadow: 0 0 0 1px $gray-light inset; +} + +.disabled { + opacity: 0.5; + pointer-events: none; } \ No newline at end of file From 534edacfb10adbdb27db0901d1f2fed0f1f1f6f8 Mon Sep 17 00:00:00 2001 From: Shekar Siri Date: Wed, 15 Dec 2021 13:16:37 +0530 Subject: [PATCH 2/6] fix(ui) - tracker version check --- .../shared/TrackerUpdateMessage/TrackerUpdateMessage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/app/components/shared/TrackerUpdateMessage/TrackerUpdateMessage.js b/frontend/app/components/shared/TrackerUpdateMessage/TrackerUpdateMessage.js index 32cabf8d3..a5fe4411c 100644 --- a/frontend/app/components/shared/TrackerUpdateMessage/TrackerUpdateMessage.js +++ b/frontend/app/components/shared/TrackerUpdateMessage/TrackerUpdateMessage.js @@ -12,7 +12,7 @@ const TrackerUpdateMessage= (props) => { const hasSessions = !!activeSite && !activeSite.recorded; const appVersionInt = parseInt(window.ENV.TRACKER_VERSION.split(".").join("")) const trackerVersionInt = site.trackerVersion ? parseInt(site.trackerVersion.split(".").join("")) : 0 - const needUpdate = !hasSessions && trackerVersionInt > appVersionInt; + const needUpdate = !hasSessions && appVersionInt > trackerVersionInt; return needUpdate ? ( <> {( From 38bc350f6967d4d04f7e5f04bb823e72bb8a3361 Mon Sep 17 00:00:00 2001 From: Shekar Siri Date: Wed, 15 Dec 2021 14:43:41 +0530 Subject: [PATCH 3/6] fix(ui) - assist mouse move --- .../app/player/MessageDistributor/managers/AssistManager.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/app/player/MessageDistributor/managers/AssistManager.ts b/frontend/app/player/MessageDistributor/managers/AssistManager.ts index f4947b1a5..2ccea1ad5 100644 --- a/frontend/app/player/MessageDistributor/managers/AssistManager.ts +++ b/frontend/app/player/MessageDistributor/managers/AssistManager.ts @@ -458,7 +458,7 @@ export default class AssistManager { name: store.getState().getIn([ 'user', 'account', 'name']), }); - // this.md.overlay.addEventListener("mousemove", this.onMouseMove) + this.md.overlay.addEventListener("mousemove", this.onMouseMove) // this.md.overlay.addEventListener("click", this.onMouseClick) }); //call.peerConnection.addEventListener("track", e => console.log('newtrack',e.track)) From 35b779a479878664b12a12006a7eee616ad00259 Mon Sep 17 00:00:00 2001 From: Shekar Siri Date: Wed, 15 Dec 2021 14:57:55 +0530 Subject: [PATCH 4/6] chagne(ui) - tracker version to 3.4.15 --- frontend/env.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/env.js b/frontend/env.js index ad71e1479..64bd66f1a 100644 --- a/frontend/env.js +++ b/frontend/env.js @@ -21,7 +21,7 @@ const oss = { MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY, MINIO_SECRET_KEY: process.env.MINIO_SECRET_KEY, ICE_SERVERS: process.env.ICE_SERVERS, - TRACKER_VERSION: '3.4.12', // trackerInfo.version, + TRACKER_VERSION: '3.4.15', // trackerInfo.version, } module.exports = { From ff62efff4f7e9e5dc7d3fa5b5b12a90f351453d1 Mon Sep 17 00:00:00 2001 From: Shekar Siri Date: Wed, 15 Dec 2021 15:36:31 +0530 Subject: [PATCH 5/6] fix(ui) - metadata toggle and disable --- .../components/Session_/EventsBlock/Metadata/Metadata.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/frontend/app/components/Session_/EventsBlock/Metadata/Metadata.js b/frontend/app/components/Session_/EventsBlock/Metadata/Metadata.js index 9b5d9ce66..b0dca0956 100644 --- a/frontend/app/components/Session_/EventsBlock/Metadata/Metadata.js +++ b/frontend/app/components/Session_/EventsBlock/Metadata/Metadata.js @@ -4,18 +4,19 @@ import { NoContent, IconButton, Popup } from 'UI'; import withToggle from 'HOCs/withToggle'; import MetadataItem from './MetadataItem'; import stl from './metadata.css'; +import cn from 'classnames'; export default connect(state => ({ metadata: state.getIn([ 'sessions', 'current', 'metadata' ]), }))(function Metadata ({ metadata }) { const [ visible, setVisible ] = useState(false); - const toggle = useCallback(() => metadata.size > 0 && setVisible(v => !v), []); + const toggle = useCallback(() => metadata.length > 0 && setVisible(v => !v), []); return ( <> ({ primaryText active={ visible } id="metadata-button" + // disabled={ metadata.length === 0 } /> } content={ From edd6cc737e5ac32eb1e45f64edfce0af41a12af0 Mon Sep 17 00:00:00 2001 From: Shekar Siri Date: Wed, 15 Dec 2021 17:57:04 +0530 Subject: [PATCH 6/6] change(ui) - tracker version to 3.4.16 --- frontend/env.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/env.js b/frontend/env.js index 64bd66f1a..f7c49c874 100644 --- a/frontend/env.js +++ b/frontend/env.js @@ -21,7 +21,7 @@ const oss = { MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY, MINIO_SECRET_KEY: process.env.MINIO_SECRET_KEY, ICE_SERVERS: process.env.ICE_SERVERS, - TRACKER_VERSION: '3.4.15', // trackerInfo.version, + TRACKER_VERSION: '3.4.16', // trackerInfo.version, } module.exports = {