Skip to content

Commit

Permalink
Merge branch 'master' of github.com:Tak-Iwamoto/mattermost-webapp int…
Browse files Browse the repository at this point in the history 
…o MM-20457

* 'master' of github.com:Tak-Iwamoto/mattermost-webapp:
  [MM-28680] fix blank page on undefined message (mattermost#6450)
  MM-28733 : Admin Advisor v2 (mattermost#6461)
  MM 20547 user settings security ts (mattermost#6216)
  MM-20904 Add E2E tests for custom categories (mattermost#5981)
  Update NOTICE.txt (mattermost#6550)
  Check if emojiMap is undefined before invoking method for it (mattermost#6495)
  [MM-28151] Cypress/E2E: Automate backlogs - System Console > User Password (mattermost#6538)
  [MM-28295] e2e/messaging/reactions: add reactions spec (mattermost#6535)
  [MM-28706] revert ordering change for `in:` auto-suggest search results (mattermost#6493)
  Remove usage of t function with useIntl (mattermost#6552)
  MM-28992 Remove unused notPresent and mustBePresent props from MultiSelectSetting (mattermost#6544)
  MM-27530 Fix for Multiselect items not scrolling into view on arrow keys (mattermost#6286)
  Demoting failed test from prod (mattermost#6534)
  migrate show_more to typescript (mattermost#6501)
  [MM-28878] Revert style change to remove next steps arrow (mattermost#6527)
  [MM-28972] Added 'Always On' option for new sidebar (mattermost#6530)
  MM-28839 Fix for hover of cursor on indicators (mattermost#6524)
  [MM-28790] allow plugins to open in a different tab (mattermost#6476)
  MM-28290 Always update team member unread counts when added to a channel (mattermost#6500)
  • Loading branch information
Tak-Iwamoto committed Sep 28, 2020
2 parents f132cca + 5fca15d commit b80528c
Show file tree
Hide file tree
Showing 117 changed files with 1,543 additions and 684 deletions.
197 changes: 69 additions & 128 deletions NOTICE.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,28 +50,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI

---

## @types/highlight.js"

This product contains '@types/highlight' by DefinitelyTyped.

The repository for high quality TypeScript type definitions.

* HOMEPAGE:
* https://github.com/DefinitelyTyped/DefinitelyTyped

* LICENSE: MIT

This project is licensed under the MIT license.
Copyrights are respective of each contributor listed at the beginning of each definition file.

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

---

## @types/react-custom-scrollbars

This product contains '@types/react-custom-scrollbars' by Malte Wessel.
Expand All @@ -93,44 +71,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI

---

## @typescript-eslint/parser

This product contains '@typescript-eslint/parser' by TypeScript ESLint.

Monorepo for all the tooling which enables ESLint to support TypeScript

* HOMEPAGE:
* https://github.com/typescript-eslint/typescript-eslint

* LICENSE: TypeScript ESLint

Originally extracted from:

TypeScript ESLint Parser
Copyright JS Foundation and other contributors, https://js.foundation

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

---

## bootstrap

This product contains 'bootstrap' by The Bootstrap Authors.
Expand Down Expand Up @@ -167,41 +107,6 @@ THE SOFTWARE.

---

## bootstrap-colorpicker

This product contains 'bootstrap-colorpicker' by Javi Aguilar.

Bootstrap Colorpicker is a modular color picker plugin for Bootstrap 4.

* HOMEPAGE:
* https://github.com/itsjavi/bootstrap-colorpicker

* LICENSE: MIT

MIT License

Copyright (c) 2017 Javi Aguilar

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

---

## chart.js

This product contains 'chart.js' by Chart.js.
Expand Down Expand Up @@ -956,39 +861,6 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND

---

## intl

This product contains 'intl' by Symfony.

A PHP replacement layer for the C intl extension that also provides access to the localization data of the ICU library.

* HOMEPAGE:
* https://github.com/symfony/intl

* LICENSE: MIT

Copyright (c) 2004-2020 Fabien Potencier

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is furnished
to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

---

## jasny-bootstrap

This product contains 'jasny-bootstrap' by Arnold Daniels.
Expand Down Expand Up @@ -2395,6 +2267,41 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

---

## react-is

This product contains 'react-is' by Facebook.

This package allows you to test arbitrary values and see if they're a particular React element type

* HOMEPAGE:
* https://github.com/facebook/react

* LICENSE: MIT

MIT License

Copyright (c) Facebook, Inc. and its affiliates.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

---

## react-overlays

This product contains 'react-overlays' by Jason Quense.
Expand Down Expand Up @@ -2859,6 +2766,40 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

---

## tinycolor2

This product contains 'tinycolor2' by MobileHero.

TinyColor is a small, fast library for color manipulation and conversion in JavaScript

* HOMEPAGE:
* https://github.com/mobilehero/mobile-tinycolor2

* LICENSE: MIT

Copyright (c), Brian Grinstead, http:https://briangrinstead.com

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:

The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

---

## typescript

This product contains 'typescript' by Microsoft.
Expand Down
30 changes: 15 additions & 15 deletions actions/post_utils.test.js → actions/new_post.test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import configureStore from 'redux-mock-store';
import {receivedNewPost} from 'mattermost-redux/actions/posts';
import {Posts} from 'mattermost-redux/constants';

import * as PostActionsUtils from 'actions/post_utils';
import * as NewPostActions from 'actions/new_post';
import {Constants} from 'utils/constants';

const mockStore = configureStore([thunk]);
Expand All @@ -26,7 +26,7 @@ global.Date.now = jest.fn(() => POST_CREATED_TIME);
const INCREASED_POST_VISIBILITY = {amount: 1, data: 'current_channel_id', type: 'INCREASE_POST_VISIBILITY'};
const STOP_TYPING = {type: 'stop_typing', data: {id: 'current_channel_idundefined', now: POST_CREATED_TIME, userId: 'some_user_id'}};

describe('actions/post_utils', () => {
describe('actions/new_post', () => {
const latestPost = {
id: 'latest_post_id',
user_id: 'current_user_id',
Expand Down Expand Up @@ -83,7 +83,7 @@ describe('actions/post_utils', () => {
const newPost = {id: 'new_post_id', channel_id: 'current_channel_id', message: 'new message', type: Constants.PostTypes.ADD_TO_CHANNEL, user_id: 'some_user_id', create_at: POST_CREATED_TIME, props: {addedUserId: 'other_user_id'}};
const websocketProps = {team_id: 'team_id', mentions: ['current_user_id']};

await testStore.dispatch(PostActionsUtils.completePostReceive(newPost, websocketProps));
await testStore.dispatch(NewPostActions.completePostReceive(newPost, websocketProps));
expect(testStore.getActions()).toEqual([
INCREASED_POST_VISIBILITY,
{
Expand Down Expand Up @@ -124,11 +124,11 @@ describe('actions/post_utils', () => {

window.isActive = true;

await testStore.dispatch(PostActionsUtils.setChannelReadAndViewed(post2, {}));
await testStore.dispatch(NewPostActions.setChannelReadAndViewed(post2, {}, false));

expect(testStore.getActions()).toEqual([{
type: 'MOCK_MARK_CHANNEL_AS_READ',
args: [channelId, null, true],
args: [channelId, undefined, true],
}, {
type: 'MOCK_MARK_CHANNEL_AS_VIEWED',
args: [channelId],
Expand Down Expand Up @@ -164,11 +164,11 @@ describe('actions/post_utils', () => {

window.isActive = false;

await testStore.dispatch(PostActionsUtils.setChannelReadAndViewed(post2, {}));
await testStore.dispatch(NewPostActions.setChannelReadAndViewed(post2, {}, false));

expect(testStore.getActions()).toEqual([{
type: 'MOCK_MARK_CHANNEL_AS_UNREAD',
args: [undefined, channelId, undefined],
args: [undefined, channelId, undefined, false],
}]);
});

Expand Down Expand Up @@ -203,11 +203,11 @@ describe('actions/post_utils', () => {

window.isActive = true;

await testStore.dispatch(PostActionsUtils.setChannelReadAndViewed(post2, {}));
await testStore.dispatch(NewPostActions.setChannelReadAndViewed(post2, {}, false));

expect(testStore.getActions()).toEqual([{
type: 'MOCK_MARK_CHANNEL_AS_UNREAD',
args: [undefined, channelId, undefined],
args: [undefined, channelId, undefined, false],
}]);
});

Expand Down Expand Up @@ -240,11 +240,11 @@ describe('actions/post_utils', () => {
},
});

await testStore.dispatch(PostActionsUtils.setChannelReadAndViewed(post2, {}));
await testStore.dispatch(NewPostActions.setChannelReadAndViewed(post2, {}, false));

expect(testStore.getActions()).toEqual([{
type: 'MOCK_MARK_CHANNEL_AS_READ',
args: [channelId, null, false],
args: [channelId, undefined, false],
}, {
type: 'MOCK_MARK_CHANNEL_AS_VIEWED',
args: [channelId],
Expand Down Expand Up @@ -280,11 +280,11 @@ describe('actions/post_utils', () => {
},
});

await testStore.dispatch(PostActionsUtils.setChannelReadAndViewed(post2, {}));
await testStore.dispatch(NewPostActions.setChannelReadAndViewed(post2, {}, false));

expect(testStore.getActions()).toEqual([{
type: 'MOCK_MARK_CHANNEL_AS_UNREAD',
args: [undefined, channelId, undefined],
args: [undefined, channelId, undefined, false],
}]);
});

Expand Down Expand Up @@ -317,11 +317,11 @@ describe('actions/post_utils', () => {
},
});

await testStore.dispatch(PostActionsUtils.setChannelReadAndViewed(post2, {}));
await testStore.dispatch(NewPostActions.setChannelReadAndViewed(post2, {}, false));

expect(testStore.getActions()).toEqual([{
type: 'MOCK_MARK_CHANNEL_AS_UNREAD',
args: [undefined, channelId, undefined],
args: [undefined, channelId, undefined, false],
}]);
});
});
Expand Down
Loading

0 comments on commit b80528c

Please sign in to comment.