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

MM-12810 Fix for redirection if path is not root #1963

Merged
merged 1 commit into from
Oct 30, 2018

Conversation

sudheerDev
Copy link
Contributor

Summary

If location is not root don't redirect to default team let it be matched through url

Ticket Link

MM-12810

Checklist

[Place an '[x]' (no spaces) in all applicable fields. Please remove unrelated fields.]

  • Ran make check-style to check for style errors (required for all pull requests)
  • Ran make test to ensure unit and component tests passed
  • Added or updated unit tests (required for all new features)

@sudheerDev sudheerDev added the 2: Dev Review Requires review by a core commiter label Oct 29, 2018
@sudheerDev sudheerDev changed the title MM-12810 Fix for redirection is path is not root MM-12810 Fix for redirection if path is not root Oct 29, 2018
@@ -52,4 +55,24 @@ describe('components/Root', () => {

expect(props.actions.loadMeAndConfig).toHaveBeenCalledTimes(1);
});

test('should load user, config, and license on mount and should not redirect to defaultTeam id pathname is not root', (done) => {
Copy link
Member

Choose a reason for hiding this comment

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

Nice

@jwilander jwilander added 4: Reviews Complete All reviewers have approved the pull request and removed 2: Dev Review Requires review by a core commiter labels Oct 30, 2018
@jwilander jwilander merged commit 24c9362 into mattermost:master Oct 30, 2018
@sudheerDev sudheerDev deleted the MM-12810 branch October 30, 2018 14:20
lieut-data added a commit that referenced this pull request Oct 31, 2018
@amyblais amyblais added this to the v5.6.0 milestone Nov 2, 2018
mickmister pushed a commit to mickmister/mattermost-webapp that referenced this pull request Nov 6, 2018
mickmister pushed a commit to mickmister/mattermost-webapp that referenced this pull request Nov 6, 2018
Remove last flux store usage from actions (mattermost#1951)

* Remove flus usages from diagnostics

* Remove flux usages from status actions

* Convert status actions to redux actions and add tests

* Updates per feedback

* Update per feedback

MM-12579 Migration of team_actions to be pure redux (mattermost#1887)

* MM-12579 Migration of team_actions to redux actions

Remove updateTeam legacy actions
 * Removing are we not using this.

Remove createTeam legacy action
 * Removing as we are not using this.

Remove getTeamMembersForUser legacy action
 * Using mattermost-redux now.

Remove getTeamsForUser legacy action
 * Using mattermost-redux now.

Remove checkIfTeams legacy actions
 * Removing as we are not using this.

* Remove wrapper.update

* Fix review comments

* Review comments

* Fix rebase updates

* Changes after rebase

  * move actions for mange_modal to its connected component

* Revert process tick

* Change async to done

MM-12807 Fix clicking on multiselect items (mattermost#1965)

* Fix clicking on multiselect items

* Update snapshots

MM-12585 Complete migration of file_actions to redux actions (mattermost#1955)

remove the setting link and dont render the settings page for a plugin if dont need (mattermost#1872)

* remove the setting link and dont render the settings page for a plugin if dont need

* add tests for admin_sidebar

MM-12810 Fix for redirection is path is not root (mattermost#1963)

Migrated removed_from_channel_modal to be Pure and use Redux (mattermost#1839)

* Migrated to redux
* Removed usage of BrowserStore and jQuery
* Added usage of react-bootstrap's Modal and openModal/closeModal
actions
* Added unit tests

migrate increasePostVisibility into redux-style action (mattermost#1958)

showFlaggedPosts uses redux (mattermost#1953)

Fixed tests

Fixed tests

fixes

Remove flux store usages from channel_actions.jsx (mattermost#1925)

change @undefined to Someone in combined system messages (mattermost#1949)

add channel header dropdown page object and some tests to channel header (mattermost#1947)

Reset state properly when cancelling notifaction settings (mattermost#1978)

MM-12815: Stop using permissions-deprecated config settings in web app (mattermost#1970)

* Remove RestrictTeamInvite.

* Do EnableOnlyAdminIntegrations

* Do EnableTeamCreation.

* Do AllowEditPost.

* Cleanup SelectTeam component use of permissions.

Fixing users not searchable when adding user to a channel. (mattermost#1977)

Remove flux store usages from websocket_actions.jsx (mattermost#1948)

* Remove BrowserStore usages and convert removed from channel modal

* Remove ChannelStore

* Remove PreferenceStore

* Remove TeamStore and fix redirect on leave team

* Remove UserStore

* Clean up import

* Fix merge

* Update tests

add build discader to avoid disk full issues in jenkins (mattermost#1973)

MM-12429 Add LDAP/AD create account label when redirected from sign-up to login (mattermost#1972)

* Add LDAP/AD create account label when redirected from sign-up to login

* Use URLSearchParams for query string construction

* Update alert colors and remove icon

MM-12838: Make hashtag highlighting case insensitive. (mattermost#1982)

Remove flux store usages from utils (mattermost#1952)

MM-12677 Removing SuggestionStore (mattermost#1932)

* Removing SuggestionStore.

* Fixing clicking mention in popover.

* Fixing laggy text manipulation.

* Feedback fixes

Removing ErrorStore. (mattermost#1976)
@amyblais amyblais added Changelog/Not Needed Does not require a changelog entry Docs/Not Needed Does not require documentation labels Nov 17, 2018
JayaKrishnaNamburu pushed a commit to JayaKrishnaNamburu/mattermost-webapp that referenced this pull request Dec 3, 2018
@lindy65 lindy65 added Tests/Not Needed Does not require new release tests and removed 4: Reviews Complete All reviewers have approved the pull request labels Dec 4, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Changelog/Not Needed Does not require a changelog entry Docs/Not Needed Does not require documentation Tests/Not Needed Does not require new release tests
Projects
None yet
5 participants