Merge pull request #416 from NYPL/development

Release 0.17.2 to production
NYPL · Jun 22, 2023 · af1ee4f · af1ee4f
2 parents cf4cfed + ad48475
commit af1ee4f
Show file tree

Hide file tree

Showing 47 changed files with 14,679 additions and 55,036 deletions.
diff --git a/.env.sample b/.env.sample
@@ -16,4 +16,4 @@ NEXT_PUBLIC_READER_VERSION="v2"
 # The airtable key is only needed in development if the developer needs to send data via the feedback form. 
 
 NEXT_PUBLIC_AIRTABLE_API_KEY=[insert key here]
-NEXT_PUBLIC_GOOGLE_ANALYTICS=[insert GA ID here]
+NEXT_PUBLIC_ADOBE_ANALYTICS=[insert AA url here]
diff --git a/.github/workflows/build-production.yaml b/.github/workflows/build-production.yaml
@@ -72,7 +72,10 @@ jobs:
           AIRTABLE_KEY: ${{ secrets.AIRTABLE_API_KEY }}
           NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }}
         run: |
-          docker build --build-arg airtable_api_key=$AIRTABLE_KEY -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG --build-arg NEW_RELIC_APP_NAME="Digital Research Books (PROD)" --build-arg NEW_RELIC_LICENSE_KEY=$NEW_RELIC_LICENSE_KEY .
+          docker build --build-arg airtable_api_key=$AIRTABLE_KEY -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG \
+          --build-arg NEW_RELIC_APP_NAME="Digital Research Books (PROD)" \
+          --build-arg NEW_RELIC_LICENSE_KEY=$NEW_RELIC_LICENSE_KEY \
+          --build-arg NEXT_PUBLIC_ADOBE_ANALYTICS="https://assets.adobedtm.com/1a9376472d37/8519dfce636d/launch-672b7e7f98ee.min.js" .
           docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
           docker tag $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG $ECR_REGISTRY/$ECR_REPOSITORY:latest
           docker push $ECR_REGISTRY/$ECR_REPOSITORY:latest

diff --git a/.github/workflows/build-qa.yml b/.github/workflows/build-qa.yml
@@ -40,7 +40,10 @@ jobs:
           AIRTABLE_KEY: ${{ secrets.AIRTABLE_API_KEY }}
           NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }}
         run: |
-          docker build --build-arg airtable_api_key=$AIRTABLE_KEY -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG --build-arg NEW_RELIC_APP_NAME="Digital Research Books (QA)" --build-arg NEW_RELIC_LICENSE_KEY=$NEW_RELIC_LICENSE_KEY .
+          docker build --build-arg airtable_api_key=$AIRTABLE_KEY -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG \
+          --build-arg NEW_RELIC_APP_NAME="Digital Research Books (QA)" \
+          --build-arg NEW_RELIC_LICENSE_KEY=$NEW_RELIC_LICENSE_KEY \
+          --build-arg NEXT_PUBLIC_ADOBE_ANALYTICS="https://assets.adobedtm.com/1a9376472d37/8519dfce636d/launch-bf8436264b01-development.min.js" .
           docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
           docker tag $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG $ECR_REGISTRY/$ECR_REPOSITORY:latest
           docker push $ECR_REGISTRY/$ECR_REPOSITORY:latest

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # CHANGE LOG
 
+## [0.17.2]
+- Update to Web Reader version 4.3.1
+- Add TOC for single resource PDFs
+- Refactored Playwright/Cucumber tests to use new dropdown action function
+- Refactored Playwright/Cucumber tests to use new text fill function
+- Hide Header and Footer components on /read pages using the Web Reader
+- Migrate from Google Analytics to Adobe Analytics
+- Refactored Playwright/Cucumber tests to use new visibility function
+
 ## [0.17.1]
 - Replace dgx-header-component and DS Footer with Header/Footer components from nypl-header-app 
 - Refactored Playwright/Cucumber tests to use new click action function

diff --git a/Dockerfile b/Dockerfile
@@ -13,6 +13,8 @@ ARG airtable_api_key
 ARG NEW_RELIC_LICENSE_KEY
 ARG NEW_RELIC_APP_NAME 
 
+ARG NEXT_PUBLIC_ADOBE_ANALYTICS 
+
 # Set environment variables. NODE_ENV is set early because we
 # want to use it when running `npm install` and `npm run build`.
 ENV PATH /app/node_modules/.bin:$PATH
@@ -23,6 +25,7 @@ ENV NEXT_PUBLIC_AIRTABLE_API_KEY $airtable_api_key
 ENV NEXT_PUBLIC_READER_VERSION=v2
 ENV NEW_RELIC_LICENSE_KEY $NEW_RELIC_LICENSE_KEY
 ENV NEW_RELIC_APP_NAME $NEW_RELIC_APP_NAME
+ENV NEXT_PUBLIC_ADOBE_ANALYTICS $NEXT_PUBLIC_ADOBE_ANALYTICS
 
 # Install dependencies.
 COPY package.json package-lock.json ./

diff --git a/config/appConfig.ts b/config/appConfig.ts
@@ -27,11 +27,7 @@ export default {
     formUrl: "https://api.airtable.com/v0/appFLZEc3LmVZCRxn/Requests",
     experimentName: "RequestDigital",
   },
-  analytics: {
-    local: "",
-    development: "UA-1420324-149",
-    production: "UA-1420324-149",
-  },
+  analytics: process.env["NEXT_PUBLIC_ADOBE_ANALYTICS"],
   feedback: {
     formURL: "https://api.airtable.com/v0/appFLZEc3LmVZCRxn/Feedback",
   },