Skip to content

Commit c5c65c7

Browse files
rzdorrzdor
authored
review after arb (#4867)
renames after arb review
1 parent 81f7229 commit c5c65c7

File tree

39 files changed

+124
-95
lines changed

39 files changed

+124
-95
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,9 +260,9 @@ export const getSupportedSpokenLanguages = (
260260

261261
/* @conditional-compile-remove(teams-meeting-conference) */
262262
/** @private */
263-
export const getTeamsMeetingConference = (
263+
export const getMeetingConferencePhones = (
264264
state: CallClientState,
265265
props: CallingBaseSelectorProps
266266
): ConferencePhoneInfo[] | undefined => {
267-
return state.calls[props.callId]?.teamsMeetingConference;
267+
return state.calls[props.callId]?.meetingConference?.conferencePhones;
268268
};

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
getEnvironmentInfo
1010
} from './baseSelectors';
1111
/* @conditional-compile-remove(notifications) */
12-
import { getTeamsMeetingConference } from './baseSelectors';
12+
import { getMeetingConferencePhones } from './baseSelectors';
1313
/* @conditional-compile-remove(notifications) */
1414
import { ActiveNotification, NotificationType } from '@internal/react-components';
1515
/* @conditional-compile-remove(notifications) */
@@ -47,7 +47,7 @@ export const notificationStackSelector: NotificationStackSelector = createSelect
4747
getDiagnostics,
4848
getDeviceManager,
4949
getEnvironmentInfo,
50-
/* @conditional-compile-remove(teams-meeting-conference) */ getTeamsMeetingConference
50+
/* @conditional-compile-remove(teams-meeting-conference) */ getMeetingConferencePhones
5151
],
5252
(
5353
latestErrors: CallErrors,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -633,7 +633,7 @@ export interface CallState {
633633
/**
634634
* Proxy of {@link @azure/communication-calling#TeamsMeetingAudioConferencingCallFeature}.
635635
*/
636-
teamsMeetingConference?: ConferencePhoneInfo[];
636+
meetingConference?: { conferencePhones: ConferencePhoneInfo[] };
637637
}
638638

639639
/**

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ export class CallContext {
187187
/* @conditional-compile-remove(meeting-id) */
188188
existingCall.info = call.info;
189189
/* @conditional-compile-remove(teams-meeting-conference) */
190-
existingCall.teamsMeetingConference = call.teamsMeetingConference;
190+
existingCall.meetingConference = call.meetingConference;
191191
} else {
192192
draft.calls[latestCallId] = call;
193193
}
@@ -570,7 +570,7 @@ export class CallContext {
570570
this.modifyState((draft: CallClientState) => {
571571
const call = draft.calls[this._callIdHistory.latestCallId(callId)];
572572
if (call) {
573-
call.teamsMeetingConference = convertConferencePhoneInfo(teamsMeetingConferenceDetails);
573+
call.meetingConference = { conferencePhones: convertConferencePhoneInfo(teamsMeetingConferenceDetails) };
574574
}
575575
});
576576
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ export function convertSdkCallToDeclarativeCall(call: CallCommon): CallState {
185185
/* @conditional-compile-remove(meeting-id) */
186186
info: callInfo,
187187
/* @conditional-compile-remove(teams-meeting-conference) */
188-
teamsMeetingConference: []
188+
meetingConference: { conferencePhones: [] }
189189
};
190190
}
191191

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -691,7 +691,7 @@ describe('errors should be reported correctly from Call when', () => {
691691
const { client, callId } = await prepareCallWithFeatures(
692692
createMockApiFeatures(new Map([[Features.TeamsMeetingAudioConferencing, conference]]))
693693
);
694-
expect(client.getState().calls[callId]?.teamsMeetingConference).toStrictEqual([]);
694+
expect(client.getState().calls[callId]?.meetingConference?.conferencePhones).toStrictEqual([]);
695695
});
696696
});
697697

‎packages/communication-react/review/beta/communication-react.api.md

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -677,7 +677,9 @@ export type CallCompositeIcons = {
677677
DefaultCustomButton?: JSX.Element;
678678
DtmfDialpadButton?: JSX.Element;
679679
PhoneNumberButton?: JSX.Element;
680-
PhoneInfoWait?: JSX.Element;
680+
JoinByPhoneDialStepIcon?: JSX.Element;
681+
JoinByPhoneConferenceIdIcon?: JSX.Element;
682+
JoinByPhoneWaitToBeAdmittedIcon?: JSX.Element;
681683
PeoplePaneMoreButton?: JSX.Element;
682684
StopAllSpotlightMenuButton?: JSX.Element;
683685
};
@@ -1072,6 +1074,9 @@ export interface CallState {
10721074
localParticipantReaction?: ReactionState;
10731075
localRecording: LocalRecordingCallFeatureState;
10741076
localVideoStreams: LocalVideoStreamState[];
1077+
meetingConference?: {
1078+
conferencePhones: ConferencePhoneInfo[];
1079+
};
10751080
optimalVideoCount: OptimalVideoCountFeatureState;
10761081
pptLive: PPTLiveCallFeatureState;
10771082
raiseHand: RaiseHandCallFeature;
@@ -1087,7 +1092,6 @@ export interface CallState {
10871092
spotlight?: SpotlightCallFeatureState;
10881093
startTime: Date;
10891094
state: CallState_2;
1090-
teamsMeetingConference?: ConferencePhoneInfo[];
10911095
totalParticipantCount?: number;
10921096
transcription: TranscriptionCallFeature;
10931097
transfer: TransferFeature;
@@ -2241,7 +2245,7 @@ export interface ComponentStrings {
22412245
imageOverlay: ImageOverlayStrings;
22422246
// (undocumented)
22432247
IncomingCallNotification: IncomingCallNotificationStrings;
2244-
MeetingConferencePhoneInfo: MeetingConferencePhoneInfoModalStrings;
2248+
meetingConferencePhoneInfo: MeetingConferencePhoneInfoModalStrings;
22452249
mentionPopover: MentionPopoverStrings;
22462250
messageStatusIndicator: MessageStatusIndicatorStrings;
22472251
messageThread: MessageThreadStrings;
@@ -2745,7 +2749,9 @@ export const DEFAULT_COMPOSITE_ICONS: {
27452749
DefaultCustomButton?: JSX.Element | undefined;
27462750
DtmfDialpadButton?: JSX.Element | undefined;
27472751
PhoneNumberButton?: JSX.Element | undefined;
2748-
PhoneInfoWait?: JSX.Element | undefined;
2752+
JoinByPhoneDialStepIcon?: JSX.Element | undefined;
2753+
JoinByPhoneConferenceIdIcon?: JSX.Element | undefined;
2754+
JoinByPhoneWaitToBeAdmittedIcon?: JSX.Element | undefined;
27492755
PeoplePaneMoreButton?: JSX.Element | undefined;
27502756
StopAllSpotlightMenuButton?: JSX.Element | undefined;
27512757
ChevronLeft?: JSX.Element | undefined;
@@ -3349,14 +3355,14 @@ export interface MediaDiagnosticsState {
33493355

33503356
// @public
33513357
export interface MeetingConferencePhoneInfoModalStrings {
3352-
meetingConferencePhoneInfoModalDialIn?: string;
3353-
meetingConferencePhoneInfoModalMeetingId?: string;
3354-
meetingConferencePhoneInfoModalNoPhoneAvailable?: string;
3355-
meetingConferencePhoneInfoModalTitle?: string;
3356-
meetingConferencePhoneInfoModalToll?: string;
3357-
meetingConferencePhoneInfoModalTollFree?: string;
3358-
meetingConferencePhoneInfoModalTollGeoData?: string;
3359-
meetingConferencePhoneInfoModalWait?: string;
3358+
meetingConferencePhoneInfoModalDialIn: string;
3359+
meetingConferencePhoneInfoModalMeetingId: string;
3360+
meetingConferencePhoneInfoModalNoPhoneAvailable: string;
3361+
meetingConferencePhoneInfoModalTitle: string;
3362+
meetingConferencePhoneInfoModalToll: string;
3363+
meetingConferencePhoneInfoModalTollFree: string;
3364+
meetingConferencePhoneInfoModalTollGeoData: string;
3365+
meetingConferencePhoneInfoModalWait: string;
33603366
}
33613367

33623368
// @beta

‎packages/communication-react/review/stable/communication-react.api.md

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,9 @@ export type CallCompositeIcons = {
506506
DefaultCustomButton?: JSX.Element;
507507
DtmfDialpadButton?: JSX.Element;
508508
PhoneNumberButton?: JSX.Element;
509-
PhoneInfoWait?: JSX.Element;
509+
JoinByPhoneDialStepIcon?: JSX.Element;
510+
JoinByPhoneConferenceIdIcon?: JSX.Element;
511+
JoinByPhoneWaitToBeAdmittedIcon?: JSX.Element;
510512
PeoplePaneMoreButton?: JSX.Element;
511513
StopAllSpotlightMenuButton?: JSX.Element;
512514
};
@@ -847,6 +849,9 @@ export interface CallState {
847849
kind: CallKind;
848850
localParticipantReaction?: ReactionState;
849851
localVideoStreams: LocalVideoStreamState[];
852+
meetingConference?: {
853+
conferencePhones: ConferencePhoneInfo[];
854+
};
850855
optimalVideoCount: OptimalVideoCountFeatureState;
851856
pptLive: PPTLiveCallFeatureState;
852857
raiseHand: RaiseHandCallFeature;
@@ -862,7 +867,6 @@ export interface CallState {
862867
spotlight?: SpotlightCallFeatureState;
863868
startTime: Date;
864869
state: CallState_2;
865-
teamsMeetingConference?: ConferencePhoneInfo[];
866870
transcription: TranscriptionCallFeature;
867871
transfer: TransferFeature;
868872
}
@@ -1879,7 +1883,7 @@ export interface ComponentStrings {
18791883
endCallButton: EndCallButtonStrings;
18801884
errorBar: ErrorBarStrings;
18811885
imageOverlay: ImageOverlayStrings;
1882-
MeetingConferencePhoneInfo: MeetingConferencePhoneInfoModalStrings;
1886+
meetingConferencePhoneInfo: MeetingConferencePhoneInfoModalStrings;
18831887
messageStatusIndicator: MessageStatusIndicatorStrings;
18841888
messageThread: MessageThreadStrings;
18851889
microphoneButton: MicrophoneButtonStrings;
@@ -2328,7 +2332,9 @@ export const DEFAULT_COMPOSITE_ICONS: {
23282332
DefaultCustomButton?: JSX.Element | undefined;
23292333
DtmfDialpadButton?: JSX.Element | undefined;
23302334
PhoneNumberButton?: JSX.Element | undefined;
2331-
PhoneInfoWait?: JSX.Element | undefined;
2335+
JoinByPhoneDialStepIcon?: JSX.Element | undefined;
2336+
JoinByPhoneConferenceIdIcon?: JSX.Element | undefined;
2337+
JoinByPhoneWaitToBeAdmittedIcon?: JSX.Element | undefined;
23322338
PeoplePaneMoreButton?: JSX.Element | undefined;
23332339
StopAllSpotlightMenuButton?: JSX.Element | undefined;
23342340
ChevronLeft?: JSX.Element | undefined;
@@ -2812,14 +2818,14 @@ export interface MediaDiagnosticsState {
28122818

28132819
// @public
28142820
export interface MeetingConferencePhoneInfoModalStrings {
2815-
meetingConferencePhoneInfoModalDialIn?: string;
2816-
meetingConferencePhoneInfoModalMeetingId?: string;
2817-
meetingConferencePhoneInfoModalNoPhoneAvailable?: string;
2818-
meetingConferencePhoneInfoModalTitle?: string;
2819-
meetingConferencePhoneInfoModalToll?: string;
2820-
meetingConferencePhoneInfoModalTollFree?: string;
2821-
meetingConferencePhoneInfoModalTollGeoData?: string;
2822-
meetingConferencePhoneInfoModalWait?: string;
2821+
meetingConferencePhoneInfoModalDialIn: string;
2822+
meetingConferencePhoneInfoModalMeetingId: string;
2823+
meetingConferencePhoneInfoModalNoPhoneAvailable: string;
2824+
meetingConferencePhoneInfoModalTitle: string;
2825+
meetingConferencePhoneInfoModalToll: string;
2826+
meetingConferencePhoneInfoModalTollFree: string;
2827+
meetingConferencePhoneInfoModalTollGeoData: string;
2828+
meetingConferencePhoneInfoModalWait: string;
28232829
}
28242830

28252831
// @public

‎packages/react-components/src/components/MeetingConferencePhoneInfo.test.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,12 @@ describe('Format phone number info based on available data', () => {
2929
const strings = {
3030
meetingConferencePhoneInfoModalTollFree: '{phoneNumber} (Toll Free)',
3131
meetingConferencePhoneInfoModalToll: '{phoneNumber} (Toll)',
32-
meetingConferencePhoneInfoModalTollGeoData: '{phoneNumber} {country} {city}'
32+
meetingConferencePhoneInfoModalTollGeoData: '{phoneNumber} {country} {city}',
33+
meetingConferencePhoneInfoModalTitle: '',
34+
meetingConferencePhoneInfoModalDialIn: '',
35+
meetingConferencePhoneInfoModalMeetingId: '',
36+
meetingConferencePhoneInfoModalWait: '',
37+
meetingConferencePhoneInfoModalNoPhoneAvailable: ''
3338
};
3439

3540
test('Test toll free and toll label', async () => {

‎packages/react-components/src/components/MeetingConferencePhoneInfo.tsx

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,35 +39,35 @@ export interface MeetingConferencePhoneInfoModalStrings {
3939
/**
4040
* Header for the phone info modal
4141
*/
42-
meetingConferencePhoneInfoModalTitle?: string;
42+
meetingConferencePhoneInfoModalTitle: string;
4343
/**
4444
* Phone number instruction
4545
*/
46-
meetingConferencePhoneInfoModalDialIn?: string;
46+
meetingConferencePhoneInfoModalDialIn: string;
4747
/**
4848
* Meeting ID instruction
4949
*/
50-
meetingConferencePhoneInfoModalMeetingId?: string;
50+
meetingConferencePhoneInfoModalMeetingId: string;
5151
/**
5252
* Wait for phone connection
5353
*/
54-
meetingConferencePhoneInfoModalWait?: string;
54+
meetingConferencePhoneInfoModalWait: string;
5555
/**
5656
* Toll Free Phone Label
5757
*/
58-
meetingConferencePhoneInfoModalTollFree?: string;
58+
meetingConferencePhoneInfoModalTollFree: string;
5959
/**
6060
* Toll Phone Label
6161
*/
62-
meetingConferencePhoneInfoModalToll?: string;
62+
meetingConferencePhoneInfoModalToll: string;
6363
/**
6464
* Toll Phone Label without geo data
6565
*/
66-
meetingConferencePhoneInfoModalTollGeoData?: string;
66+
meetingConferencePhoneInfoModalTollGeoData: string;
6767
/**
6868
* No phone number available message
6969
*/
70-
meetingConferencePhoneInfoModalNoPhoneAvailable?: string;
70+
meetingConferencePhoneInfoModalNoPhoneAvailable: string;
7171
}
7272

7373
/* @conditional-compile-remove(teams-meeting-conference) */
@@ -90,7 +90,7 @@ export const MeetingConferencePhoneInfoModal = (props: MeetingConferencePhoneInf
9090
const { conferencePhoneInfoList, showModal, onDismissMeetingPhoneInfoSettings } = props;
9191

9292
const theme = useTheme();
93-
const strings = useLocale().strings.MeetingConferencePhoneInfo;
93+
const strings = useLocale().strings.meetingConferencePhoneInfo;
9494

9595
const onDismiss = useCallback((): void => {
9696
if (onDismissMeetingPhoneInfoSettings) {
@@ -131,7 +131,7 @@ export const MeetingConferencePhoneInfoModal = (props: MeetingConferencePhoneInf
131131
<Stack className={infoConnectionLinkStyle(theme)}></Stack>
132132
<Stack.Item className={phoneInfoIcon(theme)}>
133133
<Stack verticalAlign="center" horizontalAlign="center">
134-
<Icon iconName="PhoneNumberButton" className={phoneInfoIconStyle(theme)} />
134+
<Icon iconName="JoinByPhoneDialStepIcon" className={phoneInfoIconStyle(theme)} />
135135
</Stack>
136136
</Stack.Item>
137137
<Stack.Item>
@@ -165,7 +165,7 @@ export const MeetingConferencePhoneInfoModal = (props: MeetingConferencePhoneInf
165165
<Stack className={infoConnectionLinkStyle(theme)}></Stack>
166166
<Stack.Item className={phoneInfoIcon(theme)}>
167167
<Stack verticalAlign="center" horizontalAlign="center">
168-
<Icon iconName="DtmfDialpadButton" className={phoneInfoIconStyle(theme)} />
168+
<Icon iconName="JoinByPhoneConferenceIdIcon" className={phoneInfoIconStyle(theme)} />
169169
</Stack>
170170
</Stack.Item>
171171
<Stack.Item>
@@ -178,7 +178,7 @@ export const MeetingConferencePhoneInfoModal = (props: MeetingConferencePhoneInf
178178
<Stack horizontal horizontalAlign="space-between" verticalAlign="center">
179179
<Stack horizontal>
180180
<Stack.Item className={phoneInfoIcon(theme)} style={{ marginLeft: _pxToRem(2) }}>
181-
<Icon iconName="PhoneInfoWait" className={phoneInfoIconStyle(theme)} />
181+
<Icon iconName="JoinByPhoneWaitToBeAdmittedIcon" className={phoneInfoIconStyle(theme)} />
182182
</Stack.Item>
183183
<Stack.Item>
184184
<Text className={stepTextStyle}>{strings?.meetingConferencePhoneInfoModalWait}</Text>

0 commit comments

Comments
 (0)