Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/2024 5 0 with 2024 3 1 #863

Merged
merged 2 commits into from
Jan 17, 2024
Merged

Release/2024 5 0 with 2024 3 1 #863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd1839d
Change materialTypes field on work as well
spaceo Jan 17, 2024
313e9fa
Merge pull request #861 from danskernesdigitalebibliotek/set-material…
spaceo Jan 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions src/apps/material/__snapshots__/helper.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ exports[`divideManifestationsByMaterialType > should divide manifestations by ma
"materialTypeSpecific": {
"display": "bog",
},
"specific": "this-will-be-deprecated",
},
],
"physicalDescriptions": [
Expand Down Expand Up @@ -164,7 +163,6 @@ exports[`divideManifestationsByMaterialType > should divide manifestations by ma
"materialTypeSpecific": {
"display": "e-bog",
},
"specific": "this-will-be-deprecated",
},
],
"physicalDescriptions": [
Expand Down Expand Up @@ -268,7 +266,6 @@ exports[`divideManifestationsByMaterialType > should divide manifestations by ma
"materialTypeSpecific": {
"display": "lydbog (online)",
},
"specific": "this-will-be-deprecated",
},
],
"physicalDescriptions": [
Expand Down Expand Up @@ -363,13 +360,11 @@ exports[`divideManifestationsByMaterialType > should divide manifestations by ma
"materialTypeSpecific": {
"display": "lydoptagelse (cd)",
},
"specific": "this-will-be-deprecated",
},
{
"materialTypeSpecific": {
"display": "bog",
},
"specific": "this-will-be-deprecated",
},
],
"physicalDescriptions": [
Expand Down
15 changes: 5 additions & 10 deletions src/apps/material/__vitest_data__/helper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,12 @@ export default {
{
materialTypeSpecific: {
display: "lydoptagelse (cd)"
},
specific: "this-will-be-deprecated"
}
},
{
materialTypeSpecific: {
display: "bog"
},
specific: "this-will-be-deprecated"
}
}
],
creators: [
Expand Down Expand Up @@ -123,8 +121,7 @@ export default {
{
materialTypeSpecific: {
display: "e-bog"
},
specific: "this-will-be-deprecated"
}
}
],
creators: [
Expand Down Expand Up @@ -219,8 +216,7 @@ export default {
{
materialTypeSpecific: {
display: "lydbog (online)"
},
specific: "this-will-be-deprecated"
}
}
],
creators: [
Expand Down Expand Up @@ -317,8 +313,7 @@ export default {
{
materialTypeSpecific: {
display: "bog"
},
specific: "this-will-be-deprecated"
}
}
],
creators: [
Expand Down
9 changes: 3 additions & 6 deletions src/components/find-on-shelf/mocked-data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ export const mockedManifestationData: Manifestation[] = [
{
materialTypeSpecific: {
display: "bog"
},
specific: "this-will-be-deprecated"
}
}
],
creators: [
Expand Down Expand Up @@ -97,8 +96,7 @@ export const mockedManifestationData: Manifestation[] = [
{
materialTypeSpecific: {
display: "lydbog (cd-mp3)"
},
specific: "this-will-be-deprecated"
}
}
],
creators: [
Expand Down Expand Up @@ -179,8 +177,7 @@ export const mockedPeriodicalManifestationData: Manifestation[] = [
{
materialTypeSpecific: {
display: "tidsskrift"
},
specific: "this-will-be-deprecated"
}
}
],
creators: [],
Expand Down
7 changes: 3 additions & 4 deletions src/core/dbc-gateway/fragments.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,6 @@ fragment ManifestationsSimpleFields on Manifestation {
numberOfPages
playingTime
}
materialTypes {
specific
}
accessTypes {
code
}
Expand Down Expand Up @@ -236,7 +233,9 @@ fragment WorkSmall on Work {
fragment WorkMedium on Work {
...WorkSmall
materialTypes {
specific
materialTypeSpecific {
display
}
}
mainLanguages {
display
Expand Down
189 changes: 189 additions & 0 deletions src/core/dbc-gateway/generated/graphql.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10759,6 +10759,59 @@
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "content",
"description": "both series and works in a list",
"args": [
{
"name": "limit",
"description": null,
"type": {
"kind": "SCALAR",
"name": "Int",
"ofType": null
},
"defaultValue": null,
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "offset",
"description": null,
"type": {
"kind": "SCALAR",
"name": "Int",
"ofType": null
},
"defaultValue": null,
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "workType",
"description": null,
"type": {
"kind": "ENUM",
"name": "WorkType",
"ofType": null
},
"defaultValue": null,
"isDeprecated": false,
"deprecationReason": null
}
],
"type": {
"kind": "NON_NULL",
"name": null,
"ofType": {
"kind": "OBJECT",
"name": "UniverseContentResult",
"ofType": null
}
},
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "description",
"description": "Description of the universe",
Expand All @@ -10771,6 +10824,22 @@
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "key",
"description": "A key that identifies a universe.",
"args": [],
"type": {
"kind": "NON_NULL",
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "String",
"ofType": null
}
},
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "series",
"description": "All series within the universe",
Expand Down Expand Up @@ -10798,6 +10867,18 @@
"defaultValue": null,
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "workType",
"description": null,
"type": {
"kind": "ENUM",
"name": "WorkType",
"ofType": null
},
"defaultValue": null,
"isDeprecated": false,
"deprecationReason": null
}
],
"type": {
Expand Down Expand Up @@ -10836,6 +10917,30 @@
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "workTypes",
"description": "work types that are in this universe",
"args": [],
"type": {
"kind": "NON_NULL",
"name": null,
"ofType": {
"kind": "LIST",
"name": null,
"ofType": {
"kind": "NON_NULL",
"name": null,
"ofType": {
"kind": "ENUM",
"name": "WorkType",
"ofType": null
}
}
}
},
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "works",
"description": "All works within the universe but not in any series",
Expand Down Expand Up @@ -10863,6 +10968,18 @@
"defaultValue": null,
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "workType",
"description": null,
"type": {
"kind": "ENUM",
"name": "WorkType",
"ofType": null
},
"defaultValue": null,
"isDeprecated": false,
"deprecationReason": null
}
],
"type": {
Expand Down Expand Up @@ -10891,6 +11008,78 @@
"enumValues": null,
"possibleTypes": null
},
{
"kind": "UNION",
"name": "UniverseContent",
"description": null,
"fields": null,
"inputFields": null,
"interfaces": null,
"enumValues": null,
"possibleTypes": [
{
"kind": "OBJECT",
"name": "Series",
"ofType": null
},
{
"kind": "OBJECT",
"name": "Work",
"ofType": null
}
]
},
{
"kind": "OBJECT",
"name": "UniverseContentResult",
"description": null,
"fields": [
{
"name": "entries",
"description": null,
"args": [],
"type": {
"kind": "NON_NULL",
"name": null,
"ofType": {
"kind": "LIST",
"name": null,
"ofType": {
"kind": "NON_NULL",
"name": null,
"ofType": {
"kind": "UNION",
"name": "UniverseContent",
"ofType": null
}
}
}
},
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "hitcount",
"description": null,
"args": [],
"type": {
"kind": "NON_NULL",
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "Int",
"ofType": null
}
},
"isDeprecated": false,
"deprecationReason": null
}
],
"inputFields": null,
"interfaces": [],
"enumValues": null,
"possibleTypes": null
},
{
"kind": "OBJECT",
"name": "Work",
Expand Down
Loading
Loading