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

MM-34128: Allow clearing custom status with only the emoji and no text #7750

Merged
merged 9 commits into from
May 7, 2021
Merged

MM-34128: Allow clearing custom status with only the emoji and no text #7750

merged 9 commits into from
May 7, 2021

Conversation

chetanyakan
Copy link
Contributor

@chetanyakan chetanyakan commented Mar 24, 2021 •
edited
Loading

Summary

  • Added the support to show a clear button even if the input has no value in the Quickinput component

Ticket Link

https://mattermost.atlassian.net/browse/MM-34128

Screenshots

image

Release Note

In Custom Statuses, added the ability to clear the custom status with only the emoji and no text from UI

manojmalik20 and others added 2 commits March 23, 2021 13:12
@manojmalik20
Fixed the MM-34128 issue
984790f 
Added the support to show clear button even if the input has no value in Quickinput component
@chetanyakan
Merge branch 'master' of github.com:mattermost/mattermost-webapp into…
4a4f7f4 
… MM-34128

* 'master' of github.com:mattermost/mattermost-webapp:
  Updating status_dropdown_spec with missing test cases (mattermost#7727)
  [MM-33609] - Fix team icon coverage on firefox (mattermost#7734)
  Update build Docker image to Node 14 (mattermost#7742)
@mattermod
Copy link
Contributor

Hello @chetanyakan,

Thanks for your pull request! A Core Committer will review your pull request soon. For code contributions, you can learn more about the review process here.

@matthewbirtch matthewbirtch added the Setup Cloud Test Server Setup a test server using Mattermost Cloud label Mar 24, 2021
@chetanyakan
Copy link
Contributor Author

@matthewbirtch were you able to test this?

@matthewbirtch
Copy link
Contributor

@matthewbirtch were you able to test this?

Just tested it and it appears to work now as expected.

@manojmalik20 manojmalik20 mentioned this pull request Apr 8, 2021
Merged
@mattermod
Copy link
Contributor

This PR 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 @jfrerich @emilyacook

@mm-cloud-bot
Copy link

@chetanyakan: Adding the "do-not-merge/release-note-label-needed" label because no release-note block was detected, please follow our release note process to remove it.

I understand the commands that are listed here

@chetanyakan
Copy link
Contributor Author

@esethna Can you assign other reviewers to this PR?

@chetanyakan
Merge branch 'MM-34128' of github.com:brightscout-alpha/mattermost-we…
d3daedd 
…bapp into MM-34128

* 'MM-34128' of github.com:brightscout-alpha/mattermost-webapp: (104 commits)
  Mm 34578 add subscribe now button (mattermost#7894)
  fix subcription typo in the code (mattermost#7930)
  Fixing keys in Cypress (mattermost#7931)
  fix test on LDAP groups, code theme and incoming webhook (mattermost#7919)
  upgrade cypress to v7.1.0 (mattermost#7923)
  Adding missing Zephyr keys to existing E2E tests (mattermost#7920)
  Prod test fixes (mattermost#7918)
  [MM-11264] Added statuses to channel invite modal (mattermost#7787)
  [MM_20388/ GH_16718] Migrate 'components/signup/signup_email' module and associated tests to TypeScript (mattermost#7699)
  MM-34569 - remove step 3 to guests (mattermost#7838)
  add mfa metadata to specs accordingly (mattermost#7896)
  fix test for forgot password based on new email template (mattermost#7892)
  fix CI run of Cypress and add flag to sort specs to first (mattermost#7913)
  cast to lowercase before comparing (mattermost#7769)
  Migrating a few stragglers from the TS migration (mattermost#7770)
  update tests and keys of search date filters (mattermost#7893)
  [MM-34523] New trial card for license page (mattermost#7826)
  Feature: In-product support for Cloud Trial (mattermost#7907)
  Cypress/E2E: Update tests and keys of search date filters (remaining) (mattermost#7895)
  Mm 29656 (mattermost#7820)
  ...
@chetanyakan
Merge branch 'master' of github.com:mattermost/mattermost-webapp into…
612a799 
… MM-34128

* 'master' of github.com:mattermost/mattermost-webapp: (46 commits)
  Mm 27913 search channel tip (mattermost#6896)
  MM-35053 - cloud trial banner fixes (mattermost#7971)
  Fixing Zephyr keys for existing tests (mattermost#7977)
  Update NOTICE.txt (mattermost#7978)
  [MM-31934] Global policy form (mattermost#7816)
  MM-32591: Reliable Websockets: Client side changes (mattermost#7921)
  Translations update from Weblate (mattermost#7988)
  fix cloud onboarding tests (mattermost#7961)
  [MM-33428] remove check for Verify Signature (mattermost#7805)
  update compass icon font (mattermost#7965)
  [MM-35039] - Send trial ended email (mattermost#7967)
  Cypress/E2E: Fix tests related to email verification (mattermost#7960)
  Adding/fixing missing Zephyr keys and polishing tests (mattermost#7935)
  Mm 20425 migrate youtubevideo to typescript (mattermost#7786)
  MM-35074: short circuit slash command hooks (mattermost#7969)
  MM-34910 New messages toast should only count root posts (mattermost#7946)
  MM-31339: add e2e test for only one auto response per day (mattermost#7938)
  Cypress/E2E: Fix compliance export test (mattermost#7964)
  fix test related to channel switcher and bot display name (mattermost#7962)
  MM-34286: Adds missing authz checks. (mattermost#7891)
  ...
@esethna esethna added 2: Dev Review Requires review by a core commiter 3: QA Review Requires review by a QA tester labels Apr 27, 2021
@esethna
Copy link
Contributor

esethna commented Apr 27, 2021

@chetanyakan done, apologies for the delay

devinbinnie
devinbinnie approved these changes Apr 27, 2021
View reviewed changes
Copy link
Member

@devinbinnie devinbinnie left a comment

Choose a reason for hiding this comment

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

LGTM! Thanks @chetanyakan!

michelengelen
michelengelen reviewed Apr 28, 2021
View reviewed changes
Copy link
Contributor

@michelengelen michelengelen left a comment

Choose a reason for hiding this comment

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

Thanks @chetanyakan ... LGTM!

@esethna esethna removed the 2: Dev Review Requires review by a core commiter label Apr 28, 2021
@esethna esethna requested a review from jgilliam17 May 4, 2021 17:56
jgilliam17
jgilliam17 approved these changes May 6, 2021
View reviewed changes
Copy link
Contributor

@jgilliam17 jgilliam17 left a comment

Choose a reason for hiding this comment

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

Thank you @chetanyakan
Tested, looks good to merge.

  • Verified option to clear only emoji custom status, no text.
    @devinbinnie Can you please help merge? Thanks.

@jgilliam17 jgilliam17 added 4: Reviews Complete All reviewers have approved the pull request and removed 3: QA Review Requires review by a QA tester Setup Cloud Test Server Setup a test server using Mattermost Cloud labels May 6, 2021
@mm-cloud-bot
Copy link

Test server destroyed

@michelengelen michelengelen merged commit 66c7fb8 into mattermost:master May 7, 2021
@amyblais amyblais added Changelog/Done Required changelog entry has been written Docs/Needed Requires documentation labels May 7, 2021
@amyblais amyblais added this to the v5.36.0 milestone May 7, 2021
@manojmalik20 manojmalik20 deleted the MM-34128 branch May 7, 2021 16:46
@cwarnermm cwarnermm added Docs/Not Needed Does not require documentation and removed Docs/Needed Requires documentation labels May 11, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@matthewbirtch matthewbirtch matthewbirtch approved these changes

@michelengelen michelengelen michelengelen approved these changes

@devinbinnie devinbinnie devinbinnie approved these changes

@jgilliam17 jgilliam17 jgilliam17 approved these changes

Assignees
No one assigned
Labels
4: Reviews Complete All reviewers have approved the pull request Changelog/Done Required changelog entry has been written Docs/Not Needed Does not require documentation release-note
Projects
None yet
Milestone
v5.36.0