Merge branch 'main' into appease_tflint

Author: sarahseewhy

support/pipeline-visualiser/Dockerfile

@@ -7,7 +7,8 @@ FROM ruby:${RUBY_VERSION}-alpine${ALPINE_VERSION}@${DOCKER_IMAGE_DIGEST}
 # Install system-level dependnecies early on so they can be cached effectively for subsequent builds
 # build-base: needed to install be able to install BigDecimal extension requried by 'activesupport-duration-human_string' gem
 # libxml2-dev: needed to be able to install libxml-ruby gem required by 'activesupport-duration-human_string' gem
-RUN apk add build-base libxml2-dev
+# tzdata: needed for setting the correct timezone in the container
+RUN apk add build-base libxml2-dev tzdata
 
 WORKDIR /app
 ADD Gemfile /app/Gemfile
@@ -18,6 +19,8 @@ RUN bundle config set --local system true && \
     bundle config set --local without development && \
     bundle install
 
+RUN ln -s /usr/share/zoneinfo/Europe/London /etc/localtime
+
 EXPOSE 4567
 
 CMD ["ruby", "index.rb"]

support/pipeline-visualiser/Makefile

@@ -8,6 +8,20 @@ run:
     AWS_SESSION_TOKEN="$$(echo "$${CREDS_JSON}" | jq -r '.Credentials.SessionToken')" \
 	ruby index.rb
 
+run_in_docker:
+	@docker build . -t forms-pipeline-visualiser:latest
+
+	CREDS_JSON="$$(aws sts assume-role --role-arn "arn:aws:iam::711966560482:role/deploy-pipeline-visualiser-ecs-task" --role-session-name "run-pipeline-visualiser")"; \
+	AWS_ACCESS_KEY_ID="$$(echo "$${CREDS_JSON}" | jq -r '.Credentials.AccessKeyId')" \
+	AWS_SECRET_ACCESS_KEY="$$(echo "$${CREDS_JSON}" | jq -r '.Credentials.SecretAccessKey')" \
+	AWS_SESSION_TOKEN="$$(echo "$${CREDS_JSON}" | jq -r '.Credentials.SessionToken')" \
+	\
+	docker run \
+		-p "4567:4567" \
+		-e AWS_ACCESS_KEY_ID -e AWS_SECRET_ACCESS_KEY -e AWS_SESSION_TOKEN -e AWS_REGION \
+		-v "$$(pwd):/app" \
+		forms-pipeline-visualiser:latest
+
 .PHONY: dev
 dev:
 	PIPELINE_VISUALISER_DEV_MODE=true ruby index.rb

support/pipeline-visualiser/index.rb

@@ -13,6 +13,8 @@
 require_relative "lib/views/group"
 
 set :public_folder, "public"
+set :bind, "0.0.0.0"
+
 helpers do
   def slugify(str)
     str.downcase

support/pipeline-visualiser/views/group.erb

@@ -30,12 +30,10 @@
       </td>
       <td class="govuk-table__cell"><%= pipeline.current_stage_name if pipeline.is_running? %></td>
       <td class="govuk-table__cell">
-        <time datetime="<%= pipeline.last_started_at %>" title="<%= pipeline.last_started_at %>">
-          <% if pipeline.is_running? %>
-            <%= pipeline.running_duration.human_str %> ago
-          <% else %>
-            <%= pipeline.last_started_at.strftime("%H:%M, %A %d %b %Y ") %>
-          <% end %>
+          <%= erb :'partials/time', :locals => {
+            time: pipeline.last_started_at, 
+            text: pipeline.is_running? ? pipeline.running_duration.human_str + " ago" : nil 
+          } %>
         </time>
       </td>
     </tr>

support/pipeline-visualiser/views/layout.erb

@@ -18,12 +18,6 @@
         background-color: #F2F3F3;
         padding: 2px 5px;
     }
-
-    time {
-        text-decoration: underline;
-        text-decoration-style: dashed;
-        text-underline-offset: 8px;
-    }
   </style>
 </head>
 
@@ -118,9 +112,19 @@
   <script type="module">
     import {
       initAll
-    } from '/javascript/govuk-frontend-5.3.0.min.js'
+    } from '/javascript/govuk-frontend-5.8.0.min.js'
     initAll()
   </script>
+
+  <script type="module">
+      document.querySelectorAll("time:not([data-relative-time])").forEach((time) => {
+        if(time.dateTime != null ) {
+            let globalTime = new Date(time.dateTime);
+            let localTime = globalTime.toLocaleString();
+            time.innerText = localTime;
+        }
+    });
+  </script>
 </body>
 
 </html>

support/pipeline-visualiser/views/partials/time.erb

@@ -0,0 +1,9 @@
+<% text = defined?(text) ? text : nil %>
+<% puts(text) %>
+<time datetime="<%= time.utc.strftime('%Y-%m-%dT%H:%M:%S.%L%z')%>" title="<%= time.utc.strftime('%Y-%m-%dT%H:%M:%S.%L%z')%>" <%= text.nil? ? '' : 'data-relative-time' %>>
+    <% if text.nil? %>
+        <%= time.strftime("%H:%M, %A %d %b %Y ") %>
+    <% else %>
+        <%= text %>
+    <% end %>
+</time>

support/pipeline-visualiser/views/pipeline.erb

@@ -11,7 +11,7 @@
 </h1>
 
 <p class="govuk-body">
-    <strong>Last execution time</strong> <%= pipeline.last_started_at.strftime("%H:%M, %A %d %b %Y ") %>
+    <strong>Last execution time</strong> <%= erb :'partials/time', :locals => {time: pipeline.last_started_at } %>
 </p>
 <p class="govuk-body">
   <strong>Execution id</strong> <%= pipeline.execution_id %>