Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updates for 1.15.0 #227

Merged
merged 6 commits into from
Apr 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions Calling/common.webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
const path = require('path');
const webpack = require('webpack');
const HtmlWebpackPlugin = require('html-webpack-plugin');
const CopyPlugin = require('copy-webpack-plugin');

const webpackConfig = (sampleAppDir, env, babelConfig) => {
const config = {
Expand Down Expand Up @@ -40,6 +41,10 @@ const webpackConfig = (sampleAppDir, env, babelConfig) => {
{
test: /\.svg/,
type: 'asset/inline'
},
{
test: /\.mp3$/,
loader: 'file-loader'
}
]
},
Expand All @@ -56,6 +61,12 @@ const webpackConfig = (sampleAppDir, env, babelConfig) => {
require(path.resolve(sampleAppDir, 'package.json')).dependencies['@azure/communication-react']
),
__BUILDTIME__: JSON.stringify(new Date().toLocaleString())
}),
new CopyPlugin({
patterns: [
{ from: path.resolve(sampleAppDir, 'public/manifest.json'), to: 'manifest.json' },
{ from: path.resolve(sampleAppDir, 'public/assets'), to: 'assets', noErrorOnMissing: true }
]
})
],
devServer: {
Expand Down
3,643 changes: 1,954 additions & 1,689 deletions Calling/package-lock.json

Large diffs are not rendered by default.

11 changes: 6 additions & 5 deletions Calling/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"@azure/communication-calling": "^1.23.2",
"@azure/communication-common": "^2.3.0",
"@azure/communication-identity": "^1.3.0",
"@azure/communication-react": "^1.14.0",
"@azure/communication-react": "^1.15.0",
"@azure/core-util": "1.5.0",
"@azure/logger": "^1.0.4",
"@babel/preset-react": "^7.12.7",
Expand All @@ -39,8 +39,8 @@
"react-router-dom": "^5.1.2",
"reactstrap": "^8.4.1",
"reselect": "~4.0.0",
"uuid": "^9.0.0",
"shake.js": "1.2.2"
"shake.js": "1.2.2",
"uuid": "^9.0.0"
},
"devDependencies": {
"@babel/core": "~7.16.0",
Expand All @@ -58,6 +58,7 @@
"babel-jest": "^29.5.0",
"babel-loader": "8.1.0",
"concurrently": "^5.3.0",
"copy-webpack-plugin": "^12.0.2",
"copyfiles": "^2.4.1",
"cross-env": "~7.0.3",
"css-loader": "~4.3.0",
Expand All @@ -84,8 +85,8 @@
"ts-loader": "^8.0.12",
"typescript": "^4.3.5",
"url-loader": "~4.1.1",
"webpack": "5.76.0",
"webpack-cli": "^4.7.2",
"webpack": "5.89.0",
"webpack-cli": "^5.1.4",
"webpack-dev-server": "4.8.1"
}
}
Binary file added Calling/public/assets/reactions/clapEmoji.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Calling/public/assets/reactions/likeEmoji.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions Calling/src/app/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@ const getJoinParams = (locator: CallAdapterLocator): string => {
if ('meetingLink' in locator) {
return '?teamsLink=' + encodeURIComponent(locator.meetingLink);
}

if ('roomId' in locator) {
return '?roomId=' + encodeURIComponent(locator.roomId);
}
Expand Down
1 change: 1 addition & 0 deletions Calling/src/app/utils/AppUtils.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,4 @@ describe('ContosoUtils tests', () => {
test('createRandomDisplayName should return a valid string for a user id', () =>
expect(createRandomDisplayName()).toBeTruthy());
});
export {}; /*The above line is generated by conditional compilation, when no export detected after CC.*/
36 changes: 0 additions & 36 deletions Calling/src/app/utils/useSecondaryInstanceCheck.ts

This file was deleted.

15 changes: 14 additions & 1 deletion Calling/src/app/views/CallScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ export const CallScreen = (props: CallScreenProps): JSX.Element => {
console.log(`Call Id: ${callIdRef.current}`);
}
});
/* @conditional-compile-remove(call-transfer) */
adapter.on('transferAccepted', (e) => {
console.log('Call being transferred to: ' + e);
});
Expand Down Expand Up @@ -99,6 +98,13 @@ const AzureCommunicationCallScreen = (props: AzureCommunicationCallScreenProps):
callEnded: { url: '/assets/sounds/callEnded.mp3' },
callRinging: { url: '/assets/sounds/callRinging.mp3' },
callBusy: { url: '/assets/sounds/callBusy.mp3' }
},
reactionResources: {
likeReaction: { url: '/assets/reactions/likeEmoji.png', frameCount: 102 },
heartReaction: { url: '/assets/reactions/heartEmoji.png', frameCount: 102 },
laughReaction: { url: '/assets/reactions/laughEmoji.png', frameCount: 102 },
applauseReaction: { url: '/assets/reactions/clapEmoji.png', frameCount: 102 },
surprisedReaction: { url: '/assets/reactions/surprisedEmoji.png', frameCount: 102 }
}
};
}, []);
Expand Down Expand Up @@ -133,6 +139,13 @@ const AzureCommunicationOutboundCallScreen = (props: AzureCommunicationCallScree
callEnded: { url: '/assets/sounds/callEnded.mp3' },
callRinging: { url: '/assets/sounds/callRinging.mp3' },
callBusy: { url: '/assets/sounds/callBusy.mp3' }
},
reactionResources: {
likeReaction: { url: '/assets/reactions/likeEmoji.png', frameCount: 102 },
heartReaction: { url: '/assets/reactions/heartEmoji.png', frameCount: 102 },
laughReaction: { url: '/assets/reactions/laughEmoji.png', frameCount: 102 },
applauseReaction: { url: '/assets/reactions/clapEmoji.png', frameCount: 102 },
surprisedReaction: { url: '/assets/reactions/surprisedEmoji.png', frameCount: 102 }
}
};
}, []);
Expand Down
1 change: 1 addition & 0 deletions Calling/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@ createRoot(domNode).render(
</SwitchableFluentThemeProvider>
</React.StrictMode>
);
export {}; /*The above line is generated by conditional compilation, when no export detected after CC.*/
Loading