Skip to content

Conversation

olipyskoty
Copy link
Contributor

Contributing to Twilio

All third party contributors acknowledge that any contributions they provide will be made under the same open source license that the open source project is provided under.

  • I acknowledge that all my contributions will be made under the project's license.

Pull Request Details

JIRA link(s):

Description

This PR adds a loading spinner while a participant is connecting to a room as it takes a second or two longer to join due to the addition of the new conversations feature.

Note, because this spinner shows if either isFetching or isConnecting is true, the screen with the Join Now button is replaced by the loading screen. Therefore, I had to remove the following test from describe('when connecting a room', () => {...}) and describe('when fetching a token', () => {...}):

it('should disable the Join Now button', () => {...}

Please let me know if I should have handled this differently!

web:
4525

mobile:
4525-mobile

Burndown

Before review

  • Updated CHANGELOG.md if necessary
  • Added unit tests if necessary
  • Updated affected documentation
  • Verified locally with npm test
  • Manually sanity tested running locally
  • Included screenshot as PR comment (if needed)
  • Ready for review

Before merge

  • Got one or more +1s
  • Re-tested if necessary

@olipyskoty olipyskoty requested a review from timmydoza March 18, 2021 21:24
@olipyskoty olipyskoty changed the base branch from master to feature/conversations March 18, 2021 21:25
Comment on lines 78 to 85
<Grid item>
<CircularProgress variant="indeterminate" />
</Grid>
<Grid item>
<Typography variant="body2" style={{ fontWeight: 'bold', fontSize: '16px' }}>
Joining Meeting
</Typography>
</Grid>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit - I think these work the same as plain divs:

Suggested change
<Grid item>
<CircularProgress variant="indeterminate" />
</Grid>
<Grid item>
<Typography variant="body2" style={{ fontWeight: 'bold', fontSize: '16px' }}>
Joining Meeting
</Typography>
</Grid>
<div>
<CircularProgress variant="indeterminate" />
</div>
<div>
<Typography variant="body2" style={{ fontWeight: 'bold', fontSize: '16px' }}>
Joining Meeting
</Typography>
</div>

@@ -71,6 +72,21 @@ export default function DeviceSelectionScreen({ name, roomName, setStep }: Devic
});
};

if (isFetching || isConnecting) {
return (
<Grid container justify="center" spacing={2} alignItems="center" direction="column" style={{ height: '100%' }}>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit - I'm finding that spacing={2} is adding some styles that are making it so the loading wheel isn't perfectly centered. These are the styles that are added:

MuiGrid-spacing-xs-2 {
    width: calc(100% + 16px);
    margin: -8px;
}

Let's remove it so that it is perfectly centered.

Suggested change
<Grid container justify="center" spacing={2} alignItems="center" direction="column" style={{ height: '100%' }}>
<Grid container justify="center" alignItems="center" direction="column" style={{ height: '100%' }}>

it('should disable the Join Now button', () => {
expect(wrapper.find({ children: 'Join Now' }).prop('disabled')).toBe(true);
it('should show the loading screen', () => {
expect(wrapper.find(CircularProgress).prop('variant')).toBe('indeterminate');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit - Here I don't think we need to look at the variant prop. It's hardcoded and won't change. We just need to know if the spinner is there or not, so I think we can do something like this (same with line 84):

Suggested change
expect(wrapper.find(CircularProgress).prop('variant')).toBe('indeterminate');
expect(wrapper.find(CircularProgress).exists()).toBe(true);

@olipyskoty olipyskoty requested a review from timmydoza March 24, 2021 16:06
@olipyskoty olipyskoty merged commit 92e1131 into feature/conversations Mar 24, 2021
@olipyskoty olipyskoty deleted the VIDEO-4525-loading-screen branch March 24, 2021 22:54
timmydoza pushed a commit that referenced this pull request Mar 31, 2021
* VIDEO 3731 Conversations UI - create chat window (#421)

* Video 4078 add flip camera button to mobile menu (#433)

VIDEO 4078 Conversations - Add flip camera button to 'more' mobile menu

* Video 3730 add conversation hooks (#438)

* Add initial hooks for chat

* Update hooks in chat provider

* Add tests for conversationProvider component

* Fix DeviceSelectionScreen tests

* Update variable names

* Revert proxy url in package.json

* Fix linting issues

* Make error handling more user friendly

* Fix a test in src/state

* Temporarily disable cypress tests

* Undo prettier changes to config.yml

* Update chatProvider test

* Cleanup ChatProvider

* Video 3732 Conversations UI - create message components (#441)

* Add links to TextMessage component (#446)

* Add links to TextMessage component

* Update CSS in TextMessage

* Update snapshot test

* Fix issue in addLinks function

* Use forEach loop in addLinks function

* Add new server (#443)

* Use new server with reused code

* Add firebase auth to server

* Convert server to typescript

* Add tests for firebaseAuthMiddleware

* Refactor server

* Add more server tests

* Add tests for CreateExpressHandler

* Fix linter issue

* Delete old server

* Fix linter issues

* Fix some server issues

* Set up server build steps

* Change request to match new server api

* Fix token fetch test

* Add server build step to circleci config

* Enable cyress tests in CI

* Undo prettier changes in config.yml

* install plugin-rtc from npm

* Fix firebaseAuth test

* Add create_conversation:true to token requests

* Upgrade plugin-rtc to 0.8.0

* Temorarily remove firebaseAuthMiddleware and recording rules route

* Add ChatProvider back in

* Update .env.example

* Change build:server script

* Add firebaseAuthMiddleware

* Add comments to firebaseAuthMiddleware

* Update useFirebaseAuth tests

* Video 3728 Conversations UI - add input field and send button (#451)

* Chat notification (#454)

* Add notification to chat icon

* Add tests for ToggleChatButton

* Some cleanup

* Fix linting issue

* Video-4525 loading screen (#461)

* Video 4454 Conversations UI -  message list scrolling (#467)

* Update MessageList component to change how messages are grouped (#469)

* Update MessageList component to change how messages are grouped

* Simplify MessageList code

* Video 3888 file input for conversations (#458)

* Add FileAttachmentIcon

* Add File Input to ChatInput component

* Add change handler to file input

* Create MediaMessage component and add it to MessageList

* Toggle ChatWindow visibility with CSS

* Update messageList tests

* Add function to format the file size

* Update error handling in ChatInput component

* Add tests for MediaMessage component

* Update snapshot test

* Add tests for ChatInput

* Fix linting issue

* Update filesize formatting

* Update error language and tests

* Reset file input value after file sent

* Center icon in MediaMessage

* Update Icon size

* Fix breaking ChatInput test

* Update snapshot

* Use accept attribute on file input element

* Update readme to add information about the chat feature and conversations api

* Cross browser fixes (#472)

* Update app.yaml for the new server

* Add cache controls for static assets

* Only hide Screenshare button on mobile devices

* Auto focus on chat input when user opens chat window

* Fix iOS bug with media messages

* Fix issues in MessageListScrollContainer

* Fix app.yaml

* Fix infinite loop when there is a conversations error

* Update tests for ChatInput

* Update mediamessage test

* Update menubar tests

* Update messageList snapshot

* Fix linting issue

* Add comments to the server

* Video 3727 - cypress testing (#473)

* Video 4597 feature flag (#475)

* Update plugin-rtc version

* Add feature flag for Twilio Conversations

* Add tests

* Add info to .env.example

* Update readme with info about twilio conversations (#476)

* Update readme with info about twilio conversations

* Update readme to address feedback

* Release 0.3.0 (#479)

* Bump version and update changelog

* Add plugin-rtc upgrade instructions to the readme

Co-authored-by: olipyskoty <77076398+olipyskoty@users.noreply.github.com>
Co-authored-by: Sean Coleman <smcoleman27@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants