From 4505c5dda3e95f0497e97a331dcd4f7763e6d1af Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan <vishnu@chatwoot.com>
Date: Tue, 18 Apr 2023 00:35:35 +0530
Subject: [PATCH] chore: add build id to settings page (#6873)

- Adds a build Id to the settings page
---
 .dockerignore                                       |  2 --
 .gitignore                                          |  2 +-
 Procfile                                            |  2 +-
 app/controllers/dashboard_controller.rb             |  3 ++-
 .../routes/dashboard/settings/account/Index.vue     |  3 +++
 app/javascript/shared/store/globalConfig.js         |  2 ++
 config/initializers/git_sha.rb                      | 13 +++++++++++++
 docker/Dockerfile                                   | 10 +++++++++-
 8 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 config/initializers/git_sha.rb

diff --git a/.dockerignore b/.dockerignore
index 85065ec7d..a5af77eb5 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,8 +1,6 @@
 .bundle
 .env
 .env.*
-.git
-.gitignore
 docker-compose.*
 docker/Dockerfile
 docker/dockerfiles
diff --git a/.gitignore b/.gitignore
index 63d0781ca..e59f13b8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,7 +61,7 @@ test/cypress/videos/*
 /config/master.key
 /config/*.enc
 
-.vscode/settings.json
+#ignore files under .vscode directory
 .vscode
 
 # yalc for local testing
diff --git a/Procfile b/Procfile
index 3cfa8ae13..f281f018a 100644
--- a/Procfile
+++ b/Procfile
@@ -1,3 +1,3 @@
-release: POSTGRES_STATEMENT_TIMEOUT=600s bundle exec rails db:chatwoot_prepare
+release: POSTGRES_STATEMENT_TIMEOUT=600s bundle exec rails db:chatwoot_prepare && echo $SOURCE_VERSION > .git_sha
 web: bundle exec rails ip_lookup:setup && bin/rails server -p $PORT -e $RAILS_ENV
 worker: bundle exec rails ip_lookup:setup && bundle exec sidekiq -C config/sidekiq.yml
diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
index 25a981df6..ff6b5f57e 100644
--- a/app/controllers/dashboard_controller.rb
+++ b/app/controllers/dashboard_controller.rb
@@ -56,7 +56,8 @@ class DashboardController < ActionController::Base
       FB_APP_ID: GlobalConfigService.load('FB_APP_ID', ''),
       FACEBOOK_API_VERSION: 'v14.0',
       IS_ENTERPRISE: ChatwootApp.enterprise?,
-      AZURE_APP_ID: ENV.fetch('AZURE_APP_ID', '')
+      AZURE_APP_ID: ENV.fetch('AZURE_APP_ID', ''),
+      GIT_SHA: GIT_HASH
     }
   end
 end
diff --git a/app/javascript/dashboard/routes/dashboard/settings/account/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/account/Index.vue
index c04c1c76a..081d7a6f9 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/account/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/account/Index.vue
@@ -104,6 +104,9 @@
             })
           }}
         </div>
+        <div class="build-id">
+          <div>{{ `Build ${globalConfig.gitSha}` }}</div>
+        </div>
       </div>
 
       <woot-submit-button
diff --git a/app/javascript/shared/store/globalConfig.js b/app/javascript/shared/store/globalConfig.js
index 000a7cc12..b45c21478 100644
--- a/app/javascript/shared/store/globalConfig.js
+++ b/app/javascript/shared/store/globalConfig.js
@@ -9,6 +9,7 @@ const {
   CREATE_NEW_ACCOUNT_FROM_DASHBOARD: createNewAccountFromDashboard,
   DIRECT_UPLOADS_ENABLED: directUploadsEnabled,
   DISPLAY_MANIFEST: displayManifest,
+  GIT_SHA: gitSha,
   HCAPTCHA_SITE_KEY: hCaptchaSiteKey,
   INSTALLATION_NAME: installationName,
   LOGO_THUMBNAIL: logoThumbnail,
@@ -33,6 +34,7 @@ const state = {
   directUploadsEnabled: directUploadsEnabled === 'true',
   disableUserProfileUpdate: disableUserProfileUpdate === 'true',
   displayManifest,
+  gitSha,
   hCaptchaSiteKey,
   installationName,
   logo,
diff --git a/config/initializers/git_sha.rb b/config/initializers/git_sha.rb
new file mode 100644
index 000000000..c93cc504d
--- /dev/null
+++ b/config/initializers/git_sha.rb
@@ -0,0 +1,13 @@
+# Define a method to fetch the git commit hash
+def fetch_git_sha
+  sha = `git rev-parse HEAD`
+  if sha.present?
+    sha.strip
+  elsif File.exist?('.git_sha')
+    File.read('.git_sha').strip
+  else
+    'unknown'
+  end
+end
+
+GIT_HASH = fetch_git_sha
diff --git a/docker/Dockerfile b/docker/Dockerfile
index aaa48b5a9..4b7fdd718 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -60,9 +60,14 @@ RUN if [ "$RAILS_ENV" = "production" ]; then \
   && rm -rf spec node_modules tmp/cache; \
   fi
 
+# Generate .git_sha file with current commit hash
+RUN git rev-parse HEAD > /app/.git_sha
+
 # Remove unnecessary files
 RUN rm -rf /gems/ruby/3.1.0/cache/*.gem \
-  && find /gems/ruby/3.1.0/gems/ \( -name "*.c" -o -name "*.o" \) -delete
+  && find /gems/ruby/3.1.0/gems/ \( -name "*.c" -o -name "*.o" \) -delete \
+  && rm -rf .git \
+  && rm .gitignore
 
 # final build stage
 FROM ruby:3.1.3-alpine3.16
@@ -100,6 +105,9 @@ RUN if [ "$RAILS_ENV" != "production" ]; then \
 COPY --from=pre-builder /gems/ /gems/
 COPY --from=pre-builder /app /app
 
+# Copy .git_sha file from pre-builder stage
+COPY --from=pre-builder /app/.git_sha /app/.git_sha
+
 WORKDIR /app
 
 EXPOSE 3000