Merge branch 'release/2024-1-0' into fix/group-loan-modal

danskernesdigitalebibliotek · Dec 27, 2023 · 8581c58 · 8581c58
2 parents 4e77ffc + 5099c60
commit 8581c58
Show file tree

Hide file tree

Showing 6 changed files with 166 additions and 151 deletions.
diff --git 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
@@ -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

diff --git a/package.json b/package.json
@@ -45,15 +45,15 @@
     "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",
     "@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",
@@ -75,30 +75,30 @@
     "@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/react": "^18.2.41",
+    "@types/node": "^20.10.5",
+    "@types/react": "^18.2.45",
     "@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",
     "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",
     "css-loader": "^6.8.1",
     "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.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",
@@ -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",
@@ -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-1d83fe3463f6eab5f7e86677e8368617e371d0a3",
+    "@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/src/components/contact-info-section/ContactInfoPhone.tsx b/src/components/contact-info-section/ContactInfoPhone.tsx
@@ -36,7 +36,6 @@ const ContactInfoPhone: FC<ContactInfoPhoneProps> = ({
         }
         value={patron?.phoneNumber}
         label={t("patronContactPhoneLabelText")}
-        placeholder={t("patronPagePhoneInputMessageText")}
       />
       {showCheckboxes && (
         <CheckBox

diff --git a/src/components/description-list/description-list.tsx b/src/components/description-list/description-list.tsx
@@ -16,9 +16,9 @@ const DescriptionList: React.FC<DescriptionListProps> = ({
       {data.map((item) => {
         const { label, value } = item;
         return (
-          <div>
-            <dt>{label}</dt>
-            <dd>{value}</dd>
+          <div className="list-description__item">
+            <dt className="list-description__key">{label}</dt>
+            <dd className="list-description__value">{value}</dd>
           </div>
         );
       })}