Release/2024 1 0

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": "2023.51.0-cd7e0937a067366392e60d85a9831b7d1cdf363e",
+    "@danskernesdigitalebibliotek/dpl-design-system": "0.0.0-53111dc1d5d35ee254a8e231f1e3721088240a4a",
     "@reach/alert": "^0.17.0",
     "@reach/dialog": "^0.18.0",
     "@reduxjs/toolkit": "^1.9.7",

src/apps/advanced-search/AdvancedSearchResults.tsx

@@ -88,7 +88,7 @@ const AdvancedSearchResult: React.FC<AdvancedSearchResultProps> = ({
   }, [data, page]);
 
   const shouldShowSearchResults = isLoading || (!isLoading && hitcount > 0);
-  const shouldShowResultHeadline = hitcount && !isLoading;
+  const shouldShowResultHeadline = !!(hitcount && !isLoading);
 
   useEffect(() => {
     if (copiedLinkToSearch) {
@@ -108,11 +108,14 @@ const AdvancedSearchResult: React.FC<AdvancedSearchResultProps> = ({
         /* ID is used to scroll to the results upon hitting the search button. */
         id="advanced-search-result"
       >
-        {isLoading && t("loadingResultsText")}
-        {shouldShowResultHeadline &&
-          t("showingMaterialsText", {
-            placeholders: { "@hitcount": hitcount }
-          })}
+        {isLoading && <>{t("loadingResultsText")}</>}
+        {shouldShowResultHeadline && (
+          <>
+            {t("showingMaterialsText", {
+              placeholders: { "@hitcount": hitcount }
+            })}
+          </>
+        )}
       </h2>
       {!showContentOnly && (
         <button

src/apps/advanced-search/advanced-search.test.ts

@@ -45,7 +45,7 @@ describe("Search Result", () => {
     cy.getBySel("advanced-search-material-types").first().click();
     cy.getBySel("preview-section", true).should(
       "contain",
-      "'Harry' AND 'Prince' AND generalmaterialtype='bøger'"
+      "'Harry' AND 'Prince' AND term.generalmaterialtype='bøger'"
     );
   });
 
@@ -170,7 +170,7 @@ describe("Search Result", () => {
       .eq(1)
       .within(() => {
         cy.get("input").should("have.value", "Rowling");
-        cy.get("select").should("have.value", "creator");
+        cy.get("select").should("have.value", "term.creatorcontributor");
       });
     // We currently have no good way to identify selected options in the
     // multiselect so checking the text of the button is the best we can do.

src/apps/advanced-search/types.ts

@@ -2,40 +2,36 @@ import { MultiselectOption } from "../../components/multiselect/types";
 
 export const advancedSearchIndexes = [
   "all",
-  "creator",
-  "subject",
-  "genre",
-  "language",
-  "date",
-  "mainCreator",
-  "mainTitle",
-  "source",
-  "dateFirstEdition",
-  "decimaldk5",
-  "type",
-  "audience",
-  "publisher",
-  "identifier",
-  "acSource"
+  "term.creatorcontributor",
+  "term.subject",
+  "term.genreandform",
+  "term.mainlanguage",
+  "datefirstedition",
+  "term.creator",
+  "term.title",
+  "term.source",
+  "dk5",
+  "term.specificmaterialtype",
+  "term.childrenoradults",
+  "term.publisher",
+  "term.isbn"
 ] as const;
 
 export const advancedSearchIndexTranslations = {
   all: "advancedSearchAllIndexesText",
-  creator: "advancedSearchCreatorText",
-  subject: "advancedSearchSubjectText",
-  genre: "advancedSearchGenreText",
-  language: "advancedSearchLanguageText",
-  date: "advancedSearchDateText",
-  mainCreator: "advancedSearchMainCreatorText",
-  mainTitle: "advancedSearchMainTitleText",
-  source: "advancedSearchSourceText",
-  dateFirstEdition: "advancedSearchDateFirstEditionText",
-  decimaldk5: "advancedSearchDecimalDk5Text",
-  type: "advancedSearchTypeText",
-  audience: "advancedSearchAudienceText",
-  publisher: "advancedSearchPublisherText",
-  identifier: "advancedSearchIdentifierText",
-  acSource: "advancedSearchAcSourceText"
+  "term.creatorcontributor": "advancedSearchCreatorText",
+  "term.subject": "advancedSearchSubjectText",
+  "term.genreandform": "advancedSearchGenreText",
+  "term.mainlanguage": "advancedSearchLanguageText",
+  datefirstedition: "advancedSearchDateText",
+  "term.creator": "advancedSearchMainCreatorText",
+  "term.title": "advancedSearchMainTitleText",
+  "term.source": "advancedSearchSourceText",
+  dk5: "advancedSearchDecimalDk5Text",
+  "term.specificmaterialtype": "advancedSearchTypeText",
+  "term.childrenoradults": "advancedSearchAudienceText",
+  "term.publisher": "advancedSearchPublisherText",
+  "term.isbn": "advancedSearchIdentifierText"
 } as const;
 
 export type AdvancedSearchIndex = typeof advancedSearchIndexes[number];
@@ -106,7 +102,7 @@ export const advancedSearchFiction: MultiselectOption[] = [
 ];
 
 export const advancedSearchFilters = {
-  materialTypes: "generalmaterialtype",
-  fiction: "fictionnonfiction",
-  accessibility: "accesstype"
+  materialTypes: "term.generalmaterialtype",
+  fiction: "term.fictionnonfiction",
+  accessibility: "term.accesstype"
 };

src/apps/fee-list/FeeList.dev.tsx

@@ -65,10 +65,6 @@ export default {
       defaultValue: "Total @total,-",
       control: { type: "text" }
     },
-    amountText: {
-      defaultValue: "@amount,-",
-      control: { type: "text" }
-    },
     expirationWarningDaysBeforeConfig: {
       defaultValue: "6",
       control: { type: "text" }
@@ -126,11 +122,11 @@ export default {
       defaultValue: "You have 0 unpaid fees or replacement costs",
       control: { type: "text" }
     },
-    FeeDetailsModalCloseModalAriaLabelText: {
+    feeDetailsModalCloseModalAriaLabelText: {
       defaultValue: "Close fee details modal",
       control: { type: "text" }
     },
-    FeeDetailsModalDescriptionText: {
+    feeDetailsModalDescriptionText: {
       defaultValue:
         "Modal containing information about this element or group of elements fees",
       control: { type: "text" }
@@ -166,6 +162,10 @@ export default {
     paymentOverviewUrl: {
       defaultValue: "https://unsplash.com/photos/yjI3ozta2Zk", // Open source image of a fluffy floofer
       control: { type: "text" }
+    },
+    materialNumberText: {
+      defaultValue: "# @materialNumber",
+      control: { type: "text" }
     }
   },
   decorators: [withQuery]

src/apps/fee-list/FeeList.entry.tsx

@@ -13,37 +13,40 @@ export interface IntermedateListEntryConfigProps {
 }
 
 export interface FeeListProps {
-  totalFeeAmountText: string;
-  otherMaterialsText: string;
-  materialByAuthorText: string;
-  materialAndAuthorText: string;
+  alreadyPaidText: string;
+  availablePaymentTypesUrl: string;
+  emptyFeeListText: string;
+  etAlText: string;
+  feeCreatedText: string;
+  feeDetailsModalScreenReaderText: string;
+  feeDetailsModalCloseModalAriaLabelText: string;
+  feeDetailsModalDescriptionText: string;
+  feeListBodyText: string;
   feeListDaysText: string;
-  payText: string;
-  totalText: string;
-  iAcceptText: string;
-  termsOfTradeText: string;
-  termsOfTradeUrl: string;
   feeListHeadlineText: string;
-  feeListBodyText: string;
-  viewFeesAndCompensationRatesText: string;
-  etAlText: string;
-  viewFeesAndCompensationRatesUrl: string;
-  unpaidFeesFirstHeadlineText: string;
-  unpaidFeesSecondHeadlineText: string;
-  alreadyPaidText: string;
-  feePaymentModalHeaderText: string;
   feePaymentModalBodyText: string;
-  feePaymentModalNoticeText: string;
-  feePaymentModalGotoText: string;
   feePaymentModalCancelText: string;
-  feeDetailsModalScreenReaderText: string;
-  emptyFeeListText: string;
-  turnedInText: string;
-  plusXOtherMaterialsText: string;
+  feePaymentModalGotoText: string;
+  feePaymentModalHeaderText: string;
+  feePaymentModalNoticeText: string;
+  iAcceptText: string;
   itemFeeAmountText: string;
-  feeCreatedText: string;
-  availablePaymentTypesUrl: string;
+  materialAndAuthorText: string;
+  materialByAuthorText: string;
+  materialNumberText: string;
+  otherMaterialsText: string;
   paymentOverviewUrl: string;
+  payText: string;
+  plusXOtherMaterialsText: string;
+  termsOfTradeText: string;
+  termsOfTradeUrl: string;
+  totalFeeAmountText: string;
+  totalText: string;
+  turnedInText: string;
+  unpaidFeesFirstHeadlineText: string;
+  unpaidFeesSecondHeadlineText: string;
+  viewFeesAndCompensationRatesText: string;
+  viewFeesAndCompensationRatesUrl: string;
 }
 
 const FeeListEntry: FC<

src/apps/fee-list/FeeList.tsx

@@ -63,7 +63,7 @@ const FeeList: FC = () => {
       }
       const feesPostPaymentChange = getFeesInRelationToPaymentChangeDate(
         fbsFees,
-        true
+        false
       ).length;
       if (feesPostPaymentChange > 0) {
         setItemsPostPaymentChange(

src/apps/fee-list/fee-list.test.ts

@@ -253,41 +253,13 @@ describe("Fee list", () => {
       .click();
 
     // 5. modal
-    // counter number
-    cy.get("div.modal-loan__header")
-      .find("div")
-      .find(".counter")
-      .find(".counter__value")
-      .should("have.text", "32");
-
-    // counter text
-    cy.get("div.modal-loan__header")
-      .find("div")
-      .find(".counter")
-      .find(".counter__label")
-      .should("exist")
-      .should("have.text", "Days");
-
     // header
     cy.get("div.modal-loan__header")
       .find("div")
       .find(".modal-loan__title")
       .should("exist")
       .should("have.text", "Turned in 6. April 2022");
 
-    // "i accept the Terms of trade*"
-    cy.getBySel("checkbox_id__fee_details").should("exist");
-
-    cy.get(".modal")
-      .find(".checkbox__label")
-      .should("have.text", "I accept the Terms of trade*");
-
-    // pay button
-    cy.get(".button-box")
-      .find("button")
-      .should("exist")
-      .should("have.text", "Pay");
-
     // book list
     cy.get(".modal-loan__list-materials")
       .find("li")

src/apps/fee-list/modal/fee-details-modal.tsx

@@ -15,8 +15,8 @@ const FeeDetailsModal: FC<FeeDetailsModalProps> = ({ modalId, children }) => {
     <Modal
       modalId={modalId || ""}
       classNames="modal-details"
-      closeModalAriaLabelText={t("FeeDetailsModalCloseModalAriaLabelText")}
-      screenReaderModalDescriptionText={t("FeeDetailsModalDescriptionText")}
+      closeModalAriaLabelText={t("feeDetailsModalCloseModalAriaLabelText")}
+      screenReaderModalDescriptionText={t("feeDetailsModalDescriptionText")}
     >
       {children}
     </Modal>