Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 0.18.10 to production #572

Merged
merged 9 commits into from
Dec 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Each line is a file pattern followed by one or more owners. These owners will be the default owners for everything in the repo. Unless a later match takes precedence,e ach owner will be requested for review when someone opens a pull request.
* @samanthaandrews @jackiequach @kristojorg @Toxiapo @oliviawongnyc
* @samanthaandrews @jackiequach @kylevillegas93
2 changes: 1 addition & 1 deletion .github/workflows/build-production.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,4 @@ jobs:

- name: Force ECS Update
run: |
aws ecs update-service --cluster sfr-front-end-production --service sfr-front-end-production --force-new-deployment
aws ecs update-service --cluster sfr-frontend-production-tf --service sfr-frontend-production-tf --force-new-deployment
4 changes: 0 additions & 4 deletions .github/workflows/build-qa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,5 @@ jobs:
docker push $ECR_REGISTRY/$ECR_REPOSITORY:qa-latest

- name: Force ECS Update
run: |
aws ecs update-service --cluster sfr-front-end-qa --service sfr-front-end-qa --force-new-deployment

- name: Force ECS Update - Terraform
run: |
aws ecs update-service --cluster sfr-frontend-qa-tf --service sfr-frontend-qa-tf --force-new-deployment
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

## [Prerelease]

## [0.18.10]

- Remove Kristo, Jiayong, and Olivia and add Kyle as codeowners
- Deploy to new Terraform ECS cluster in production
- Deploy only to the new Terraform ECS clusters
- Update API endpoints to plural nouns

## [0.18.9]

- Enable playwright tests GH action
Expand Down
8 changes: 4 additions & 4 deletions config/appConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ const appConfig = {
production: "http://drb-api-qa.nypl.org",
},
searchPath: "/search",
recordPath: "/work",
editionPath: "/edition",
readPath: "/link",
recordPath: "/works",
editionPath: "/editions",
readPath: "/links",
languagesPath: "/utils/languages",
collectionPath: "/collection",
collectionPath: "/collections",
},
booksCount: {
apiUrl: "/utils/counts",
Expand Down
2 changes: 1 addition & 1 deletion mocks/mockEnv.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ export const LIMITED_ACCESS_EDITION_PATH = "/edition/6977884";
export const WORK_PATH = "/work/5950e6df-9d99-42fe-8924-1116166a2acb";
export const DOWNLOAD_PATH = "/test-download-pdf";
export const HOME_PATH = "/";
export const COLLECTION_LIST_PATH = "/collection/list";
export const COLLECTION_LIST_PATH = "/collections";
export const INVALID_COLLECTION_PATH = "/collection/invalid-collection";
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sfr-bookfinder-front-end",
"version": "0.18.9",
"version": "0.18.10",
"private": true,
"scripts": {
"dev": "next dev",
Expand Down
4 changes: 2 additions & 2 deletions src/__tests__/fixtures/CollectionFixture.ts
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ export const oneCollectionListData: Opds2Feed = {
],
links: [
{
href: "/collection/list?page=1",
href: "/collections?page=1",
rel: ["self", "first", "previous", "next", "last"],
type: "application/opds+json",
},
Expand Down Expand Up @@ -1721,7 +1721,7 @@ export const collectionListData: CollectionResult = {
],
links: [
{
href: "/collection/list?page=1",
href: "/collections?page=1",
rel: ["self", "first", "previous", "next", "last"],
type: "application/opds+json",
},
Expand Down
5 changes: 4 additions & 1 deletion src/lib/api/CollectionApi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@ const collectionUrl = apiUrl + collectionPath;
export const collectionFetcher = async (query: CollectionQuery) => {
const collectionApiQuery = toApiCollectionQuery(query);

const url = new URL(collectionUrl + "/" + query.identifier);
const urlWithIdentifier = query.identifier
? collectionUrl + "/" + query.identifier
: collectionUrl;
const url = new URL(urlWithIdentifier);
url.search = new URLSearchParams(
toLocationQuery(collectionApiQuery)
).toString();
Expand Down
1 change: 0 additions & 1 deletion src/pages/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import Error from "./_error";
export async function getServerSideProps() {
// Fetch all collections
const collectionResult: CollectionResult = await collectionFetcher({
identifier: "list",
perPage: 8,
});

Expand Down
2 changes: 1 addition & 1 deletion src/types/CollectionQuery.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export type ApiCollectionQuery = {
};

export type CollectionQuery = {
identifier: string;
identifier?: string;
page?: number;
perPage?: number;
sort?: string;
Expand Down
Loading