Updating minor functional changes

components/channel_header/channel_header.js

@@ -77,7 +77,6 @@ class ChannelHeader extends React.PureComponent {
  showMentions: PropTypes.func.isRequired,
  openRHSSearch: PropTypes.func.isRequired,
  closeRightHandSide: PropTypes.func.isRequired,
- setRhsExpanded: PropTypes.func.isRequired,
  getCustomEmojisInText: PropTypes.func.isRequired,
  updateChannelNotifyProps: PropTypes.func.isRequired,
  goToLastViewedChannel: PropTypes.func.isRequired,
@@ -125,10 +124,6 @@ class ChannelHeader extends React.PureComponent {
  if (header !== prevHeader) {
  this.props.actions.getCustomEmojisInText(header);
  }
-
- if (this.props.channel.id !== prevProps.channel.id) {
- this.props.actions.setRhsExpanded(false);
- }
  }
 
  static getDerivedStateFromProps(nextProps) {

components/channel_header/channel_header.test.jsx

@@ -20,7 +20,6 @@ describe('components/ChannelHeader', () => {
  showMentions: jest.fn(),
  openRHSSearch: jest.fn(),
  closeRightHandSide: jest.fn(),
- setRhsExpanded: jest.fn(),
  openModal: jest.fn(),
  closeModal: jest.fn(),
  getCustomEmojisInText: jest.fn(),

components/channel_header/index.js

@@ -36,7 +36,6 @@ import {
  showMentions,
  openRHSSearch,
  closeRightHandSide,
- setRhsExpanded,
 } from 'actions/views/rhs';
 import {getIsRhsOpen, getRhsState} from 'selectors/rhs';
 import {isModalOpen} from 'selectors/views/modals';
@@ -97,7 +96,6 @@ const mapDispatchToProps = (dispatch) => ({
  showMentions,
  openRHSSearch,
  closeRightHandSide,
- setRhsExpanded,
  getCustomEmojisInText,
  updateChannelNotifyProps,
  goToLastViewedChannel,

components/rhs_header_post/rhs_header_post.jsx

@@ -6,7 +6,6 @@ import React from 'react';
 import {Tooltip} from 'react-bootstrap';
 import {FormattedMessage} from 'react-intl';
 
-import store from 'stores/redux_store.jsx';
 import OverlayTrigger from 'components/overlay_trigger';
 
 import Constants, {RHSStates} from 'utils/constants';
@@ -20,6 +19,7 @@ export default class RhsHeaderPost extends React.Component {
  previousRhsState: PropTypes.oneOf(
  Object.values(RHSStates)
  ),
+ relativeTeamUrl: PropTypes.string.isRequired,
  actions: PropTypes.shape({
  setRhsExpanded: PropTypes.func,
  showMentions: PropTypes.func,

components/rhs_root_post/index.js

@@ -44,8 +44,6 @@ function mapStateToProps(state, ownProps) {
  teamId,
  pluginPostTypes: state.plugins.postTypes,
  channelIsArchived: isArchivedChannel(channel),
- channelType: channel.type,
- channelDisplayName: channel.display_name,
  isFlagged: get(state, Preferences.CATEGORY_FLAGGED_POST, ownProps.post.id, null) != null,
  compactDisplay: get(state, Preferences.CATEGORY_DISPLAY_SETTINGS, Preferences.MESSAGE_DISPLAY, Preferences.MESSAGE_DISPLAY_DEFAULT) === Preferences.MESSAGE_DISPLAY_COMPACT,
  shortcutReactToLastPostEmittedFrom,

components/rhs_root_post/rhs_root_post.jsx

@@ -45,8 +45,6 @@ class RhsRootPost extends React.PureComponent {
  isReadOnly: PropTypes.bool.isRequired,
  pluginPostTypes: PropTypes.object,
  channelIsArchived: PropTypes.bool.isRequired,
- channelType: PropTypes.string,
- channelDisplayName: PropTypes.string,
  handleCardClick: PropTypes.func.isRequired,
 
  /**

components/sidebar_right/index.js

@@ -4,7 +4,10 @@
 import {connect} from 'react-redux';
 import {bindActionCreators} from 'redux';
 import {getCurrentUserId} from 'mattermost-redux/selectors/entities/users';
-import {getChannel} from 'mattermost-redux/selectors/entities/channels';
+import {
+ getChannel,
+ getCurrentChannel,
+} from 'mattermost-redux/selectors/entities/channels';
 
 import {setRhsExpanded, showPinnedPosts, openRHSSearch, closeRightHandSide, openAtPrevious} from 'actions/views/rhs';
 import {
@@ -22,12 +25,12 @@ import SidebarRight from './sidebar_right.jsx';
 
 function mapStateToProps(state) {
  const rhsState = getRhsState(state);
-
+ const channel = getCurrentChannel(state) || {};
  const channelId = getSelectedChannelId(state);
 
- let channel = null;
+ let rhsChannel = null;
  if (channelId) {
- channel = getChannel(state, channelId);
+ rhsChannel = getChannel(state, channelId);
  }
 
  const selectedPostId = getSelectedPostId(state);
@@ -46,6 +49,7 @@ function mapStateToProps(state) {
  isFlaggedPosts: rhsState === RHSStates.FLAG,
  isPinnedPosts: rhsState === RHSStates.PIN,
  isPluginView: rhsState === RHSStates.PLUGIN,
+ rhsChannel,
  selectedPostId,
  selectedPostCardId,
  };

components/sidebar_right/sidebar_right.jsx

@@ -31,6 +31,7 @@ export default class SidebarRight extends React.PureComponent {
  isPinnedPosts: PropTypes.bool,
  isPluginView: PropTypes.bool,
  previousRhsState: PropTypes.string,
+ rhsChannel: PropTypes.object,
  selectedPostId: PropTypes.string,
  selectedPostCardId: PropTypes.string,
  actions: PropTypes.shape({
@@ -100,9 +101,13 @@ export default class SidebarRight extends React.PureComponent {
  trackEvent('ui', 'ui_rhs_opened');
  }
 
- const {actions, isPinnedPosts, channel} = this.props;
- if (isPinnedPosts && prevProps.isPinnedPosts === isPinnedPosts && channel.id !== prevProps.channel.id) {
- actions.showPinnedPosts(channel.id);
+ const {actions, isPinnedPosts, rhsChannel, channel} = this.props;
+ if (isPinnedPosts && prevProps.isPinnedPosts === isPinnedPosts && rhsChannel.id !== prevProps.rhsChannel.id) {
+ actions.showPinnedPosts(rhsChannel.id);
+ }
+
+ if (channel && prevProps.channel && (channel.id !== prevProps.channel.id)) {
+ this.props.actions.setRhsExpanded(false);
  }
 
  this.setPrevious();
@@ -135,7 +140,7 @@ export default class SidebarRight extends React.PureComponent {
 
  render() {
  const {
- channel,
+ rhsChannel,
  currentUserId,
  isFlaggedPosts,
  isMentionSearch,
@@ -165,12 +170,8 @@ export default class SidebarRight extends React.PureComponent {
  }
 
  let channelDisplayName = '';
- if (channel) {
- if (channel.type === Constants.DM_CHANNEL || channel.type === Constants.GM_CHANNEL) {
- channelDisplayName = Utils.localizeMessage('rhs_root.direct', 'Direct Message');
- } else {
- channelDisplayName = channel.display_name;
- }
+ if (rhsChannel) {
+ channelDisplayName = rhsChannel.display_name;
  }
 
  if (searchVisible) {

sass/utils/_mixins.scss

@@ -40,14 +40,3 @@
  max-height: $line-height * $lines * 1px;
  }
 }
-
-@mixin linear-gradient($top, $bottom){
- background: $top; /* Old browsers */
- background: -moz-linear-gradient(top, $top 0%, $bottom 100%); /* FF3.6+ */
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,$top), color-stop(100%,$bottom)); /* Chrome,Safari4+ */
- background: -webkit-linear-gradient(top, $top 0%,$bottom 100%); /* Chrome10+,Safari5.1+ */
- background: -o-linear-gradient(top, $top 0%,$bottom 100%); /* Opera 11.10+ */
- background: -ms-linear-gradient(top, $top 0%,$bottom 100%); /* IE10+ */
- background: linear-gradient(to bottom, $top 0%,$bottom 100%); /* W3C */
- filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#000000',GradientType=0 ); /* IE6-9 */
-}