Skip to content

Commit a973cbd

Browse files
Turn call readiness alwayson (for beta packages only) (#2603)
1 parent 6210bfa commit a973cbd

20 files changed

Lines changed: 52 additions & 133 deletions
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "prerelease",
3+
"comment": "turn call readiness alwayson",
4+
"packageName": "@azure/communication-react",
5+
"email": "2684369+JamesBurnside@users.noreply.github.com",
6+
"dependentChangeType": "patch"
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "prerelease",
3+
"comment": "turn call readiness alwayson",
4+
"packageName": "@azure/communication-react",
5+
"email": "2684369+JamesBurnside@users.noreply.github.com",
6+
"dependentChangeType": "patch"
7+
}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,6 @@ export type CallCompositeOptions = {
470470
errorBar?: boolean;
471471
callControls?: boolean | CallControlOptions;
472472
deviceChecks?: DeviceCheckOptions;
473-
callReadinessOptedIn?: boolean;
474473
onPermissionsTroubleshootingClick?: (permissionsState: {
475474
camera: PermissionState;
476475
microphone: PermissionState;
@@ -963,7 +962,6 @@ export type CallWithChatCompositeOptions = {
963962
}) => void;
964963
onNetworkingTroubleShootingClick?: () => void;
965964
onEnvironmentInfoTroubleshootingClick?: () => void;
966-
callReadinessOptedIn?: boolean;
967965
};
968966

969967
// @public

packages/react-composites/review/beta/react-composites.api.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,6 @@ export type CallCompositeOptions = {
321321
errorBar?: boolean;
322322
callControls?: boolean | CallControlOptions;
323323
deviceChecks?: DeviceCheckOptions;
324-
callReadinessOptedIn?: boolean;
325324
onPermissionsTroubleshootingClick?: (permissionsState: {
326325
camera: PermissionState;
327326
microphone: PermissionState;
@@ -721,7 +720,6 @@ export type CallWithChatCompositeOptions = {
721720
}) => void;
722721
onNetworkingTroubleShootingClick?: () => void;
723722
onEnvironmentInfoTroubleshootingClick?: () => void;
724-
callReadinessOptedIn?: boolean;
725723
};
726724

727725
// @public

packages/react-composites/src/composites/CallComposite/CallComposite.test.tsx

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ describe('CallComposite device permission test for different roles', () => {
7777
});
7878
});
7979

80-
describe('CallComposite device permission test for call readiness opted in/opted out', () => {
80+
describe('CallComposite device permission test for call readiness', () => {
8181
let audioDevicePermissionRequests = 0;
8282
let videoDevicePermissionRequests = 0;
8383

@@ -109,11 +109,4 @@ describe('CallComposite device permission test for call readiness opted in/opted
109109
expect(audioDevicePermissionRequests).toBe(1);
110110
expect(videoDevicePermissionRequests).toBe(1);
111111
});
112-
113-
/* @conditional-compile-remove(call-readiness) */
114-
test('Audio and video device permission should still be requested when callreadiness option opted in', async () => {
115-
mount(<CallComposite adapter={adapter} options={{ callReadinessOptedIn: true }} />);
116-
expect(audioDevicePermissionRequests).toBe(1);
117-
expect(videoDevicePermissionRequests).toBe(1);
118-
});
119112
});

packages/react-composites/src/composites/CallComposite/CallComposite.tsx

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,6 @@ export type CallCompositeOptions = {
113113
*/
114114
deviceChecks?: DeviceCheckOptions;
115115
/* @conditional-compile-remove(call-readiness) */
116-
/**
117-
* Opt in call readiness feature for your call
118-
* Setting this to `true` will add call readiness features to the call experience
119-
*/
120-
callReadinessOptedIn?: boolean;
121-
/* @conditional-compile-remove(call-readiness) */
122116
/**
123117
* Callback you may provide to supply users with further steps to troubleshoot why they have been
124118
* unable to grant your site the required permissions for the call.
@@ -228,8 +222,6 @@ const MainScreen = (props: MainScreenProps): JSX.Element => {
228222
onPermissionsTroubleshootingClick={props.options?.onPermissionsTroubleshootingClick}
229223
/* @conditional-compile-remove(call-readiness) */
230224
onNetworkingTroubleShootingClick={props.options?.onNetworkingTroubleShootingClick}
231-
/* @conditional-compile-remove(call-readiness) */
232-
callReadinessOptedIn={props.options?.callReadinessOptedIn}
233225
/>
234226
);
235227
break;

packages/react-composites/src/composites/CallComposite/components/ConfigurationPageCameraDropdown.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ export interface ConfigurationPageCameraDropdownProps {
2222
cameraPermissionGranted: boolean;
2323
/* @conditional-compile-remove(call-readiness) */
2424
dropdownProps: Partial<_DevicePermissionDropdownProps>;
25-
callReadinessOptedIn?: boolean;
2625
onClickEnableDevicePermission?: () => void;
2726
}
2827

@@ -53,9 +52,7 @@ export const ConfigurationPageCameraDropdown = (props: ConfigurationPageCameraDr
5352
);
5453

5554
/* @conditional-compile-remove(call-readiness) */
56-
if (props.callReadinessOptedIn) {
57-
return <>{props.cameraPermissionGranted ? props.cameraGrantedDropdown : cameraBlockedDropdown}</>;
58-
}
55+
return props.cameraPermissionGranted ? props.cameraGrantedDropdown : cameraBlockedDropdown;
5956

6057
return props.cameraGrantedDropdown;
6158
};

packages/react-composites/src/composites/CallComposite/components/ConfigurationPageErrorBar.tsx

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ export interface ConfigurationPageErrorBarProps {
3131
camera: PermissionState;
3232
microphone: PermissionState;
3333
};
34-
callReadinessOptedIn?: boolean;
3534
}
3635

3736
/**
@@ -47,9 +46,7 @@ export const ConfigurationPageErrorBar = (props: ConfigurationPageErrorBarProps)
4746
/* @conditional-compile-remove(call-readiness) */
4847
onNetworkingTroubleShootingClick,
4948
/* @conditional-compile-remove(call-readiness) */
50-
permissionsState,
51-
/* @conditional-compile-remove(call-readiness) */
52-
callReadinessOptedIn = false
49+
permissionsState
5350
} = props;
5451

5552
/* @conditional-compile-remove(call-readiness) */
@@ -60,7 +57,7 @@ export const ConfigurationPageErrorBar = (props: ConfigurationPageErrorBarProps)
6057
};
6158

6259
/* @conditional-compile-remove(call-readiness) */
63-
if (showTroubleShootingErrorBar && callReadinessOptedIn) {
60+
if (showTroubleShootingErrorBar) {
6461
return (
6562
<_TroubleshootingGuideErrorBar
6663
troubleshootingGuideStrings={permissionTroubleshootingGuideStrings}

packages/react-composites/src/composites/CallComposite/components/ConfigurationPageMicDropdown.tsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ export interface ConfigurationPageMicDropdownProps {
2222
micPermissionGranted: boolean;
2323
/* @conditional-compile-remove(call-readiness) */
2424
dropdownProps: Partial<_DevicePermissionDropdownProps>;
25-
callReadinessOptedIn?: boolean;
2625
onClickEnableDevicePermission?: () => void;
2726
}
2827

@@ -51,8 +50,7 @@ export const ConfigurationPageMicDropdown = (props: ConfigurationPageMicDropdown
5150
);
5251

5352
/* @conditional-compile-remove(call-readiness) */
54-
if (props.callReadinessOptedIn) {
55-
return <> {props.micPermissionGranted ? props.micGrantedDropdown : microphoneBlockedDropdown}</>;
56-
}
53+
return props.micPermissionGranted ? props.micGrantedDropdown : microphoneBlockedDropdown;
54+
5755
return props.micGrantedDropdown;
5856
};

packages/react-composites/src/composites/CallComposite/components/LocalDeviceSettings.tsx

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ export interface LocalDeviceSettingsType {
8686
onSelectCamera: (device: VideoDeviceInfo, options?: VideoStreamOptions) => Promise<void>;
8787
onSelectMicrophone: (device: AudioDeviceInfo) => Promise<void>;
8888
onSelectSpeaker: (device: AudioDeviceInfo) => Promise<void>;
89-
callReadinessOptedIn?: boolean;
9089
/* @conditional-compile-remove(call-readiness) */
9190
onClickEnableDevicePermission?: () => void;
9291
}
@@ -218,8 +217,6 @@ export const LocalDeviceSettings = (props: LocalDeviceSettingsType): JSX.Element
218217
/* @conditional-compile-remove(call-readiness) */
219218
dropdownProps={dropdownProps}
220219
/* @conditional-compile-remove(call-readiness) */
221-
callReadinessOptedIn={props.callReadinessOptedIn ?? false}
222-
/* @conditional-compile-remove(call-readiness) */
223220
onClickEnableDevicePermission={props.onClickEnableDevicePermission}
224221
/>
225222
</Stack>
@@ -239,8 +236,6 @@ export const LocalDeviceSettings = (props: LocalDeviceSettingsType): JSX.Element
239236
/* @conditional-compile-remove(call-readiness) */
240237
dropdownProps={dropdownProps}
241238
/* @conditional-compile-remove(call-readiness) */
242-
callReadinessOptedIn={props.callReadinessOptedIn ?? false}
243-
/* @conditional-compile-remove(call-readiness) */
244239
onClickEnableDevicePermission={props.onClickEnableDevicePermission}
245240
/>
246241
<Dropdown

0 commit comments

Comments
 (0)