Merge pull request #1275 from mattermost/PLT-951

PLT-951 PLT-972 fixing issues with team directory

5 files changed, 75 insertions, 48 deletions

diff --git a/web/react/components/login.jsx b/web/react/components/login.jsx
index c519959af..2b9ce67ca 100644
--- a/web/react/components/login.jsx
+++ b/web/react/components/login.jsx
@@ -185,7 +185,7 @@ export default class Login extends React.Component {
         if (this.props.inviteId) {
             userSignUp = (
                 <div>
-                    <span>{'Do not have an account? '}
+                    <span>{`Don't have an account? `}
                         <a
                             href={'/signup_user_complete/?id=' + this.props.inviteId}
                             className='signup-team-login'
diff --git a/web/react/components/signup_team.jsx b/web/react/components/signup_team.jsx
index f926f5cbb..37760a2a2 100644
--- a/web/react/components/signup_team.jsx
+++ b/web/react/components/signup_team.jsx
@@ -12,11 +12,6 @@ export default class TeamSignUp extends React.Component {
 
         this.updatePage = this.updatePage.bind(this);
 
-        if (global.window.mm_config.EnableTeamListing === 'true') {
-            this.state = {page: 'team_listing'};
-            return;
-        }
-
         var count = 0;
 
         if (global.window.mm_config.EnableSignUpWithEmail === 'true') {
@@ -41,50 +36,83 @@ export default class TeamSignUp extends React.Component {
     }
 
     render() {
-        if (this.state.page === 'team_listing') {
-            return (
-                <div>
-                    <h3>{'Choose a Team'}</h3>
-                    <div className='signup-team-all'>
-                        {
-                            this.props.teams.map((team) => {
-                                return (
-                                    <div
-                                        key={'team_' + team.name}
-                                        className='signup-team-dir'
-                                    >
-                                        <a
-                                            href={'/' + team.name}
+        var teamListing = null;
+
+        if (global.window.mm_config.EnableTeamListing === 'true') {
+            if (this.props.teams.length === 0) {
+                if (global.window.mm_config.EnableTeamCreation !== 'true') {
+                    teamListing = (<div>{'There are no teams include in the Team Directory and team creation has been disabled.'}</div>);
+                }
+            } else {
+                teamListing = (
+                    <div>
+                        <h3>{'Choose a Team'}</h3>
+                        <div className='signup-team-all'>
+                            {
+                                this.props.teams.map((team) => {
+                                    return (
+                                        <div
+                                            key={'team_' + team.name}
+                                            className='signup-team-dir'
                                         >
-                                            <div className='signup-team-dir__group'>
-                                                <span className='signup-team-dir__name'>{team.display_name}</span>
-                                                <span
-                                                    className='glyphicon glyphicon-menu-right right signup-team-dir__arrow'
-                                                    aria-hidden='true'
-                                                />
-                                            </div>
-                                        </a>
-                                    </div>
-                                );
-                            })
-                        }
+                                            <a
+                                                href={'/' + team.name}
+                                            >
+                                                <div className='signup-team-dir__group'>
+                                                    <span className='signup-team-dir__name'>{team.display_name}</span>
+                                                    <span
+                                                        className='glyphicon glyphicon-menu-right right signup-team-dir__arrow'
+                                                        aria-hidden='true'
+                                                    />
+                                                </div>
+                                            </a>
+                                        </div>
+                                    );
+                                })
+                            }
+                        </div>
                     </div>
+                );
+            }
+        }
+
+        if (global.window.mm_config.EnableTeamCreation !== 'true') {
+            if (teamListing == null) {
+                return (<div>{'Team creation has been disabled.  Please contact an administrator for access.'}</div>);
+            }
+
+            return (
+                <div>
+                    {teamListing}
                 </div>
             );
         }
 
         if (this.state.page === 'choose') {
             return (
-                <ChoosePage
-                    updatePage={this.updatePage}
-                />
+                <div>
+                    {teamListing}
+                    <ChoosePage
+                        updatePage={this.updatePage}
+                    />
+                </div>
             );
         }
 
         if (this.state.page === 'email') {
-            return <EmailSignUpPage />;
+            return (
+                <div>
+                    {teamListing}
+                    <EmailSignUpPage />
+                </div>
+            );
         } else if (this.state.page === 'gitlab') {
-            return <SSOSignupPage service={Constants.GITLAB_SERVICE} />;
+            return (
+                <div>
+                    {teamListing}
+                    <SSOSignupPage service={Constants.GITLAB_SERVICE} />
+                </div>
+            );
         }
     }
 }
diff --git a/web/react/components/team_general_tab.jsx b/web/react/components/team_general_tab.jsx
index 69ba44664..c7c4fa2ea 100644
--- a/web/react/components/team_general_tab.jsx
+++ b/web/react/components/team_general_tab.jsx
@@ -54,7 +54,6 @@ export default class GeneralTab extends React.Component {
 
     handleTeamListingRadio(listing) {
         if (global.window.mm_config.EnableTeamListing !== 'true' && listing) {
-            ReactDOM.findDOMNode(this.refs.teamListingRadioNo).checked = true;
             this.setState({clientError: 'Team directory has been disabled.  Please ask a system admin to enable it.'});
         } else {
             this.setState({allow_team_listing: listing});
@@ -278,13 +277,13 @@ export default class GeneralTab extends React.Component {
                         </label>
                         <br/>
                     </div>
-                    <div><br/>{'When allowed the team will appear on the main page as part of team directory.'}</div>
+                    <div><br/>{'Including this team will display the team name from the Team Directory section of the Home Page, and provide a link to the sign-in page.'}</div>
                 </div>
             ];
 
             teamListingSection = (
                 <SettingItemMax
-                    title='Allow in Team Directory'
+                    title='Include this team in the Team Directory'
                     inputs={inputs}
                     submit={this.handleTeamListingSubmit}
                     server_error={serverError}
@@ -302,7 +301,7 @@ export default class GeneralTab extends React.Component {
 
             teamListingSection = (
                 <SettingItemMin
-                    title='Allow in Team Directory'
+                    title='Include this team in the Team Directory'
                     describe={describe}
                     updateSection={this.onUpdateTeamListingSection}
                 />
@@ -337,13 +336,13 @@ export default class GeneralTab extends React.Component {
                         </label>
                         <br/>
                     </div>
-                    <div><br/>{'When allowed the team signup link will be included on the login page and anyone can signup to this team.'}</div>
+                    <div><br/>{'When allowed, a link to account creation will be included on the sign-in page of this team and allow any visitor to sign-up.'}</div>
                 </div>
             ];
 
             openInviteSection = (
                 <SettingItemMax
-                    title='Allow Open Invitations'
+                    title='Allow anyone to sign-up from login page'
                     inputs={inputs}
                     submit={this.handleOpenInviteSubmit}
                     server_error={serverError}
@@ -360,7 +359,7 @@ export default class GeneralTab extends React.Component {
 
             openInviteSection = (
                 <SettingItemMin
-                    title='Allow Open Invitations'
+                    title='Allow anyone to sign-up from login page'
                     describe={describe}
                     updateSection={this.onUpdateOpenInviteSection}
                 />
@@ -387,7 +386,7 @@ export default class GeneralTab extends React.Component {
                             maxLength='32'
                         />
                     </div>
-                    <div><br/>{'When allowing open invites this code is used as part of the signup process.  Changing this code will invalidate the previous open signup link.'}</div>
+                    <div><br/>{'Your Invite Code is used in the URL sent to people to join your team. Regenerating your Invite Code will invalidate the URLs in previous invitations, unless "Allow anyone to sign-up from login page" is enabled.'}</div>
                     <div className='help-text'>
                         <button
                             className='btn btn-default'
@@ -413,7 +412,7 @@ export default class GeneralTab extends React.Component {
             inviteSection = (
                 <SettingItemMin
                     title={`Invite Code`}
-                    describe={`Click 'Edit' to re-generate invite Code.`}
+                    describe={`Click 'Edit' to regenerate Invite Code.`}
                     updateSection={this.onUpdateInviteIdSection}
                 />
             );
diff --git a/web/sass-files/sass/partials/_signup.scss b/web/sass-files/sass/partials/_signup.scss
index 14c676f82..84f9892f4 100644
--- a/web/sass-files/sass/partials/_signup.scss
+++ b/web/sass-files/sass/partials/_signup.scss
@@ -316,7 +316,7 @@
 .signup-team-all {
     width: 280px;
     box-shadow: 3px 3px 1px #d5d5d5;
-    margin: 0px 0px 0px 5px;
+    margin: 0px 0px 50px 5px;
 }
 
 .signup-team-dir {
diff --git a/web/web.go b/web/web.go
index 34f4df08f..51f6664b6 100644
--- a/web/web.go
+++ b/web/web.go
@@ -170,7 +170,7 @@ func root(c *api.Context, w http.ResponseWriter, r *http.Request) {
 				page.Props[team.Name] = team.DisplayName
 			}
 
-			if len(teams) == 1 && *utils.Cfg.TeamSettings.EnableTeamListing {
+			if len(teams) == 1 && *utils.Cfg.TeamSettings.EnableTeamListing && !utils.Cfg.TeamSettings.EnableTeamCreation {
 				http.Redirect(w, r, c.GetSiteURL()+"/"+teams[0].Name, http.StatusTemporaryRedirect)
 				return
 			}