Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

MM-18157 - added loading screen to members modal #3725

Merged
merged 6 commits into from
Oct 30, 2019

Conversation

jordeguevara
Copy link
Contributor

Summary

This pull request addresses the issue that 'no users found' is displayed when a user goes to a channel's 'manage member' modal. It now will display a 'Loading. . .' while it is loading and only display original text if after loading there are 'no users found'

Ticket Link

Jira Ticket
Fixes mattermost/mattermost#12241

Related Pull Requests

@hanzei hanzei added 2: Dev Review Requires review by a core commiter 3: QA Review Requires review by a QA tester labels Sep 21, 2019
Copy link
Contributor

@bradjcoughlin bradjcoughlin left a comment

Choose a reason for hiding this comment

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

Thanks @jordeguevara . One small question/comment.

components/member_list_channel/member_list_channel.jsx Outdated Show resolved Hide resolved
@lindalumitchell lindalumitchell added this to the v5.18.0 milestone Sep 25, 2019
@sbishel sbishel removed the 2: Dev Review Requires review by a core commiter label Oct 1, 2019
@mattermod
Copy link
Contributor

This issue has been automatically labelled "stale" because it hasn't had recent activity.
A core team member will check in on the status of the PR to help with questions.
Thank you for your contribution!

/cc @jasonblais @hanzei

Copy link
Member

@saturninoabril saturninoabril left a comment

Choose a reason for hiding this comment

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

Tested and looks good. Please update the import and it's good to merge. Thanks!

@@ -9,7 +9,7 @@ import * as UserAgent from 'utils/user_agent.jsx';

import ChannelMembersDropdown from 'components/channel_members_dropdown';
import SearchableUserList from 'components/searchable_user_list/searchable_user_list_container.jsx';

import LoadingScreen from 'components/loading_screen.jsx';
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
import LoadingScreen from 'components/loading_screen.jsx';
import LoadingScreen from 'components/loading_screen';

This component was recently migrated to typescript.

@mattermod
Copy link
Contributor

This issue has been automatically labelled "stale" because it hasn't had recent activity.
A core team member will check in on the status of the PR to help with questions.
Thank you for your contribution!

/cc @jasonblais @hanzei

@jasonblais
Copy link
Contributor

Hi @jordeguevara, huge thanks for your contribution! Looks like this just needs a small change to the import, and a sync against master branch and then this one is ready to merge.

Let me know if you have any questions!

Copy link
Contributor

@stevemudie stevemudie left a comment

Choose a reason for hiding this comment

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

QA will test after merge.

@stevemudie stevemudie added QA Review Done and removed 3: QA Review Requires review by a QA tester labels Oct 29, 2019
@hanzei hanzei added Do Not Merge Should not be merged until this label is removed and removed Do Not Merge Should not be merged until this label is removed labels Oct 29, 2019
@saturninoabril saturninoabril added the 4: Reviews Complete All reviewers have approved the pull request label Oct 30, 2019
@saturninoabril saturninoabril merged commit 1d2bcff into mattermost:master Oct 30, 2019
iwataka added a commit to iwataka/mattermost-webapp that referenced this pull request Oct 30, 2019
…d-ui-testing-for-channel-reference-autocompletion

* upstream/master: (58 commits)
  MM-18541 - Updating header description css (mattermost#4048)
  [MM-19441] Fix the case of redirecting to an unavailable channel (mattermost#4070)
  [GH-12954] Migrate 'components/admin_console/color_setting.jsx' and associated tests to TypeScript (mattermost#4080)
  MM-18910 Migrate utils/emoticons to typescript (mattermost#3853)
  Mm 12447 Migrate 'components/get_link_modal.jsx' and associated tests to TypeScript (mattermost#3954)
  MM 17278 - Stop posts lists from scrolling when the emoji picker is open (mattermost#3860)
  MM-18157 - added loading screen to members modal (mattermost#3725)
  MM-19017 - Updating markdown images (mattermost#4047)
  MM-18956: error_pages components and tests to TS (mattermost#4050)
  Request team from API if invite_id is missing (mattermost#4072)
  MM-19678 - Restored setSelected in MultiSelectList component (mattermost#4033)
  [GH-12956] Migrate 'components/admin_console/banner.jsx' to TypeScript (mattermost#4075)
  [GH-12955] Migrate 'components/admin_console/highlight.jsx' to TypeScript (mattermost#4076)
  Change erroneous role='icon' to role='img' (mattermost#4051)
  [MM-18989] Migrate 'components/save_button.jsx' and associated tests to TypeScript (mattermost#4046)
  correct the height of the team sidebar when there's an announcement (mattermost#4073)
  Publishing storybook using circle-ci (mattermost#4037)
  [MM-18988] Migrate components/recent_date to TypeScript (mattermost#3883)
  MM-18629 - Remove default value for radio elements in interacti… (mattermost#4059)
  Replaced functionality in deprecated lifecycle methods (mattermost#3947)
  ...
ashishmahi pushed a commit to ashishmahi/mattermost-webapp that referenced this pull request Oct 30, 2019
* added loading screen to members modal

* removed div

* Fix import
brewsterbhg pushed a commit to brewsterbhg/mattermost-webapp that referenced this pull request Nov 11, 2019
* added loading screen to members modal

* removed div

* Fix import
@amyblais amyblais added Changelog/Not Needed Does not require a changelog entry Docs/Not Needed Does not require documentation labels Nov 19, 2019
@lindy65 lindy65 added the Tests/Not Needed Does not require new release tests label Dec 2, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
4: Reviews Complete All reviewers have approved the pull request Changelog/Not Needed Does not require a changelog entry Docs/Not Needed Does not require documentation QA Review Done Tests/Not Needed Does not require new release tests
Projects
None yet