Skip to content

Commit db232bb

Browse files
remove cc for conference coordinates (#5166)
1 parent e413910 commit db232bb

31 files changed

Lines changed: 91 additions & 223 deletions

common/config/babel/features.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,6 @@ module.exports = {
9494
'end-call-options',
9595
// Feature to support file sharing in Teams interoperability chats
9696
"file-sharing-teams-interop",
97-
// Get join conference information
98-
'teams-meeting-conference',
9997
// Close captions feature for ACS calls
10098
"acs-close-captions",
10199
// Feature for showing notifications

packages/calling-component-bindings/src/baseSelectors.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import { CaptionsInfo } from '@internal/calling-stateful-client';
2626
import { CaptionsKind } from '@azure/communication-calling';
2727
import { RaisedHandState } from '@internal/calling-stateful-client';
2828
import { _SupportedCaptionLanguage, _SupportedSpokenLanguage } from '@internal/react-components';
29-
/* @conditional-compile-remove(teams-meeting-conference) */
3029
import { ConferencePhoneInfo } from '@internal/calling-stateful-client';
3130
/* @conditional-compile-remove(breakout-rooms) */
3231
import { CallNotifications } from '@internal/calling-stateful-client';
@@ -270,7 +269,6 @@ export const getSupportedSpokenLanguages = (
270269
return state.calls[props.callId]?.captionsFeature.supportedSpokenLanguages as _SupportedSpokenLanguage[];
271270
};
272271

273-
/* @conditional-compile-remove(teams-meeting-conference) */
274272
/** @private */
275273
export const getMeetingConferencePhones = (
276274
state: CallClientState,

packages/calling-component-bindings/src/notificationStackSelector.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export const notificationStackSelector: NotificationStackSelector = createSelect
5050
getDiagnostics,
5151
getDeviceManager,
5252
getEnvironmentInfo,
53-
/* @conditional-compile-remove(teams-meeting-conference) */ getMeetingConferencePhones,
53+
getMeetingConferencePhones,
5454
/* @conditional-compile-remove(breakout-rooms) */ getAssignedBreakoutRoom
5555
],
5656
(
@@ -59,7 +59,7 @@ export const notificationStackSelector: NotificationStackSelector = createSelect
5959
diagnostics,
6060
deviceManager,
6161
environmentInfo,
62-
/* @conditional-compile-remove(teams-meeting-conference) */ meetingConference,
62+
meetingConference,
6363
/* @conditional-compile-remove(breakout-rooms) */ assignedBreakoutRoom
6464
): { activeErrorMessages: ActiveNotification[]; activeNotifications: ActiveNotification[] } => {
6565
// The order in which the errors are returned is significant: The `Notification` shows errors on the UI in that order.
@@ -85,7 +85,7 @@ export const notificationStackSelector: NotificationStackSelector = createSelect
8585

8686
// Errors reported via diagnostics are more reliable than from API method failures, so process those first.
8787
let isTeamsMeetingWithPhones = false;
88-
/* @conditional-compile-remove(teams-meeting-conference) */
88+
8989
if (meetingConference && meetingConference.length > 0) {
9090
isTeamsMeetingWithPhones = true;
9191
}

packages/calling-stateful-client/src/CallClientState.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -655,7 +655,6 @@ export interface CallState {
655655
*/
656656
info?: TeamsCallInfo | /* @conditional-compile-remove(calling-beta-sdk) */ CallInfo;
657657

658-
/* @conditional-compile-remove(teams-meeting-conference) */
659658
/**
660659
* Proxy of {@link @azure/communication-calling#TeamsMeetingAudioConferencingCallFeature}.
661660
*/

packages/calling-stateful-client/src/CallContext.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ import { RaisedHand } from '@azure/communication-calling';
1414
/* @conditional-compile-remove(breakout-rooms) */
1515
import { BreakoutRoom, BreakoutRoomsSettings } from '@azure/communication-calling';
1616

17-
/* @conditional-compile-remove(teams-meeting-conference) */
1817
import { TeamsMeetingAudioConferencingDetails } from '@azure/communication-calling';
19-
/* @conditional-compile-remove(teams-meeting-conference) */
2018
import { convertConferencePhoneInfo } from './Converter';
2119

2220
import { CapabilitiesChangeInfo, ParticipantCapabilities } from '@azure/communication-calling';
@@ -189,7 +187,7 @@ export class CallContext {
189187
existingCall.captionsFeature.currentSpokenLanguage = call.captionsFeature.currentSpokenLanguage;
190188
existingCall.captionsFeature.currentCaptionLanguage = call.captionsFeature.currentCaptionLanguage;
191189
existingCall.info = call.info;
192-
/* @conditional-compile-remove(teams-meeting-conference) */
190+
193191
existingCall.meetingConference = call.meetingConference;
194192
} else {
195193
draft.calls[latestCallId] = call;
@@ -574,7 +572,6 @@ export class CallContext {
574572
});
575573
}
576574

577-
/* @conditional-compile-remove(teams-meeting-conference) */
578575
public setTeamsMeetingConference(
579576
callId: string,
580577
teamsMeetingConferenceDetails: TeamsMeetingAudioConferencingDetails

packages/calling-stateful-client/src/CallSubscriber.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@ export class CallSubscriber {
126126
private subscribe = (): void => {
127127
this._call.on('stateChanged', this.stateChanged);
128128
this._call.on('stateChanged', this.initCaptionSubscriber);
129-
/* @conditional-compile-remove(teams-meeting-conference) */
130129
this._call.on('stateChanged', this.initTeamsMeetingConference);
131130
/* @conditional-compile-remove(local-recording-notification) */
132131
this._call.on('stateChanged', this.initLocalRecordingNotificationSubscriber);
@@ -170,7 +169,7 @@ export class CallSubscriber {
170169
this._call.off('stateChanged', this.initCaptionSubscriber);
171170
/* @conditional-compile-remove(local-recording-notification) */
172171
this._call.off('stateChanged', this.initLocalRecordingNotificationSubscriber);
173-
/* @conditional-compile-remove(teams-meeting-conference) */
172+
174173
this._call.off('stateChanged', this.initTeamsMeetingConference);
175174
this._call.off('idChanged', this.idChanged);
176175
this._call.off('isScreenSharingOnChanged', this.isScreenSharingOnChanged);
@@ -253,7 +252,6 @@ export class CallSubscriber {
253252
}
254253
};
255254

256-
/* @conditional-compile-remove(teams-meeting-conference) */
257255
private initTeamsMeetingConference = (): void => {
258256
if (this._call.state === 'Connected') {
259257
this._call

packages/calling-stateful-client/src/Converter.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,6 @@ export function convertSdkCallToDeclarativeCall(call: CallCommon): CallState {
188188
/* @conditional-compile-remove(hide-attendee-name) */
189189
hideAttendeeNames,
190190
info: callInfo,
191-
/* @conditional-compile-remove(teams-meeting-conference) */
192191
meetingConference: { conferencePhones: [] }
193192
};
194193
}

packages/calling-stateful-client/src/StatefulCallClient.test.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,6 @@ describe('errors should be reported correctly from Call when', () => {
672672
}
673673
});
674674

675-
/* @conditional-compile-remove(teams-meeting-conference) */
676675
test('Conference call is undefined in acs to acs calls', async () => {
677676
const conference = addMockEmitter({ name: 'Conference' });
678677

packages/calling-stateful-client/src/index-public.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ export type { ReactionState } from './CallClientState';
5050
export type { SpotlightCallFeatureState, SpotlightState } from './CallClientState';
5151
/* @conditional-compile-remove(local-recording-notification) */
5252
export type { LocalRecordingCallFeatureState } from './CallClientState';
53-
/* @conditional-compile-remove(teams-meeting-conference) */
5453
export type { ConferencePhoneInfo } from './CallClientState';
5554
/* @conditional-compile-remove(breakout-rooms) */
5655
export type { BreakoutRoomsState } from './CallClientState';

packages/communication-react/src/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,5 +443,4 @@ export type {
443443
NotificationType,
444444
ActiveNotification
445445
} from '../../react-components/src';
446-
/* @conditional-compile-remove(teams-meeting-conference) */
447446
export type { MeetingConferencePhoneInfoModalStrings } from '../../react-components/src';

0 commit comments

Comments
 (0)