diff --git a/src/apps/advanced-search/AdvancedSearch.dev.tsx b/src/apps/advanced-search/AdvancedSearch.dev.tsx index 44a34070f5..c52bbb7c13 100644 --- a/src/apps/advanced-search/AdvancedSearch.dev.tsx +++ b/src/apps/advanced-search/AdvancedSearch.dev.tsx @@ -98,18 +98,6 @@ export default { '[\n {\n "branchId":"DK-775120",\n "title":"Højbjerg"\n },\n {\n "branchId":"DK-775122",\n "title":"Beder-Malling"\n },\n {\n "branchId":"DK-775144",\n "title":"Gellerup"\n },\n {\n "branchId":"DK-775167",\n "title":"Lystrup"\n },\n {\n "branchId":"DK-775146",\n "title":"Harlev"\n },\n {\n "branchId":"DK-775168",\n "title":"Skødstrup"\n },\n {\n "branchId":"FBS-751010",\n "title":"Arresten"\n },\n {\n "branchId":"DK-775147",\n "title":"Hasle"\n },\n {\n "branchId":"FBS-751032",\n "title":"Må ikke benyttes"\n },\n {\n "branchId":"FBS-751031",\n "title":"Fjernlager 1"\n },\n {\n "branchId":"DK-775126",\n "title":"Solbjerg"\n },\n {\n "branchId":"FBS-751030",\n "title":"ITK"\n },\n {\n "branchId":"DK-775149",\n "title":"Sabro"\n },\n {\n "branchId":"DK-775127",\n "title":"Tranbjerg"\n },\n {\n "branchId":"DK-775160",\n "title":"Risskov"\n },\n {\n "branchId":"DK-775162",\n "title":"Hjortshøj"\n },\n {\n "branchId":"DK-775140",\n "title":"Åby"\n },\n {\n "branchId":"FBS-751009",\n "title":"Fjernlager 2"\n },\n {\n "branchId":"FBS-751029",\n "title":"Stadsarkivet"\n },\n {\n "branchId":"FBS-751027",\n "title":"Intern"\n },\n {\n "branchId":"FBS-751026",\n "title":"Fælles undervejs"\n },\n {\n "branchId":"FBS-751025",\n "title":"Fællessekretariatet"\n },\n {\n "branchId":"DK-775133",\n "title":"Bavnehøj"\n },\n {\n "branchId":"FBS-751024",\n "title":"Fjernlånte materialer"\n },\n {\n "branchId":"DK-775100",\n "title":"Hovedbiblioteket"\n },\n {\n "branchId":"DK-775170",\n "title":"Trige"\n },\n {\n "branchId":"DK-775150",\n "title":"Tilst"\n },\n {\n "branchId":"DK-775130",\n "title":"Viby"\n },\n {\n "branchId":"DK-775164",\n "title":"Egå"\n }\n]', control: { type: "text" } }, - addToFavoritesAriaLabelText: { - control: { - type: "text" - }, - defaultValue: "Add @title to favorites list" - }, - removeFromFavoritesAriaLabelText: { - control: { - type: "text" - }, - defaultValue: "Remove @title from favorites list" - }, loadingText: { name: "Loading", defaultValue: "Loading", diff --git a/src/apps/advanced-search/AdvancedSearch.entry.tsx b/src/apps/advanced-search/AdvancedSearch.entry.tsx index 4801478f5a..e0d748ef03 100644 --- a/src/apps/advanced-search/AdvancedSearch.entry.tsx +++ b/src/apps/advanced-search/AdvancedSearch.entry.tsx @@ -9,13 +9,11 @@ import AdvancedSearch from "./AdvancedSearch"; import { GlobalEntryTextProps } from "../../core/storybook/globalTextArgs"; interface AdvancedSearchEntryTextProps { - addToFavoritesAriaLabelText: string; byAuthorText: string; etAlText: string; inSeriesText: string; loadingText: string; numberDescriptionText: string; - removeFromFavoritesAriaLabelText: string; resultPagerStatusText: string; noSearchResultText: string; showMoreText: string; diff --git a/src/apps/dashboard/dashboard.dev.tsx b/src/apps/dashboard/dashboard.dev.tsx index 6e448ce748..5a8a388e12 100644 --- a/src/apps/dashboard/dashboard.dev.tsx +++ b/src/apps/dashboard/dashboard.dev.tsx @@ -9,7 +9,6 @@ import reservationGroupModalArgs from "../../core/storybook/reservationGroupModa import reservationMaterialDetailsProps from "../../core/storybook/reservationMaterialDetailsArgs"; import materialDetailsModalArgs from "../../core/storybook/materialDetailsModalArgs"; import deleteReservationModalArgs from "../../core/storybook/deleteReservationModalArgs"; -import acceptModalArgs from "../../core/storybook/acceptFeesModalArgs"; import reservationListArgs from "../../core/storybook/reservationListArgs"; import globalTextArgs from "../../core/storybook/globalTextArgs"; @@ -22,7 +21,6 @@ export default { ...renewalArgs, ...reservationGroupModalArgs, ...reservationMaterialDetailsProps, - ...acceptModalArgs, ...materialDetailsModalArgs, ...deleteReservationModalArgs, ...reservationListArgs, diff --git a/src/apps/dashboard/dashboard.entry.tsx b/src/apps/dashboard/dashboard.entry.tsx index d494d2a85f..013c840162 100644 --- a/src/apps/dashboard/dashboard.entry.tsx +++ b/src/apps/dashboard/dashboard.entry.tsx @@ -10,7 +10,6 @@ import { ReservationMaterialDetailsProps } from "../../core/storybook/reservatio import { MaterialDetailsModalProps } from "../../core/storybook/materialDetailsModalArgs"; import { GroupModalReservationsProps } from "../../core/storybook/reservationGroupModalArgs"; import { DeleteReservationModalArgs } from "../../core/storybook/deleteReservationModalArgs"; -import { AcceptFeesModalEntryTextProps } from "../../core/storybook/acceptFeesModalArgs"; import { RenewalArgs } from "../../core/storybook/renewalArgs"; import { GlobalEntryTextProps } from "../../core/storybook/globalTextArgs"; @@ -64,7 +63,6 @@ const DashboardEntry: FC< GroupModalProps & GroupModalLoansProps & DeleteReservationModalArgs & - AcceptFeesModalEntryTextProps & GroupModalReservationsProps & RenewalArgs & ReservationMaterialDetailsProps & diff --git a/src/apps/favorites-list-material-component/FavoritesListMaterialComponent.dev.tsx b/src/apps/favorites-list-material-component/FavoritesListMaterialComponent.dev.tsx index 41334bc63f..a4be579590 100644 --- a/src/apps/favorites-list-material-component/FavoritesListMaterialComponent.dev.tsx +++ b/src/apps/favorites-list-material-component/FavoritesListMaterialComponent.dev.tsx @@ -51,18 +51,6 @@ export default { type: "text" }, defaultValue: "https://unsplash.com/photos/wd6YQy0PJt8" // open source image of a red panda - }, - addToFavoritesAriaLabelText: { - control: { - type: "text" - }, - defaultValue: "Add @title to favorites list" - }, - removeFromFavoritesAriaLabelText: { - control: { - type: "text" - }, - defaultValue: "Remove @title from favorites list" } } } as ComponentMeta; diff --git a/src/apps/favorites-list-material-component/FavoritesListMaterialComponent.entry.tsx b/src/apps/favorites-list-material-component/FavoritesListMaterialComponent.entry.tsx index 4c33b61de9..82b0589d1a 100644 --- a/src/apps/favorites-list-material-component/FavoritesListMaterialComponent.entry.tsx +++ b/src/apps/favorites-list-material-component/FavoritesListMaterialComponent.entry.tsx @@ -19,8 +19,6 @@ export interface FavoritesListMaterialComponentProps { etAlText: string; favoritesListMaterialComponentGoToListText: string; favoritesListMaterialComponentGoToListUrl: string; - addToFavoritesAriaLabelText: string; - removeFromFavoritesAriaLabelText: string; } const SomethingSimilarEntry: FC< diff --git a/src/apps/loan-list/list/loan-list.dev.tsx b/src/apps/loan-list/list/loan-list.dev.tsx index 4215bc56ff..743240f84c 100644 --- a/src/apps/loan-list/list/loan-list.dev.tsx +++ b/src/apps/loan-list/list/loan-list.dev.tsx @@ -7,7 +7,6 @@ import globalTextArgs from "../../../core/storybook/globalTextArgs"; import LoanList from "./loan-list.entry"; import groupModalArgs from "../../../core/storybook/groupModalArgs"; import loanGroupModalArgs from "../../../core/storybook/loanGroupModalArgs"; -import acceptModalArgs from "../../../core/storybook/acceptFeesModalArgs"; import materialDetailsModalArgs from "../../../core/storybook/materialDetailsModalArgs"; import renewalArgs from "../../../core/storybook/renewalArgs"; import { getModalIds } from "../../../core/utils/helpers/modal-helpers"; @@ -21,7 +20,6 @@ export default { ...globalTextArgs, ...loanGroupModalArgs, ...renewalArgs, - ...acceptModalArgs, ...materialDetailsModalArgs, ...blockedArgs, // Config diff --git a/src/apps/loan-list/list/loan-list.entry.tsx b/src/apps/loan-list/list/loan-list.entry.tsx index 28f59f5fb9..768d05df26 100644 --- a/src/apps/loan-list/list/loan-list.entry.tsx +++ b/src/apps/loan-list/list/loan-list.entry.tsx @@ -11,7 +11,6 @@ import { GroupModalProps } from "../../../core/storybook/groupModalArgs"; import { GroupModalLoansProps } from "../../../core/storybook/loanGroupModalArgs"; import { RenewalArgs } from "../../../core/storybook/renewalArgs"; import { MaterialDetailsModalProps } from "../../../core/storybook/materialDetailsModalArgs"; -import { AcceptFeesModalEntryTextProps } from "../../../core/storybook/acceptFeesModalArgs"; import { GlobalEntryTextProps } from "../../../core/storybook/globalTextArgs"; export interface LoanListEntryConfigProps { @@ -64,7 +63,6 @@ export interface LoanListEntryWithPageSizeProps RenewalArgs, LoanListEntryUrlProps, MaterialDetailsModalProps, - AcceptFeesModalEntryTextProps, GlobalUrlEntryPropsInterface {} const LoanListEntry: FC = ({ diff --git a/src/apps/material/material.dev.tsx b/src/apps/material/material.dev.tsx index 5c54185949..df66a834ee 100644 --- a/src/apps/material/material.dev.tsx +++ b/src/apps/material/material.dev.tsx @@ -679,18 +679,6 @@ export default { defaultValue: "Unknown", control: { type: "text" } }, - addToFavoritesAriaLabelText: { - control: { - type: "text" - }, - defaultValue: "Add @title to favorites list" - }, - removeFromFavoritesAriaLabelText: { - control: { - type: "text" - }, - defaultValue: "Remove @title from favorites list" - }, firstAvailableEditionText: { name: "First available edition", defaultValue: "First available edition", diff --git a/src/apps/material/material.entry.tsx b/src/apps/material/material.entry.tsx index d8323c2008..1e4ae99a83 100644 --- a/src/apps/material/material.entry.tsx +++ b/src/apps/material/material.entry.tsx @@ -9,7 +9,6 @@ import GlobalUrlEntryPropsInterface from "../../core/utils/types/global-url-prop import { GlobalEntryTextProps } from "../../core/storybook/globalTextArgs"; interface MaterialEntryTextProps { - addToFavoritesAriaLabelText: string; alreadyReservedText: string; approveReservationText: string; blockedButtonText: string; @@ -143,7 +142,6 @@ interface MaterialEntryTextProps { readArticleText: string; receiveEmailWhenMaterialReadyText: string; receiveSmsWhenMaterialReadyText: string; - removeFromFavoritesAriaLabelText: string; reservableFromAnotherLibraryText: string; reservationErrorsDescriptionText: string; reservationErrorsTitleText: string; diff --git a/src/apps/recommender/Recommender.dev.tsx b/src/apps/recommender/Recommender.dev.tsx index 3e9cd4cb06..faa2665962 100644 --- a/src/apps/recommender/Recommender.dev.tsx +++ b/src/apps/recommender/Recommender.dev.tsx @@ -50,18 +50,6 @@ export default { }, defaultValue: "For your inspiration" }, - addToFavoritesAriaLabelText: { - control: { - type: "text" - }, - defaultValue: "Add @title to favorites list" - }, - removeFromFavoritesAriaLabelText: { - control: { - type: "text" - }, - defaultValue: "Remove @title from favorites list" - }, materialUrl: { defaultValue: "/work/:workid", control: { type: "text" } diff --git a/src/apps/recommender/Recommender.entry.tsx b/src/apps/recommender/Recommender.entry.tsx index b86499dff8..a5eb7d87cf 100644 --- a/src/apps/recommender/Recommender.entry.tsx +++ b/src/apps/recommender/Recommender.entry.tsx @@ -15,8 +15,6 @@ export interface RecommenderProps { materialAndAuthorText: string; etAlText: string; recommenderTitleInspirationText: string; - addToFavoritesAriaLabelText: string; - removeFromFavoritesAriaLabelText: string; } export interface ReccommenderPropsInterface diff --git a/src/apps/reservation-list/list/reservation-list.dev.tsx b/src/apps/reservation-list/list/reservation-list.dev.tsx index 6b5139e1a1..28519ee3a0 100644 --- a/src/apps/reservation-list/list/reservation-list.dev.tsx +++ b/src/apps/reservation-list/list/reservation-list.dev.tsx @@ -211,11 +211,6 @@ export default { defaultValue: "Settings", control: { type: "text" } }, - pauseReservationModalAriaDescriptionText: { - defaultValue: - "This modal makes it possible to pause your physical reservations", - control: { type: "text" } - }, pauseReservationModalHeaderText: { defaultValue: "Pause reservations on physical items", control: { type: "text" } diff --git a/src/apps/reservation-list/list/reservation-list.entry.tsx b/src/apps/reservation-list/list/reservation-list.entry.tsx index af5d4da745..3ef4de57cd 100644 --- a/src/apps/reservation-list/list/reservation-list.entry.tsx +++ b/src/apps/reservation-list/list/reservation-list.entry.tsx @@ -52,7 +52,6 @@ export interface ReservationListTextProps { reservationListPauseReservationOnHoldText: string; reservationListOnHoldAriaText: string; reservationListPauseReservationAriaModalText: string; - pauseReservationModalAriaDescriptionText: string; pauseReservationModalHeaderText: string; pauseReservationModalBodyText: string; pauseReservationModalCloseModalText: string; diff --git a/src/apps/search-result/search-result.dev.tsx b/src/apps/search-result/search-result.dev.tsx index 8848b629dd..da55805351 100644 --- a/src/apps/search-result/search-result.dev.tsx +++ b/src/apps/search-result/search-result.dev.tsx @@ -203,18 +203,6 @@ export default { defaultValue: "+ more filters", control: { type: "text" } }, - addToFavoritesAriaLabelText: { - control: { - type: "text" - }, - defaultValue: "Add @title to favorites list" - }, - removeFromFavoritesAriaLabelText: { - control: { - type: "text" - }, - defaultValue: "Remove @title from favorites list" - }, loadingText: { name: "Loading", defaultValue: "Loading", diff --git a/src/apps/search-result/search-result.entry.tsx b/src/apps/search-result/search-result.entry.tsx index 02b416b963..8c321a5d68 100644 --- a/src/apps/search-result/search-result.entry.tsx +++ b/src/apps/search-result/search-result.entry.tsx @@ -10,7 +10,6 @@ import { GlobalEntryTextProps } from "../../core/storybook/globalTextArgs"; interface SearchResultEntryTextProps { addMoreFiltersText: string; - addToFavoritesAriaLabelText: string; byAuthorText: string; etAlText: string; facetAccessTypesText: string; @@ -34,7 +33,6 @@ interface SearchResultEntryTextProps { inSeriesText: string; loadingText: string; numberDescriptionText: string; - removeFromFavoritesAriaLabelText: string; resultPagerStatusText: string; showingResultsForText: string; noSearchResultText: string; diff --git a/src/apps/something-similar/SomethingSimilar.dev.tsx b/src/apps/something-similar/SomethingSimilar.dev.tsx index 5520f34e25..568a4dda03 100644 --- a/src/apps/something-similar/SomethingSimilar.dev.tsx +++ b/src/apps/something-similar/SomethingSimilar.dev.tsx @@ -57,18 +57,6 @@ export default { type: "text" }, defaultValue: "Something similar" - }, - addToFavoritesAriaLabelText: { - control: { - type: "text" - }, - defaultValue: "Add @title to favorites list" - }, - removeFromFavoritesAriaLabelText: { - control: { - type: "text" - }, - defaultValue: "Remove @title from favorites list" } } } as ComponentMeta; diff --git a/src/apps/something-similar/SomethingSimilar.entry.tsx b/src/apps/something-similar/SomethingSimilar.entry.tsx index 48ef884233..a9c83246ab 100644 --- a/src/apps/something-similar/SomethingSimilar.entry.tsx +++ b/src/apps/something-similar/SomethingSimilar.entry.tsx @@ -20,8 +20,6 @@ export interface SomethingSimilarProps { etAlText: string; somethingSimilarByTheSameAuthorText: string; somethingSimilarSomethingSimilarAuthorText: string; - addToFavoritesAriaLabelText: string; - removeFromFavoritesAriaLabelText: string; faust: FaustId; } diff --git a/src/components/button-favourite/button-favourite.dev.tsx b/src/components/button-favourite/button-favourite.dev.tsx index 06afe26325..27213fc675 100644 --- a/src/components/button-favourite/button-favourite.dev.tsx +++ b/src/components/button-favourite/button-favourite.dev.tsx @@ -22,18 +22,6 @@ export default { control: "text", defaultValue: "work-of:870970-basis:45234401" }, - addToFavoritesAriaLabelText: { - control: { - type: "text" - }, - defaultValue: "Add @title to favorites list" - }, - removeFromFavoritesAriaLabelText: { - control: { - type: "text" - }, - defaultValue: "Remove @title from favorites list" - }, title: { control: { type: "text" diff --git a/src/core/storybook/acceptFeesModalArgs.ts b/src/core/storybook/acceptFeesModalArgs.ts deleted file mode 100644 index 26acc5a135..0000000000 --- a/src/core/storybook/acceptFeesModalArgs.ts +++ /dev/null @@ -1,36 +0,0 @@ -export default { - acceptModalHeaderText: { - defaultValue: "Hov, dit gebyr forhøjes!", - control: { type: "text" } - }, - acceptModalBodyText: { - defaultValue: - "Fornyer du dine lån, forhøjes dit gebyr. Alle materialer ikke kan fornys og lånet splittes derfor op. Ved overskredne lån modtager du et gebyr pr. lån og derfor forhøjes dit samlede gebyr, hvis du vælger at gå videre med at fornye.", - control: { type: "text" } - }, - acceptModalAreYouSureText: { - defaultValue: "Er du sikker på du vil fornye?", - control: { type: "text" } - }, - acceptModalAcceptButtonText: { - defaultValue: "Ja, forny mulige", - control: { type: "text" } - }, - acceptModalCancelButtonText: { - defaultValue: "Annuller fornyelse", - control: { type: "text" } - }, - acceptModalAriaDescriptionText: { - defaultValue: "accept modal aria description text", - control: { type: "text" } - } -}; - -export interface AcceptFeesModalEntryTextProps { - acceptModalHeaderText: string; - acceptModalAreYouSureText: string; - acceptModalBodyText: string; - acceptModalCancelButtonText: string; - acceptModalAcceptButtonText: string; - acceptModalAriaDescriptionText: string; -} diff --git a/src/core/storybook/globalTextArgs.ts b/src/core/storybook/globalTextArgs.ts index 6dbd7f37e7..cee88622a2 100644 --- a/src/core/storybook/globalTextArgs.ts +++ b/src/core/storybook/globalTextArgs.ts @@ -142,6 +142,49 @@ export default { acceptModalAriaLabelText: { defaultValue: "accept modal aria label text", control: { type: "text" } + }, + pauseReservationModalAriaDescriptionText: { + defaultValue: + "This modal makes it possible to pause your physical reservations", + control: { type: "text" } + }, + addToFavoritesAriaLabelText: { + defaultValue: "Add @title to favorites list", + control: { + type: "text" + } + }, + removeFromFavoritesAriaLabelText: { + defaultValue: "Remove @title from favorites list", + control: { + type: "text" + } + }, + acceptModalAriaDescriptionText: { + defaultValue: "accept modal aria description text", + control: { type: "text" } + }, + + acceptModalHeaderText: { + defaultValue: "Hov, dit gebyr forhøjes!", + control: { type: "text" } + }, + acceptModalBodyText: { + defaultValue: + "Fornyer du dine lån, forhøjes dit gebyr. Alle materialer ikke kan fornys og lånet splittes derfor op. Ved overskredne lån modtager du et gebyr pr. lån og derfor forhøjes dit samlede gebyr, hvis du vælger at gå videre med at fornye.", + control: { type: "text" } + }, + acceptModalAreYouSureText: { + defaultValue: "Er du sikker på du vil fornye?", + control: { type: "text" } + }, + acceptModalAcceptButtonText: { + defaultValue: "Ja, forny mulige", + control: { type: "text" } + }, + acceptModalCancelButtonText: { + defaultValue: "Annuller fornyelse", + control: { type: "text" } } }; @@ -174,5 +217,14 @@ export interface GlobalEntryTextProps { closeModalAriaLabelInterestPeriodText: string; closeModalAriaLabelSmsText: string; deleteReservationModalButtonText: string; + pauseReservationModalAriaDescriptionText: string; + acceptModalAriaDescriptionText: string; + addToFavoritesAriaLabelText: string; + removeFromFavoritesAriaLabelText: string; acceptModalAriaLabelText: string; + acceptModalHeaderText: string; + acceptModalAreYouSureText: string; + acceptModalBodyText: string; + acceptModalCancelButtonText: string; + acceptModalAcceptButtonText: string; } diff --git a/src/core/storybook/reservationListArgs.ts b/src/core/storybook/reservationListArgs.ts index 064fbb742a..1252956127 100644 --- a/src/core/storybook/reservationListArgs.ts +++ b/src/core/storybook/reservationListArgs.ts @@ -180,11 +180,6 @@ export default { defaultValue: "Settings", control: { type: "text" } }, - pauseReservationModalAriaDescriptionText: { - defaultValue: - "This modal makes it possible to pause your physical reservations", - control: { type: "text" } - }, pauseReservationModalHeaderText: { defaultValue: "Pause reservations on physical items", control: { type: "text" }