From 153ffd4bade4f6e19f7441c5c701078311e5e4ba Mon Sep 17 00:00:00 2001
From: jer3k <99355997+jer3k@users.noreply.github.com>
Date: Fri, 1 Nov 2024 11:57:20 -0700
Subject: [PATCH 1/5] Snowplow button

---
 admin-frontend/src/App.vue                    |  4 ++++
 .../src/components/AnalyticsPage.vue          | 20 +++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/admin-frontend/src/App.vue b/admin-frontend/src/App.vue
index 3cdd83af1..661c88c5e 100644
--- a/admin-frontend/src/App.vue
+++ b/admin-frontend/src/App.vue
@@ -118,6 +118,10 @@ a:hover {
   background-color: transparent !important;
 }
 
+.v-card-title {
+  font-size: 1.35rem !important; //default is 1.25, but BCSans font looks wonky at that size.
+}
+
 .theme--light.application {
   background: #f1f1f1;
 }
diff --git a/admin-frontend/src/components/AnalyticsPage.vue b/admin-frontend/src/components/AnalyticsPage.vue
index 177ac3442..e4b9a565a 100644
--- a/admin-frontend/src/components/AnalyticsPage.vue
+++ b/admin-frontend/src/components/AnalyticsPage.vue
@@ -1,4 +1,21 @@
 <template>
+  <v-card
+    class="mb-5"
+    append-icon="mdi-open-in-new"
+    :href="sanitizeUrl(snowplowUrl)"
+    rel="noopener"
+    target="_blank"
+    title="Snowplow Analytics"
+    subtitle="Track and analyze user behavior."
+  >
+    <v-card-text>
+      <span class="text-info">
+        <v-icon icon="mdi-information" />
+        Only authorized users can access Snowplow.
+      </span>
+    </v-card-text>
+  </v-card>
+
   <div v-if="isAnalyticsAvailable" class="w-100 overflow-x-auto">
     <div
       v-for="[name, details] in resourceDetails"
@@ -25,6 +42,7 @@ import ApiService from '../services/apiService';
 import { ZonedDateTime, Duration } from '@js-joda/core';
 import { POWERBI_RESOURCE } from '../utils/constant';
 import { NotificationService } from '../services/notificationService';
+import { sanitizeUrl } from '@braintree/sanitize-url';
 
 type PowerBiDetails = {
   config: IReportEmbedConfiguration;
@@ -33,6 +51,8 @@ type PowerBiDetails = {
   eventHandlersMap: Map<string, EventHandler>;
 };
 
+const snowplowUrl = (window as any).config?.SNOWPLOW_URL;
+
 const isAnalyticsAvailable =
   (window as any).config?.IS_ADMIN_ANALYTICS_AVAILABLE?.toUpperCase() == 'TRUE';
 

From 3f36dc20c4252694cb2807ac048369b6b5d2758d Mon Sep 17 00:00:00 2001
From: jer3k <99355997+jer3k@users.noreply.github.com>
Date: Fri, 1 Nov 2024 11:57:49 -0700
Subject: [PATCH 2/5] Snowplow environment config

---
 .github/workflows/.deploy.yml                     | 1 +
 admin-frontend/Caddyfile                          | 3 ++-
 charts/fin-pay-transparency/templates/secret.yaml | 1 +
 charts/fin-pay-transparency/values-dev.yaml       | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/.deploy.yml b/.github/workflows/.deploy.yml
index d5cdacb0f..6cc93001d 100644
--- a/.github/workflows/.deploy.yml
+++ b/.github/workflows/.deploy.yml
@@ -168,6 +168,7 @@ jobs:
           --set-string crunchy.pgBackRest.s3.accessKey="${{ secrets.S3_ACCESS_KEY }}"  \
           --set-string crunchy.pgBackRest.s3.secretKey="${{ secrets.S3_SECRET_ACCESS_KEY }}"  \
           --set-string global.secrets.clamavApiKey="${{ secrets.CLAMAV_API_KEY }}" \
+          --set-string global.secrets.snowplowUrl="${{ secrets.SNOWPLOW_URL }}" \
           ${{ inputs.params }} \
           --timeout "$DEPLOY_TIMEOUT"m  ./${{ github.event.repository.name }}-${{ steps.vars.outputs.semver }}.tgz
 
diff --git a/admin-frontend/Caddyfile b/admin-frontend/Caddyfile
index c83f7f573..6f6390bba 100644
--- a/admin-frontend/Caddyfile
+++ b/admin-frontend/Caddyfile
@@ -20,7 +20,8 @@
     }
     respond `window.config = {
       "IS_ADMIN_DASHBOARD_AVAILABLE":"{$IS_ADMIN_DASHBOARD_AVAILABLE}",
-      "IS_ADMIN_ANALYTICS_AVAILABLE":"{$IS_ADMIN_ANALYTICS_AVAILABLE}"
+      "IS_ADMIN_ANALYTICS_AVAILABLE":"{$IS_ADMIN_ANALYTICS_AVAILABLE}",
+      "SNOWPLOW_URL":"{$SNOWPLOW_URL}"
     };`
   }
   root * /app/dist
diff --git a/charts/fin-pay-transparency/templates/secret.yaml b/charts/fin-pay-transparency/templates/secret.yaml
index 6de223119..16da11ac8 100644
--- a/charts/fin-pay-transparency/templates/secret.yaml
+++ b/charts/fin-pay-transparency/templates/secret.yaml
@@ -62,4 +62,5 @@ data:
   S3_BUCKET_NAME: {{ .Values.global.secrets.s3Bucket | b64enc | quote }}
   S3_ENDPOINT: {{ .Values.global.secrets.s3Endpoint | b64enc | quote }}
   CLAMAV_API_KEY: {{ .Values.global.secrets.clamavApiKey | b64enc | quote }}
+  SNOWPLOW_URL: {{ .Values.global.secrets.snowplowUrl | b64enc | quote }}
 
diff --git a/charts/fin-pay-transparency/values-dev.yaml b/charts/fin-pay-transparency/values-dev.yaml
index 3005fde8b..e4c490f3f 100644
--- a/charts/fin-pay-transparency/values-dev.yaml
+++ b/charts/fin-pay-transparency/values-dev.yaml
@@ -158,6 +158,7 @@ admin-frontend:
   env:
     isAdminDashboardAvailable: true
     isAdminAnalyticsAvailable: true
+    isAdminAnalyticsAvailable: true
 database:
   enabled: false
 crunchy:

From 296bc4509edc6a8b2693cbbee1a25eac22ab35ec Mon Sep 17 00:00:00 2001
From: jer3k <99355997+jer3k@users.noreply.github.com>
Date: Fri, 1 Nov 2024 12:12:45 -0700
Subject: [PATCH 3/5] fix

---
 .../charts/admin-frontend/templates/deployment.yaml             | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/charts/fin-pay-transparency/charts/admin-frontend/templates/deployment.yaml b/charts/fin-pay-transparency/charts/admin-frontend/templates/deployment.yaml
index 82654bcfd..57e2c2c8c 100644
--- a/charts/fin-pay-transparency/charts/admin-frontend/templates/deployment.yaml
+++ b/charts/fin-pay-transparency/charts/admin-frontend/templates/deployment.yaml
@@ -49,6 +49,8 @@ spec:
               value: "{{ .Values.env.isAdminDashboardAvailable }}"
             - name: IS_ADMIN_ANALYTICS_AVAILABLE
               value: "{{ .Values.env.isAdminAnalyticsAvailable }}"
+            - name: SNOWPLOW_URL
+              value: "{{ .Values.global.secrets.snowplowUrl }}"
             - name: CLAMAV_API_KEY
               valueFrom:
                 secretKeyRef:

From de2b251e5d58fee55ea0eeac21e362a425ffae8f Mon Sep 17 00:00:00 2001
From: jer3k <99355997+jer3k@users.noreply.github.com>
Date: Fri, 1 Nov 2024 14:13:10 -0700
Subject: [PATCH 4/5] alt design

---
 admin-frontend/src/components/AnalyticsPage.vue | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/admin-frontend/src/components/AnalyticsPage.vue b/admin-frontend/src/components/AnalyticsPage.vue
index e4b9a565a..2a8e0f3cb 100644
--- a/admin-frontend/src/components/AnalyticsPage.vue
+++ b/admin-frontend/src/components/AnalyticsPage.vue
@@ -1,8 +1,15 @@
 <template>
-  <v-card
-    class="mb-5"
+  <v-btn
+    v-tooltip:bottom-end="'Only authorized users can access Snowplow.'"
     append-icon="mdi-open-in-new"
+    class="ml-auto btn-secondary"
+    style="margin-top: -40px"
     :href="sanitizeUrl(snowplowUrl)"
+    >Snowplow Analytics</v-btn
+  >
+  <!-- <v-card
+    class="mb-5"
+    append-icon="mdi-open-in-new"
     rel="noopener"
     target="_blank"
     title="Snowplow Analytics"
@@ -14,7 +21,7 @@
         Only authorized users can access Snowplow.
       </span>
     </v-card-text>
-  </v-card>
+  </v-card> -->
 
   <div v-if="isAnalyticsAvailable" class="w-100 overflow-x-auto">
     <div

From bc088a2828e915ddb819c44d408403976f0f5400 Mon Sep 17 00:00:00 2001
From: jer3k <99355997+jer3k@users.noreply.github.com>
Date: Tue, 5 Nov 2024 13:33:49 -0800
Subject: [PATCH 5/5] update button with new design

---
 .../src/components/AnalyticsPage.vue          | 21 ++++---------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/admin-frontend/src/components/AnalyticsPage.vue b/admin-frontend/src/components/AnalyticsPage.vue
index 2a8e0f3cb..5e22866c3 100644
--- a/admin-frontend/src/components/AnalyticsPage.vue
+++ b/admin-frontend/src/components/AnalyticsPage.vue
@@ -1,27 +1,14 @@
 <template>
   <v-btn
-    v-tooltip:bottom-end="'Only authorized users can access Snowplow.'"
+    v-tooltip:bottom-end="'Only authorized users can access this data'"
     append-icon="mdi-open-in-new"
-    class="ml-auto btn-secondary"
+    class="ml-auto btn-primary"
     style="margin-top: -40px"
-    :href="sanitizeUrl(snowplowUrl)"
-    >Snowplow Analytics</v-btn
-  >
-  <!-- <v-card
-    class="mb-5"
-    append-icon="mdi-open-in-new"
     rel="noopener"
     target="_blank"
-    title="Snowplow Analytics"
-    subtitle="Track and analyze user behavior."
+    :href="sanitizeUrl(snowplowUrl)"
+    >Web Traffic Analytics</v-btn
   >
-    <v-card-text>
-      <span class="text-info">
-        <v-icon icon="mdi-information" />
-        Only authorized users can access Snowplow.
-      </span>
-    </v-card-text>
-  </v-card> -->
 
   <div v-if="isAnalyticsAvailable" class="w-100 overflow-x-auto">
     <div