[MM-26466] Close Next Steps Modal and functionality

actions/views/next_steps.ts

@@ -0,0 +1,11 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {ActionTypes} from 'utils/constants';
+
+export function setShowNextStepsView(show: boolean) {
+    return {
+        type: ActionTypes.SET_SHOW_NEXT_STEPS_VIEW,
+        show,
+    };
+}

components/channel_view/channel_view.jsx

@@ -29,10 +29,12 @@ export default class ChannelView extends React.PureComponent {
         }).isRequired,
         showTutorial: PropTypes.bool.isRequired,
         showNextSteps: PropTypes.bool.isRequired,
+        showNextStepsEphemeral: PropTypes.bool.isRequired,
         channelIsArchived: PropTypes.bool.isRequired,
         viewArchivedChannels: PropTypes.bool.isRequired,
         actions: PropTypes.shape({
             goToLastViewedChannel: PropTypes.func.isRequired,
+            setShowNextStepsView: PropTypes.func.isRequired,
         }),
     };
 
@@ -54,7 +56,7 @@ export default class ChannelView extends React.PureComponent {
         const focusedPostId = props.match.params.postid;
 
         if (props.match.url !== state.url && props.channelId !== state.channelId) {
-            updatedState = {deferredPostView: ChannelView.createDeferredPostView(), url: props.match.url, focusedPostId, showNextSteps: false};
+            updatedState = {deferredPostView: ChannelView.createDeferredPostView(), url: props.match.url, focusedPostId};
         }
 
         if (props.channelId !== state.channelId) {
@@ -65,6 +67,10 @@ export default class ChannelView extends React.PureComponent {
             updatedState = {...updatedState, focusedPostId};
         }
 
+        if (props.showNextSteps !== state.showNextSteps) {
+            updatedState = {...updatedState, showNextSteps: props.showNextSteps};
+        }
+
         if (Object.keys(updatedState).length) {
             return updatedState;
         }
@@ -79,7 +85,6 @@ export default class ChannelView extends React.PureComponent {
             url: props.match.url,
             channelId: props.channelId,
             deferredPostView: ChannelView.createDeferredPostView(),
-            showNextSteps: props.showNextSteps,
         };
     }
 
@@ -91,6 +96,12 @@ export default class ChannelView extends React.PureComponent {
         this.props.actions.goToLastViewedChannel();
     }
 
+    componentDidMount() {
+        if (this.props.showNextSteps) {
+            this.props.actions.setShowNextStepsView(true);
+        }
+    }
+
     componentDidUpdate(prevProps) {
         if (prevProps.channelId !== this.props.channelId || prevProps.channelIsArchived !== this.props.channelIsArchived) {
             mark('ChannelView#componentDidUpdate');
@@ -114,6 +125,10 @@ export default class ChannelView extends React.PureComponent {
                 this.props.actions.goToLastViewedChannel();
             }
         }
+
+        if (this.props.match.url !== prevProps.match.url && this.props.showNextStepsEphemeral) {
+            this.props.actions.setShowNextStepsView(false);
+        }
     }
 
     render() {
@@ -126,7 +141,7 @@ export default class ChannelView extends React.PureComponent {
             );
         }
 
-        if (this.state.showNextSteps) {
+        if (this.props.showNextStepsEphemeral) {
             return (
                 <NextStepsView/>
             );

components/channel_view/channel_view.test.jsx

@@ -17,10 +17,12 @@ describe('components/channel_view', () => {
         },
         showTutorial: false,
         showNextSteps: false,
+        showNextStepsEphemeral: false,
         channelIsArchived: false,
         viewArchivedChannels: false,
         actions: {
             goToLastViewedChannel: jest.fn(),
+            setShowNextStepsView: jest.fn(),
         },
     };
 

components/channel_view/index.js

@@ -16,6 +16,7 @@ import {getDirectTeammate} from 'utils/utils.jsx';
 import {TutorialSteps, Preferences} from 'utils/constants';
 
 import {goToLastViewedChannel} from 'actions/views/channel';
+import {setShowNextStepsView} from 'actions/views/next_steps';
 import {showNextSteps} from 'components/next_steps_view/steps';
 
 import ChannelView from './channel_view.jsx';
@@ -59,6 +60,7 @@ function mapStateToProps(state) {
         deactivatedChannel: channel ? getDeactivatedChannel(state, channel.id) : false,
         showTutorial: enableTutorial && tutorialStep <= TutorialSteps.INTRO_SCREENS,
         showNextSteps: showNextSteps(state),
+        showNextStepsEphemeral: state.views.nextSteps.show,
         channelIsArchived: channel ? channel.delete_at !== 0 : false,
         viewArchivedChannels,
     };
@@ -67,6 +69,7 @@ function mapStateToProps(state) {
 function mapDispatchToProps(dispatch) {
     return {
         actions: bindActionCreators({
+            setShowNextStepsView,
             goToLastViewedChannel,
         }, dispatch),
     };

components/next_steps_view/index.ts

@@ -9,6 +9,7 @@ import {getLicense} from 'mattermost-redux/selectors/entities/general';
 import {makeGetCategory} from 'mattermost-redux/selectors/entities/preferences';
 import {getCurrentUser} from 'mattermost-redux/selectors/entities/users';
 
+import {setShowNextStepsView} from 'actions/views/next_steps';
 import {GlobalState} from 'types/store';
 import {Preferences} from 'utils/constants';
 
@@ -33,6 +34,7 @@ function mapDispatchToProps(dispatch: Dispatch) {
     return {
         actions: bindActionCreators({
             savePreferences,
+            setShowNextStepsView,
         }, dispatch),
     };
 }

components/next_steps_view/next_steps_view.test.tsx

@@ -12,6 +12,7 @@ describe('components/next_steps_view', () => {
         preferences: [],
         skuName: '',
         actions: {
+            setShowNextStepsView: jest.fn(),
             savePreferences: jest.fn(),
         },
     };

components/next_steps_view/next_steps_view.tsx

@@ -21,6 +21,7 @@ type Props = {
     skuName: string;
     actions: {
         savePreferences: (userId: string, preferences: PreferenceType[]) => void;
+        setShowNextStepsView: (show: boolean) => void;
     };
 };
 

components/next_steps_view/steps.ts

@@ -3,8 +3,8 @@
 import {createSelector} from 'reselect';
 
 import {makeGetCategory} from 'mattermost-redux/selectors/entities/preferences';
-import {GlobalState} from 'mattermost-redux/types/store';
 
+import {GlobalState} from 'types/store';
 import {RecommendedNextSteps, Preferences} from 'utils/constants';
 import {localizeMessage} from 'utils/utils';
 
@@ -44,6 +44,10 @@ const getCategory = makeGetCategory();
 export const showNextSteps = createSelector(
     (state: GlobalState) => getCategory(state, Preferences.RECOMMENDED_NEXT_STEPS),
     (stepPreferences) => {
+        if (stepPreferences.some((pref) => pref.name === RecommendedNextSteps.HIDE && pref.value)) {
+            return false;
+        }
+
         const checkPref = (step: StepType) => stepPreferences.some((pref) => pref.name === step.id && pref.value);
         return !Steps.every(checkPref);
     }

components/sidebar/__snapshots__/sidebar.test.tsx.snap

@@ -33,7 +33,7 @@ exports[`components/sidebar should match snapshot 1`] = `
     onDragStart={[Function]}
   />
   <Connect(DataPrefetch) />
-  <SidebarNextSteps />
+  <Connect(SidebarNextSteps) />
   <Connect(NewChannelFlow)
     canCreatePrivateChannel={true}
     canCreatePublicChannel={true}
@@ -77,7 +77,7 @@ exports[`components/sidebar should match snapshot when direct channels modal is
     onDragStart={[Function]}
   />
   <Connect(DataPrefetch) />
-  <SidebarNextSteps />
+  <Connect(SidebarNextSteps) />
   <Connect(NewChannelFlow)
     canCreatePrivateChannel={true}
     canCreatePublicChannel={true}
@@ -124,7 +124,7 @@ exports[`components/sidebar should match snapshot when isDataPrefechEnabled is d
     onDragEnd={[Function]}
     onDragStart={[Function]}
   />
-  <SidebarNextSteps />
+  <Connect(SidebarNextSteps) />
   <Connect(NewChannelFlow)
     canCreatePrivateChannel={true}
     canCreatePublicChannel={true}
@@ -168,7 +168,7 @@ exports[`components/sidebar should match snapshot when more channels modal is op
     onDragStart={[Function]}
   />
   <Connect(DataPrefetch) />
-  <SidebarNextSteps />
+  <Connect(SidebarNextSteps) />
   <Connect(NewChannelFlow)
     canCreatePrivateChannel={true}
     canCreatePublicChannel={true}

components/sidebar/sidebar.tsx

@@ -21,7 +21,7 @@ import SidebarHeader from './sidebar_header';
 import ChannelNavigator from './channel_navigator';
 import ChannelFilter from './channel_filter';
 import SidebarCategoryList from './sidebar_category_list';
-import SidebarNextSteps from './sidebar_next_steps/sidebar_next_steps';
+import SidebarNextSteps from './sidebar_next_steps';
 import SidebarWhatsNewModal from './sidebar_whats_new_modal';
 
 type Props = {

components/sidebar/sidebar_next_steps/close_next_steps_modal.scss

@@ -0,0 +1,58 @@
+.modal-backdrop.in {
+    clip-path: polygon(0 0, 65px 0, 65px 63px, 305px 63px, 305px 0, 100% 0, 100% 100%, 0 100%);
+}
+
+.CloseNextStepsModal__helpBox {
+    position: fixed;
+    top: 16px;
+    left: 266px;
+    z-index: 1050;
+}
+
+.CloseNextStepsModal__helpText {
+    font-weight: 600;
+    font-size: 12px;
+    line-height: 16px;
+    text-align: center;
+    color: var(--center-channel-bg);
+    display: block;
+    width: 188px;
+    margin-left: -12px;
+    margin-top: 4px;
+}
+
+.GenericModal__header {
+    text-align: center;
+    padding-bottom: 8px;
+
+    h1 {
+        font-size: 24px;
+        line-height: 32px;
+    }
+}
+
+.GenericModal__body {
+    text-align: center;
+    color: var(--center-channel-color);
+}
+
+.modal-footer {
+    text-align: center;
+}
+
+.modal .GenericModal .modal-content {
+    padding: 40px 36px 24px 36px;
+}
+
+.GenericModal__button {
+    padding: 13px 20px;
+    line-height: 14px;
+
+    & +.GenericModal__button {
+        margin-left: 10px;
+    }
+}
+
+.modal .GenericModal {
+    max-width: 514px;
+}

components/sidebar/sidebar_next_steps/close_next_steps_modal.tsx

@@ -0,0 +1,63 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import React from 'react';
+import ReactDOM from 'react-dom';
+import {FormattedMessage} from 'react-intl';
+
+import GenericModal from 'components/generic_modal';
+import closeNextStepsArrow from 'images/close_next_steps_arrow.svg';
+
+import './close_next_steps_modal.scss';
+
+type Props = {
+    onConfirm: () => void;
+    onCancel: () => void;
+}
+
+export default function CloseNextStepsModal(props: Props) {
+    const {onConfirm, onCancel} = props;
+
+    return (
+        <>
+            {ReactDOM.createPortal(
+                <div className='CloseNextStepsModal__helpBox'>
+                    <img
+                        className='CloseNextStepsModal__arrow'
+                        src={closeNextStepsArrow}
+                    />
+                    <span className='CloseNextStepsModal__helpText'>
+                        <FormattedMessage
+                            id='close_next_steps_modal.helpText'
+                            defaultMessage='Access Tips & Next Steps any time through the Help section in the Main Menu'
+                        />
+                    </span>
+                </div>,
+                document.body as HTMLElement
+            )}
+            <GenericModal
+                show={true}
+                onHide={onCancel}
+                handleConfirm={onConfirm}
+                handleCancel={onCancel}
+                modalHeaderText={(
+                    <FormattedMessage
+                        id={'close_next_steps_modal.header'}
+                        defaultMessage={'Remove Tip & Next Steps?'}
+                    />
+                )}
+                confirmButtonText={(
+                    <FormattedMessage
+                        id={'close_next_steps_modal.confirm'}
+                        defaultMessage='Remove'
+                    />
+                )}
+            >
+                <FormattedMessage
+                    id={'close_next_steps_modal.mainText'}
+                    defaultMessage='This will remove this section from your sidebar, but you can access it later in the Help section of the Main Menu.'
+                />
+            </GenericModal>
+        </>
+    );
+}

components/sidebar/sidebar_next_steps/index.ts

@@ -0,0 +1,41 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {connect} from 'react-redux';
+import {Dispatch, bindActionCreators} from 'redux';
+
+import {savePreferences} from 'mattermost-redux/actions/preferences';
+import {makeGetCategory} from 'mattermost-redux/selectors/entities/preferences';
+import {getCurrentUserId} from 'mattermost-redux/selectors/entities/users';
+
+import {openModal, closeModal} from 'actions/views/modals';
+import {setShowNextStepsView} from 'actions/views/next_steps';
+import {showNextSteps} from 'components/next_steps_view/steps';
+import {GlobalState} from 'types/store';
+import {Preferences} from 'utils/constants';
+
+import SidebarNextSteps from './sidebar_next_steps';
+
+function makeMapStateToProps() {
+    const getCategory = makeGetCategory();
+
+    return (state: GlobalState) => ({
+        active: state.views.nextSteps.show,
+        showNextSteps: showNextSteps(state),
+        currentUserId: getCurrentUserId(state),
+        preferences: getCategory(state, Preferences.RECOMMENDED_NEXT_STEPS),
+    });
+}
+
+function mapDispatchToProps(dispatch: Dispatch) {
+    return {
+        actions: bindActionCreators({
+            savePreferences,
+            openModal,
+            closeModal,
+            setShowNextStepsView,
+        }, dispatch),
+    };
+}
+
+export default connect(makeMapStateToProps, mapDispatchToProps)(SidebarNextSteps);