-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #654 from reload/fix/link-to-ereol
Fix/link to ereol
- Loading branch information
Showing
20 changed files
with
557 additions
and
71 deletions.
There are no files selected for viewing
40 changes: 20 additions & 20 deletions
40
.docker/wiremock/publizon/mappings/v1_user_loans-9b13da33-2be3-4711-8664-81c27009495e.json
Large diffs are not rendered by default.
Oops, something went wrong.
36 changes: 18 additions & 18 deletions
36
...wiremock/publizon/mappings/v1_user_reservations-1b8c0935-12c7-43c9-9a49-3e591cc079bb.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,22 @@ | ||
| { | ||
| "id" : "1b8c0935-12c7-43c9-9a49-3e591cc079bb", | ||
| "name" : "Reservations (list)", | ||
| "request" : { | ||
| "url" : "/v1/user/reservations", | ||
| "method" : "GET" | ||
| "id": "1b8c0935-12c7-43c9-9a49-3e591cc079bb", | ||
| "name": "Reservations (list)", | ||
| "request": { | ||
| "url": "/v1/user/reservations", | ||
| "method": "GET" | ||
| }, | ||
| "response" : { | ||
| "status" : 200, | ||
| "body" : "{\n \"reservations\": [\n {\n \"productId\": \"0ddd10d0-d69f-4734-8a27-ac4546f4b912\",\n \"identifier\": \"9788711321683\",\n \"createdDateUtc\": \"2022-08-16T10:52:39.932Z\",\n \"status\": 1,\n \"productTitle\": \"Bargums synder\",\n \"expireDateUtc\": \"2023-01-27T19:37:15.63Z\",\n \"expectedRedeemDateUtc\": \"2023-01-27T19:37:15.63Z\"\n },\n {\n \"productId\": \"0ddd10d0-d69f-4734-8a27-ac4546f4b912\",\n \"identifier\": \"9788740047905\",\n \"createdDateUtc\": \"2022-08-16T10:52:39.932Z\",\n \"status\": 2,\n \"productTitle\": \"Bargums synder\",\n \"expireDateUtc\": \"2023-01-27T19:37:15.63Z\",\n \"expectedRedeemDateUtc\": \"2023-01-27T19:37:15.63Z\"\n }\n ],\n \"code\": 101,\n \"message\": \"OK\"\n}", | ||
| "headers" : { | ||
| "content-type" : "application/json; charset=utf-8", | ||
| "date" : "{{now format='yyyy-MM-dd HH:mm:ssZ'}}", | ||
| "strict-transport-security" : "max-age=15552000" | ||
| "response": { | ||
| "status": 200, | ||
| "body": "{\n \"reservations\": [\n {\n \"productId\": \"0ddd10d0-d69f-4734-8a27-ac4546f4b912\",\n \"identifier\": \"9788711321683\",\n \"createdDateUtc\": \"2022-08-16T10:52:39.932Z\",\n \"status\": 1,\n \"productTitle\": \"Bargums synder\",\n \"expireDateUtc\": \"2023-01-27T19:37:15.63Z\",\n \"expectedRedeemDateUtc\": \"2023-01-27T19:37:15.63Z\"\n },\n {\n \"productId\": \"0ddd10d0-d69f-4734-8a27-ac4546f4b912\",\n \"identifier\": \"9788702319361\",\n \"createdDateUtc\": \"2022-08-16T10:52:39.932Z\",\n \"status\": 2,\n \"productTitle\": \"Bargums synder\",\n \"expireDateUtc\": \"2023-01-27T19:37:15.63Z\",\n \"expectedRedeemDateUtc\": \"2023-01-27T19:37:15.63Z\"\n }\n ],\n \"code\": 101,\n \"message\": \"OK\"\n}", | ||
| "headers": { | ||
| "content-type": "application/json; charset=utf-8", | ||
| "date": "{{now format='yyyy-MM-dd HH:mm:ssZ'}}", | ||
| "strict-transport-security": "max-age=15552000" | ||
| } | ||
| }, | ||
| "uuid" : "1b8c0935-12c7-43c9-9a49-3e591cc079bb", | ||
| "persistent" : true, | ||
| "priority" : 5, | ||
| "insertionIndex" : 23, | ||
| "postServeActions" : [ ] | ||
| } | ||
| "uuid": "1b8c0935-12c7-43c9-9a49-3e591cc079bb", | ||
| "persistent": true, | ||
| "priority": 5, | ||
| "insertionIndex": 23, | ||
| "postServeActions": [] | ||
| } |
125 changes: 125 additions & 0 deletions
125
cypress/fixtures/reservation-details/advanced-search-fbi-api.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,125 @@ | ||
| { | ||
| "data": { | ||
| "complexSearch": { | ||
| "hitcount": 1, | ||
| "works": [ | ||
| { | ||
| "workId": "work-of:870970-basis:22677780", | ||
| "manifestations": { | ||
| "all": [ | ||
| { | ||
| "pid": "870970-basis:22677780", | ||
| "identifiers": [ | ||
| { | ||
| "type": "ISBN", | ||
| "value": "9788702319361" | ||
| }, | ||
| { | ||
| "type": "ISBN", | ||
| "value": "87-00-45994-1" | ||
| } | ||
| ], | ||
| "access": [ | ||
| { | ||
| "__typename": "Ereol", | ||
| "url": "https://ereolen.dk/ting/object/870970-basis:51412656" | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "pid": "870970-basis:27639097", | ||
| "identifiers": [ | ||
| { | ||
| "type": "ISBN", | ||
| "value": "9788702075397" | ||
| } | ||
| ], | ||
| "access": [ | ||
| { | ||
| "__typename": "InterLibraryLoan", | ||
| "loanIsPossible": true | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "pid": "870970-basis:29316945", | ||
| "identifiers": [ | ||
| { | ||
| "type": "ISBN", | ||
| "value": "9788702114331" | ||
| } | ||
| ], | ||
| "access": [ | ||
| { | ||
| "__typename": "InterLibraryLoan", | ||
| "loanIsPossible": true | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "pid": "870970-basis:51980239", | ||
| "identifiers": [ | ||
| { | ||
| "type": "ISBN", | ||
| "value": "9788702173239" | ||
| } | ||
| ], | ||
| "access": [ | ||
| { | ||
| "__typename": "InterLibraryLoan", | ||
| "loanIsPossible": true | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "pid": "870970-basis:52652219", | ||
| "identifiers": [ | ||
| { | ||
| "type": "ISBN", | ||
| "value": "9788702204681" | ||
| } | ||
| ], | ||
| "access": [ | ||
| { | ||
| "__typename": "InterLibraryLoan", | ||
| "loanIsPossible": true | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "pid": "870970-basis:54871929", | ||
| "identifiers": [ | ||
| { | ||
| "type": "ISBN", | ||
| "value": "9788702272444" | ||
| } | ||
| ], | ||
| "access": [ | ||
| { | ||
| "__typename": "InterLibraryLoan", | ||
| "loanIsPossible": true | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "pid": "870970-basis:61636935", | ||
| "identifiers": [ | ||
| { | ||
| "type": "ISBN", | ||
| "value": "9788702319361" | ||
| } | ||
| ], | ||
| "access": [ | ||
| { | ||
| "__typename": "InterLibraryLoan", | ||
| "loanIsPossible": true | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 35 additions & 0 deletions
35
src/apps/reservation-list/modal/reservation-details/helper.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| import { ComplexSearchWithPaginationWorkAccessQuery } from "../../../../core/dbc-gateway/generated/graphql"; | ||
|
|
||
| type AccessManifestations = | ||
| ComplexSearchWithPaginationWorkAccessQuery["complexSearch"]["works"][0]["manifestations"]["all"]; | ||
|
|
||
| export const findAccessManifestationByIdentifier = ( | ||
| manifestations: AccessManifestations, | ||
| identifier: string | ||
| ) => | ||
| manifestations.filter((manifestation) => | ||
| manifestation.identifiers.find( | ||
| // We are comparing ISBNs here, which can have different formats - | ||
| // with spaces/dashes, so we remove all non-digits before comparing. | ||
| (id) => id.value.replace(/\D/g, "") === identifier.replace(/\D/g, "") | ||
| ) | ||
| ); | ||
|
|
||
| export const findEreolAccessLinkFromManifestations = ( | ||
| manifestations: AccessManifestations | ||
| ) => { | ||
| const manifestationWithEreolAccess = manifestations.find((manifestation) => { | ||
| return manifestation.access.find((access) => { | ||
| return access.__typename === "Ereol"; | ||
| }); | ||
| }); | ||
| const ereolAccess = manifestationWithEreolAccess?.access.find( | ||
| (access) => access.__typename === "Ereol" | ||
| ); | ||
| // TODO: Find out why TS doesn't understand that ereolAccess will always exist | ||
| // eslint-disable-next-line @typescript-eslint/ban-ts-comment | ||
| // @ts-ignore-next-line | ||
| return ereolAccess?.url; | ||
| }; | ||
|
|
||
| export default {}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.