Revert "fix(salesforce) use salesforce only in the main room (#11286)"
This reverts commit bd994f2103
.
This commit is contained in:
parent
a27948b3af
commit
331bd2014b
|
@ -841,7 +841,7 @@
|
|||
"raisedHandsLabel": "Number of raised hands",
|
||||
"record": {
|
||||
"already": {
|
||||
"linked": "The meeting is already linked to this Salesforce object."
|
||||
"linked": "Record is already linked to this session."
|
||||
},
|
||||
"type": {
|
||||
"account": "Account",
|
||||
|
|
|
@ -73,7 +73,7 @@
|
|||
"jquery-i18next": "1.2.1",
|
||||
"js-md5": "0.6.1",
|
||||
"jwt-decode": "2.2.0",
|
||||
"lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1409.0.0+88378583/lib-jitsi-meet.tgz",
|
||||
"lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1399.0.0+1a98d919/lib-jitsi-meet.tgz",
|
||||
"libflacjs": "https://git@github.com/mmig/libflac.js#93d37e7f811f01cf7d8b6a603e38bd3c3810907d",
|
||||
"lodash": "4.17.21",
|
||||
"moment": "2.29.1",
|
||||
|
@ -11789,8 +11789,8 @@
|
|||
},
|
||||
"node_modules/lib-jitsi-meet": {
|
||||
"version": "0.0.0",
|
||||
"resolved": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1409.0.0+88378583/lib-jitsi-meet.tgz",
|
||||
"integrity": "sha512-c6WfdRVZl1cLl+oCKggMXk7yoYVTnvMU6kL8q9g3TtiNCocpBlh6HPLz9/A2DzLzCcyNio5KeNucyX7Ir3EXbA==",
|
||||
"resolved": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1399.0.0+1a98d919/lib-jitsi-meet.tgz",
|
||||
"integrity": "sha512-aIWaPY62nEZ9x13JDvv92UFhAvCSdC0ogCv4KpR1+Bwb6YmOPks+GHWpirZGk2RzgOL3cry43SDTVL4Tc0VyNA==",
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"@jitsi/js-utils": "2.0.0",
|
||||
|
@ -28784,8 +28784,8 @@
|
|||
}
|
||||
},
|
||||
"lib-jitsi-meet": {
|
||||
"version": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1409.0.0+88378583/lib-jitsi-meet.tgz",
|
||||
"integrity": "sha512-c6WfdRVZl1cLl+oCKggMXk7yoYVTnvMU6kL8q9g3TtiNCocpBlh6HPLz9/A2DzLzCcyNio5KeNucyX7Ir3EXbA==",
|
||||
"version": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1399.0.0+1a98d919/lib-jitsi-meet.tgz",
|
||||
"integrity": "sha512-aIWaPY62nEZ9x13JDvv92UFhAvCSdC0ogCv4KpR1+Bwb6YmOPks+GHWpirZGk2RzgOL3cry43SDTVL4Tc0VyNA==",
|
||||
"requires": {
|
||||
"@jitsi/js-utils": "2.0.0",
|
||||
"@jitsi/logger": "2.0.0",
|
||||
|
|
|
@ -78,7 +78,7 @@
|
|||
"jquery-i18next": "1.2.1",
|
||||
"js-md5": "0.6.1",
|
||||
"jwt-decode": "2.2.0",
|
||||
"lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1409.0.0+88378583/lib-jitsi-meet.tgz",
|
||||
"lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1399.0.0+1a98d919/lib-jitsi-meet.tgz",
|
||||
"libflacjs": "https://git@github.com/mmig/libflac.js#93d37e7f811f01cf7d8b6a603e38bd3c3810907d",
|
||||
"lodash": "4.17.21",
|
||||
"moment": "2.29.1",
|
||||
|
|
|
@ -15,6 +15,7 @@ import {
|
|||
NOTIFICATION_TIMEOUT_TYPE,
|
||||
showErrorNotification
|
||||
} from '../../notifications';
|
||||
import { showSalesforceNotification } from '../../salesforce';
|
||||
import { CONNECTION_ESTABLISHED, CONNECTION_FAILED, connectionDisconnected } from '../connection';
|
||||
import { validateJwt } from '../jwt';
|
||||
import { JitsiConferenceErrors } from '../lib-jitsi-meet';
|
||||
|
@ -239,6 +240,9 @@ function _conferenceJoined({ dispatch, getState }, next, action) {
|
|||
dispatch(openDisplayNamePrompt(undefined));
|
||||
}
|
||||
|
||||
|
||||
dispatch(showSalesforceNotification());
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
|
|
|
@ -12,7 +12,6 @@ import { MiddlewareRegistry, StateListenerRegistry } from '../base/redux';
|
|||
import { SET_REDUCED_UI } from '../base/responsive-ui';
|
||||
import { FeedbackDialog } from '../feedback';
|
||||
import { setFilmstripEnabled } from '../filmstrip';
|
||||
import { showSalesforceNotification } from '../salesforce/actions';
|
||||
import { setToolboxEnabled } from '../toolbox/actions';
|
||||
|
||||
import { notifyKickedOut } from './actions';
|
||||
|
@ -22,12 +21,13 @@ MiddlewareRegistry.register(store => next => action => {
|
|||
|
||||
switch (action.type) {
|
||||
case CONFERENCE_JOINED:
|
||||
_conferenceJoined(store);
|
||||
|
||||
break;
|
||||
|
||||
case SET_REDUCED_UI: {
|
||||
_setReducedUI(store);
|
||||
const { dispatch, getState } = store;
|
||||
const state = getState();
|
||||
const { reducedUI } = state['features/base/responsive-ui'];
|
||||
|
||||
dispatch(setToolboxEnabled(!reducedUI));
|
||||
dispatch(setFilmstripEnabled(!reducedUI));
|
||||
|
||||
break;
|
||||
}
|
||||
|
@ -80,37 +80,3 @@ StateListenerRegistry.register(
|
|||
}
|
||||
}
|
||||
});
|
||||
|
||||
/**
|
||||
* Configures the UI. In reduced UI mode some components will
|
||||
* be hidden if there is no space to render them.
|
||||
*
|
||||
* @param {Store} store - The redux store in which the specified {@code action}
|
||||
* is being dispatched.
|
||||
* @private
|
||||
* @returns {void}
|
||||
*/
|
||||
function _setReducedUI({ dispatch, getState }) {
|
||||
const { reducedUI } = getState()['features/base/responsive-ui'];
|
||||
|
||||
dispatch(setToolboxEnabled(!reducedUI));
|
||||
dispatch(setFilmstripEnabled(!reducedUI));
|
||||
}
|
||||
|
||||
/**
|
||||
* Does extra sync up on properties that may need to be updated after the
|
||||
* conference was joined.
|
||||
*
|
||||
* @param {Store} store - The redux store in which the specified {@code action}
|
||||
* is being dispatched.
|
||||
* @private
|
||||
* @returns {void}
|
||||
*/
|
||||
function _conferenceJoined({ dispatch, getState }) {
|
||||
_setReducedUI({
|
||||
dispatch,
|
||||
getState
|
||||
});
|
||||
|
||||
dispatch(showSalesforceNotification());
|
||||
}
|
||||
|
|
|
@ -10,7 +10,6 @@ import {
|
|||
} from '../notifications';
|
||||
|
||||
import { SalesforceLinkDialog } from './components';
|
||||
import { isSalesforceEnabled } from './functions';
|
||||
|
||||
/**
|
||||
* Displays the notification for linking the meeting to Salesforce.
|
||||
|
@ -19,7 +18,9 @@ import { isSalesforceEnabled } from './functions';
|
|||
*/
|
||||
export function showSalesforceNotification() {
|
||||
return (dispatch: Object, getState: Function) => {
|
||||
if (!isSalesforceEnabled(getState())) {
|
||||
const { salesforceUrl } = getState()['features/base/config'];
|
||||
|
||||
if (!salesforceUrl) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
@ -1,21 +1,6 @@
|
|||
// @flow
|
||||
|
||||
import { doGetJSON } from '../base/util';
|
||||
import { isInBreakoutRoom } from '../breakout-rooms/functions';
|
||||
|
||||
/**
|
||||
* Determines whether Salesforce is enabled for the current conference.
|
||||
*
|
||||
* @param {Function|Object} state - The redux store, the redux
|
||||
* {@code getState} function, or the redux state itself.
|
||||
* @returns {boolean}
|
||||
*/
|
||||
export const isSalesforceEnabled = (state: Function | Object) => {
|
||||
const { salesforceUrl } = state['features/base/config'];
|
||||
const isBreakoutRoom = isInBreakoutRoom(state);
|
||||
|
||||
return Boolean(salesforceUrl) && !isBreakoutRoom;
|
||||
};
|
||||
|
||||
/**
|
||||
* Fetches the Salesforce records that were most recently interacted with.
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
export * from './components';
|
||||
export * from './actions';
|
|
@ -8,7 +8,6 @@ import { AbstractButton, type AbstractButtonProps } from '../../../base/toolbox/
|
|||
import { navigate }
|
||||
from '../../../mobile/navigation/components/conference/ConferenceNavigationContainerRef';
|
||||
import { screen } from '../../../mobile/navigation/routes';
|
||||
import { isSalesforceEnabled } from '../../../salesforce/functions';
|
||||
|
||||
/**
|
||||
* Implementation of a button for opening the Salesforce link dialog.
|
||||
|
@ -40,7 +39,7 @@ class LinkToSalesforceButton extends AbstractButton<AbstractButtonProps, *> {
|
|||
*/
|
||||
function mapStateToProps(state) {
|
||||
return {
|
||||
visible: isSalesforceEnabled(state)
|
||||
visible: Boolean(state['features/base/config'].salesforceUrl)
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@ import { translate } from '../../../base/i18n';
|
|||
import { IconSalesforce } from '../../../base/icons';
|
||||
import { connect } from '../../../base/redux';
|
||||
import { AbstractButton, type AbstractButtonProps } from '../../../base/toolbox/components';
|
||||
import { SalesforceLinkDialog } from '../../../salesforce/components';
|
||||
import { SalesforceLinkDialog } from '../../../salesforce';
|
||||
|
||||
/**
|
||||
* The type of the React {@code Component} props of {@link LinkToSalesforce}.
|
||||
|
|
|
@ -52,7 +52,6 @@ import {
|
|||
LiveStreamButton,
|
||||
RecordButton
|
||||
} from '../../../recording';
|
||||
import { isSalesforceEnabled } from '../../../salesforce/functions';
|
||||
import {
|
||||
isScreenAudioSupported,
|
||||
isScreenVideoShared,
|
||||
|
@ -1392,7 +1391,8 @@ function _mapStateToProps(state, ownProps) {
|
|||
disableProfile,
|
||||
enableFeaturesBasedOnToken,
|
||||
iAmRecorder,
|
||||
iAmSipGateway
|
||||
iAmSipGateway,
|
||||
salesforceUrl
|
||||
} = state['features/base/config'];
|
||||
const {
|
||||
fullScreen,
|
||||
|
@ -1441,7 +1441,7 @@ function _mapStateToProps(state, ownProps) {
|
|||
_isIosMobile: isIosMobileBrowser(),
|
||||
_isMobile: isMobileBrowser(),
|
||||
_isVpaasMeeting: isVpaasMeeting(state),
|
||||
_hasSalesforce: isSalesforceEnabled(state),
|
||||
_hasSalesforce: Boolean(salesforceUrl),
|
||||
_localParticipantID: localParticipant?.id,
|
||||
_localVideo: localVideo,
|
||||
_overflowMenuVisible: overflowMenuVisible,
|
||||
|
|
Loading…
Reference in New Issue