From bec808c373ccc803367e58ab3b4e026a63afceb7 Mon Sep 17 00:00:00 2001 From: Alex Kwan Date: Fri, 10 Nov 2023 15:54:19 -0800 Subject: [PATCH] updating calling sample --- Calling/package-lock.json | 198 +++++++++--------- Calling/package.json | 4 +- Calling/src/app/App.tsx | 24 +-- Calling/src/app/styles/CallScreen.styles.ts | 2 +- .../src/app/styles/DisplayNameField.styles.ts | 2 +- Calling/src/app/styles/EndCall.styles.ts | 2 +- Calling/src/app/styles/Footer.styles.ts | 2 +- Calling/src/app/styles/HomeScreen.styles.ts | 2 +- .../src/app/styles/StartCallButton.styles.ts | 2 +- .../theming/SwitchableFluentThemeProvider.tsx | 2 +- Calling/src/app/theming/ThemeSelector.tsx | 2 +- Calling/src/app/utils/AppUtils.test.ts | 2 +- Calling/src/app/utils/AppUtils.ts | 11 +- Calling/src/app/utils/credential.ts | 2 +- Calling/src/app/utils/localStorage.ts | 2 +- .../app/utils/useSecondaryInstanceCheck.ts | 2 +- .../src/app/views/CallCompositeContainer.tsx | 2 +- Calling/src/app/views/CallError.tsx | 2 +- Calling/src/app/views/CallScreen.tsx | 2 +- Calling/src/app/views/DisplayNameField.tsx | 2 +- Calling/src/app/views/Footer.tsx | 2 +- Calling/src/app/views/HomeScreen.tsx | 16 +- Calling/src/app/views/NoticePage.tsx | 2 +- .../src/app/views/PageOpenInAnotherTab.tsx | 2 +- .../src/app/views/UnsupportedBrowserPage.tsx | 2 +- Calling/src/assets/assets.d.ts | 2 +- Calling/src/index.css | 2 +- Calling/src/index.tsx | 17 +- 28 files changed, 168 insertions(+), 146 deletions(-) diff --git a/Calling/package-lock.json b/Calling/package-lock.json index 622d035..cf890fe 100644 --- a/Calling/package-lock.json +++ b/Calling/package-lock.json @@ -9,10 +9,10 @@ "version": "0.0.1", "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", @@ -90,11 +90,11 @@ } }, "node_modules/@azure/communication-calling": { - "version": "1.16.3", - "resolved": "https://registry.npmjs.org/@azure/communication-calling/-/communication-calling-1.16.3.tgz", - "integrity": "sha512-LJdhn82vuy5/jSjRxySHnGUagoHpE4Xfl//1rDEpaa1invVRQbu6AlvgG5CbIkiIFScjnypkDmtdXX+8mwknhQ==", + "version": "1.18.1", + "resolved": "https://registry.npmjs.org/@azure/communication-calling/-/communication-calling-1.18.1.tgz", + "integrity": "sha512-yndR64+z3I09k0NLYyXoxdLpFbdCSi+nkix608ZCyIc7Jldm+ftzOr2tvF+tp2LB2xJ4BIYBjEwJtT/pPsfhEQ==", "dependencies": { - "@azure/communication-common": "^2.0.0", + "@azure/communication-common": "^2.3.0", "@azure/logger": "^1.0.3" } }, @@ -141,9 +141,9 @@ } }, "node_modules/@azure/communication-common": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/@azure/communication-common/-/communication-common-2.2.1.tgz", - "integrity": "sha512-5Ls1zfy56tOghPxS7gAetSybQNxR22lF76q4Uk2QbP4TIHs7sj3lL+Y6npAAE1nkbcNqBTYPziolJBP+xHX2FA==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@azure/communication-common/-/communication-common-2.3.0.tgz", + "integrity": "sha512-KqpdV1AsojDcmISMnvv9MTE8lNRcgz+OQukp2mFl/cm4aKjzROrGcSlayU6p9A51knRGwgoS6hXkaUdqU5cXow==", "dependencies": { "@azure/abort-controller": "^1.0.0", "@azure/core-auth": "^1.3.0", @@ -180,11 +180,11 @@ } }, "node_modules/@azure/communication-react": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@azure/communication-react/-/communication-react-1.9.0.tgz", - "integrity": "sha512-w5a364cA79ofzDmNFAWKE8Anyvsaor33xk2ZykAHOneQbJvs2xymdHacIs9BXASK1aCBUWK3FwB5dgb8gEHtSg==", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/@azure/communication-react/-/communication-react-1.10.0.tgz", + "integrity": "sha512-ky3+5zZblr9Y1/8IKKpCUsOFjOqCr71Rz9+0bweOKPdSjs9CFAA48HojfuA3QtuMs+J8SXFiBUgbC3POtgj9nw==", "dependencies": { - "@azure/communication-common": "^2.2.1", + "@azure/communication-common": "^2.3.0", "@azure/core-client": "^1.7.3", "@azure/core-paging": "^1.5.0", "@azure/core-rest-pipeline": "^1.11.0", @@ -192,7 +192,7 @@ "@fluentui-contrib/react-chat": "0.1.6", "@fluentui/react": "^8.110.4", "@fluentui/react-components": "^9.30.0", - "@fluentui/react-file-type-icons": "8.8.13", + "@fluentui/react-file-type-icons": "8.10.2", "@fluentui/react-hooks": "^8.6.12", "@fluentui/react-icons": "^2.0.194", "@fluentui/react-window-provider": "^2.2.3", @@ -212,7 +212,7 @@ "uuid": "^9.0.0" }, "peerDependencies": { - "@azure/communication-calling": "^1.15.3", + "@azure/communication-calling": "^1.18.1", "@azure/communication-calling-effects": "1.0.1", "@azure/communication-chat": ">=1.3.2", "@types/react": ">=16.8.0 <19.0.0", @@ -2412,11 +2412,11 @@ } }, "node_modules/@fluentui/dom-utilities": { - "version": "2.2.11", - "resolved": "https://registry.npmjs.org/@fluentui/dom-utilities/-/dom-utilities-2.2.11.tgz", - "integrity": "sha512-2tXfg7/9PXu9nfU72/P3o3waHEFEQtHUfQbVexUaYqNNAxMj6sOfsqpUx4vd5nPgO+grSWrl+spqlLN2yej51w==", + "version": "2.2.12", + "resolved": "https://registry.npmjs.org/@fluentui/dom-utilities/-/dom-utilities-2.2.12.tgz", + "integrity": "sha512-safCKQPJTnshYG13/U2Zx1KWhOhU4vl5RAKqW7HEBfLOHds/fAR+EzTvKgO6OgxJq59JAKJvpH2QujkLXZZQ3A==", "dependencies": { - "@fluentui/set-version": "^8.2.11", + "@fluentui/set-version": "^8.2.12", "tslib": "^2.1.0" } }, @@ -2472,11 +2472,11 @@ } }, "node_modules/@fluentui/merge-styles": { - "version": "8.5.12", - "resolved": "https://registry.npmjs.org/@fluentui/merge-styles/-/merge-styles-8.5.12.tgz", - "integrity": "sha512-ZnUo0YuMP7AYi68dkknFqVxopIAgbrUnqR/MZlemmRvBYyy1SMj1WQeHcoiLFA8mF8YKn7B+jxQgJbN2bfcrRw==", + "version": "8.5.13", + "resolved": "https://registry.npmjs.org/@fluentui/merge-styles/-/merge-styles-8.5.13.tgz", + "integrity": "sha512-ocgwNlQcQwn5mNlZKFazrFVbYDEQ6BptoW4GyEv6U5TEHE8HKKYuPRf340NXCRGiacSpz3vLkyDjp+L431qUXg==", "dependencies": { - "@fluentui/set-version": "^8.2.11", + "@fluentui/set-version": "^8.2.12", "tslib": "^2.1.0" } }, @@ -2970,12 +2970,12 @@ } }, "node_modules/@fluentui/react-file-type-icons": { - "version": "8.8.13", - "resolved": "https://registry.npmjs.org/@fluentui/react-file-type-icons/-/react-file-type-icons-8.8.13.tgz", - "integrity": "sha512-zAu64AamTdDJ2ySmZ+3fr2Zvqx5pa5ewhNd5nZQY7R8+pHpr4/7KwwBnctAC95IHJHd+i2dbhJSv8qUk93timw==", + "version": "8.10.2", + "resolved": "https://registry.npmjs.org/@fluentui/react-file-type-icons/-/react-file-type-icons-8.10.2.tgz", + "integrity": "sha512-4h2L9sEEKUmflCaMmjwyKpukxKVCTuJ1eVSaOXTuHSPQnsJSEKSf80uCOyPvhROOZbWjDJLshX9+mkszY4kLiA==", "dependencies": { - "@fluentui/set-version": "^8.2.6", - "@fluentui/style-utilities": "^8.9.6", + "@fluentui/set-version": "^8.2.11", + "@fluentui/style-utilities": "^8.9.18", "tslib": "^2.1.0" }, "peerDependencies": { @@ -4552,34 +4552,34 @@ } }, "node_modules/@fluentui/set-version": { - "version": "8.2.11", - "resolved": "https://registry.npmjs.org/@fluentui/set-version/-/set-version-8.2.11.tgz", - "integrity": "sha512-UI03tysau/adBO1a3q4uFZWQ3lfkiFcAWIFng4k5odWcCokfCm5IxA0urKqj5W5JRYdyoBUaq8QbcNGkFB4dCw==", + "version": "8.2.12", + "resolved": "https://registry.npmjs.org/@fluentui/set-version/-/set-version-8.2.12.tgz", + "integrity": "sha512-I4uXIg9xkL2Heotf1+7CyGcHQskdtMSH0B5mSV0TL3w7WI2qpnzrpKuP2Kq6DHZN6Xrsg4ORFNJSjLxq/s9cUQ==", "dependencies": { "tslib": "^2.1.0" } }, "node_modules/@fluentui/style-utilities": { - "version": "8.9.17", - "resolved": "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.9.17.tgz", - "integrity": "sha512-wMeLw3MSIotx1EzDYTMWFx03iZqR/YBaUt1FR2oamt+zz3HKiproNR9xNKEQmszNFUDDAZJL9XhLVp1iNlS88A==", - "dependencies": { - "@fluentui/merge-styles": "^8.5.12", - "@fluentui/set-version": "^8.2.11", - "@fluentui/theme": "^2.6.35", - "@fluentui/utilities": "^8.13.18", + "version": "8.9.20", + "resolved": "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.9.20.tgz", + "integrity": "sha512-oj0ghn21DnqCardlcEp+zob3IEAfA/Z7ZjzuYqlHuPUItwRqGmpr1wErssRC4R1kHsH6gq9ALxVgMa4/FvdzGg==", + "dependencies": { + "@fluentui/merge-styles": "^8.5.13", + "@fluentui/set-version": "^8.2.12", + "@fluentui/theme": "^2.6.38", + "@fluentui/utilities": "^8.13.21", "@microsoft/load-themed-styles": "^1.10.26", "tslib": "^2.1.0" } }, "node_modules/@fluentui/theme": { - "version": "2.6.35", - "resolved": "https://registry.npmjs.org/@fluentui/theme/-/theme-2.6.35.tgz", - "integrity": "sha512-8EusEcEX/9gA1H0vVYZX0q+na88cPrS8Cs2XPlN056Xtzzrbgl6qFRJ79aiJaZ8Oq6TkcASn1gfgyUTz6fbMng==", + "version": "2.6.38", + "resolved": "https://registry.npmjs.org/@fluentui/theme/-/theme-2.6.38.tgz", + "integrity": "sha512-LObK/mZOQFb3aTcDlKBSLpPV0BOp5BOuNqg0Wps51b1RlisI6oS3STmw3BkcAe6jOi/p4cgLpwHMkYHh2o8PmQ==", "dependencies": { - "@fluentui/merge-styles": "^8.5.12", - "@fluentui/set-version": "^8.2.11", - "@fluentui/utilities": "^8.13.18", + "@fluentui/merge-styles": "^8.5.13", + "@fluentui/set-version": "^8.2.12", + "@fluentui/utilities": "^8.13.21", "tslib": "^2.1.0" }, "peerDependencies": { @@ -4604,13 +4604,13 @@ } }, "node_modules/@fluentui/utilities": { - "version": "8.13.18", - "resolved": "https://registry.npmjs.org/@fluentui/utilities/-/utilities-8.13.18.tgz", - "integrity": "sha512-/0rX9EzltLKwU1SS14VV7agWoOzruVTU3oagZq1QgFAvoj8qi7fNqvSX/VEeRy+0gmbsCkrEViUPkmC7drKzPg==", + "version": "8.13.21", + "resolved": "https://registry.npmjs.org/@fluentui/utilities/-/utilities-8.13.21.tgz", + "integrity": "sha512-YPWsRAL1jgbPxf+wAY8p6LjIG4em0NReqgU8ZCFnQx9wpQbe/ZRjQcaU06pD1tYtRGvyCutwhnWDaQHDw843Xg==", "dependencies": { - "@fluentui/dom-utilities": "^2.2.11", - "@fluentui/merge-styles": "^8.5.12", - "@fluentui/set-version": "^8.2.11", + "@fluentui/dom-utilities": "^2.2.12", + "@fluentui/merge-styles": "^8.5.13", + "@fluentui/set-version": "^8.2.12", "tslib": "^2.1.0" }, "peerDependencies": { @@ -20885,11 +20885,11 @@ } }, "@azure/communication-calling": { - "version": "1.16.3", - "resolved": "https://registry.npmjs.org/@azure/communication-calling/-/communication-calling-1.16.3.tgz", - "integrity": "sha512-LJdhn82vuy5/jSjRxySHnGUagoHpE4Xfl//1rDEpaa1invVRQbu6AlvgG5CbIkiIFScjnypkDmtdXX+8mwknhQ==", + "version": "1.18.1", + "resolved": "https://registry.npmjs.org/@azure/communication-calling/-/communication-calling-1.18.1.tgz", + "integrity": "sha512-yndR64+z3I09k0NLYyXoxdLpFbdCSi+nkix608ZCyIc7Jldm+ftzOr2tvF+tp2LB2xJ4BIYBjEwJtT/pPsfhEQ==", "requires": { - "@azure/communication-common": "^2.0.0", + "@azure/communication-common": "^2.3.0", "@azure/logger": "^1.0.3" } }, @@ -20932,9 +20932,9 @@ } }, "@azure/communication-common": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/@azure/communication-common/-/communication-common-2.2.1.tgz", - "integrity": "sha512-5Ls1zfy56tOghPxS7gAetSybQNxR22lF76q4Uk2QbP4TIHs7sj3lL+Y6npAAE1nkbcNqBTYPziolJBP+xHX2FA==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@azure/communication-common/-/communication-common-2.3.0.tgz", + "integrity": "sha512-KqpdV1AsojDcmISMnvv9MTE8lNRcgz+OQukp2mFl/cm4aKjzROrGcSlayU6p9A51knRGwgoS6hXkaUdqU5cXow==", "requires": { "@azure/abort-controller": "^1.0.0", "@azure/core-auth": "^1.3.0", @@ -20965,11 +20965,11 @@ } }, "@azure/communication-react": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@azure/communication-react/-/communication-react-1.9.0.tgz", - "integrity": "sha512-w5a364cA79ofzDmNFAWKE8Anyvsaor33xk2ZykAHOneQbJvs2xymdHacIs9BXASK1aCBUWK3FwB5dgb8gEHtSg==", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/@azure/communication-react/-/communication-react-1.10.0.tgz", + "integrity": "sha512-ky3+5zZblr9Y1/8IKKpCUsOFjOqCr71Rz9+0bweOKPdSjs9CFAA48HojfuA3QtuMs+J8SXFiBUgbC3POtgj9nw==", "requires": { - "@azure/communication-common": "^2.2.1", + "@azure/communication-common": "^2.3.0", "@azure/core-client": "^1.7.3", "@azure/core-paging": "^1.5.0", "@azure/core-rest-pipeline": "^1.11.0", @@ -20977,7 +20977,7 @@ "@fluentui-contrib/react-chat": "0.1.6", "@fluentui/react": "^8.110.4", "@fluentui/react-components": "^9.30.0", - "@fluentui/react-file-type-icons": "8.8.13", + "@fluentui/react-file-type-icons": "8.10.2", "@fluentui/react-hooks": "^8.6.12", "@fluentui/react-icons": "^2.0.194", "@fluentui/react-window-provider": "^2.2.3", @@ -22575,11 +22575,11 @@ } }, "@fluentui/dom-utilities": { - "version": "2.2.11", - "resolved": "https://registry.npmjs.org/@fluentui/dom-utilities/-/dom-utilities-2.2.11.tgz", - "integrity": "sha512-2tXfg7/9PXu9nfU72/P3o3waHEFEQtHUfQbVexUaYqNNAxMj6sOfsqpUx4vd5nPgO+grSWrl+spqlLN2yej51w==", + "version": "2.2.12", + "resolved": "https://registry.npmjs.org/@fluentui/dom-utilities/-/dom-utilities-2.2.12.tgz", + "integrity": "sha512-safCKQPJTnshYG13/U2Zx1KWhOhU4vl5RAKqW7HEBfLOHds/fAR+EzTvKgO6OgxJq59JAKJvpH2QujkLXZZQ3A==", "requires": { - "@fluentui/set-version": "^8.2.11", + "@fluentui/set-version": "^8.2.12", "tslib": "^2.1.0" } }, @@ -22633,11 +22633,11 @@ } }, "@fluentui/merge-styles": { - "version": "8.5.12", - "resolved": "https://registry.npmjs.org/@fluentui/merge-styles/-/merge-styles-8.5.12.tgz", - "integrity": "sha512-ZnUo0YuMP7AYi68dkknFqVxopIAgbrUnqR/MZlemmRvBYyy1SMj1WQeHcoiLFA8mF8YKn7B+jxQgJbN2bfcrRw==", + "version": "8.5.13", + "resolved": "https://registry.npmjs.org/@fluentui/merge-styles/-/merge-styles-8.5.13.tgz", + "integrity": "sha512-ocgwNlQcQwn5mNlZKFazrFVbYDEQ6BptoW4GyEv6U5TEHE8HKKYuPRf340NXCRGiacSpz3vLkyDjp+L431qUXg==", "requires": { - "@fluentui/set-version": "^8.2.11", + "@fluentui/set-version": "^8.2.12", "tslib": "^2.1.0" } }, @@ -23048,12 +23048,12 @@ } }, "@fluentui/react-file-type-icons": { - "version": "8.8.13", - "resolved": "https://registry.npmjs.org/@fluentui/react-file-type-icons/-/react-file-type-icons-8.8.13.tgz", - "integrity": "sha512-zAu64AamTdDJ2ySmZ+3fr2Zvqx5pa5ewhNd5nZQY7R8+pHpr4/7KwwBnctAC95IHJHd+i2dbhJSv8qUk93timw==", + "version": "8.10.2", + "resolved": "https://registry.npmjs.org/@fluentui/react-file-type-icons/-/react-file-type-icons-8.10.2.tgz", + "integrity": "sha512-4h2L9sEEKUmflCaMmjwyKpukxKVCTuJ1eVSaOXTuHSPQnsJSEKSf80uCOyPvhROOZbWjDJLshX9+mkszY4kLiA==", "requires": { - "@fluentui/set-version": "^8.2.6", - "@fluentui/style-utilities": "^8.9.6", + "@fluentui/set-version": "^8.2.11", + "@fluentui/style-utilities": "^8.9.18", "tslib": "^2.1.0" } }, @@ -24339,34 +24339,34 @@ } }, "@fluentui/set-version": { - "version": "8.2.11", - "resolved": "https://registry.npmjs.org/@fluentui/set-version/-/set-version-8.2.11.tgz", - "integrity": "sha512-UI03tysau/adBO1a3q4uFZWQ3lfkiFcAWIFng4k5odWcCokfCm5IxA0urKqj5W5JRYdyoBUaq8QbcNGkFB4dCw==", + "version": "8.2.12", + "resolved": "https://registry.npmjs.org/@fluentui/set-version/-/set-version-8.2.12.tgz", + "integrity": "sha512-I4uXIg9xkL2Heotf1+7CyGcHQskdtMSH0B5mSV0TL3w7WI2qpnzrpKuP2Kq6DHZN6Xrsg4ORFNJSjLxq/s9cUQ==", "requires": { "tslib": "^2.1.0" } }, "@fluentui/style-utilities": { - "version": "8.9.17", - "resolved": "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.9.17.tgz", - "integrity": "sha512-wMeLw3MSIotx1EzDYTMWFx03iZqR/YBaUt1FR2oamt+zz3HKiproNR9xNKEQmszNFUDDAZJL9XhLVp1iNlS88A==", - "requires": { - "@fluentui/merge-styles": "^8.5.12", - "@fluentui/set-version": "^8.2.11", - "@fluentui/theme": "^2.6.35", - "@fluentui/utilities": "^8.13.18", + "version": "8.9.20", + "resolved": "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.9.20.tgz", + "integrity": "sha512-oj0ghn21DnqCardlcEp+zob3IEAfA/Z7ZjzuYqlHuPUItwRqGmpr1wErssRC4R1kHsH6gq9ALxVgMa4/FvdzGg==", + "requires": { + "@fluentui/merge-styles": "^8.5.13", + "@fluentui/set-version": "^8.2.12", + "@fluentui/theme": "^2.6.38", + "@fluentui/utilities": "^8.13.21", "@microsoft/load-themed-styles": "^1.10.26", "tslib": "^2.1.0" } }, "@fluentui/theme": { - "version": "2.6.35", - "resolved": "https://registry.npmjs.org/@fluentui/theme/-/theme-2.6.35.tgz", - "integrity": "sha512-8EusEcEX/9gA1H0vVYZX0q+na88cPrS8Cs2XPlN056Xtzzrbgl6qFRJ79aiJaZ8Oq6TkcASn1gfgyUTz6fbMng==", + "version": "2.6.38", + "resolved": "https://registry.npmjs.org/@fluentui/theme/-/theme-2.6.38.tgz", + "integrity": "sha512-LObK/mZOQFb3aTcDlKBSLpPV0BOp5BOuNqg0Wps51b1RlisI6oS3STmw3BkcAe6jOi/p4cgLpwHMkYHh2o8PmQ==", "requires": { - "@fluentui/merge-styles": "^8.5.12", - "@fluentui/set-version": "^8.2.11", - "@fluentui/utilities": "^8.13.18", + "@fluentui/merge-styles": "^8.5.13", + "@fluentui/set-version": "^8.2.12", + "@fluentui/utilities": "^8.13.21", "tslib": "^2.1.0" } }, @@ -24389,13 +24389,13 @@ } }, "@fluentui/utilities": { - "version": "8.13.18", - "resolved": "https://registry.npmjs.org/@fluentui/utilities/-/utilities-8.13.18.tgz", - "integrity": "sha512-/0rX9EzltLKwU1SS14VV7agWoOzruVTU3oagZq1QgFAvoj8qi7fNqvSX/VEeRy+0gmbsCkrEViUPkmC7drKzPg==", + "version": "8.13.21", + "resolved": "https://registry.npmjs.org/@fluentui/utilities/-/utilities-8.13.21.tgz", + "integrity": "sha512-YPWsRAL1jgbPxf+wAY8p6LjIG4em0NReqgU8ZCFnQx9wpQbe/ZRjQcaU06pD1tYtRGvyCutwhnWDaQHDw843Xg==", "requires": { - "@fluentui/dom-utilities": "^2.2.11", - "@fluentui/merge-styles": "^8.5.12", - "@fluentui/set-version": "^8.2.11", + "@fluentui/dom-utilities": "^2.2.12", + "@fluentui/merge-styles": "^8.5.13", + "@fluentui/set-version": "^8.2.12", "tslib": "^2.1.0" } }, diff --git a/Calling/package.json b/Calling/package.json index b9d6ea3..99c0f4a 100644 --- 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 index c012f5d..1b464d2 100644 --- 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,7 +65,6 @@ const App = (): JSX.Element => { const isMobileSession = useIsMobile(); const isLandscapeSession = isLandscape(); - const isAppAlreadyRunningInAnotherTab = useSecondaryInstanceCheck(); useEffect(() => { if (isMobileSession && isLandscapeSession) { @@ -68,10 +72,6 @@ const App = (): JSX.Element => { } }, [isMobileSession, isLandscapeSession]); - if (isMobileSession && isAppAlreadyRunningInAnotherTab) { - return ; - } - const supportedBrowser = !isOnIphoneAndNotSafari(); if (!supportedBrowser) { return ; @@ -124,11 +124,7 @@ const App = (): JSX.Element => { document.title = `credentials - ${WEB_APP_TITLE}`; return ; } - return ( - - - - ); + return ; } 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 index dd22793..9c2d10b 100644 --- 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 index 0e5e2da..81f37d1 100644 --- 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 index 69ca85a..517a6b3 100644 --- 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 index 74c6c75..c091806 100644 --- 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 index f8b32ed..b84fb50 100644 --- 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 index 1f4c6af..86156e2 100644 --- 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 index e63a355..9f8226e 100644 --- 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 index f730d8a..a3f89cc 100644 --- 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 index 3bd436e..05e393f 100644 --- 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 index 2966035..56c13db 100644 --- 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 index bc27c74..5143b61 100644 --- 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 index c31e57f..fce0971 100644 --- 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 index 7e75f21..4ba8e2a 100644 --- 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 index 73e27e5..b56b07f 100644 --- 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 index c509e3c..065bbdf 100644 --- 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 index 3325804..abcf4c6 100644 --- 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 index 96a63eb..ec21236 100644 --- 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 index 4550c4a..82b9266 100644 --- 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 index 2f21bc1..003f26a 100644 --- 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 })} /> )} + + {} + + {} + + {} + + {} + + {} + + {} + + {} {showDisplayNameField && } >; diff --git a/Calling/src/index.css b/Calling/src/index.css index 263a527..71015e9 100644 --- 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 index 858cc7b..fd6a7de 100644 --- 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( - -
- - -
- + + +
+ + +
+ + ); +export {}; /*The above line is generated by conditional compilation, when no export detected after CC.*/