Skip to content

Commit

Permalink
Merge pull request #129 from NYPL/qa
Browse files Browse the repository at this point in the history
Merge qa into production
  • Loading branch information
dgcohen authored Mar 5, 2024
2 parents 8bbc8b4 + 1f44c0e commit 6483dd8
Show file tree
Hide file tree
Showing 118 changed files with 18,495 additions and 11,008 deletions.
17 changes: 13 additions & 4 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,9 +1,18 @@
NEXT_PUBLIC_APP_ENV="development"
PLATFORM_API_CLIENT_ID=[secret]
PLATFORM_API_CLIENT_SECRET=[secret]
NYPL_HEADER_URL=https://ds-header.nypl.org
NEXT_PUBLIC_CLOSED_LOCATIONS=""
NEXT_PUBLIC_RECAP_CLOSED_LOCATIONS=""
NEXT_PUBLIC_NON_RECAP_CLOSED_LOCATIONS=""
CLOSED_LOCATIONS=""
RECAP_CLOSED_LOCATIONS=""
NON_RECAP_CLOSED_LOCATIONS=""
ADOBE_EMBED_URL=https://assets.adobedtm.com/1a9376472d37/ddf1bedfe52e/launch-4eefcc91c90e.min.js
SHEP_API=http://[fqdn]/api/v0.1
NEXT_PUBLIC_REVERSE_PROXY_ENABLED=false
SIERRA_KEY=[secret]
SIERRA_SECRET=[secret]
SIERRA_BASE=https://nypl-sierra-test.nypl.org:443/iii/sierra-api
NEXT_PUBLIC_REVERSE_PROXY_ENABLED=false
LOGIN_BASE_URL=https://[fqdn]
SEARCH_RESULTS_NOTIFICATION=""
SOURCE_EMAIL=""
LIB_ANSWERS_EMAIL=""

13 changes: 6 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
language: minimal
dist: xenial
language: ruby

services:
- docker
Expand All @@ -15,24 +16,22 @@ jobs:
before_install:
- if [[ $TRAVIS_BRANCH == "qa" ]];
then
export ENV="qa";
export NYPL_HEADER_URL="https://qa-ds-header.nypl.org";
export NEXT_PUBLIC_APP_ENV="qa";
fi
- if [[ "$TRAVIS_BRANCH" == "production" ]];
then
export ENV="production";
export NYPL_HEADER_URL="https://ds-header.nypl.org";
export NEXT_PUBLIC_APP_ENV="production";
fi
env:
- ECR_URL=946183545209.dkr.ecr.us-east-1.amazonaws.com/research-catalog
- AWS_DEFAULT_REGION=us-east-1
- AWS_REGION=us-east-1
install:
- pip install --user awscli
- export LOCAL_TAG_NAME="${ENV}-latest"
- export LOCAL_TAG_NAME="${NEXT_PUBLIC_APP_ENV}-latest"
script:
- eval $(aws ecr get-login --no-include-email --region us-east-1)
- docker build -t "$LOCAL_TAG_NAME" --build-arg NYPL_HEADER_URL="${NYPL_HEADER_URL}" .
- docker build -t "$LOCAL_TAG_NAME" --build-arg NEXT_PUBLIC_APP_ENV="${NEXT_PUBLIC_APP_ENV}" .
- docker tag "$LOCAL_TAG_NAME" "$ECR_URL:$LOCAL_TAG_NAME"
# Re-tag last latest image just in case
- |
Expand Down
35 changes: 32 additions & 3 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,40 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## Unreleased
## [1.0.0] 2024-03-04

## Release Notes

- This version represents the first public release of the Research Catalog refactor.
- This first public release will include the new Homepage and Advanced Search page, the Header and Footer, as well as the Feedback form (SCC-3614).
- Other pages will fall back to their currently live DFE versions.

### My Account

- My Account Header (SCC-3924)
- Holds API routes (SCC-3953)
- Settings API routes (SCC-3954)
- Checkout renewal API route (SCC-3951)

### Added

- Feedback Box (SCC-3614)
- Tests for existing API routes (SCC-3967)

### Removals

- Removal of client-side item sorting (SCC-3984)

## [0.1.1] 2024-02-14

### Added

- Added the Notification banner on the home and search result pages (SCC-3996)
- OG and Twitter meta tags (SCC-4002)

### Updated

- Make the reverse proxy feature flag a boolean to avoid issues with stringified array values in Docker
- Remove all build time env variables from appConfig except for ENV

## [0.1.0] 2024-02-02

Expand All @@ -20,4 +49,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Search Results Page (SCC-3600)
- DRB Sidebar (SCC-3606)
- Advanced Search (SCC-3890)
- Initial Bib Page work (SCC-3659, SCC-3962, SCC-3938)
- Initial Bib Page work (SCC-3659, SCC-3962, SCC-3938)
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM node:16-alpine AS production
#RUN apt-get update
#RUN apt-get upgrade -y

ARG NYPL_HEADER_URL
ARG NEXT_PUBLIC_APP_ENV

WORKDIR /app

Expand All @@ -21,7 +21,7 @@ RUN npm install
# Add application code.
COPY . .

ENV NYPL_HEADER_URL=${NYPL_HEADER_URL}
ENV NEXT_PUBLIC_APP_ENV=${NEXT_PUBLIC_APP_ENV}
RUN npm run build

# Explicitly set port 3000 as open to requests.
Expand Down
26 changes: 17 additions & 9 deletions ENVIRONMENTVARS.md

Large diffs are not rendered by default.

68 changes: 68 additions & 0 deletions __test__/fixtures/accountFixtures.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
export const mockPatron = {
notificationPreference: "Email",
name: "NONNA, STREGA",
barcode: "23333121538324",
expirationDate: "2025-03-28",
primaryEmail: "[email protected]",
emails: ["[email protected]", "[email protected]"],
primaryPhone: "123-456-7890",
phones: [
{
number: "123-456-7890",
type: "t",
},
],
homeLibrary: "Stavros Niarchos Foundation Library (SNFL)",
id: 2772226,
}
export const mockCheckouts = [
{
id: "65060571",
callNumber: "972.93 D",
barcode: "33333432264691",
dueDate: "2024-02-09T09:00:00Z",
patron: "2772226",
title: "The Dominican Republic reader : history, culture, politics",
isResearch: false,
bibId: "21678146",
isNyplOwned: true,
},
{
id: "65060570",
callNumber: "Spa FIC ALVAREZ",
barcode: "33333455520789",
dueDate: "2024-02-09T09:00:00Z",
patron: "2772226",
title: "En el tiempo de las mariposas",
isResearch: false,
bibId: "17699134",
isNyplOwned: true,
},
]

export const mockHolds = [
{
patron: "2772226",
id: "48636910",
pickupByDate: "2024-02-15T09:00:00Z",
canFreeze: false,
frozen: false,
status: "Requested item ready for pickup.",
pickupLocation: "SNFL (formerly Mid-Manhattan)",
title:
"Quit like a woman : the radical choice to not drink in a culture obsessed with alcohol",
isResearch: false,
bibId: "22002760",
isNyplOwned: false,
},
]
export const mockFines = {
total: 14.99,
entries: [
{
detail: "Replacement",
amount: 14.99,
date: "2023-06-15T17:34:46Z",
},
],
}
Loading

0 comments on commit 6483dd8

Please sign in to comment.