From 7e93ff4c8513b82b193f11d627576fad42ff75f8 Mon Sep 17 00:00:00 2001 From: Adam Antal Date: Tue, 19 Dec 2023 13:39:45 +0100 Subject: [PATCH 01/24] Show fees in a single list & include non-payable ones + update wiremock ..stub. A lot of functionality was removed from the FeeList component, due to it being obsolete for the company. A lot of it revolved around the change date where municipalities switched between different ways for users to pay fees. But we no longer need to divide fees between "before" and "after" this date. --- ...-bd783b91-b464-4137-9575-b093008866df.json | 38 ++++----- src/apps/fee-list/FeeList.tsx | 83 +++---------------- src/apps/fee-list/utils/helper.ts | 29 ------- 3 files changed, 32 insertions(+), 118 deletions(-) diff --git a/.docker/wiremock/fbs/mappings/external_agencyid_patron_patronid_fees_v2-bd783b91-b464-4137-9575-b093008866df.json b/.docker/wiremock/fbs/mappings/external_agencyid_patron_patronid_fees_v2-bd783b91-b464-4137-9575-b093008866df.json index 5d55732c32..b88169000a 100644 --- a/.docker/wiremock/fbs/mappings/external_agencyid_patron_patronid_fees_v2-bd783b91-b464-4137-9575-b093008866df.json +++ b/.docker/wiremock/fbs/mappings/external_agencyid_patron_patronid_fees_v2-bd783b91-b464-4137-9575-b093008866df.json @@ -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" : [ ] +} \ No newline at end of file diff --git a/src/apps/fee-list/FeeList.tsx b/src/apps/fee-list/FeeList.tsx index 745c60c5b5..d6495930e8 100644 --- a/src/apps/fee-list/FeeList.tsx +++ b/src/apps/fee-list/FeeList.tsx @@ -10,10 +10,7 @@ import FeeDetailsModal from "./modal/fee-details-modal"; import MyPaymentOverviewModal from "./modal/my-payment-overview-modal"; import FeeDetailsContent from "./stackable-fees/fee-details-content"; import modalIdsConf from "../../core/configuration/modal-ids.json"; -import { - getFeeObjectByFaustId, - getFeesInRelationToPaymentChangeDate -} from "./utils/helper"; +import { getFeeObjectByFaustId } from "./utils/helper"; import ListHeader from "../../components/list-header/list-header"; import EmptyList from "../../components/empty-list/empty-list"; @@ -21,22 +18,14 @@ const FeeList: FC = () => { const t = useText(); const u = useUrls(); const viewFeesAndCompensationRatesUrl = u("viewFeesAndCompensationRatesUrl"); - const [feeDetailsModalId, setFeeDetailsModalId] = useState(""); const { open } = useModalButtonHandler(); - const { data: fbsFees = [] } = useGetFeesV2(); - const [itemsPrePaymentChange, setItemsPrePaymentChange] = useState< - FeeV2[] | null - >(null); - const [totalFeePrePaymentChange, setTotalFeePrePaymentChange] = - useState(0); - const [itemsPostPaymentChange, setItemsPostPaymentChange] = useState< - FeeV2[] | null - >(null); - const [totalFeePostPaymentChange, setTotalFeePostPaymentChange] = - useState(0); + const { data: fbsFees = [] } = useGetFeesV2({ + includepaid: false, + includenonpayable: true + }); + const [totalFeeAmount, setTotalFeeAmount] = useState(0); const [feeDetailsData, setFeeDetailsData] = useState(); - const openDetailsModalClickEvent = useCallback( (faustId: string) => { if (faustId) { @@ -51,54 +40,17 @@ const FeeList: FC = () => { ); useEffect(() => { - if (fbsFees) { - const feesPrePaymentChange = getFeesInRelationToPaymentChangeDate( - fbsFees, - true - ).length; - if (feesPrePaymentChange > 0) { - setItemsPrePaymentChange( - getFeesInRelationToPaymentChangeDate(fbsFees, true) - ); - } - const feesPostPaymentChange = getFeesInRelationToPaymentChangeDate( - fbsFees, - false - ).length; - if (feesPostPaymentChange > 0) { - setItemsPostPaymentChange( - getFeesInRelationToPaymentChangeDate(fbsFees, false) - ); - } - } - }, [fbsFees]); - - useEffect(() => { - if (totalFeePrePaymentChange > 0) { - return; - } - const totalFee = itemsPrePaymentChange?.reduce( - (accumulator, { amount }) => accumulator + amount, - 0 - ); - if (totalFee) { - setTotalFeePrePaymentChange(totalFee); - } - }, [itemsPrePaymentChange, totalFeePrePaymentChange]); - - useEffect(() => { - if (totalFeePostPaymentChange > 0) { + if (totalFeeAmount > 0 || !fbsFees.length) { return; } - const totalFee = itemsPostPaymentChange?.reduce( + const totalFee = fbsFees.reduce( (accumulator, { amount }) => accumulator + amount, 0 ); - if (totalFee) { - setTotalFeePostPaymentChange(totalFee); + setTotalFeeAmount(totalFee); } - }, [itemsPostPaymentChange, totalFeePostPaymentChange]); + }, [fbsFees, totalFeeAmount]); return ( <> @@ -112,7 +64,7 @@ const FeeList: FC = () => { {t("viewFeesAndCompensationRatesText")} - {!itemsPrePaymentChange && !itemsPostPaymentChange && ( + {!fbsFees.length && ( <> {t("unpaidFeesFirstHeadlineText")}} @@ -128,18 +80,9 @@ const FeeList: FC = () => { dataCy="fee-list-before" listHeader={t("unpaidFeesFirstHeadlineText")} openDetailsModalClickEvent={openDetailsModalClickEvent} - fees={itemsPrePaymentChange} - totalText={t("totalText", { - placeholders: { "@total": totalFeePrePaymentChange } - })} - /> - diff --git a/src/apps/fee-list/utils/helper.ts b/src/apps/fee-list/utils/helper.ts index cff26d21e0..106bce85d8 100644 --- a/src/apps/fee-list/utils/helper.ts +++ b/src/apps/fee-list/utils/helper.ts @@ -1,34 +1,5 @@ import dayjs from "dayjs"; import { FeeV2 } from "../../../core/fbs/model"; -import configuration, { getConf } from "../../../core/configuration"; - -const paymentConf = getConf("payment", configuration); -const { - paymentChangeDate -}: // paymentChangeDate should never be undefined, but the config system requires -// us to handle that case -{ paymentChangeDate?: `${number}-${number}-${number}` } = paymentConf; - -export const getFeesInRelationToPaymentChangeDate = ( - feeObj: FeeV2[], - beforePaymentChangeDate: boolean -) => { - const paymentMethodChangeDate = dayjs(paymentChangeDate); // The Date fee-payment-method changed - return feeObj.filter((fee) => { - const { dueDate } = fee; - if (dueDate) { - const feeDate = dayjs(dueDate); - if (beforePaymentChangeDate) { - if (feeDate < paymentMethodChangeDate) { - return fee; - } - } else if (feeDate > paymentMethodChangeDate) { - return fee; - } - } - return false; - }); -}; export const getFeeObjectByFaustId = (feeObj: FeeV2[], faustId: string) => { return feeObj.filter((item) => { From 088dd3c1d4d49fbd75788a9dbb08b89f4092eb0b Mon Sep 17 00:00:00 2001 From: Adam Antal Date: Tue, 19 Dec 2023 14:03:53 +0100 Subject: [PATCH 02/24] Add feeListAlreadyPaidInfoText to the fee list dev & app entry --- src/apps/fee-list/FeeList.dev.tsx | 5 +++++ src/apps/fee-list/FeeList.entry.tsx | 1 + 2 files changed, 6 insertions(+) diff --git a/src/apps/fee-list/FeeList.dev.tsx b/src/apps/fee-list/FeeList.dev.tsx index c363d92b1a..3c131c7706 100644 --- a/src/apps/fee-list/FeeList.dev.tsx +++ b/src/apps/fee-list/FeeList.dev.tsx @@ -164,6 +164,11 @@ export default { paymentOverviewUrl: { defaultValue: "https://unsplash.com/photos/yjI3ozta2Zk", // Open source image of a fluffy floofer control: { type: "text" } + }, + feeListAlreadyPaidInfoText: { + defaultValue: + "Already paid? It can take up to 72 hours register the transaction.", + control: { type: "text" } } }, decorators: [withQuery] diff --git a/src/apps/fee-list/FeeList.entry.tsx b/src/apps/fee-list/FeeList.entry.tsx index 05d17eda3e..cae16a1d93 100644 --- a/src/apps/fee-list/FeeList.entry.tsx +++ b/src/apps/fee-list/FeeList.entry.tsx @@ -43,6 +43,7 @@ export interface FeeListProps { feeCreatedText: string; availablePaymentTypesUrl: string; paymentOverviewUrl: string; + feeListAlreadyPaidInfoText: string; } const FeeListEntry: FC< From 56a1b6270df0efc4516f58f6ffb72e021032a9a4 Mon Sep 17 00:00:00 2001 From: Adam Antal Date: Tue, 19 Dec 2023 14:05:04 +0100 Subject: [PATCH 03/24] Add feeListAlreadyPaidInfoText to the bottom of fee list page This text explains that it can take up to 72 hours to register a paid fee. --- src/apps/fee-list/list.tsx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/apps/fee-list/list.tsx b/src/apps/fee-list/list.tsx index c530593a4d..a9d2d78d57 100644 --- a/src/apps/fee-list/list.tsx +++ b/src/apps/fee-list/list.tsx @@ -3,6 +3,7 @@ import ListHeader from "../../components/list-header/list-header"; import { FeeV2 } from "../../core/fbs/model"; import StackableFees from "./stackable-fees/stackable-fees"; import { FaustId } from "../../core/utils/types/ids"; +import { useText } from "../../core/utils/text"; interface ListProps { openDetailsModalClickEvent: (faustId: string) => void; @@ -18,6 +19,8 @@ const List: FC = ({ dataCy, totalText }) => { + const t = useText(); + return (
{fees && ( @@ -36,7 +39,10 @@ const List: FC = ({
-

{totalText}

+

+ {t("feeListAlreadyPaidInfoText")} +

+

{totalText}

From 414c7c7d45534ff7c394cd2657f9a675a7d05588 Mon Sep 17 00:00:00 2001 From: Adam Antal Date: Tue, 19 Dec 2023 14:30:00 +0100 Subject: [PATCH 04/24] Add feeLitsMaterialNumberText translation text to fee list app --- src/apps/fee-list/FeeList.dev.tsx | 4 ++++ src/apps/fee-list/FeeList.entry.tsx | 1 + 2 files changed, 5 insertions(+) diff --git a/src/apps/fee-list/FeeList.dev.tsx b/src/apps/fee-list/FeeList.dev.tsx index 3c131c7706..ce64260a58 100644 --- a/src/apps/fee-list/FeeList.dev.tsx +++ b/src/apps/fee-list/FeeList.dev.tsx @@ -169,6 +169,10 @@ export default { defaultValue: "Already paid? It can take up to 72 hours register the transaction.", control: { type: "text" } + }, + feeLitsMaterialNumberText: { + defaultValue: "#", + control: { type: "text" } } }, decorators: [withQuery] diff --git a/src/apps/fee-list/FeeList.entry.tsx b/src/apps/fee-list/FeeList.entry.tsx index cae16a1d93..798d3a1a71 100644 --- a/src/apps/fee-list/FeeList.entry.tsx +++ b/src/apps/fee-list/FeeList.entry.tsx @@ -44,6 +44,7 @@ export interface FeeListProps { availablePaymentTypesUrl: string; paymentOverviewUrl: string; feeListAlreadyPaidInfoText: string; + feeLitsMaterialNumberText: string; } const FeeListEntry: FC< From d109fe7466b52ebad54d9f5b01e6cfce3c1a566e Mon Sep 17 00:00:00 2001 From: Adam Antal Date: Tue, 19 Dec 2023 14:31:14 +0100 Subject: [PATCH 05/24] Use feeLitsMaterialNumberText in the fee info component --- src/apps/fee-list/stackable-fees/fee-info.tsx | 5 +++-- src/apps/fee-list/stackable-fees/stackable-fees.tsx | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/apps/fee-list/stackable-fees/fee-info.tsx b/src/apps/fee-list/stackable-fees/fee-info.tsx index 6bb35bb5f4..3b0dca237c 100644 --- a/src/apps/fee-list/stackable-fees/fee-info.tsx +++ b/src/apps/fee-list/stackable-fees/fee-info.tsx @@ -3,6 +3,7 @@ import AuthorYear from "../../../components/author-year/authorYear"; import { Cover } from "../../../components/cover/cover"; import { BasicDetailsType } from "../../../core/utils/types/basic-details-type"; import { Pid } from "../../../core/utils/types/ids"; +import { useText } from "../../../core/utils/text"; interface FeeInfoProps { material: BasicDetailsType; @@ -23,7 +24,7 @@ const FeeInfo: FC = ({ pid, series = "" } = material; - + const t = useText(); return (
@@ -50,7 +51,7 @@ const FeeInfo: FC = ({

- {materialItemNumber} + {`${t("feeLitsMaterialNumberText")} ${materialItemNumber}`}

{children}
diff --git a/src/apps/fee-list/stackable-fees/stackable-fees.tsx b/src/apps/fee-list/stackable-fees/stackable-fees.tsx index 137923c47a..cdfd5b3391 100644 --- a/src/apps/fee-list/stackable-fees/stackable-fees.tsx +++ b/src/apps/fee-list/stackable-fees/stackable-fees.tsx @@ -43,7 +43,7 @@ const StackableFees: FC = ({ {stackSize > 0 && (

{t("plusXOtherMaterialsText", { From ffbc2e98b43429bd586c135dbe9a63864f55ca8a Mon Sep 17 00:00:00 2001 From: Adam Antal Date: Tue, 19 Dec 2023 14:32:26 +0100 Subject: [PATCH 06/24] Update fee list test based on new stub --- src/apps/fee-list/fee-list.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/apps/fee-list/fee-list.test.ts b/src/apps/fee-list/fee-list.test.ts index 1aca8b30ab..90269f7ed0 100644 --- a/src/apps/fee-list/fee-list.test.ts +++ b/src/apps/fee-list/fee-list.test.ts @@ -187,7 +187,7 @@ describe("Fee list", () => { .find(".list-reservation__deadline") .find(".text-small-caption") .should("exist") - .should("have.text", "Fees charged 18. 10. 2019"); + .should("have.text", "Fees charged 06. 04. 2022"); // 3. e Label: reason cy.get(".fee-list-page") From 7c4f3ecfb9e58b1a00085ae63488acec550b4496 Mon Sep 17 00:00:00 2001 From: Adam Antal Date: Wed, 20 Dec 2023 09:15:21 +0100 Subject: [PATCH 07/24] Use data-cy in fee list test, not fee-list-page class & update the test --- src/apps/fee-list/FeeList.tsx | 4 +-- src/apps/fee-list/fee-list.test.ts | 56 +++++++++--------------------- 2 files changed, 19 insertions(+), 41 deletions(-) diff --git a/src/apps/fee-list/FeeList.tsx b/src/apps/fee-list/FeeList.tsx index d6495930e8..bb98428659 100644 --- a/src/apps/fee-list/FeeList.tsx +++ b/src/apps/fee-list/FeeList.tsx @@ -54,7 +54,7 @@ const FeeList: FC = () => { return ( <> -

+

{t("feeListHeadlineText")}

@@ -77,7 +77,7 @@ const FeeList: FC = () => { )} { it("Fee list basics (physical loans)", () => { // 2. System shows: // 2.a. Headline "Fees & Replacement costs" - cy.get(".fee-list-page") + cy.getBySel("fee-list-page") .getBySel("fee-list-headline") .should("exist") .should("have.text", "Fees & Replacement costs"); @@ -130,7 +130,7 @@ describe("Fee list", () => { cy.getBySel("list-header").should("contain.text", "Unsettled debt"); // 2.d link “See our fees and replacement costs” - cy.get(".fee-list-page") + cy.getBySel("fee-list-page") .find("[data-cy='fee-list-body']") .find(".link-tag") .should("exist") @@ -138,11 +138,14 @@ describe("Fee list", () => { .should("have.text", "See our fees and replacement costs"); // 3.b list of intermediates - cy.get(".fee-list-page").find(".list-reservation").eq(0).should("exist"); + cy.getBySel("fee-list-page") + .find(".list-reservation") + .eq(0) + .should("exist"); // 3.c metadata // 3.c.a material type - cy.get(".fee-list-page") + cy.getBySel("fee-list-page") .find(".list-reservation") .eq(0) .should("exist") @@ -154,7 +157,7 @@ describe("Fee list", () => { .should("have.text", "Dummy bog"); // 3.c.b title - cy.get("[data-cy='fee-list-before']") + cy.get("[data-cy='fee-list']") .find(".list-reservation") .eq(0) .should("exist") @@ -163,7 +166,7 @@ describe("Fee list", () => { .should("have.text", "Dummy Some Title"); // 3.c.c author - cy.get(".fee-list-page") + cy.getBySel("fee-list-page") .find(".list-reservation") .eq(0) .should("exist") @@ -178,7 +181,7 @@ describe("Fee list", () => { ); // 3. d fees charged dd.mm.yyyy - cy.get(".fee-list-page") + cy.getBySel("fee-list-page") .find(".list-reservation") .eq(0) .should("exist") @@ -190,7 +193,7 @@ describe("Fee list", () => { .should("have.text", "Fees charged 06. 04. 2022"); // 3. e Label: reason - cy.get(".fee-list-page") + cy.getBySel("fee-list-page") .find(".list-reservation") .eq(0) .should("exist") @@ -202,7 +205,7 @@ describe("Fee list", () => { .should("have.text", "Gebyr (for sent)"); // 3. e Label: fee amount - cy.get(".fee-list-page") + cy.getBySel("fee-list-page") .find(".list-reservation") .eq(0) .should("exist") @@ -210,35 +213,10 @@ describe("Fee list", () => { .find(".list-reservation__fee") .find(".text-body-medium-regular") .should("exist") - .should("have.text", "Fee 2.56,-"); - - // 4. a List after date - // Title - cy.get("[data-cy='fee-list-after']") - .find(".list-reservation") - .eq(0) - .should("exist") - .find(".text-header-h4") - .should("exist") - .should("have.text", "Dummy Some Title"); - - // Author && year - cy.get(".fee-list-page") - .find(".list-reservation") - .eq(1) - .should("exist") - .find(".list-reservation__material") - .find(".list-reservation__information") - .find(".list-reservation__about") - .find(".text-small-caption") - .should("exist") - .should( - "have.text", - "By Dummy Jens Jensen and Dummy Some Corporation (2006)" - ); + .should("have.text", "Fee 70,-"); // 4.b +x other materials - cy.get(".fee-list-page") + cy.getBySel("fee-list-page") .find(".list-reservation") .eq(1) .should("exist") @@ -246,7 +224,7 @@ describe("Fee list", () => { .should("exist") .should("have.text", "+ 2 other materials"); - cy.get(".fee-list-page") + cy.getBySel("fee-list-page") .find(".list-reservation") .eq(1) .should("exist") @@ -258,7 +236,7 @@ describe("Fee list", () => { .find("div") .find(".counter") .find(".counter__value") - .should("have.text", "32"); + .should("have.text", "180"); // counter text cy.get("div.modal-loan__header") @@ -273,7 +251,7 @@ describe("Fee list", () => { .find("div") .find(".modal-loan__title") .should("exist") - .should("have.text", "Turned in 6. April 2022"); + .should("have.text", "Turned in 18. October 2019"); // "i accept the Terms of trade*" cy.getBySel("checkbox_id__fee_details").should("exist"); From 18faea6c913a5b6a73d38c631cddd3bb3dd2979a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Dec 2023 08:10:57 +0000 Subject: [PATCH 08/24] Bump the babel group with 2 updates Bumps the babel group with 2 updates: [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) and [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env). Updates `@babel/core` from 7.23.5 to 7.23.6 - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.23.6/packages/babel-core) Updates `@babel/preset-env` from 7.23.5 to 7.23.6 - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.23.6/packages/babel-preset-env) --- updated-dependencies: - dependency-name: "@babel/core" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: babel - dependency-name: "@babel/preset-env" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: babel ... Signed-off-by: dependabot[bot] --- package.json | 4 +- yarn.lock | 138 ++++++++++++++++++++++++++++++--------------------- 2 files changed, 84 insertions(+), 58 deletions(-) diff --git a/package.json b/package.json index a32179595f..4b09a9aec6 100644 --- a/package.json +++ b/package.json @@ -45,10 +45,10 @@ "post-process-generated-graphql": "ts-node ./scripts/post-process-generated-graphql.ts" }, "devDependencies": { - "@babel/core": "^7.23.5", + "@babel/core": "^7.23.6", "@babel/plugin-proposal-class-properties": "^7.18.6", "@babel/plugin-proposal-optional-chaining": "^7.21.0", - "@babel/preset-env": "^7.23.5", + "@babel/preset-env": "^7.23.6", "@babel/preset-react": "^7.23.3", "@babel/preset-typescript": "^7.23.3", "@csstools/postcss-sass": "^5.0.1", diff --git a/yarn.lock b/yarn.lock index 5351c64863..3e26980780 100644 --- a/yarn.lock +++ b/yarn.lock @@ -60,7 +60,7 @@ "@babel/highlight" "^7.23.4" chalk "^2.4.2" -"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.17.0", "@babel/compat-data@^7.22.6", "@babel/compat-data@^7.22.9", "@babel/compat-data@^7.23.3", "@babel/compat-data@^7.23.5": +"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.17.0", "@babel/compat-data@^7.22.6", "@babel/compat-data@^7.23.3", "@babel/compat-data@^7.23.5": version "7.23.5" resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.23.5.tgz#ffb878728bb6bdcb6f4510aa51b1be9afb8cfd98" integrity sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw== @@ -87,33 +87,33 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/core@^7.1.0", "@babel/core@^7.12.10", "@babel/core@^7.12.3", "@babel/core@^7.14.0", "@babel/core@^7.16.0", "@babel/core@^7.23.5", "@babel/core@^7.7.5": - version "7.23.5" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.5.tgz#6e23f2acbcb77ad283c5ed141f824fd9f70101c7" - integrity sha512-Cwc2XjUrG4ilcfOw4wBAK+enbdgwAcAJCfGUItPBKR7Mjw4aEfAFYrLxeRp4jWgtNIKn3n2AlBOfwwafl+42/g== +"@babel/core@^7.1.0", "@babel/core@^7.12.10", "@babel/core@^7.12.3", "@babel/core@^7.14.0", "@babel/core@^7.16.0", "@babel/core@^7.23.6", "@babel/core@^7.7.5": + version "7.23.6" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.6.tgz#8be77cd77c55baadcc1eae1c33df90ab6d2151d4" + integrity sha512-FxpRyGjrMJXh7X3wGLGhNDCRiwpWEF74sKjTLDJSG5Kyvow3QZaG0Adbqzi9ZrVjTWpsX+2cxWXD71NMg93kdw== dependencies: "@ampproject/remapping" "^2.2.0" "@babel/code-frame" "^7.23.5" - "@babel/generator" "^7.23.5" - "@babel/helper-compilation-targets" "^7.22.15" + "@babel/generator" "^7.23.6" + "@babel/helper-compilation-targets" "^7.23.6" "@babel/helper-module-transforms" "^7.23.3" - "@babel/helpers" "^7.23.5" - "@babel/parser" "^7.23.5" + "@babel/helpers" "^7.23.6" + "@babel/parser" "^7.23.6" "@babel/template" "^7.22.15" - "@babel/traverse" "^7.23.5" - "@babel/types" "^7.23.5" + "@babel/traverse" "^7.23.6" + "@babel/types" "^7.23.6" convert-source-map "^2.0.0" debug "^4.1.0" gensync "^1.0.0-beta.2" json5 "^2.2.3" semver "^6.3.1" -"@babel/generator@^7.12.11", "@babel/generator@^7.12.5", "@babel/generator@^7.14.0", "@babel/generator@^7.23.5": - version "7.23.5" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.5.tgz#17d0a1ea6b62f351d281350a5f80b87a810c4755" - integrity sha512-BPssCHrBD+0YrxviOa3QzpqwhNIXKEtOa2jQrm4FlmkC2apYgRnQcmPWiGZDlGxiNtltnUFolMe8497Esry+jA== +"@babel/generator@^7.12.11", "@babel/generator@^7.12.5", "@babel/generator@^7.14.0", "@babel/generator@^7.23.6": + version "7.23.6" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.6.tgz#9e1fca4811c77a10580d17d26b57b036133f3c2e" + integrity sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw== dependencies: - "@babel/types" "^7.23.5" + "@babel/types" "^7.23.6" "@jridgewell/gen-mapping" "^0.3.2" "@jridgewell/trace-mapping" "^0.3.17" jsesc "^2.5.1" @@ -139,14 +139,14 @@ dependencies: "@babel/types" "^7.22.15" -"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.7", "@babel/helper-compilation-targets@^7.22.15", "@babel/helper-compilation-targets@^7.22.6": - version "7.22.15" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz#0698fc44551a26cf29f18d4662d5bf545a6cfc52" - integrity sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw== +"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.7", "@babel/helper-compilation-targets@^7.22.15", "@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.23.6": + version "7.23.6" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz#4d79069b16cbcf1461289eccfbbd81501ae39991" + integrity sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ== dependencies: - "@babel/compat-data" "^7.22.9" - "@babel/helper-validator-option" "^7.22.15" - browserslist "^4.21.9" + "@babel/compat-data" "^7.23.5" + "@babel/helper-validator-option" "^7.23.5" + browserslist "^4.22.2" lru-cache "^5.1.1" semver "^6.3.1" @@ -384,14 +384,14 @@ "@babel/template" "^7.22.15" "@babel/types" "^7.22.19" -"@babel/helpers@^7.12.5", "@babel/helpers@^7.23.5": - version "7.23.5" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.23.5.tgz#52f522840df8f1a848d06ea6a79b79eefa72401e" - integrity sha512-oO7us8FzTEsG3U6ag9MfdF1iA/7Z6dz+MtFhifZk8C8o453rGJFFWUP1t+ULM9TUIAzC9uxXEiXjOiVMyd7QPg== +"@babel/helpers@^7.12.5", "@babel/helpers@^7.23.6": + version "7.23.6" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.23.6.tgz#d03af2ee5fb34691eec0cda90f5ecbb4d4da145a" + integrity sha512-wCfsbN4nBidDRhpDhvcKlzHWCTlgJYUUdSJfzXb2NuBssDSIjc3xcb+znA7l+zYsFljAcGM0aFkN40cR3lXiGA== dependencies: "@babel/template" "^7.22.15" - "@babel/traverse" "^7.23.5" - "@babel/types" "^7.23.5" + "@babel/traverse" "^7.23.6" + "@babel/types" "^7.23.6" "@babel/highlight@^7.23.4": version "7.23.4" @@ -402,10 +402,10 @@ chalk "^2.4.2" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.12.11", "@babel/parser@^7.12.7", "@babel/parser@^7.14.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.8", "@babel/parser@^7.22.15", "@babel/parser@^7.23.3", "@babel/parser@^7.23.5": - version "7.23.5" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.5.tgz#37dee97c4752af148e1d38c34b856b2507660563" - integrity sha512-hOOqoiNXrmGdFbhgCzu6GiURxUgM27Xwd/aPuu8RfHEZPBzL1Z54okAHAQjXfcQNwvrlkAmAp4SlRTZ45vlthQ== +"@babel/parser@^7.1.0", "@babel/parser@^7.12.11", "@babel/parser@^7.12.7", "@babel/parser@^7.14.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.8", "@babel/parser@^7.22.15", "@babel/parser@^7.23.3", "@babel/parser@^7.23.6": + version "7.23.6" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.6.tgz#ba1c9e512bda72a47e285ae42aff9d2a635a9e3b" + integrity sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ== "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.23.3": version "7.23.3" @@ -821,12 +821,13 @@ "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-flow" "^7.16.7" -"@babel/plugin-transform-for-of@^7.0.0", "@babel/plugin-transform-for-of@^7.12.1", "@babel/plugin-transform-for-of@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.23.3.tgz#afe115ff0fbce735e02868d41489093c63e15559" - integrity sha512-X8jSm8X1CMwxmK878qsUGJRmbysKNbdpTv/O1/v0LuY/ZkZrng5WYiekYSdg9m09OTmDDUWeEDsTE+17WYbAZw== +"@babel/plugin-transform-for-of@^7.0.0", "@babel/plugin-transform-for-of@^7.12.1", "@babel/plugin-transform-for-of@^7.23.6": + version "7.23.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.23.6.tgz#81c37e24171b37b370ba6aaffa7ac86bcb46f94e" + integrity sha512-aYH4ytZ0qSuBbpfhuofbg/e96oQ7U2w1Aw/UQmKT+1l39uEhUPoFS3fHevDc1G0OvewyDudfMKY1OulczHzWIw== dependencies: "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" "@babel/plugin-transform-function-name@^7.0.0", "@babel/plugin-transform-function-name@^7.23.3": version "7.23.3" @@ -1138,13 +1139,13 @@ "@babel/helper-create-regexp-features-plugin" "^7.22.15" "@babel/helper-plugin-utils" "^7.22.5" -"@babel/preset-env@^7.12.11", "@babel/preset-env@^7.16.0", "@babel/preset-env@^7.23.5": - version "7.23.5" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.23.5.tgz#350a3aedfa9f119ad045b068886457e895ba0ca1" - integrity sha512-0d/uxVD6tFGWXGDSfyMD1p2otoaKmu6+GD+NfAx0tMaH+dxORnp7T9TaVQ6mKyya7iBtCIVxHjWT7MuzzM9z+A== +"@babel/preset-env@^7.12.11", "@babel/preset-env@^7.16.0", "@babel/preset-env@^7.23.6": + version "7.23.6" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.23.6.tgz#ad0ea799d5a3c07db5b9a172819bbd444092187a" + integrity sha512-2XPn/BqKkZCpzYhUUNZ1ssXw7DcXfKQEjv/uXZUXgaebCMYmkEsfZ2yY+vv+xtXv50WmL5SGhyB6/xsWxIvvOQ== dependencies: "@babel/compat-data" "^7.23.5" - "@babel/helper-compilation-targets" "^7.22.15" + "@babel/helper-compilation-targets" "^7.23.6" "@babel/helper-plugin-utils" "^7.22.5" "@babel/helper-validator-option" "^7.23.5" "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.23.3" @@ -1184,7 +1185,7 @@ "@babel/plugin-transform-dynamic-import" "^7.23.4" "@babel/plugin-transform-exponentiation-operator" "^7.23.3" "@babel/plugin-transform-export-namespace-from" "^7.23.4" - "@babel/plugin-transform-for-of" "^7.23.3" + "@babel/plugin-transform-for-of" "^7.23.6" "@babel/plugin-transform-function-name" "^7.23.3" "@babel/plugin-transform-json-strings" "^7.23.4" "@babel/plugin-transform-literals" "^7.23.3" @@ -1312,26 +1313,26 @@ "@babel/parser" "^7.22.15" "@babel/types" "^7.22.15" -"@babel/traverse@^7.12.11", "@babel/traverse@^7.12.9", "@babel/traverse@^7.13.0", "@babel/traverse@^7.14.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.23.5": - version "7.23.5" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.5.tgz#f546bf9aba9ef2b042c0e00d245990c15508e7ec" - integrity sha512-czx7Xy5a6sapWWRx61m1Ke1Ra4vczu1mCTtJam5zRTBOonfdJ+S/B6HYmGYu3fJtr8GGET3si6IhgWVBhJ/m8w== +"@babel/traverse@^7.12.11", "@babel/traverse@^7.12.9", "@babel/traverse@^7.13.0", "@babel/traverse@^7.14.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.23.6": + version "7.23.6" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.6.tgz#b53526a2367a0dd6edc423637f3d2d0f2521abc5" + integrity sha512-czastdK1e8YByZqezMPFiZ8ahwVMh/ESl9vPgvgdB9AmFMGP5jfpFax74AQgl5zj4XHzqeYAg2l8PuUeRS1MgQ== dependencies: "@babel/code-frame" "^7.23.5" - "@babel/generator" "^7.23.5" + "@babel/generator" "^7.23.6" "@babel/helper-environment-visitor" "^7.22.20" "@babel/helper-function-name" "^7.23.0" "@babel/helper-hoist-variables" "^7.22.5" "@babel/helper-split-export-declaration" "^7.22.6" - "@babel/parser" "^7.23.5" - "@babel/types" "^7.23.5" - debug "^4.1.0" + "@babel/parser" "^7.23.6" + "@babel/types" "^7.23.6" + debug "^4.3.1" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.49", "@babel/types@^7.12.11", "@babel/types@^7.12.7", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.18.6", "@babel/types@^7.22.15", "@babel/types@^7.22.19", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.3", "@babel/types@^7.23.5", "@babel/types@^7.3.0", "@babel/types@^7.4.4": - version "7.23.5" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.5.tgz#48d730a00c95109fa4393352705954d74fb5b602" - integrity sha512-ON5kSOJwVO6xXVRTvOI0eOnWe7VdUcIpsovGo9U/Br4Ie4UVFQTboO2cYnDhAGU6Fp+UxSiT+pMft0SMHfuq6w== +"@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.49", "@babel/types@^7.12.11", "@babel/types@^7.12.7", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.18.6", "@babel/types@^7.22.15", "@babel/types@^7.22.19", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.3", "@babel/types@^7.23.6", "@babel/types@^7.3.0", "@babel/types@^7.4.4": + version "7.23.6" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.6.tgz#be33fdb151e1f5a56877d704492c240fc71c7ccd" + integrity sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg== dependencies: "@babel/helper-string-parser" "^7.23.4" "@babel/helper-validator-identifier" "^7.22.20" @@ -6629,7 +6630,7 @@ browserify@^17.0.0: vm-browserify "^1.0.0" xtend "^4.0.0" -browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.21.10, browserslist@^4.21.4, browserslist@^4.21.9, browserslist@^4.22.1: +browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.21.10, browserslist@^4.21.4, browserslist@^4.22.1: version "4.22.1" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.22.1.tgz#ba91958d1a59b87dab6fed8dfbcb3da5e2e9c619" integrity sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ== @@ -6639,6 +6640,16 @@ browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4 node-releases "^2.0.13" update-browserslist-db "^1.0.13" +browserslist@^4.22.2: + version "4.22.2" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.22.2.tgz#704c4943072bd81ea18997f3bd2180e89c77874b" + integrity sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A== + dependencies: + caniuse-lite "^1.0.30001565" + electron-to-chromium "^1.4.601" + node-releases "^2.0.14" + update-browserslist-db "^1.0.13" + bser@2.1.1: version "2.1.1" resolved "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz" @@ -6916,6 +6927,11 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001538, can resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001566.tgz#61a8e17caf3752e3e426d4239c549ebbb37fef0d" integrity sha512-ggIhCsTxmITBAMmK8yZjEhCO5/47jKXPu6Dha/wuCS4JePVL+3uiDEBuhu2aIoT+bqTOR8L76Ip1ARL9xYsEJA== +caniuse-lite@^1.0.30001565: + version "1.0.30001570" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001570.tgz#b4e5c1fa786f733ab78fc70f592df6b3f23244ca" + integrity sha512-+3e0ASu4sw1SWaoCtvPeyXp+5PsjigkSt8OXZbF9StH5pQWbxEjLAZE3n8Aup5udop1uRiKA7a4utUk/uoSpUw== + capital-case@^1.0.4: version "1.0.4" resolved "https://registry.npmjs.org/capital-case/-/capital-case-1.0.4.tgz" @@ -8742,6 +8758,11 @@ electron-to-chromium@^1.4.535: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.554.tgz#04e09c2ee31dc0f1546174033809b54cc372740b" integrity sha512-Q0umzPJjfBrrj8unkONTgbKQXzXRrH7sVV7D9ea2yBV3Oaogz991yhbpfvo2LMNkJItmruXTEzVpP9cp7vaIiQ== +electron-to-chromium@^1.4.601: + version "1.4.612" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.612.tgz#350c6fd4201d677307519b931949fa64dae6a5cc" + integrity sha512-dM8BMtXtlH237ecSMnYdYuCkib2QHq0kpWfUnavjdYsyr/6OsAwg5ZGUfnQ9KD1Ga4QgB2sqXlB2NT8zy2GnVg== + elegant-spinner@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/elegant-spinner/-/elegant-spinner-1.0.1.tgz" @@ -14166,6 +14187,11 @@ node-releases@^2.0.13: resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.13.tgz#d5ed1627c23e3461e819b02e57b75e4899b1c81d" integrity sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ== +node-releases@^2.0.14: + version "2.0.14" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.14.tgz#2ffb053bceb8b2be8495ece1ab6ce600c4461b0b" + integrity sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw== + normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.5.0: version "2.5.0" resolved "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz" From ff484a412f47bd35c9a30ca85822c543f3bf84e6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Dec 2023 08:15:31 +0000 Subject: [PATCH 09/24] Bump eslint-config-prettier from 9.0.0 to 9.1.0 Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 9.0.0 to 9.1.0. - [Changelog](https://github.com/prettier/eslint-config-prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/eslint-config-prettier/compare/v9.0.0...v9.1.0) --- updated-dependencies: - dependency-name: eslint-config-prettier dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 4b09a9aec6..1e88c6c7ef 100644 --- a/package.json +++ b/package.json @@ -98,7 +98,7 @@ "eslint": "^8.54.0", "eslint-config-airbnb": "^19.0.4", "eslint-config-airbnb-typescript": "^17.1.0", - "eslint-config-prettier": "^9.0.0", + "eslint-config-prettier": "^9.1.0", "eslint-loader": "^4.0.2", "eslint-plugin-cypress": "^2.12.1", "eslint-plugin-import": "^2.29.0", diff --git a/yarn.lock b/yarn.lock index 3e26980780..3948ae7c9f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9321,10 +9321,10 @@ eslint-config-airbnb@^19.0.4: object.assign "^4.1.2" object.entries "^1.1.5" -eslint-config-prettier@^9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-9.0.0.tgz#eb25485946dd0c66cd216a46232dc05451518d1f" - integrity sha512-IcJsTkJae2S35pRsRAwoCE+925rJJStOdkKnLVgtE+tEpqU0EVVM7OqrwxqgptKdX29NUwC82I5pXsGFIgSevw== +eslint-config-prettier@^9.1.0: + version "9.1.0" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz#31af3d94578645966c082fcb71a5846d3c94867f" + integrity sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw== eslint-import-resolver-node@^0.3.9: version "0.3.9" From 266ed468eb860b774dba041f6f79364b1518eecd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Dec 2023 08:16:52 +0000 Subject: [PATCH 10/24] Bump caniuse-lite from 1.0.30001566 to 1.0.30001570 Bumps [caniuse-lite](https://github.com/browserslist/caniuse-lite) from 1.0.30001566 to 1.0.30001570. - [Commits](https://github.com/browserslist/caniuse-lite/compare/1.0.30001566...1.0.30001570) --- updated-dependencies: - dependency-name: caniuse-lite dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 1e88c6c7ef..bc8a0593ee 100644 --- a/package.json +++ b/package.json @@ -87,7 +87,7 @@ "babel-plugin-istanbul": "^6.1.1", "babel-plugin-lodash": "^3.3.4", "babel-plugin-transform-react-remove-prop-types": "^0.4.24", - "caniuse-lite": "^1.0.30001566", + "caniuse-lite": "^1.0.30001570", "chokidar-cli": "^3.0.0", "concurrently": "^8.2.2", "core-js": "^3.34.0", diff --git a/yarn.lock b/yarn.lock index 3948ae7c9f..d2819df2bf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6922,10 +6922,10 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001538, caniuse-lite@^1.0.30001541, caniuse-lite@^1.0.30001566: - version "1.0.30001566" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001566.tgz#61a8e17caf3752e3e426d4239c549ebbb37fef0d" - integrity sha512-ggIhCsTxmITBAMmK8yZjEhCO5/47jKXPu6Dha/wuCS4JePVL+3uiDEBuhu2aIoT+bqTOR8L76Ip1ARL9xYsEJA== +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001538, caniuse-lite@^1.0.30001541, caniuse-lite@^1.0.30001570: + version "1.0.30001570" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001570.tgz#b4e5c1fa786f733ab78fc70f592df6b3f23244ca" + integrity sha512-+3e0ASu4sw1SWaoCtvPeyXp+5PsjigkSt8OXZbF9StH5pQWbxEjLAZE3n8Aup5udop1uRiKA7a4utUk/uoSpUw== caniuse-lite@^1.0.30001565: version "1.0.30001570" From 92d77b3ccde8ce04e06fcae10342df40281f1311 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Dec 2023 08:17:23 +0000 Subject: [PATCH 11/24] Bump stylelint-scss from 5.3.2 to 6.0.0 Bumps [stylelint-scss](https://github.com/stylelint-scss/stylelint-scss) from 5.3.2 to 6.0.0. - [Release notes](https://github.com/stylelint-scss/stylelint-scss/releases) - [Changelog](https://github.com/stylelint-scss/stylelint-scss/blob/master/CHANGELOG.md) - [Commits](https://github.com/stylelint-scss/stylelint-scss/compare/v5.3.2...v6.0.0) --- updated-dependencies: - dependency-name: stylelint-scss dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index bc8a0593ee..fa5ffedcf3 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "stylelint-config-prettier": "^9.0.5", "stylelint-config-recommended-scss": "^6.0.0", "stylelint-prettier": "^2.0.0", - "stylelint-scss": "^5.3.2", + "stylelint-scss": "^6.0.0", "stylelint-webpack-plugin": "^4.1.1", "svg-url-loader": "^8.0.0", "ts-node": "^10.9.2", diff --git a/yarn.lock b/yarn.lock index d2819df2bf..870d34bd42 100644 --- a/yarn.lock +++ b/yarn.lock @@ -18179,10 +18179,10 @@ stylelint-scss@^4.0.0: postcss-selector-parser "^6.0.6" postcss-value-parser "^4.1.0" -stylelint-scss@^5.3.2: - version "5.3.2" - resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-5.3.2.tgz#c54564dfbd98de0c08742b9c43025cda91acf940" - integrity sha512-4LzLaayFhFyneJwLo0IUa8knuIvj+zF0vBFueQs4e3tEaAMIQX8q5th8ziKkgOavr6y/y9yoBe+RXN/edwLzsQ== +stylelint-scss@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-6.0.0.tgz#bf6be6798d71c898484b7e97007d5ed69a89308d" + integrity sha512-N1xV/Ef5PNRQQt9E45unzGvBUN1KZxCI8B4FgN/pMfmyRYbZGVN4y9qWlvOMdScU17c8VVCnjIHTVn38Bb6qSA== dependencies: known-css-properties "^0.29.0" postcss-media-query-parser "^0.2.3" From 51ed1bd3e9329ccc3a4a095886b442454f3d154b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Dec 2023 08:19:31 +0000 Subject: [PATCH 12/24] Bump @types/react from 18.2.41 to 18.2.45 Bumps [@types/react](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react) from 18.2.41 to 18.2.45. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react) --- updated-dependencies: - dependency-name: "@types/react" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index fa5ffedcf3..9eebd01fe2 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "@testing-library/react-hooks": "^8.0.1", "@tsconfig/create-react-app": "^1.0.2", "@types/node": "^20.10.3", - "@types/react": "^18.2.41", + "@types/react": "^18.2.45", "@types/react-dom": "^18.2.17", "@types/react-redux": "^7.1.24", "@typescript-eslint/eslint-plugin": "^5.23.0", diff --git a/yarn.lock b/yarn.lock index 870d34bd42..3c7f8ab3ce 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4671,10 +4671,10 @@ dependencies: "@types/react" "*" -"@types/react@*", "@types/react@^18.2.41": - version "18.2.41" - resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.41.tgz#9eea044246bdb10510df89ef7f8422a8b6ad8fb9" - integrity sha512-CwOGr/PiLiNBxEBqpJ7fO3kocP/2SSuC9fpH5K7tusrg4xPSRT/193rzolYwQnTN02We/ATXKnb6GqA5w4fRxw== +"@types/react@*", "@types/react@^18.2.45": + version "18.2.45" + resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.45.tgz#253f4fac288e7e751ab3dc542000fb687422c15c" + integrity sha512-TtAxCNrlrBp8GoeEp1npd5g+d/OejJHFxS3OWmrPBMFaVQMSN0OFySozJio5BHxTuTeug00AVXVAjfDSfk+lUg== dependencies: "@types/prop-types" "*" "@types/scheduler" "*" From cc55c166814425190276c6598dab6aaa87a94019 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Dec 2023 08:18:07 +0000 Subject: [PATCH 13/24] Bump @typescript-eslint/parser from 6.13.2 to 6.14.0 Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 6.13.2 to 6.14.0. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.14.0/packages/parser) --- updated-dependencies: - dependency-name: "@typescript-eslint/parser" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 60 ++++++++++++++++++++++++++-------------------------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/package.json b/package.json index 9eebd01fe2..37bfd46a4f 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "@types/react-dom": "^18.2.17", "@types/react-redux": "^7.1.24", "@typescript-eslint/eslint-plugin": "^5.23.0", - "@typescript-eslint/parser": "^6.13.2", + "@typescript-eslint/parser": "^6.14.0", "@vitest/coverage-istanbul": "^1.0.4", "autoprefixer": "^10.4.16", "babel-loader": "^9.1.3", diff --git a/yarn.lock b/yarn.lock index 3c7f8ab3ce..30e02e801b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4818,15 +4818,15 @@ semver "^7.3.5" tsutils "^3.21.0" -"@typescript-eslint/parser@^6.13.2": - version "6.13.2" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.13.2.tgz#390b79cc9a57a5f904d197a201cc4b6bc4f9afb9" - integrity sha512-MUkcC+7Wt/QOGeVlM8aGGJZy1XV5YKjTpq9jK6r6/iLsGXhBVaGP5N0UYvFsu9BFlSpwY9kMretzdBH01rkRXg== - dependencies: - "@typescript-eslint/scope-manager" "6.13.2" - "@typescript-eslint/types" "6.13.2" - "@typescript-eslint/typescript-estree" "6.13.2" - "@typescript-eslint/visitor-keys" "6.13.2" +"@typescript-eslint/parser@^6.14.0": + version "6.14.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.14.0.tgz#a2d6a732e0d2b95c73f6a26ae7362877cc1b4212" + integrity sha512-QjToC14CKacd4Pa7JK4GeB/vHmWFJckec49FR4hmIRf97+KXole0T97xxu9IFiPxVQ1DBWrQ5wreLwAGwWAVQA== + dependencies: + "@typescript-eslint/scope-manager" "6.14.0" + "@typescript-eslint/types" "6.14.0" + "@typescript-eslint/typescript-estree" "6.14.0" + "@typescript-eslint/visitor-keys" "6.14.0" debug "^4.3.4" "@typescript-eslint/scope-manager@5.23.0": @@ -4837,13 +4837,13 @@ "@typescript-eslint/types" "5.23.0" "@typescript-eslint/visitor-keys" "5.23.0" -"@typescript-eslint/scope-manager@6.13.2": - version "6.13.2" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.13.2.tgz#5fa4e4adace028dafac212c770640b94e7b61052" - integrity sha512-CXQA0xo7z6x13FeDYCgBkjWzNqzBn8RXaE3QVQVIUm74fWJLkJkaHmHdKStrxQllGh6Q4eUGyNpMe0b1hMkXFA== +"@typescript-eslint/scope-manager@6.14.0": + version "6.14.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.14.0.tgz#53d24363fdb5ee0d1d8cda4ed5e5321272ab3d48" + integrity sha512-VT7CFWHbZipPncAZtuALr9y3EuzY1b1t1AEkIq2bTXUPKw+pHoXflGNG5L+Gv6nKul1cz1VH8fz16IThIU0tdg== dependencies: - "@typescript-eslint/types" "6.13.2" - "@typescript-eslint/visitor-keys" "6.13.2" + "@typescript-eslint/types" "6.14.0" + "@typescript-eslint/visitor-keys" "6.14.0" "@typescript-eslint/type-utils@5.23.0": version "5.23.0" @@ -4859,10 +4859,10 @@ resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.23.0.tgz" integrity sha512-NfBsV/h4dir/8mJwdZz7JFibaKC3E/QdeMEDJhiAE3/eMkoniZ7MjbEMCGXw6MZnZDMN3G9S0mH/6WUIj91dmw== -"@typescript-eslint/types@6.13.2": - version "6.13.2" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.13.2.tgz#c044aac24c2f6cefb8e921e397acad5417dd0ae6" - integrity sha512-7sxbQ+EMRubQc3wTfTsycgYpSujyVbI1xw+3UMRUcrhSy+pN09y/lWzeKDbvhoqcRbHdc+APLs/PWYi/cisLPg== +"@typescript-eslint/types@6.14.0": + version "6.14.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.14.0.tgz#935307f7a931016b7a5eb25d494ea3e1f613e929" + integrity sha512-uty9H2K4Xs8E47z3SnXEPRNDfsis8JO27amp2GNCnzGETEW3yTqEIVg5+AI7U276oGF/tw6ZA+UesxeQ104ceA== "@typescript-eslint/typescript-estree@5.23.0": version "5.23.0" @@ -4877,13 +4877,13 @@ semver "^7.3.5" tsutils "^3.21.0" -"@typescript-eslint/typescript-estree@6.13.2": - version "6.13.2" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.13.2.tgz#ae556ee154c1acf025b48d37c3ef95a1d55da258" - integrity sha512-SuD8YLQv6WHnOEtKv8D6HZUzOub855cfPnPMKvdM/Bh1plv1f7Q/0iFUDLKKlxHcEstQnaUU4QZskgQq74t+3w== +"@typescript-eslint/typescript-estree@6.14.0": + version "6.14.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.14.0.tgz#90c7ddd45cd22139adf3d4577580d04c9189ac13" + integrity sha512-yPkaLwK0yH2mZKFE/bXkPAkkFgOv15GJAUzgUVonAbv0Hr4PK/N2yaA/4XQbTZQdygiDkpt5DkxPELqHguNvyw== dependencies: - "@typescript-eslint/types" "6.13.2" - "@typescript-eslint/visitor-keys" "6.13.2" + "@typescript-eslint/types" "6.14.0" + "@typescript-eslint/visitor-keys" "6.14.0" debug "^4.3.4" globby "^11.1.0" is-glob "^4.0.3" @@ -4910,12 +4910,12 @@ "@typescript-eslint/types" "5.23.0" eslint-visitor-keys "^3.0.0" -"@typescript-eslint/visitor-keys@6.13.2": - version "6.13.2" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.13.2.tgz#e0a4a80cf842bb08e6127b903284166ac4a5594c" - integrity sha512-OGznFs0eAQXJsp+xSd6k/O1UbFi/K/L7WjqeRoFE7vadjAF9y0uppXhYNQNEqygjou782maGClOoZwPqF0Drlw== +"@typescript-eslint/visitor-keys@6.14.0": + version "6.14.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.14.0.tgz#1d1d486581819287de824a56c22f32543561138e" + integrity sha512-fB5cw6GRhJUz03MrROVuj5Zm/Q+XWlVdIsFj+Zb1Hvqouc8t+XP2H5y53QYU/MGtd2dPg6/vJJlhoX3xc2ehfw== dependencies: - "@typescript-eslint/types" "6.13.2" + "@typescript-eslint/types" "6.14.0" eslint-visitor-keys "^3.4.1" "@ungap/structured-clone@^1.2.0": From 0422e45a4b079986099d1927194f490b7b57d841 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Dec 2023 02:07:10 +0000 Subject: [PATCH 14/24] Bump actions/upload-artifact from 3 to 4 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 2 +- .github/workflows/tests.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 40941e58ef..63045be7fc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,7 +31,7 @@ jobs: VERSION_FILE_VERSION=$(git describe --tags --exclude=latest) \ yarn build:js:prod --json webpack-stats.json - name: Upload build - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: dist path: dist diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f6df7c7d8a..6035d6bf3d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -32,13 +32,13 @@ jobs: wait-on: "http://localhost:57021" browser: chrome - name: Upload screenshots - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: failure() with: name: cypress-screenshots path: cypress/screenshots - name: Upload videos - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: always() with: name: cypress-videos From 4ac3e3cf44261be005ff86d3b1f254f51754fd6b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Dec 2023 02:38:45 +0000 Subject: [PATCH 15/24] Bump @cypress/code-coverage from 3.12.12 to 3.12.14 Bumps [@cypress/code-coverage](https://github.com/cypress-io/code-coverage) from 3.12.12 to 3.12.14. - [Release notes](https://github.com/cypress-io/code-coverage/releases) - [Changelog](https://github.com/cypress-io/code-coverage/blob/master/.releaserc) - [Commits](https://github.com/cypress-io/code-coverage/compare/v3.12.12...v3.12.14) --- updated-dependencies: - dependency-name: "@cypress/code-coverage" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 15 +++++---------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 37bfd46a4f..cb1adc8492 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "@babel/preset-typescript": "^7.23.3", "@csstools/postcss-sass": "^5.0.1", "@cypress/browserify-preprocessor": "^3.0.2", - "@cypress/code-coverage": "^3.12.12", + "@cypress/code-coverage": "^3.12.14", "@graphql-codegen/add": "^3.1.1", "@graphql-codegen/cli": "^2.6.2", "@graphql-codegen/introspection": "^2.1.1", diff --git a/yarn.lock b/yarn.lock index 30e02e801b..34c3f51405 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1421,10 +1421,10 @@ through2 "^2.0.0" watchify "^4.0.0" -"@cypress/code-coverage@^3.12.12": - version "3.12.12" - resolved "https://registry.yarnpkg.com/@cypress/code-coverage/-/code-coverage-3.12.12.tgz#c10806466a8fcd200f5636319ad681a8adca8482" - integrity sha512-V/fWyg6E1xdf/HHHUAg9cfGGU4hzsBgXYCm0ouXW2lOQHeo2/730R+CdXnbhPvDdl6GrndZtXW8K9FZhFNZJbQ== +"@cypress/code-coverage@^3.12.14": + version "3.12.14" + resolved "https://registry.yarnpkg.com/@cypress/code-coverage/-/code-coverage-3.12.14.tgz#6689e7edf773a7022802506d3b3d0fedfc0960f5" + integrity sha512-uTlt0cdfohRWkH/HaXHRnyc+uj/Jb2on9V6H6CB6hdQvUfsmvHgTbc+qoqdwVOXI/33ctnreZpLjVkbuH0gYvw== dependencies: "@cypress/webpack-preprocessor" "^6.0.0" chalk "4.1.2" @@ -1432,7 +1432,7 @@ debug "4.3.4" execa "4.1.0" globby "11.1.0" - istanbul-lib-coverage "3.0.0" + istanbul-lib-coverage "^3.0.0" js-yaml "4.1.0" nyc "15.1.0" @@ -12369,11 +12369,6 @@ isstream@~0.1.2: resolved "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz" integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= -istanbul-lib-coverage@3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz" - integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg== - istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.0.0-alpha.1, istanbul-lib-coverage@^3.2.0, istanbul-lib-coverage@^3.2.2: version "3.2.2" resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz#2d166c4b0644d43a39f04bf6c2edd1e585f31756" From 9688ef4fe3054c7af6b292cd37cd0b0fd67790b5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Dec 2023 06:41:00 +0000 Subject: [PATCH 16/24] Bump eslint from 8.54.0 to 8.56.0 Bumps [eslint](https://github.com/eslint/eslint) from 8.54.0 to 8.56.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v8.54.0...v8.56.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 35 +++++++++++++++-------------------- 2 files changed, 16 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index cb1adc8492..1c5ab8d3d6 100644 --- a/package.json +++ b/package.json @@ -95,7 +95,7 @@ "cssnano": "^6.0.1", "cypress": "^9.6.1", "dotenv": "^16.3.1", - "eslint": "^8.54.0", + "eslint": "^8.56.0", "eslint-config-airbnb": "^19.0.4", "eslint-config-airbnb-typescript": "^17.1.0", "eslint-config-prettier": "^9.1.0", diff --git a/yarn.lock b/yarn.lock index 34c3f51405..c0741ef3d4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1721,10 +1721,10 @@ resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.10.0.tgz#548f6de556857c8bb73bbee70c35dc82a2e74d63" integrity sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA== -"@eslint/eslintrc@^2.1.3": - version "2.1.3" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.3.tgz#797470a75fe0fbd5a53350ee715e85e87baff22d" - integrity sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA== +"@eslint/eslintrc@^2.1.4": + version "2.1.4" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.4.tgz#388a269f0f25c1b6adc317b5a2c55714894c70ad" + integrity sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ== dependencies: ajv "^6.12.4" debug "^4.3.2" @@ -1736,10 +1736,10 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" -"@eslint/js@8.54.0": - version "8.54.0" - resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.54.0.tgz#4fab9a2ff7860082c304f750e94acd644cf984cf" - integrity sha512-ut5V+D+fOoWPgGGNj83GGjnntO39xDy6DWxO0wb7Jp3DcMX0TfIqdzHF85VTQkerdyGmuuMD9AKAo5KiNlf/AQ== +"@eslint/js@8.56.0": + version "8.56.0" + resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.56.0.tgz#ef20350fec605a7f7035a01764731b2de0f3782b" + integrity sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A== "@exodus/schemasafe@^1.0.0-rc.2": version "1.0.0-rc.6" @@ -6922,12 +6922,7 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001538, caniuse-lite@^1.0.30001541, caniuse-lite@^1.0.30001570: - version "1.0.30001570" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001570.tgz#b4e5c1fa786f733ab78fc70f592df6b3f23244ca" - integrity sha512-+3e0ASu4sw1SWaoCtvPeyXp+5PsjigkSt8OXZbF9StH5pQWbxEjLAZE3n8Aup5udop1uRiKA7a4utUk/uoSpUw== - -caniuse-lite@^1.0.30001565: +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001538, caniuse-lite@^1.0.30001541, caniuse-lite@^1.0.30001565, caniuse-lite@^1.0.30001570: version "1.0.30001570" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001570.tgz#b4e5c1fa786f733ab78fc70f592df6b3f23244ca" integrity sha512-+3e0ASu4sw1SWaoCtvPeyXp+5PsjigkSt8OXZbF9StH5pQWbxEjLAZE3n8Aup5udop1uRiKA7a4utUk/uoSpUw== @@ -9492,15 +9487,15 @@ eslint-webpack-plugin@^4.0.1: normalize-path "^3.0.0" schema-utils "^4.0.0" -eslint@^8.54.0: - version "8.54.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.54.0.tgz#588e0dd4388af91a2e8fa37ea64924074c783537" - integrity sha512-NY0DfAkM8BIZDVl6PgSa1ttZbx3xHgJzSNJKYcQglem6CppHyMhRIQkBVSSMaSRnLhig3jsDbEzOjwCVt4AmmA== +eslint@^8.56.0: + version "8.56.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.56.0.tgz#4957ce8da409dc0809f99ab07a1b94832ab74b15" + integrity sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ== dependencies: "@eslint-community/eslint-utils" "^4.2.0" "@eslint-community/regexpp" "^4.6.1" - "@eslint/eslintrc" "^2.1.3" - "@eslint/js" "8.54.0" + "@eslint/eslintrc" "^2.1.4" + "@eslint/js" "8.56.0" "@humanwhocodes/config-array" "^0.11.13" "@humanwhocodes/module-importer" "^1.0.1" "@nodelib/fs.walk" "^1.2.8" From b7a7bb1ddefb2406608431b15ce093942f3edab9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Dec 2023 06:41:09 +0000 Subject: [PATCH 17/24] Bump @types/node from 20.10.3 to 20.10.5 Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.10.3 to 20.10.5. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) --- updated-dependencies: - dependency-name: "@types/node" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 1c5ab8d3d6..4ab04ce900 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "@testing-library/react": "^14.1.2", "@testing-library/react-hooks": "^8.0.1", "@tsconfig/create-react-app": "^1.0.2", - "@types/node": "^20.10.3", + "@types/node": "^20.10.5", "@types/react": "^18.2.45", "@types/react-dom": "^18.2.17", "@types/react-redux": "^7.1.24", diff --git a/yarn.lock b/yarn.lock index c0741ef3d4..b42f8006fc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4583,10 +4583,10 @@ "@types/node" "*" form-data "^3.0.0" -"@types/node@*", "@types/node@^20.10.3": - version "20.10.3" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.10.3.tgz#4900adcc7fc189d5af5bb41da8f543cea6962030" - integrity sha512-XJavIpZqiXID5Yxnxv3RUDKTN5b81ddNC3ecsA0SoFXz/QU8OGBwZGMomiq0zw+uuqbL/krztv/DINAQ/EV4gg== +"@types/node@*", "@types/node@^20.10.5": + version "20.10.5" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.10.5.tgz#47ad460b514096b7ed63a1dae26fad0914ed3ab2" + integrity sha512-nNPsNE65wjMxEKI93yOP+NPGGBJz/PoN3kZsVLee0XMiJolxSekEVD8wRwBUBqkwc7UWop0edW50yrCQW4CyRw== dependencies: undici-types "~5.26.4" From 7aa7ac6ab0dceb099189749f41cc2942fcd530e5 Mon Sep 17 00:00:00 2001 From: Kasper Birch Date: Thu, 7 Dec 2023 15:29:37 +0100 Subject: [PATCH 18/24] Update `DescriptionList` with BEM Classes Reflecting Changes in: https://github.com/danskernesdigitalebibliotek/dpl-design-system/pull/365 --- src/components/description-list/description-list.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/description-list/description-list.tsx b/src/components/description-list/description-list.tsx index 5309663d42..99d1e82a79 100644 --- a/src/components/description-list/description-list.tsx +++ b/src/components/description-list/description-list.tsx @@ -16,9 +16,9 @@ const DescriptionList: React.FC = ({ {data.map((item) => { const { label, value } = item; return ( -
-
{label}
-
{value}
+
+
{label}
+
{value}
); })} From e841896a88eed928ae0cc7f325ecb4a0903fbd4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Garn=C3=A6s?= Date: Tue, 19 Dec 2023 09:09:56 +0100 Subject: [PATCH 19/24] Use release 2023.51.0 of design system --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 4ab04ce900..bd512c4590 100644 --- a/package.json +++ b/package.json @@ -143,7 +143,7 @@ "prop-types": "Since we use former ddb-react components that depend on prop-types we keep this. Should be removed when usage of prop-types is deprecated." }, "dependencies": { - "@danskernesdigitalebibliotek/dpl-design-system": "0.0.0-751e1ca427e827b1412c0d292cca6df2f43d9453", + "@danskernesdigitalebibliotek/dpl-design-system": "2023.51.0-cd7e0937a067366392e60d85a9831b7d1cdf363e", "@reach/alert": "^0.17.0", "@reach/dialog": "^0.18.0", "@reduxjs/toolkit": "^1.9.7", diff --git a/yarn.lock b/yarn.lock index b42f8006fc..113338a7f6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1477,10 +1477,10 @@ debug "^3.1.0" lodash.once "^4.1.1" -"@danskernesdigitalebibliotek/dpl-design-system@0.0.0-751e1ca427e827b1412c0d292cca6df2f43d9453": - version "0.0.0-751e1ca427e827b1412c0d292cca6df2f43d9453" - resolved "https://npm.pkg.github.com/download/@danskernesdigitalebibliotek/dpl-design-system/0.0.0-751e1ca427e827b1412c0d292cca6df2f43d9453/153a01a50e9e03281ad26e676a3d59dfe982e79e#153a01a50e9e03281ad26e676a3d59dfe982e79e" - integrity sha512-E6Q1gtnNEzi09f9Gq7mveVmyGRaKQrOoz7dN+L2PJQPsKMVRCKEhb+agXoud7+PEy3b5ewx8ylbVf6cM1Xqmew== +"@danskernesdigitalebibliotek/dpl-design-system@2023.51.0-cd7e0937a067366392e60d85a9831b7d1cdf363e": + version "2023.51.0-cd7e0937a067366392e60d85a9831b7d1cdf363e" + resolved "https://npm.pkg.github.com/download/@danskernesdigitalebibliotek/dpl-design-system/2023.51.0-cd7e0937a067366392e60d85a9831b7d1cdf363e/eaa8bd13af004074cd2447655a4bb20fccd8dc2c#eaa8bd13af004074cd2447655a4bb20fccd8dc2c" + integrity sha512-Zimpf9G00kcS7QA27wuOtN4zmrRbs+4UAADXkAq0lFE+VhaQZ7EbcueVw2tZ47UXzQUgcPbF5a9X5P1Jk/kkZQ== "@discoveryjs/json-ext@^0.5.0", "@discoveryjs/json-ext@^0.5.3": version "0.5.7" From 371f5411f5db7ff854024464cf2c82608fba81a9 Mon Sep 17 00:00:00 2001 From: Adam Antal Date: Wed, 27 Dec 2023 11:38:12 +0100 Subject: [PATCH 20/24] Make feeLitsMaterialNumberText into translatable text with a placeholder --- src/apps/fee-list/FeeList.dev.tsx | 4 ++-- src/apps/fee-list/stackable-fees/fee-info.tsx | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/apps/fee-list/FeeList.dev.tsx b/src/apps/fee-list/FeeList.dev.tsx index ce64260a58..47d27f45b9 100644 --- a/src/apps/fee-list/FeeList.dev.tsx +++ b/src/apps/fee-list/FeeList.dev.tsx @@ -167,11 +167,11 @@ export default { }, feeListAlreadyPaidInfoText: { defaultValue: - "Already paid? It can take up to 72 hours register the transaction.", + "Already paid? It can take up to 72 hours to register the transaction.", control: { type: "text" } }, feeLitsMaterialNumberText: { - defaultValue: "#", + defaultValue: "# @materialNumber", control: { type: "text" } } }, diff --git a/src/apps/fee-list/stackable-fees/fee-info.tsx b/src/apps/fee-list/stackable-fees/fee-info.tsx index 3b0dca237c..704e826aaa 100644 --- a/src/apps/fee-list/stackable-fees/fee-info.tsx +++ b/src/apps/fee-list/stackable-fees/fee-info.tsx @@ -51,7 +51,9 @@ const FeeInfo: FC = ({

- {`${t("feeLitsMaterialNumberText")} ${materialItemNumber}`} + {t("feeLitsMaterialNumberText", { + placeholders: { "@materialNumber": materialItemNumber } + })}

{children}
From f6e51f5049a7098609e1d534dde57f9d8cf3d8c8 Mon Sep 17 00:00:00 2001 From: Adam Antal Date: Wed, 27 Dec 2023 11:39:01 +0100 Subject: [PATCH 21/24] Use getBySel instead of get("[data-cy='']") in fee list test 3.c.b. --- src/apps/fee-list/fee-list.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/apps/fee-list/fee-list.test.ts b/src/apps/fee-list/fee-list.test.ts index b8efd5c35e..a28fd6ea67 100644 --- a/src/apps/fee-list/fee-list.test.ts +++ b/src/apps/fee-list/fee-list.test.ts @@ -157,7 +157,7 @@ describe("Fee list", () => { .should("have.text", "Dummy bog"); // 3.c.b title - cy.get("[data-cy='fee-list']") + cy.getBySel("fee-list") .find(".list-reservation") .eq(0) .should("exist") From a2e273b833ab976849baa6f38d663d9c15af3d19 Mon Sep 17 00:00:00 2001 From: Adam Antal Date: Tue, 2 Jan 2024 12:39:19 +0100 Subject: [PATCH 22/24] Correct spelling in feeLitsMaterialNumberText -> feeListMaterialNumberTe ..xt --- src/apps/fee-list/stackable-fees/fee-info.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/apps/fee-list/stackable-fees/fee-info.tsx b/src/apps/fee-list/stackable-fees/fee-info.tsx index 704e826aaa..9025a76881 100644 --- a/src/apps/fee-list/stackable-fees/fee-info.tsx +++ b/src/apps/fee-list/stackable-fees/fee-info.tsx @@ -51,7 +51,7 @@ const FeeInfo: FC = ({

- {t("feeLitsMaterialNumberText", { + {t("feeListMaterialNumberText", { placeholders: { "@materialNumber": materialItemNumber } })}

From 26c4c8e80a830fa6aa698e1f0f4fd0a920de3342 Mon Sep 17 00:00:00 2001 From: Adam Antal Date: Tue, 2 Jan 2024 13:10:04 +0100 Subject: [PATCH 23/24] Correct definition of feeListMaterialNumberText in FeeList.dev.tsx --- src/apps/fee-list/FeeList.dev.tsx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/apps/fee-list/FeeList.dev.tsx b/src/apps/fee-list/FeeList.dev.tsx index 84b6923a24..8fc53d751a 100644 --- a/src/apps/fee-list/FeeList.dev.tsx +++ b/src/apps/fee-list/FeeList.dev.tsx @@ -169,10 +169,8 @@ export default { control: { type: "text" } }, feeListMaterialNumberText: { - materialNumberText: { - defaultValue: "# @materialNumber", - control: { type: "text" } - } + defaultValue: "# @materialNumber", + control: { type: "text" } } }, decorators: [withQuery] From 97eb24ace7943d343b8917f0b934478700392ac1 Mon Sep 17 00:00:00 2001 From: Adam Antal Date: Tue, 2 Jan 2024 15:12:29 +0100 Subject: [PATCH 24/24] Change outdated materialNumberText to feeListMaterialNumberText In stackable fees list. --- src/apps/fee-list/stackable-fees/stackable-fees-list.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/apps/fee-list/stackable-fees/stackable-fees-list.tsx b/src/apps/fee-list/stackable-fees/stackable-fees-list.tsx index 4703447e6a..79be60fc18 100644 --- a/src/apps/fee-list/stackable-fees/stackable-fees-list.tsx +++ b/src/apps/fee-list/stackable-fees/stackable-fees-list.tsx @@ -30,14 +30,14 @@ const StackableFeeList: FC = ({ key={recordId} statusMessageComponentMobile={
- {t("materialNumberText", { + {t("feeListMaterialNumberText", { placeholders: { "@materialNumber": materialItemNumber } })}
} statusMessageComponentDesktop={
- {t("materialNumberText", { + {t("feeListMaterialNumberText", { placeholders: { "@materialNumber": materialItemNumber } })}