Adding enterprise build hash to about dialog (#3058)

Makefile

@@ -15,10 +15,12 @@ BUILD_ENTERPRISE_DIR ?= ../enterprise
 BUILD_ENTERPRISE ?= true
 BUILD_ENTERPRISE_READY = false
 BUILD_TYPE_NAME = team
+BUILD_HASH_ENTERPRISE = none
 ifneq ($(wildcard $(BUILD_ENTERPRISE_DIR)/.),)
 	ifeq ($(BUILD_ENTERPRISE),true)
 		BUILD_ENTERPRISE_READY = true
 		BUILD_TYPE_NAME = enterprise
+		BUILD_HASH_ENTERPRISE = $(shell cd $(BUILD_ENTERPRISE_DIR) && git rev-parse HEAD)
 	else
 		BUILD_ENTERPRISE_READY = false
 		BUILD_TYPE_NAME = team
@@ -37,6 +39,7 @@ GO_LINKER_FLAGS ?= -ldflags \
 				   "-X github.com/mattermost/platform/model.BuildNumber=$(BUILD_NUMBER)\
 				    -X 'github.com/mattermost/platform/model.BuildDate=$(BUILD_DATE)'\
 				    -X github.com/mattermost/platform/model.BuildHash=$(BUILD_HASH)\
+				    -X github.com/mattermost/platform/model.BuildHashEnterprise=$(BUILD_HASH_ENTERPRISE)\
 				    -X github.com/mattermost/platform/model.BuildEnterpriseReady=$(BUILD_ENTERPRISE_READY)"
 
 # Output paths

i18n/en.json

@@ -2073,7 +2073,7 @@
   },
   {
     "id": "mattermost.current_version",
-    "translation": "Current version is %v (%v/%v/%v)"
+    "translation": "Current version is %v (%v/%v/%v/%v)"
   },
   {
     "id": "mattermost.entreprise_enabled",

i18n/es.json

@@ -2073,7 +2073,7 @@
   },
   {
     "id": "mattermost.current_version",
-    "translation": "La versión actual es %v (%v/%v/%v)"
+    "translation": "La versión actual es %v (%v/%v/%v/%v)"
   },
   {
     "id": "mattermost.entreprise_enabled",

i18n/fr.json

@@ -2073,7 +2073,7 @@
   },
   {
     "id": "mattermost.current_version",
-    "translation": "Version courante %v (%v/%v/%v)"
+    "translation": "Version courante %v (%v/%v/%v/%v)"
   },
   {
     "id": "mattermost.entreprise_enabled",

i18n/ja.json

@@ -2073,7 +2073,7 @@
   },
   {
     "id": "mattermost.current_version",
-    "translation": "現在のバージョンは%v (%v/%v/%v)です"
+    "translation": "現在のバージョンは%v (%v/%v/%v/%v)です"
   },
   {
     "id": "mattermost.entreprise_enabled",

i18n/pt.json

@@ -2073,7 +2073,7 @@
   },
   {
     "id": "mattermost.current_version",
-    "translation": "Versão atual é %v (%v/%v/%v)"
+    "translation": "Versão atual é %v (%v/%v/%v/%v)"
   },
   {
     "id": "mattermost.entreprise_enabled",

mattermost.go

@@ -88,7 +88,7 @@ func main() {
 	}
 
 	pwd, _ := os.Getwd()
-	l4g.Info(utils.T("mattermost.current_version"), model.CurrentVersion, model.BuildNumber, model.BuildDate, model.BuildHash)
+	l4g.Info(utils.T("mattermost.current_version"), model.CurrentVersion, model.BuildNumber, model.BuildDate, model.BuildHash, model.BuildHashEnterprise)
 	l4g.Info(utils.T("mattermost.entreprise_enabled"), model.BuildEnterpriseReady)
 	l4g.Info(utils.T("mattermost.working_dir"), pwd)
 	l4g.Info(utils.T("mattermost.config_file"), utils.FindConfigFile(flagConfigFile))

model/version.go

@@ -33,6 +33,7 @@ var CurrentVersion string = versions[0]
 var BuildNumber string
 var BuildDate string
 var BuildHash string
+var BuildHashEnterprise string
 var BuildEnterpriseReady string
 var versionsWithoutHotFixes []string
 

utils/config.go

@@ -198,6 +198,7 @@ func getClientConfig(c *model.Config) map[string]string {
 	props["BuildNumber"] = model.BuildNumber
 	props["BuildDate"] = model.BuildDate
 	props["BuildHash"] = model.BuildHash
+	props["BuildHashEnterprise"] = model.BuildHashEnterprise
 	props["BuildEnterpriseReady"] = model.BuildEnterpriseReady
 
 	props["SiteName"] = c.TeamSettings.SiteName

webapp/components/about_build_modal.jsx

@@ -157,6 +157,12 @@ export default class AboutBuildModal extends React.Component {
                                 defaultMessage='Build Hash:'
                             />
                              {config.BuildHash}
+                            <br/>
+                            <FormattedMessage
+                                id='about.hashee'
+                                defaultMessage='EE Build Hash:'
+                            />
+                            &nbsp;{config.BuildHashEnterprise}
                         </p>
                         <p>
                             <FormattedMessage

webapp/i18n/en.json

@@ -6,6 +6,7 @@
   "about.enterpriseEditionSt": "Modern enterprise communication from behind your firewall.",
   "about.enterpriseEditione1": "Enterprise Edition",
   "about.hash": "Build Hash:",
+  "about.hashee": "EE Build Hash:",
   "about.licensed": "Licensed by:",
   "about.number": "Build Number:",
   "about.teamEditionLearn": "Join the Mattermost community at ",

webapp/sass/routes/_about-modal.scss

@@ -59,6 +59,7 @@
                 p {
                     &:first-child {
                         float: left;
+                        text-align: left;
                     }
                 }
             }
@@ -79,4 +80,4 @@
         }
     }
 
-}
+}