updating calling sample

Azure-Samples · Nov 10, 2023 · bec808c · bec808c
1 parent 1d0c25d
commit bec808c
Show file tree

Hide file tree

Showing 28 changed files with 168 additions and 146 deletions.
diff --git a/Calling/package-lock.json b/Calling/package-lock.json
diff --git a/Calling/package.json b/Calling/package.json
@@ -19,10 +19,10 @@
   },
   "dependencies": {
     "@azure/abort-controller": "^1.1.0",
-    "@azure/communication-calling": "^1.16.3",
+    "@azure/communication-calling": "1.18.1",
     "@azure/communication-common": "^2.2.1",
     "@azure/communication-identity": "^1.2.0",
-    "@azure/communication-react": "1.9.0",
+    "@azure/communication-react": "1.10.0",
     "@azure/logger": "1.0.4",
     "@babel/preset-react": "^7.12.7",
     "@fluentui/react": "~8.110.4",

diff --git a/Calling/src/app/App.tsx b/Calling/src/app/App.tsx
@@ -1,5 +1,5 @@
 // Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
+// Licensed under the MIT License.
 
 import { CommunicationUserIdentifier } from '@azure/communication-common';
 
@@ -8,6 +8,9 @@ import { initializeIcons, Spinner } from '@fluentui/react';
 import { CallAdapterLocator } from '@azure/communication-react';
 import React, { useEffect, useState } from 'react';
 import {
+  buildTime,
+  callingSDKVersion,
+  communicationReactSDKVersion,
   createGroupId,
   fetchTokenResponse,
   getGroupIdFromUrl,
@@ -19,14 +22,16 @@ import {
 } from './utils/AppUtils';
 
 import { useIsMobile } from './utils/useIsMobile';
-import { useSecondaryInstanceCheck } from './utils/useSecondaryInstanceCheck';
 import { CallError } from './views/CallError';
 import { CallScreen } from './views/CallScreen';
 import { HomeScreen } from './views/HomeScreen';
-import { PageOpenInAnotherTab } from './views/PageOpenInAnotherTab';
 import { UnsupportedBrowserPage } from './views/UnsupportedBrowserPage';
 
-setLogLevel('verbose');
+setLogLevel('error');
+
+console.log(
+  `ACS sample calling app. Last Updated ${buildTime} Using @azure/communication-calling:${callingSDKVersion} and @azure/communication-react:${communicationReactSDKVersion}`
+);
 
 initializeIcons();
 
@@ -60,18 +65,13 @@ const App = (): JSX.Element => {
 
   const isMobileSession = useIsMobile();
   const isLandscapeSession = isLandscape();
-  const isAppAlreadyRunningInAnotherTab = useSecondaryInstanceCheck();
 
   useEffect(() => {
     if (isMobileSession && isLandscapeSession) {
       console.log('ACS Calling sample: Mobile landscape view is experimental behavior');
     }
   }, [isMobileSession, isLandscapeSession]);
 
-  if (isMobileSession && isAppAlreadyRunningInAnotherTab) {
-    return <PageOpenInAnotherTab />;
-  }
-
   const supportedBrowser = !isOnIphoneAndNotSafari();
   if (!supportedBrowser) {
     return <UnsupportedBrowserPage />;
@@ -124,11 +124,7 @@ const App = (): JSX.Element => {
         document.title = `credentials - ${WEB_APP_TITLE}`;
         return <Spinner label={'Getting user credentials from server'} ariaLive="assertive" labelPosition="top" />;
       }
-      return (
-        <React.StrictMode>
-          <CallScreen token={token} userId={userId} displayName={displayName} callLocator={callLocator} />
-        </React.StrictMode>
-      );
+      return <CallScreen token={token} userId={userId} displayName={displayName} callLocator={callLocator} />;
     }
     default:
       document.title = `error - ${WEB_APP_TITLE}`;

diff --git a/Calling/src/app/styles/CallScreen.styles.ts b/Calling/src/app/styles/CallScreen.styles.ts
@@ -1,5 +1,5 @@
 // Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
+// Licensed under the MIT License.
 
 import { IStackItemStyles, IStackStyles } from '@fluentui/react';
 

diff --git a/Calling/src/app/styles/DisplayNameField.styles.ts b/Calling/src/app/styles/DisplayNameField.styles.ts
@@ -1,5 +1,5 @@
 // Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
+// Licensed under the MIT License.
 
 import { mergeStyles } from '@fluentui/react';
 

diff --git a/Calling/src/app/styles/EndCall.styles.ts b/Calling/src/app/styles/EndCall.styles.ts
@@ -1,5 +1,5 @@
 // Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
+// Licensed under the MIT License.
 
 import { IButtonStyles, IStackTokens, mergeStyles } from '@fluentui/react';
 

diff --git a/Calling/src/app/styles/Footer.styles.ts b/Calling/src/app/styles/Footer.styles.ts
@@ -1,5 +1,5 @@
 // Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
+// Licensed under the MIT License.
 
 import { IButtonStyles, IStackStyles, IStackTokens, ITextFieldStyles, mergeStyles } from '@fluentui/react';
 

diff --git a/Calling/src/app/styles/HomeScreen.styles.ts b/Calling/src/app/styles/HomeScreen.styles.ts
@@ -1,5 +1,5 @@
 // Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
+// Licensed under the MIT License.
 
 import { IStackTokens, mergeStyles } from '@fluentui/react';
 

diff --git a/Calling/src/app/styles/StartCallButton.styles.ts b/Calling/src/app/styles/StartCallButton.styles.ts
@@ -1,5 +1,5 @@
 // Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
+// Licensed under the MIT License.
 
 import { mergeStyles } from '@fluentui/react';
 

diff --git a/Calling/src/app/theming/SwitchableFluentThemeProvider.tsx b/Calling/src/app/theming/SwitchableFluentThemeProvider.tsx
@@ -1,5 +1,5 @@
 // Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
+// Licensed under the MIT License.
 
 import React, { useState, useMemo, createContext, useContext } from 'react';
 import { FluentThemeProvider, lightTheme, darkTheme } from '@azure/communication-react';

diff --git a/Calling/src/app/theming/ThemeSelector.tsx b/Calling/src/app/theming/ThemeSelector.tsx
@@ -1,5 +1,5 @@
 // Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
+// Licensed under the MIT License.
 
 import React from 'react';
 import { ChoiceGroup, IChoiceGroupOption, concatStyleSets } from '@fluentui/react';

diff --git a/Calling/src/app/utils/AppUtils.test.ts b/Calling/src/app/utils/AppUtils.test.ts
@@ -1,5 +1,5 @@
 // Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
+// Licensed under the MIT License.
 
 import { createRandomDisplayName, getGroupIdFromUrl } from './AppUtils';
 

diff --git a/Calling/src/app/utils/AppUtils.ts b/Calling/src/app/utils/AppUtils.ts
@@ -1,5 +1,5 @@
 // Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
+// Licensed under the MIT License.
 
 import { GroupLocator, TeamsMeetingLinkLocator } from '@azure/communication-calling';
 
@@ -65,3 +65,12 @@ export const navigateToHomePage = (): void => {
 };
 
 export const WEB_APP_TITLE = document.title;
+
+declare let __BUILDTIME__: string; // Injected by webpack
+export const buildTime = __BUILDTIME__;
+
+declare let __CALLINGVERSION__: string; // Injected by webpack
+export const callingSDKVersion = __CALLINGVERSION__;
+
+declare let __COMMUNICATIONREACTVERSION__: string; //Injected by webpack
+export const communicationReactSDKVersion = __COMMUNICATIONREACTVERSION__;
diff --git a/Calling/src/app/utils/credential.ts b/Calling/src/app/utils/credential.ts
@@ -1,5 +1,5 @@
 // Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
+// Licensed under the MIT License.
 
 import { AzureCommunicationTokenCredential, CommunicationTokenRefreshOptions } from '@azure/communication-common';
 import { AbortSignalLike } from '@azure/abort-controller';

diff --git a/Calling/src/app/utils/localStorage.ts b/Calling/src/app/utils/localStorage.ts
@@ -1,5 +1,5 @@
 // Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
+// Licensed under the MIT License.
 
 export const localStorageAvailable = typeof Storage !== 'undefined';
 

diff --git a/Calling/src/app/utils/useSecondaryInstanceCheck.ts b/Calling/src/app/utils/useSecondaryInstanceCheck.ts
@@ -1,5 +1,5 @@
 // Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
+// Licensed under the MIT License.
 
 import { useEffect, useState } from 'react';
 

diff --git a/Calling/src/app/views/CallCompositeContainer.tsx b/Calling/src/app/views/CallCompositeContainer.tsx
@@ -1,5 +1,5 @@
 // Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
+// Licensed under the MIT License.
 
 import { CommonCallAdapter, CallComposite } from '@azure/communication-react';
 

diff --git a/Calling/src/app/views/CallError.tsx b/Calling/src/app/views/CallError.tsx
@@ -1,5 +1,5 @@
 // Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
+// Licensed under the MIT License.
 
 import React from 'react';
 import { DefaultButton, PrimaryButton, Stack, Text } from '@fluentui/react';

diff --git a/Calling/src/app/views/CallScreen.tsx b/Calling/src/app/views/CallScreen.tsx
@@ -1,5 +1,5 @@
 // Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
+// Licensed under the MIT License.
 
 import { AzureCommunicationTokenCredential, CommunicationUserIdentifier } from '@azure/communication-common';
 

diff --git a/Calling/src/app/views/DisplayNameField.tsx b/Calling/src/app/views/DisplayNameField.tsx
@@ -1,5 +1,5 @@
 // Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
+// Licensed under the MIT License.
 
 import { TextField } from '@fluentui/react';
 import React, { useState } from 'react';

diff --git a/Calling/src/app/views/Footer.tsx b/Calling/src/app/views/Footer.tsx
@@ -1,5 +1,5 @@
 // Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
+// Licensed under the MIT License.
 
 import { Icon, PrimaryButton, Separator, Stack, TextField } from '@fluentui/react';
 import {

diff --git a/Calling/src/app/views/HomeScreen.tsx b/Calling/src/app/views/HomeScreen.tsx
@@ -1,5 +1,5 @@
 // Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
+// Licensed under the MIT License.
 
 import React, { useState } from 'react';
 import { Stack, PrimaryButton, Image, ChoiceGroup, IChoiceGroupOption, Text, TextField } from '@fluentui/react';
@@ -95,6 +95,20 @@ export const HomeScreen = (props: HomeScreenProps): JSX.Element => {
                 onChange={(_, newValue) => newValue && setCallLocator({ meetingLink: newValue })}
               />
             )}
+
+            {}
+
+            {}
+
+            {}
+
+            {}
+
+            {}
+
+            {}
+
+            {}
           </Stack>
           {showDisplayNameField && <DisplayNameField defaultName={displayName} setName={setDisplayName} />}
           <PrimaryButton

diff --git a/Calling/src/app/views/NoticePage.tsx b/Calling/src/app/views/NoticePage.tsx
@@ -1,5 +1,5 @@
 // Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
+// Licensed under the MIT License.
 
 import React, { ReactNode } from 'react';
 import { IStyle, IStackTokens, mergeStyles, Stack, Text } from '@fluentui/react';

diff --git a/Calling/src/app/views/PageOpenInAnotherTab.tsx b/Calling/src/app/views/PageOpenInAnotherTab.tsx
@@ -1,5 +1,5 @@
 // Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
+// Licensed under the MIT License.
 
 import { Link } from '@fluentui/react';
 import React from 'react';

diff --git a/Calling/src/app/views/UnsupportedBrowserPage.tsx b/Calling/src/app/views/UnsupportedBrowserPage.tsx
@@ -1,5 +1,5 @@
 // Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
+// Licensed under the MIT License.
 
 import { Link } from '@fluentui/react';
 import React from 'react';

diff --git a/Calling/src/assets/assets.d.ts b/Calling/src/assets/assets.d.ts
@@ -1,5 +1,5 @@
 // Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
+// Licensed under the MIT License.
 
 declare module '*.svg' {
   const content: React.FunctionComponent<React.SVGAttributes<SVGElement>>;

diff --git a/Calling/src/index.css b/Calling/src/index.css
@@ -1,5 +1,5 @@
 /* Copyright (c) Microsoft Corporation. */
-/* Licensed under the MIT license. */
+/* Licensed under the MIT License. */
 
 body,
 html,

diff --git a/Calling/src/index.tsx b/Calling/src/index.tsx
@@ -1,5 +1,5 @@
 // Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
+// Licensed under the MIT License.
 
 import React from 'react';
 import { createRoot } from 'react-dom/client';
@@ -14,10 +14,13 @@ if (!domNode) {
 }
 
 createRoot(domNode).render(
-  <SwitchableFluentThemeProvider scopeId="SampleCallingApp">
-    <div className="wrapper">
-      <App />
-      <ShakeToSendLogs />
-    </div>
-  </SwitchableFluentThemeProvider>
+  <React.StrictMode>
+    <SwitchableFluentThemeProvider scopeId="SampleCallingApp">
+      <div className="wrapper">
+        <App />
+        <ShakeToSendLogs />
+      </div>
+    </SwitchableFluentThemeProvider>
+  </React.StrictMode>
 );
+export {}; /*The above line is generated by conditional compilation, when no export detected after CC.*/