[PLT-6496] Remove System Console and config settings for image height and width (#6688)

* remove System Console and config settings for image height and width

* add constants and update config.json

* updated as per review

7 files changed, 9 insertions, 205 deletions

diff --git a/webapp/components/admin_console/admin_sidebar.jsx b/webapp/components/admin_console/admin_sidebar.jsx
index 05924d02f..d64d5edee 100644
--- a/webapp/components/admin_console/admin_sidebar.jsx
+++ b/webapp/components/admin_console/admin_sidebar.jsx
@@ -529,6 +529,7 @@ export default class AdminSidebar extends React.Component {
                                 }
                             >
                                 <AdminSidebarSection
+                                    key='storage'
                                     name='storage'
                                     title={
                                         <FormattedMessage
@@ -537,15 +538,6 @@ export default class AdminSidebar extends React.Component {
                                         />
                                     }
                                 />
-                                <AdminSidebarSection
-                                    name='images'
-                                    title={
-                                        <FormattedMessage
-                                            id='admin.sidebar.images'
-                                            defaultMessage='Images'
-                                        />
-                                    }
-                                />
                             </AdminSidebarSection>
                             <AdminSidebarSection
                                 name='customization'
diff --git a/webapp/components/admin_console/admin_sidebar_section.jsx b/webapp/components/admin_console/admin_sidebar_section.jsx
index e0f327da0..2a8ecab71 100644
--- a/webapp/components/admin_console/admin_sidebar_section.jsx
+++ b/webapp/components/admin_console/admin_sidebar_section.jsx
@@ -16,7 +16,7 @@ export default class AdminSidebarSection extends React.Component {
             type: PropTypes.string,
             parentLink: PropTypes.string,
             subsection: PropTypes.bool,
-            children: PropTypes.arrayOf(PropTypes.element),
+            children: PropTypes.node,
             action: PropTypes.node,
             onlyActiveOnIndex: PropTypes.bool
         };
@@ -39,7 +39,7 @@ export default class AdminSidebarSection extends React.Component {
         const link = this.getLink();
 
         let clonedChildren = null;
-        if (this.props.children.length > 0) {
+        if (this.props.children) {
             clonedChildren = (
                 <ul className='nav nav__sub-menu subsections'>
                     {
diff --git a/webapp/components/admin_console/image_settings.jsx b/webapp/components/admin_console/image_settings.jsx
deleted file mode 100644
index 94f893ee2..000000000
--- a/webapp/components/admin_console/image_settings.jsx
+++ /dev/null
@@ -1,167 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See License.txt for license information.
-
-import React from 'react';
-
-import * as Utils from 'utils/utils.jsx';
-
-import AdminSettings from './admin_settings.jsx';
-import {FormattedMessage} from 'react-intl';
-import SettingsGroup from './settings_group.jsx';
-import TextSetting from './text_setting.jsx';
-
-export default class ImageSettings extends AdminSettings {
-    constructor(props) {
-        super(props);
-
-        this.getConfigFromState = this.getConfigFromState.bind(this);
-
-        this.renderSettings = this.renderSettings.bind(this);
-    }
-
-    getConfigFromState(config) {
-        config.FileSettings.ThumbnailWidth = this.parseInt(this.state.thumbnailWidth);
-        config.FileSettings.ThumbnailHeight = this.parseInt(this.state.thumbnailHeight);
-        config.FileSettings.ProfileWidth = this.parseInt(this.state.profileWidth);
-        config.FileSettings.ProfileHeight = this.parseInt(this.state.profileHeight);
-        config.FileSettings.PreviewWidth = this.parseInt(this.state.previewWidth);
-        config.FileSettings.PreviewHeight = this.parseInt(this.state.previewHeight);
-
-        return config;
-    }
-
-    getStateFromConfig(config) {
-        return {
-            thumbnailWidth: config.FileSettings.ThumbnailWidth,
-            thumbnailHeight: config.FileSettings.ThumbnailHeight,
-            profileWidth: config.FileSettings.ProfileWidth,
-            profileHeight: config.FileSettings.ProfileHeight,
-            previewWidth: config.FileSettings.PreviewWidth,
-            previewHeight: config.FileSettings.PreviewHeight
-        };
-    }
-
-    renderTitle() {
-        return (
-            <FormattedMessage
-                id='admin.files.images'
-                defaultMessage='Images'
-            />
-        );
-    }
-
-    renderSettings() {
-        return (
-            <SettingsGroup>
-                <TextSetting
-                    id='thumbnailWidth'
-                    label={
-                        <FormattedMessage
-                            id='admin.image.thumbWidthTitle'
-                            defaultMessage='Attachment Thumbnail Width:'
-                        />
-                    }
-                    placeholder={Utils.localizeMessage('admin.image.thumbWidthExample', 'Ex "120"')}
-                    helpText={
-                        <FormattedMessage
-                            id='admin.image.thumbWidthDescription'
-                            defaultMessage='Width of thumbnails generated from uploaded images. Updating this value changes how thumbnail images render in future, but does not change images created in the past.'
-                        />
-                    }
-                    value={this.state.thumbnailWidth}
-                    onChange={this.handleChange}
-                />
-                <TextSetting
-                    id='thumbnailHeight'
-                    label={
-                        <FormattedMessage
-                            id='admin.image.thumbHeightTitle'
-                            defaultMessage='Attachment Thumbnail Height:'
-                        />
-                    }
-                    placeholder={Utils.localizeMessage('admin.image.thumbHeightExample', 'Ex "100"')}
-                    helpText={
-                        <FormattedMessage
-                            id='admin.image.thumbHeightDescription'
-                            defaultMessage='Height of thumbnails generated from uploaded images. Updating this value changes how thumbnail images render in future, but does not change images created in the past.'
-                        />
-                    }
-                    value={this.state.thumbnailHeight}
-                    onChange={this.handleChange}
-                />
-                <TextSetting
-                    id='profileWidth'
-                    label={
-                        <FormattedMessage
-                            id='admin.image.profileWidthTitle'
-                            defaultMessage='Profile Picture Width:'
-                        />
-                    }
-                    placeholder={Utils.localizeMessage('admin.image.profileWidthExample', 'Ex "1024"')}
-                    helpText={
-                        <FormattedMessage
-                            id='admin.image.profileWidthDescription'
-                            defaultMessage='Width of profile picture.'
-                        />
-                    }
-                    value={this.state.profileWidth}
-                    onChange={this.handleChange}
-                />
-                <TextSetting
-                    id='profileHeight'
-                    label={
-                        <FormattedMessage
-                            id='admin.image.profileHeightTitle'
-                            defaultMessage='Profile Picture Height:'
-                        />
-                    }
-                    placeholder={Utils.localizeMessage('admin.image.profileHeightExample', 'Ex "0"')}
-                    helpText={
-                        <FormattedMessage
-                            id='admin.image.profileHeightDescription'
-                            defaultMessage='Height of profile picture.'
-                        />
-                    }
-                    value={this.state.profileHeight}
-                    onChange={this.handleChange}
-                />
-                <TextSetting
-                    id='previewWidth'
-                    label={
-                        <FormattedMessage
-                            id='admin.image.previewWidthTitle'
-                            defaultMessage='Image Preview Width:'
-                        />
-                    }
-                    placeholder={Utils.localizeMessage('admin.image.previewWidthExample', 'Ex "1024"')}
-                    helpText={
-                        <FormattedMessage
-                            id='admin.image.previewWidthDescription'
-                            defaultMessage='Maximum width of preview image. Updating this value changes how preview images render in future, but does not change images created in the past.'
-                        />
-                    }
-                    value={this.state.previewWidth}
-                    onChange={this.handleChange}
-                />
-                <TextSetting
-                    id='previewHeight'
-                    label={
-                        <FormattedMessage
-                            id='admin.image.previewHeightTitle'
-                            defaultMessage='Image Preview Height:'
-                        />
-                    }
-                    placeholder={Utils.localizeMessage('admin.image.previewHeightExample', 'Ex "0"')}
-                    helpText={
-                        <FormattedMessage
-                            id='admin.image.previewHeightDescription'
-                            defaultMessage='Maximum height of preview image ("0": Sets to auto-size). Updating this value changes how preview images render in future, but does not change images created in the past.'
-                        />
-                    }
-                    value={this.state.previewHeight}
-                    onChange={this.handleChange}
-                />
-            </SettingsGroup>
-        );
-    }
-}
diff --git a/webapp/components/setting_picture.jsx b/webapp/components/setting_picture.jsx
index 2d389a902..faa463cc7 100644
--- a/webapp/components/setting_picture.jsx
+++ b/webapp/components/setting_picture.jsx
@@ -7,9 +7,10 @@ import React, {Component} from 'react';
 import {FormattedMessage} from 'react-intl';
 
 import FormError from 'components/form_error.jsx';
-
 import loadingGif from 'images/load.gif';
 
+import Constants from 'utils/constants.jsx';
+
 export default class SettingPicture extends Component {
     static propTypes = {
         clientError: PropTypes.string,
@@ -114,8 +115,8 @@ export default class SettingPicture extends Component {
                                 id='setting_picture.help'
                                 defaultMessage='Upload a profile picture in BMP, JPG, JPEG or PNG format, at least {width}px in width and {height}px height.'
                                 values={{
-                                    width: global.mm_config.ProfileWidth,
-                                    height: global.mm_config.ProfileHeight
+                                    width: Constants.PROFILE_WIDTH,
+                                    height: Constants.PROFILE_WIDTH
                                 }}
                             />
                         </li>
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index b1f688e40..878c6cdea 100755
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -415,18 +415,6 @@
   "admin.image.maxFileSizeDescription": "Maximum file size for message attachments in megabytes. Caution: Verify server memory can support your setting choice. Large file sizes increase the risk of server crashes and failed uploads due to network interruptions.",
   "admin.image.maxFileSizeExample": "50",
   "admin.image.maxFileSizeTitle": "Maximum File Size:",
-  "admin.image.previewHeightDescription": "Maximum height of preview image (\"0\": Sets to auto-size). Updating this value changes how preview images render in future, but does not change images created in the past.",
-  "admin.image.previewHeightExample": "E.g.: \"0\"",
-  "admin.image.previewHeightTitle": "Image Preview Height:",
-  "admin.image.previewWidthDescription": "Maximum width of preview image. Updating this value changes how preview images render in future, but does not change images created in the past.",
-  "admin.image.previewWidthExample": "E.g.: \"1024\"",
-  "admin.image.previewWidthTitle": "Image Preview Width:",
-  "admin.image.profileHeightDescription": "Height of profile picture.",
-  "admin.image.profileHeightExample": "E.g.: \"0\"",
-  "admin.image.profileHeightTitle": "Profile Picture Height:",
-  "admin.image.profileWidthDescription": "Width of profile picture.",
-  "admin.image.profileWidthExample": "E.g.: \"1024\"",
-  "admin.image.profileWidthTitle": "Profile Picture Width:",
   "admin.image.publicLinkDescription": "32-character salt added to signing of public image links. Randomly generated on install. Click \"Regenerate\" to create new salt.",
   "admin.image.publicLinkExample": "E.g.: \"gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6\"",
   "admin.image.publicLinkTitle": "Public Link Salt:",
@@ -436,12 +424,6 @@
   "admin.image.storeDescription": "Storage system where files and image attachments are saved.<br /><br />Selecting \"Amazon S3\" enables fields to enter your Amazon credentials and bucket details.<br /><br />Selecting \"Local File System\" enables the field to specify a local file directory.",
   "admin.image.storeLocal": "Local File System",
   "admin.image.storeTitle": "File Storage System:",
-  "admin.image.thumbHeightDescription": "Height of thumbnails generated from uploaded images. Updating this value changes how thumbnail images render in future, but does not change images created in the past.",
-  "admin.image.thumbHeightExample": "E.g.: \"100\"",
-  "admin.image.thumbHeightTitle": "Attachment Thumbnail Height:",
-  "admin.image.thumbWidthDescription": "Width of thumbnails generated from uploaded images. Updating this value changes how thumbnail images render in future, but does not change images created in the past.",
-  "admin.image.thumbWidthExample": "E.g.: \"120\"",
-  "admin.image.thumbWidthTitle": "Attachment Thumbnail Width:",
   "admin.integrations.custom": "Custom Integrations",
   "admin.integrations.external": "External Services",
   "admin.integrations.webrtc": "Mattermost WebRTC",
@@ -782,7 +764,6 @@
   "admin.sidebar.files": "Files",
   "admin.sidebar.general": "General",
   "admin.sidebar.gitlab": "GitLab",
-  "admin.sidebar.images": "Images",
   "admin.sidebar.integrations": "Integrations",
   "admin.sidebar.ldap": "AD/LDAP",
   "admin.sidebar.legalAndSupport": "Legal and Support",
diff --git a/webapp/routes/route_admin_console.jsx b/webapp/routes/route_admin_console.jsx
index 2a01d4115..06fb2ac30 100644
--- a/webapp/routes/route_admin_console.jsx
+++ b/webapp/routes/route_admin_console.jsx
@@ -32,7 +32,6 @@ import ExternalServiceSettings from 'components/admin_console/external_service_s
 import WebrtcSettings from 'components/admin_console/webrtc_settings.jsx';
 import DatabaseSettings from 'components/admin_console/database_settings.jsx';
 import StorageSettings from 'components/admin_console/storage_settings.jsx';
-import ImageSettings from 'components/admin_console/image_settings.jsx';
 import CustomBrandSettings from 'components/admin_console/custom_brand_settings.jsx';
 import CustomEmojiSettings from 'components/admin_console/custom_emoji_settings.jsx';
 import LinkPreviewsSettings from 'components/admin_console/link_previews_settings.jsx';
@@ -166,10 +165,6 @@ export default (
                 path='storage'
                 component={StorageSettings}
             />
-            <Route
-                path='images'
-                component={ImageSettings}
-            />
         </Route>
         <Route path='customization'>
             <IndexRedirect to='custom_brand'/>
diff --git a/webapp/utils/constants.jsx b/webapp/utils/constants.jsx
index 46cb009fd..14ef62ebc 100644
--- a/webapp/utils/constants.jsx
+++ b/webapp/utils/constants.jsx
@@ -385,6 +385,8 @@ export const Constants = {
     MAX_UPLOAD_FILES: 5,
     THUMBNAIL_WIDTH: 128,
     THUMBNAIL_HEIGHT: 100,
+    PROFILE_WIDTH: 128,
+    PROFILE_HEIGHT: 128,
     WEB_VIDEO_WIDTH: 640,
     WEB_VIDEO_HEIGHT: 480,
     MOBILE_VIDEO_WIDTH: 480,