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

Merge Release/2024 3 0 into develop #860

Merged
merged 63 commits into from
Jan 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
80678f8
Expanding fetching system for FBI to handle multiple urls
spaceo Dec 19, 2023
7e93ff4
Show fees in a single list & include non-payable ones + update wiremock
Adamik10 Dec 19, 2023
088dd3c
Add feeListAlreadyPaidInfoText to the fee list dev & app entry
Adamik10 Dec 19, 2023
56a1b62
Add feeListAlreadyPaidInfoText to the bottom of fee list page
Adamik10 Dec 19, 2023
414c7c7
Add feeLitsMaterialNumberText translation text to fee list app
Adamik10 Dec 19, 2023
d109fe7
Use feeLitsMaterialNumberText in the fee info component
Adamik10 Dec 19, 2023
ffbc2e9
Update fee list test based on new stub
Adamik10 Dec 19, 2023
7c4f3ec
Use data-cy in fee list test, not fee-list-page class & update the test
Adamik10 Dec 20, 2023
18faea6
Bump the babel group with 2 updates
dependabot[bot] Dec 14, 2023
ff484a4
Bump eslint-config-prettier from 9.0.0 to 9.1.0
dependabot[bot] Dec 14, 2023
266ed46
Bump caniuse-lite from 1.0.30001566 to 1.0.30001570
dependabot[bot] Dec 14, 2023
92d77b3
Bump stylelint-scss from 5.3.2 to 6.0.0
dependabot[bot] Dec 14, 2023
51ed1bd
Bump @types/react from 18.2.41 to 18.2.45
dependabot[bot] Dec 14, 2023
cc55c16
Bump @typescript-eslint/parser from 6.13.2 to 6.14.0
dependabot[bot] Dec 14, 2023
0422e45
Bump actions/upload-artifact from 3 to 4
dependabot[bot] Dec 18, 2023
4ac3e3c
Bump @cypress/code-coverage from 3.12.12 to 3.12.14
dependabot[bot] Dec 18, 2023
9688ef4
Bump eslint from 8.54.0 to 8.56.0
dependabot[bot] Dec 19, 2023
b7a7bb1
Bump @types/node from 20.10.3 to 20.10.5
dependabot[bot] Dec 19, 2023
7aa7ac6
Update `DescriptionList` with BEM Classes
kasperbirch1 Dec 7, 2023
e841896
Use release 2023.51.0 of design system
kasperg Dec 19, 2023
371f541
Make feeLitsMaterialNumberText into translatable text with a placeholder
Adamik10 Dec 27, 2023
f6e51f5
Use getBySel instead of get("[data-cy='']") in fee list test 3.c.b.
Adamik10 Dec 27, 2023
a57f97c
Merge branch 'release/2024-1-0' into fix/fee-list
Adamik10 Dec 27, 2023
b603df1
Merge branch 'release/2024-1-0' into fix/fee-list
Adamik10 Jan 2, 2024
a2e273b
Correct spelling in feeLitsMaterialNumberText -> feeListMaterialNumberTe
Adamik10 Jan 2, 2024
26c4c8e
Correct definition of feeListMaterialNumberText in FeeList.dev.tsx
Adamik10 Jan 2, 2024
97eb24a
Change outdated materialNumberText to feeListMaterialNumberText
Adamik10 Jan 2, 2024
3febf25
Merge branch 'release/2024-1-0' into fix/fee-list
Adamik10 Jan 2, 2024
195e900
Merge branch 'release/2024-1-0' into fix/fee-list
Adamik10 Jan 4, 2024
d7fad5b
Use Work.materialTypes.materialTypeSpecific field
spaceo Jan 10, 2024
e73562b
Improve types on fbi fetch helper functions
spaceo Jan 11, 2024
6d224e8
Add tests for resolving fbi fetcher base urls
spaceo Jan 11, 2024
73b2ccb
Add all queries/mutations to fbi mapping
spaceo Jan 11, 2024
0cb777a
Move query map to separate file
spaceo Jan 12, 2024
8bd9ddd
Partial mock in the DBC Gateway Request tests
spaceo Jan 12, 2024
df82877
Change materialTypes.specific references
spaceo Jan 10, 2024
6ee99f6
Add openOrderErrorMissingPincodeText
spaceo Jan 10, 2024
2cef9fe
Updating all cypress fixtures to use new materialTypeSpecific fields
spaceo Jan 13, 2024
475be9d
Adjust unit tests to new type.materialTypeSpecific field
spaceo Jan 13, 2024
bda6888
Found more issing materialTypeSpecific references
spaceo Jan 13, 2024
0679189
Adding missing orderDigitalCopyFeedbackErrorMissingMunicipalityagency…
spaceo Jan 14, 2024
c017bc2
Merge pull request #794 from danskernesdigitalebibliotek/fix/fee-list
Adamik10 Jan 15, 2024
13888a0
Merge branch 'develop' into merge-develop-into-2024_3_0
spaceo Jan 15, 2024
1a849a1
Merge pull request #855 from danskernesdigitalebibliotek/merge-develo…
spaceo Jan 15, 2024
08c6392
Introduce wiremock stub to mock fees-v2 call without any parameteres
Adamik10 Jan 15, 2024
2b3e4fe
Add a possibility for ArrowButton comp to handle keyboard events
Adamik10 Jan 15, 2024
15d4152
Don't render arrow button inside another button in selectable-material
Adamik10 Jan 15, 2024
72b39fa
Merge pull request #841 from danskernesdigitalebibliotek/DDFLSBP-380-…
spaceo Jan 15, 2024
70f88ac
Use next-present for all FBI requests except search related ones
spaceo Jan 15, 2024
38f02c3
Replace isDateBeforePaymentChangeDate by getFeesBasedOnPayableByClient
Adamik10 Jan 15, 2024
e200897
Rename feeList translations to better reflect their purpose
Adamik10 Jan 15, 2024
590d8ae
Show how many fees appear in the fee list beside the headline
Adamik10 Jan 15, 2024
8808263
Divide fees into two lists - payable and not payable by the client
Adamik10 Jan 15, 2024
c73e842
Make it possible to vary the FBI profile in fixtures
spaceo Jan 16, 2024
091eef5
Adjust patron storybook menu to reflect harcoded conf in dpl-cms
spaceo Jan 15, 2024
fba97ef
Merge pull request #796 from danskernesdigitalebibliotek/DDFLSBP-318-…
spaceo Jan 16, 2024
626f496
Use useMemo() over useEffect() in FeeList for values kept between ren…
Adamik10 Jan 16, 2024
3c0903f
Move calculateFeeAmount helper function into the helper file
Adamik10 Jan 16, 2024
c54458f
Document the difference between the two fee lists in FeeList.tsx
Adamik10 Jan 16, 2024
8754477
Merge pull request #856 from danskernesdigitalebibliotek/fix/arrow-do…
Adamik10 Jan 16, 2024
0e10b9d
Merge pull request #857 from danskernesdigitalebibliotek/divide-fees-…
Adamik10 Jan 16, 2024
3d94881
Adjust menu cypress test after changes
spaceo Jan 16, 2024
c938909
Merge pull request #859 from danskernesdigitalebibliotek/DDFLSBP-366-…
spaceo Jan 17, 2024
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
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
{
"id": "bd783b91-b464-4137-9575-b093008866df",
"name": "Fees (v2)",
"request": {
"url": "/external/agencyid/patron/patronid/fees/v2",
"method": "GET"
"id" : "bd783b91-b464-4137-9575-b093008866df",
"name" : "Fees (v2)",
"request" : {
"url" : "/external/agencyid/patron/patronid/fees/v2?includepaid=false&includenonpayable=true",
"method" : "GET"
},
"response": {
"status": 200,
"body": "[\n {\n \"feeId\": 434536,\n \"type\": \"fee\",\n \"reasonMessage\": \"Gebyr (for sent)\",\n \"amount\": 70,\n \"dueDate\": \"2022-05-08\",\n \"creationDate\": \"2022-04-06\",\n \"paidDate\": null,\n \"payableByClient\": true,\n \"materials\": [\n {\n \"materialItemNumber\": \"5237124059\",\n \"recordId\": \"48724566\",\n \"periodical\": null,\n \"materialGroup\": {\n \"name\": \"standard\",\n \"description\": \"31 dages lånetid til alm lånere\"\n }\n },\n {\n \"materialItemNumber\": \"5119382558\",\n \"recordId\": \"52518563\",\n \"periodical\": null,\n \"materialGroup\": {\n \"name\": \"standard\",\n \"description\": \"31 dages lånetid til alm lånere\"\n }\n },\n {\n \"materialItemNumber\": \"5324175956\",\n \"recordId\": \"38540335\",\n \"periodical\": null,\n \"materialGroup\": {\n \"name\": \"standard\",\n \"description\": \"31 dages lånetid til alm lånere\"\n }\n }\n ]\n },\n {\n \"feeId\": 434537,\n \"type\": \"fee\",\n \"reasonMessage\": \"Gebyr (for sent)\",\n \"amount\": 70,\n \"dueDate\": \"2022-05-08\",\n \"creationDate\": \"2022-04-06\",\n \"paidDate\": null,\n \"payableByClient\": true,\n \"materials\": [\n {\n \"materialItemNumber\": \"3275348197\",\n \"recordId\": \"23790823\",\n \"periodical\": null,\n \"materialGroup\": {\n \"name\": \"standard\",\n \"description\": \"31 dages lånetid til alm lånere\"\n }\n },\n {\n \"materialItemNumber\": \"5218297864\",\n \"recordId\": \"45951685\",\n \"periodical\": null,\n \"materialGroup\": {\n \"name\": \"standard\",\n \"description\": \"31 dages lånetid til alm lånere\"\n }\n }\n ]\n },\n {\n \"feeId\": 434538,\n \"type\": \"fee\",\n \"reasonMessage\": \"Gebyr (for sent)\",\n \"amount\": 120,\n \"dueDate\": \"2022-05-08\",\n \"creationDate\": \"2022-04-06\",\n \"paidDate\": null,\n \"payableByClient\": true,\n \"materials\": [\n {\n \"materialItemNumber\": \"5136106556\",\n \"recordId\": \"53067034\",\n \"periodical\": null,\n \"materialGroup\": {\n \"name\": \"standard\",\n \"description\": \"31 dages lånetid til alm lånere\"\n }\n },\n {\n \"materialItemNumber\": \"5232011841\",\n \"recordId\": \"54058969\",\n \"periodical\": null,\n \"materialGroup\": {\n \"name\": \"standard\",\n \"description\": \"31 dages lånetid til alm lånere\"\n }\n }\n ]\n },\n {\n \"feeId\": 306404,\n \"type\": \"fee\",\n \"reasonMessage\": \"Gebyr (for sent)\",\n \"amount\": 2.56,\n \"dueDate\": \"2020-04-15\",\n \"creationDate\": \"2019-10-18\",\n \"paidDate\": null,\n \"payableByClient\": true,\n \"materials\": [\n {\n \"materialItemNumber\": \"3839631447\",\n \"recordId\": \"26285283\",\n \"periodical\": null,\n \"materialGroup\": {\n \"name\": \"standard\",\n \"description\": \"31 dages lånetid til alm lånere\"\n }\n }\n ]\n },\n {\n \"feeId\": 377242,\n \"type\": \"compensation\",\n \"reasonMessage\": \"Erstatning (test)\",\n \"amount\": 1,\n \"dueDate\": \"2021-08-10\",\n \"creationDate\": \"2021-02-11\",\n \"paidDate\": null,\n \"payableByClient\": true,\n \"materials\": [\n {\n \"materialItemNumber\": \"271358741\",\n \"recordId\": \"01484524\",\n \"periodical\": null,\n \"materialGroup\": {\n \"name\": \"standard\",\n \"description\": \"31 dages lånetid til alm lånere\"\n }\n }\n ]\n },\n {\n \"feeId\": 411199,\n \"type\": \"compensation\",\n \"reasonMessage\": \"Gebyr (for sent)\",\n \"amount\": 1.5,\n \"dueDate\": \"2021-12-24\",\n \"creationDate\": \"2021-11-24\",\n \"paidDate\": null,\n \"payableByClient\": true,\n \"materials\": [\n {\n \"materialItemNumber\": \"262088571\",\n \"recordId\": \"06964206\",\n \"periodical\": null,\n \"materialGroup\": {\n \"name\": \"standard\",\n \"description\": \"31 dages lånetid til alm lånere\"\n }\n }\n ]\n }\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 {\n \"feeId\": 434536,\n \"type\": \"fee\",\n \"reasonMessage\": \"Gebyr (for sent)\",\n \"amount\": 70,\n \"dueDate\": \"2022-05-08\",\n \"creationDate\": \"2022-04-06\",\n \"paidDate\": null,\n \"payableByClient\": true,\n \"materials\": [\n {\n \"materialItemNumber\": \"5237124059\",\n \"recordId\": \"48724566\",\n \"periodical\": null,\n \"materialGroup\": {\n \"name\": \"standard\",\n \"description\": \"31 dages lånetid til alm lånere\"\n }\n },\n {\n \"materialItemNumber\": \"5119382558\",\n \"recordId\": \"52518563\",\n \"periodical\": null,\n \"materialGroup\": {\n \"name\": \"standard\",\n \"description\": \"31 dages lånetid til alm lånere\"\n }\n },\n {\n \"materialItemNumber\": \"5324175956\",\n \"recordId\": \"38540335\",\n \"periodical\": null,\n \"materialGroup\": {\n \"name\": \"standard\",\n \"description\": \"31 dages lånetid til alm lånere\"\n }\n }\n ]\n },\n {\n \"feeId\": 434537,\n \"type\": \"fee\",\n \"reasonMessage\": \"Gebyr (for sent)\",\n \"amount\": 70,\n \"dueDate\": \"2022-05-08\",\n \"creationDate\": \"2022-04-06\",\n \"paidDate\": null,\n \"payableByClient\": true,\n \"materials\": [\n {\n \"materialItemNumber\": \"3275348197\",\n \"recordId\": \"23790823\",\n \"periodical\": null,\n \"materialGroup\": {\n \"name\": \"standard\",\n \"description\": \"31 dages lånetid til alm lånere\"\n }\n },\n {\n \"materialItemNumber\": \"5218297864\",\n \"recordId\": \"45951685\",\n \"periodical\": null,\n \"materialGroup\": {\n \"name\": \"standard\",\n \"description\": \"31 dages lånetid til alm lånere\"\n }\n }\n ]\n },\n {\n \"feeId\": 434538,\n \"type\": \"fee\",\n \"reasonMessage\": \"Gebyr (for sent)\",\n \"amount\": 120,\n \"dueDate\": \"2022-05-08\",\n \"creationDate\": \"2022-04-06\",\n \"paidDate\": null,\n \"payableByClient\": true,\n \"materials\": [\n {\n \"materialItemNumber\": \"5136106556\",\n \"recordId\": \"53067034\",\n \"periodical\": null,\n \"materialGroup\": {\n \"name\": \"standard\",\n \"description\": \"31 dages lånetid til alm lånere\"\n }\n },\n {\n \"materialItemNumber\": \"5232011841\",\n \"recordId\": \"54058969\",\n \"periodical\": null,\n \"materialGroup\": {\n \"name\": \"standard\",\n \"description\": \"31 dages lånetid til alm lånere\"\n }\n }\n ]\n },\n {\n \"feeId\": 306404,\n \"type\": \"fee\",\n \"reasonMessage\": \"Gebyr (for sent)\",\n \"amount\": 2.56,\n \"dueDate\": \"2020-04-15\",\n \"creationDate\": \"2019-10-18\",\n \"paidDate\": null,\n \"payableByClient\": true,\n \"materials\": [\n {\n \"materialItemNumber\": \"3839631447\",\n \"recordId\": \"26285283\",\n \"periodical\": null,\n \"materialGroup\": {\n \"name\": \"standard\",\n \"description\": \"31 dages lånetid til alm lånere\"\n }\n }\n ]\n },\n {\n \"feeId\": 377242,\n \"type\": \"compensation\",\n \"reasonMessage\": \"Erstatning (test)\",\n \"amount\": 1,\n \"dueDate\": \"2021-08-10\",\n \"creationDate\": \"2021-02-11\",\n \"paidDate\": null,\n \"payableByClient\": true,\n \"materials\": [\n {\n \"materialItemNumber\": \"271358741\",\n \"recordId\": \"01484524\",\n \"periodical\": null,\n \"materialGroup\": {\n \"name\": \"standard\",\n \"description\": \"31 dages lånetid til alm lånere\"\n }\n }\n ]\n },\n {\n \"feeId\": 411199,\n \"type\": \"compensation\",\n \"reasonMessage\": \"Gebyr (for sent)\",\n \"amount\": 1.5,\n \"dueDate\": \"2021-12-24\",\n \"creationDate\": \"2021-11-24\",\n \"paidDate\": null,\n \"payableByClient\": true,\n \"materials\": [\n {\n \"materialItemNumber\": \"262088571\",\n \"recordId\": \"06964206\",\n \"periodical\": null,\n \"materialGroup\": {\n \"name\": \"standard\",\n \"description\": \"31 dages lånetid til alm lånere\"\n }\n }\n ]\n }\n]",
"headers" : {
"content-type" : "application/json; charset=utf-8",
"date" : "{{now format='yyyy-MM-dd HH:mm:ssZ'}}",
"strict-transport-security" : "max-age=15552000"
},
"transformers": ["response-template"]
"transformers" : [ "response-template" ]
},
"uuid": "bd783b91-b464-4137-9575-b093008866df",
"persistent": true,
"priority": 5,
"insertionIndex": 13,
"postServeActions": []
}
"uuid" : "bd783b91-b464-4137-9575-b093008866df",
"persistent" : true,
"priority" : 5,
"insertionIndex" : 18,
"postServeActions" : [ ]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"id" : "ed922f92-46bb-46c6-926f-73678410fcd0",
"name" : "Fees (v2) (without parameters)",
"request" : {
"urlPath" : "/external/agencyid/patron/patronid/fees/v2",
"method" : "GET"
},
"response" : {
"status" : 200,
"body" : "[\n {\n \"feeId\": 434536,\n \"type\": \"fee\",\n \"reasonMessage\": \"Gebyr (for sent)\",\n \"amount\": 70,\n \"dueDate\": \"2022-05-08\",\n \"creationDate\": \"2022-04-06\",\n \"paidDate\": null,\n \"payableByClient\": true,\n \"materials\": [\n {\n \"materialItemNumber\": \"5237124059\",\n \"recordId\": \"48724566\",\n \"periodical\": null,\n \"materialGroup\": {\n \"name\": \"standard\",\n \"description\": \"31 dages lånetid til alm lånere\"\n }\n },\n {\n \"materialItemNumber\": \"5119382558\",\n \"recordId\": \"52518563\",\n \"periodical\": null,\n \"materialGroup\": {\n \"name\": \"standard\",\n \"description\": \"31 dages lånetid til alm lånere\"\n }\n },\n {\n \"materialItemNumber\": \"5324175956\",\n \"recordId\": \"38540335\",\n \"periodical\": null,\n \"materialGroup\": {\n \"name\": \"standard\",\n \"description\": \"31 dages lånetid til alm lånere\"\n }\n }\n ]\n },\n {\n \"feeId\": 434537,\n \"type\": \"fee\",\n \"reasonMessage\": \"Gebyr (for sent)\",\n \"amount\": 70,\n \"dueDate\": \"2022-05-08\",\n \"creationDate\": \"2022-04-06\",\n \"paidDate\": null,\n \"payableByClient\": true,\n \"materials\": [\n {\n \"materialItemNumber\": \"3275348197\",\n \"recordId\": \"23790823\",\n \"periodical\": null,\n \"materialGroup\": {\n \"name\": \"standard\",\n \"description\": \"31 dages lånetid til alm lånere\"\n }\n },\n {\n \"materialItemNumber\": \"5218297864\",\n \"recordId\": \"45951685\",\n \"periodical\": null,\n \"materialGroup\": {\n \"name\": \"standard\",\n \"description\": \"31 dages lånetid til alm lånere\"\n }\n }\n ]\n },\n {\n \"feeId\": 434538,\n \"type\": \"fee\",\n \"reasonMessage\": \"Gebyr (for sent)\",\n \"amount\": 120,\n \"dueDate\": \"2022-05-08\",\n \"creationDate\": \"2022-04-06\",\n \"paidDate\": null,\n \"payableByClient\": true,\n \"materials\": [\n {\n \"materialItemNumber\": \"5136106556\",\n \"recordId\": \"53067034\",\n \"periodical\": null,\n \"materialGroup\": {\n \"name\": \"standard\",\n \"description\": \"31 dages lånetid til alm lånere\"\n }\n },\n {\n \"materialItemNumber\": \"5232011841\",\n \"recordId\": \"54058969\",\n \"periodical\": null,\n \"materialGroup\": {\n \"name\": \"standard\",\n \"description\": \"31 dages lånetid til alm lånere\"\n }\n }\n ]\n },\n {\n \"feeId\": 306404,\n \"type\": \"fee\",\n \"reasonMessage\": \"Gebyr (for sent)\",\n \"amount\": 2.56,\n \"dueDate\": \"2020-04-15\",\n \"creationDate\": \"2019-10-18\",\n \"paidDate\": null,\n \"payableByClient\": true,\n \"materials\": [\n {\n \"materialItemNumber\": \"3839631447\",\n \"recordId\": \"26285283\",\n \"periodical\": null,\n \"materialGroup\": {\n \"name\": \"standard\",\n \"description\": \"31 dages lånetid til alm lånere\"\n }\n }\n ]\n },\n {\n \"feeId\": 377242,\n \"type\": \"compensation\",\n \"reasonMessage\": \"Erstatning (test)\",\n \"amount\": 1,\n \"dueDate\": \"2021-08-10\",\n \"creationDate\": \"2021-02-11\",\n \"paidDate\": null,\n \"payableByClient\": true,\n \"materials\": [\n {\n \"materialItemNumber\": \"271358741\",\n \"recordId\": \"01484524\",\n \"periodical\": null,\n \"materialGroup\": {\n \"name\": \"standard\",\n \"description\": \"31 dages lånetid til alm lånere\"\n }\n }\n ]\n },\n {\n \"feeId\": 411199,\n \"type\": \"compensation\",\n \"reasonMessage\": \"Gebyr (for sent)\",\n \"amount\": 1.5,\n \"dueDate\": \"2021-12-24\",\n \"creationDate\": \"2021-11-24\",\n \"paidDate\": null,\n \"payableByClient\": true,\n \"materials\": [\n {\n \"materialItemNumber\": \"262088571\",\n \"recordId\": \"06964206\",\n \"periodical\": null,\n \"materialGroup\": {\n \"name\": \"standard\",\n \"description\": \"31 dages lånetid til alm lånere\"\n }\n }\n ]\n }\n]",
"headers" : {
"content-type" : "application/json; charset=utf-8",
"date" : "{{now format='yyyy-MM-dd HH:mm:ssZ'}}",
"strict-transport-security" : "max-age=15552000"
},
"transformers" : [ "response-template" ]
},
"uuid" : "ed922f92-46bb-46c6-926f-73678410fcd0",
"persistent" : true,
"priority" : 4,
"insertionIndex" : 19,
"postServeActions" : [ ]
}
Loading
Loading