[DO NOT MERGE] Update search dashboard

GA4_handlers/active_users_yesterday.rb

@@ -0,0 +1,21 @@
+require "google/analytics/data/v1beta"
+
+def active_users_yesterday
+  client = ::Google::Analytics::Data::V1beta::AnalyticsData::Client.new
+
+  request = Google::Analytics::Data::V1beta::RunReportRequest.new(
+    property: "properties/330577055",
+    date_ranges: [
+      { start_date: "yesterday", end_date: "yesterday" }
+    ],
+    metrics: [
+      { name: "activeUsers" }
+    ]
+  )
+
+  response = client.run_report(request) 
+
+  if response.rows.any?
+    active_users_yesterday = response.rows[0].metric_values[0].value
+  end
+end

public/javascripts/manager.js

@@ -12,9 +12,8 @@
         $body.addClass('tall');
       }
       matrix.traffic.init();
+      matrix.trafficYesterday.init();
       matrix.search.init();
-      matrix.content.init();
-      matrix.recentlyPublished.init();
     },
   };
   root.matrix.manager = manager;

public/javascripts/search.js

@@ -104,16 +104,17 @@
     },
 
     displayResults: function(){
-      var term = search.newTerms.pop();
+      var term = search.newTerms.pop() || search.terms?.pop()?.term
       if(term){
+        console.warn(term)
         var updateElement = search.updateElement();
-        updateElement.prepend('<li class="govuk-body-l">'+$('<div class="govuk-body-l">').text(term).html()+'</li>');
+        updateElement.prepend('<li class="govuk-body govuk-!-font-size-36 govuk-!-static-margin-bottom-5">'+$('<div class="govuk-body-l">').text(term).html()+'</li>');
         updateElement.css('margin-top',-search.$el.find('li').first().outerHeight(true)).animate({'margin-top':0}, function(){
-          search.$el.find('li:gt(20)').remove();
-          root.setTimeout(search.displayResults, (search.nextRefresh - Date.now()) / search.newTerms.length);
+          search.$el.find('li:gt(18)').remove();
+          root.setTimeout(search.displayResults, 100);
         });
       } else {
-        root.setTimeout(search.displayResults, 5e3);
+        root.setTimeout(search.displayResults, 100);
       }
     },
 
@@ -122,13 +123,13 @@
 
       search.reload();
       search.displayResults();
-      window.setInterval(search.reload, 60e3);
+      window.setInterval(search.reload, 10e3);
     },
 
     reload: function(){
       var endpoint = search.endpoint();
 
-      search.nextRefresh = Date.now() + 60e3;
+      search.nextRefresh = 100 + 100;
       $.ajax({ dataType: 'json', url: endpoint, success: search.parseResponse });
     },
 

public/javascripts/traffic-yesterday.js

@@ -0,0 +1,37 @@
+(function(){
+  "use strict"
+  var root = this,
+      $ = root.jQuery;
+  if(typeof root.matrix === 'undefined'){ root.matrix = {} }
+
+  var trafficYesterday = {
+    $el: false,
+    user_count: 0,
+
+    endpoint: function(){
+      return "/active-users-yesterday";
+    },
+
+    parseResponse: function(data){
+      console.warn(data)
+      trafficYesterday.user_count = data
+      trafficYesterday.displayResults() 
+    },
+    displayResults: function(){
+      trafficYesterday.$el.text(root.matrix.numberWithCommas(trafficYesterday.user_count))
+    },
+    init: function(){
+      trafficYesterday.$el = $('#traffic-count-yesterday');
+
+      trafficYesterday.reload();
+      window.setInterval(trafficYesterday.reload, 86400000);
+    },
+    reload: function(){
+      var endpoint = trafficYesterday.endpoint();
+
+      $.ajax({ dataType: 'json', url: endpoint, success: trafficYesterday.parseResponse});
+    }
+  };
+
+  root.matrix.trafficYesterday = trafficYesterday;
+}).call(this);

public/javascripts/traffic.js

@@ -13,6 +13,7 @@
     },
 
     parseResponse: function(data){
+      console.warn(data)
       traffic.user_count = data.active_users_30_minutes
       traffic.displayResults() 
     },

public/stylesheets/govuk-custom-dashboard.css

@@ -1,40 +1,29 @@
 /* Note: `!important` is used to override default gov.uk css styles */
 
-
-html,body {
-    background-color: #282D30 !important;
+html,
+body {
+    background-color: #0b0c0c !important;
+    height: 100vh;
 }
 
-.dashboard-banner {
-    border-bottom: 10px solid #0b0c0c;
+.dashboard-body--flex {
+    box-sizing: border-box;
+    display: flex;
+    flex-direction: column;
+    margin: 0;
+    padding: 30px 50px;
 }
 
-.dashboard-banner-inner {
-    border-bottom: 10px solid #0b0c0c; 
-    margin-left: 20px;
-    margin-right: 0 !important;
-    max-width: 100% !important;
+.dashboard-body--flex .dashboard-main {
+    flex-grow: 1;
+    overflow: hidden;
 }
 
-.dashboard-banner-inner {
-    display: flex;
-    justify-content: space-between;
+.dashboard-logo {
     align-items: center;
-}
-#slack-channel-link {
-    margin-right: 20px;
-    font-size: 32px;
-}
-.govuk-header__logo{
-    flex: 1;
-}
-
-.dashboard-background {
-    padding: 20px; 
-    background-color: #282D30;
+    display: flex;
 }
 
-.dashboard-number-count {
-    text-align: left; 
-    font-size: 72px;
+.text-wrap-balance {
+    text-wrap: balance
 }

server.rb

@@ -13,6 +13,7 @@
 require 'dotenv/load'
 require "google/analytics/data/v1beta"
 require_relative 'GA4_handlers/active_users'
+require_relative 'GA4_handlers/active_users_yesterday'
 require_relative 'GA4_handlers/popular_content'
 require_relative 'GA4_handlers/live_searches'
 autoload :Google, 'google-analytics-data-v1beta'
@@ -51,6 +52,11 @@
   active_users
 end
 
+get '/active-users-yesterday' do
+  content_type :json
+  active_users_yesterday
+end
+
 get '/recently-published' do
   http = Net::HTTP.new('www.gov.uk', 443)
   http.use_ssl = true