From a8f6cdd6d5a31a36c4c2c8e25b58c60972043ea2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 01:46:22 +0000 Subject: [PATCH 1/7] Bump @types/react from 18.3.4 to 18.3.5 Bumps [@types/react](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react) from 18.3.4 to 18.3.5. - [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 5b4663f7a6..f48fff1fd8 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.16.1", - "@types/react": "^18.3.4", + "@types/react": "^18.3.5", "@types/react-dom": "^18.3.0", "@types/react-flatpickr": "^3.8.11", "@types/react-redux": "^7.1.24", diff --git a/yarn.lock b/yarn.lock index e6c908eaf3..5c6c78b8ce 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4951,10 +4951,10 @@ dependencies: "@types/react" "*" -"@types/react@*", "@types/react@^18.3.4": - version "18.3.4" - resolved "https://registry.yarnpkg.com/@types/react/-/react-18.3.4.tgz#dfdd534a1d081307144c00e325c06e00312c93a3" - integrity sha512-J7W30FTdfCxDDjmfRM+/JqLHBIyl7xUIp9kwK637FGmY7+mkSFSe6L4jpZzhj5QMfLssSDP4/i75AKkrdC7/Jw== +"@types/react@*", "@types/react@^18.3.5": + version "18.3.5" + resolved "https://registry.yarnpkg.com/@types/react/-/react-18.3.5.tgz#5f524c2ad2089c0ff372bbdabc77ca2c4dbadf8f" + integrity sha512-WeqMfGJLGuLCqHGYRGHxnKrXcTitc6L/nBUWfWPcTarG3t9PsquqUMuVeXZeca+mglY4Vo5GZjCi0A3Or2lnxA== dependencies: "@types/prop-types" "*" csstype "^3.0.2" From f8cd209eca2d395560eaaded4fe8d118f4bc1fb0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 01:46:39 +0000 Subject: [PATCH 2/7] Bump postcss from 8.4.41 to 8.4.43 Bumps [postcss](https://github.com/postcss/postcss) from 8.4.41 to 8.4.43. - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](https://github.com/postcss/postcss/compare/8.4.41...8.4.43) --- updated-dependencies: - dependency-name: postcss dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package.json | 4 ++-- yarn.lock | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index f48fff1fd8..9f1fe4c4c8 100644 --- a/package.json +++ b/package.json @@ -117,7 +117,7 @@ "mutationobserver-shim": "^0.3.7", "nyc": "^17.0.0", "orval": "^6.26.0", - "postcss": "^8.4.41", + "postcss": "^8.4.43", "postcss-cli": "^11.0.0", "postcss-loader": "^8.1.1", "postcss-scss": "^4.0.9", @@ -176,6 +176,6 @@ "unfetch": "^4.2.0" }, "peerDependencies": { - "postcss": "^8.4.41" + "postcss": "^8.4.43" } } diff --git a/yarn.lock b/yarn.lock index 5c6c78b8ce..497bd599b4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -15900,10 +15900,10 @@ postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.26, postcss@^7.0.32, postcss@^7.0 picocolors "^0.2.1" source-map "^0.6.1" -postcss@^8.2.15, postcss@^8.4.21, postcss@^8.4.28, postcss@^8.4.33, postcss@^8.4.41: - version "8.4.41" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.41.tgz#d6104d3ba272d882fe18fc07d15dc2da62fa2681" - integrity sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ== +postcss@^8.2.15, postcss@^8.4.21, postcss@^8.4.28, postcss@^8.4.33, postcss@^8.4.43: + version "8.4.43" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.43.tgz#a5ddf22f4cc38e64c6ae030182b43e539d316419" + integrity sha512-gJAQVYbh5R3gYm33FijzCZj7CHyQ3hWMgJMprLUlIYqCwTeZhBQ19wp0e9mA25BUbEvY5+EXuuaAjqQsrBxQBQ== dependencies: nanoid "^3.3.7" picocolors "^1.0.1" From 6ba203546ed20e538e2e2467ada372c60ec469bc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 01:46:52 +0000 Subject: [PATCH 3/7] Bump @cypress/code-coverage from 3.12.45 to 3.12.46 Bumps [@cypress/code-coverage](https://github.com/cypress-io/code-coverage) from 3.12.45 to 3.12.46. - [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.45...v3.12.46) --- 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 | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 9f1fe4c4c8..0551669578 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "@babel/preset-typescript": "^7.24.7", "@csstools/postcss-sass": "^5.1.1", "@cypress/browserify-preprocessor": "^3.0.2", - "@cypress/code-coverage": "^3.12.45", + "@cypress/code-coverage": "^3.12.46", "@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 497bd599b4..e6960f44b2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1632,10 +1632,10 @@ through2 "^2.0.0" watchify "^4.0.0" -"@cypress/code-coverage@^3.12.45": - version "3.12.45" - resolved "https://registry.yarnpkg.com/@cypress/code-coverage/-/code-coverage-3.12.45.tgz#45eeeb53391153767640a5a1a626b0d6e4c417b0" - integrity sha512-QRvdc9Zmner/CxQ1F5jcNVZR8P8VrRTyE8THcisxnB6D3AMIKKSmjYUGH6OnWBDF/vi3CqimuMSbrUfzmPzmhw== +"@cypress/code-coverage@^3.12.46": + version "3.12.46" + resolved "https://registry.yarnpkg.com/@cypress/code-coverage/-/code-coverage-3.12.46.tgz#16c178a5b729ce9829588866cf9b66c262ced34f" + integrity sha512-Y6lG3VjJX8R64mZH5lSqZPw2aj89C1v7e8uC9Ngob1r1DgaAVRQtXZD6mXeHm23FHh131ZMckQ9b+AzCUeJ0mg== dependencies: "@cypress/webpack-preprocessor" "^6.0.0" chalk "4.1.2" From 1183e64a124b069bbfe058be392cb0ef75d01762 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 07:19:29 +0000 Subject: [PATCH 4/7] Bump @types/node from 20.16.1 to 20.16.3 Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.16.1 to 20.16.3. - [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 0551669578..cb354b77b9 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "@testing-library/react": "^14.2.2", "@testing-library/react-hooks": "^8.0.1", "@tsconfig/create-react-app": "^1.0.2", - "@types/node": "^20.16.1", + "@types/node": "^20.16.3", "@types/react": "^18.3.5", "@types/react-dom": "^18.3.0", "@types/react-flatpickr": "^3.8.11", diff --git a/yarn.lock b/yarn.lock index e6960f44b2..eda9806bb8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4855,10 +4855,10 @@ "@types/node" "*" form-data "^3.0.0" -"@types/node@*", "@types/node@^20.16.1": - version "20.16.1" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.16.1.tgz#0b44b15271d0e2191ca68faf1fbe506e06aed732" - integrity sha512-zJDo7wEadFtSyNz5QITDfRcrhqDvQI1xQNQ0VoizPjM/dVAODqqIUWbJPkvsxmTI0MYRGRikcdjMPhOssnPejQ== +"@types/node@*", "@types/node@^20.16.3": + version "20.16.3" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.16.3.tgz#7b4f9a37091cf03a0c2561bf76a9a55f03f4f523" + integrity sha512-/wdGiWRkMOm53gAsSyFMXFZHbVg7C6CbkrzHNpaHoYfsUWPg7m6ZRKtvQjgvQ9i8WT540a3ydRlRQbxjY30XxQ== dependencies: undici-types "~6.19.2" From 198630de199da5b8cac641b21e933a71411d74e4 Mon Sep 17 00:00:00 2001 From: Adam Antal Date: Mon, 2 Sep 2024 13:25:07 +0200 Subject: [PATCH 5/7] chore: Update material.dev.tsx with irregular Faust IDs --- src/apps/material/material.dev.tsx | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/apps/material/material.dev.tsx b/src/apps/material/material.dev.tsx index 7953412d8d..2c797bd05e 100644 --- a/src/apps/material/material.dev.tsx +++ b/src/apps/material/material.dev.tsx @@ -958,11 +958,16 @@ digitalArticle.args = { wid: "work-of:870971-tsart:36297484" }; -export const inLargeSameSeriesAndIrregularFaustId = Template.bind({}); -inLargeSameSeriesAndIrregularFaustId.args = { +export const irregularFaustId1InLargeSameSeries = Template.bind({}); +irregularFaustId1InLargeSameSeries.args = { wid: "work-of:150086-netmusik:BIS-2067" }; +export const irregularFaustId2fairytale = Template.bind({}); +irregularFaustId2fairytale.args = { + wid: "work-of:800010-katalog:99122572002205763__1" +}; + export const journal = Template.bind({}); journal.args = { wid: "work-of:870970-basis:01007556" From 1359a93bf4305b729036214d2bc96500f5774d18 Mon Sep 17 00:00:00 2001 From: Adam Antal Date: Mon, 2 Sep 2024 13:25:24 +0200 Subject: [PATCH 6/7] refactor: Update regular expression to allow hyphens and underscores in Faust IDs --- src/core/utils/helpers/general.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/utils/helpers/general.ts b/src/core/utils/helpers/general.ts index c98f3ba5af..0d4cd08ad5 100644 --- a/src/core/utils/helpers/general.ts +++ b/src/core/utils/helpers/general.ts @@ -151,7 +151,7 @@ export const convertPostIdToFaustId = (postId: Pid) => { // in the last part after the colon, but it can also have a dash. // We are about to have clarified what the proper name of the element. // But for now we will call it faustId. - const matches = postId.match(/^[0-9]+-[a-z]+:([a-zA-Z0-9-]+)$/); + const matches = postId.match(/^[0-9]+-[a-z]+:([a-zA-Z0-9-_]+)$/); if (matches?.[1]) { return matches?.[1] as FaustId; } From 262d7bba614b6f24de6f1ed61a0d1a122b309adb Mon Sep 17 00:00:00 2001 From: Adam Antal Date: Mon, 2 Sep 2024 13:25:35 +0200 Subject: [PATCH 7/7] refactor: Update skeleton loading styles in FavoritesList component --- src/apps/favorites-list/FavoritesList.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/apps/favorites-list/FavoritesList.tsx b/src/apps/favorites-list/FavoritesList.tsx index 70c6ef7512..ca6546d243 100644 --- a/src/apps/favorites-list/FavoritesList.tsx +++ b/src/apps/favorites-list/FavoritesList.tsx @@ -44,8 +44,8 @@ const FavoritesList: React.FC = ({ pageSize }) => { const skeletonList = ( <> -
-
 
+
+
 
    {/*