diff --git a/package.json b/package.json index 3c86b4ec..66706aca 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "@graphql-tools/mock": "^9.1.5", "@ndla/types-backend": "^1.0.114", "@ndla/types-embed": "^5.0.21-alpha.0", - "@ndla/types-taxonomy": "^1.0.51", + "@ndla/types-taxonomy": "^1.0.54", "@types/compression": "^1.8.1", "@types/cors": "^2.8.19", "@types/graphql": "^14.5.0", diff --git a/src/resolvers/programmeResolvers.ts b/src/resolvers/programmeResolvers.ts index 1cd92760..5314103f 100644 --- a/src/resolvers/programmeResolvers.ts +++ b/src/resolvers/programmeResolvers.ts @@ -28,6 +28,7 @@ const nodeToProgramme = (node: Node, language: string): GQLProgrammePage => { language: language, }, url: node.url, + defaultUrl: node.defaultUrl, contentUri: node.contentUri, supportedLanguages: node.supportedLanguages, }; diff --git a/src/schema.ts b/src/schema.ts index c4223617..291151c2 100644 --- a/src/schema.ts +++ b/src/schema.ts @@ -443,6 +443,7 @@ export const typeDefs = gql` id: String! name: String! url: String + defaultUrl: String } interface TaxonomyEntity { @@ -458,6 +459,7 @@ export const typeDefs = gql` supportedLanguages: [String!]! resourceTypes: [ResourceType!] url: String + defaultUrl: String language: String nodeType: String! } @@ -482,6 +484,7 @@ export const typeDefs = gql` supportedLanguages: [String!]! resourceTypes: [ResourceType!] url: String + defaultUrl: String language: String nodeType: String! connectionId: String @@ -511,6 +514,7 @@ export const typeDefs = gql` supportedLanguages: [String!]! resourceTypes: [ResourceType!] url: String + defaultUrl: String language: String nodeType: String! rank: Int @@ -526,6 +530,7 @@ export const typeDefs = gql` contextId: String! name: String! url: String! + defaultUrl: String } type TaxonomyContext { @@ -533,6 +538,7 @@ export const typeDefs = gql` breadcrumbs: [String!]! name: String! url: String! + defaultUrl: String! parentIds: [String!]! rootId: String! relevance: String! @@ -555,6 +561,7 @@ export const typeDefs = gql` supportedLanguages: [String!]! resourceTypes: [ResourceType!] url: String + defaultUrl: String language: String nodeType: String! meta: Meta @@ -916,6 +923,7 @@ export const typeDefs = gql` supportedLanguages: [String!]! resourceTypes: [ResourceType!] url: String + defaultUrl: String language: String nodeType: String! subjectpage: SubjectPage @@ -927,6 +935,7 @@ export const typeDefs = gql` contextId: String title: Title! url: String + defaultUrl: String contentUri: String metaDescription: String desktopImage: MetaImage diff --git a/src/types/schema.d.ts b/src/types/schema.d.ts index b9493d7d..6167e7d2 100644 --- a/src/types/schema.d.ts +++ b/src/types/schema.d.ts @@ -1296,6 +1296,7 @@ export type GQLNode = GQLTaxBase & GQLTaxonomyEntity & GQLWithArticle & { context?: Maybe; contextId?: Maybe; contexts: Array; + defaultUrl?: Maybe; grepCodes?: Maybe>; id: Scalars['String']['output']; language?: Maybe; @@ -1413,6 +1414,7 @@ export type GQLProgrammePage = { __typename?: 'ProgrammePage'; contentUri?: Maybe; contextId?: Maybe; + defaultUrl?: Maybe; desktopImage?: Maybe; grades?: Maybe>; id: Scalars['String']['output']; @@ -1809,6 +1811,7 @@ export type GQLResource = GQLTaxBase & GQLTaxonomyEntity & GQLWithArticle & { context?: Maybe; contextId?: Maybe; contexts: Array; + defaultUrl?: Maybe; id: Scalars['String']['output']; language?: Maybe; learningpath?: Maybe; @@ -1950,6 +1953,7 @@ export type GQLSubject = GQLTaxBase & GQLTaxonomyEntity & { context?: Maybe; contextId?: Maybe; contexts: Array; + defaultUrl?: Maybe; grepCodes?: Maybe>; id: Scalars['String']['output']; language?: Maybe; @@ -2026,6 +2030,7 @@ export type GQLTags = { }; export type GQLTaxBase = { + defaultUrl?: Maybe; id: Scalars['String']['output']; name: Scalars['String']['output']; url?: Maybe; @@ -2035,6 +2040,7 @@ export type GQLTaxonomyContext = { __typename?: 'TaxonomyContext'; breadcrumbs: Array; contextId: Scalars['String']['output']; + defaultUrl: Scalars['String']['output']; isActive: Scalars['Boolean']['output']; isArchived: Scalars['Boolean']['output']; name: Scalars['String']['output']; @@ -2049,6 +2055,7 @@ export type GQLTaxonomyContext = { export type GQLTaxonomyCrumb = GQLTaxBase & { __typename?: 'TaxonomyCrumb'; contextId: Scalars['String']['output']; + defaultUrl?: Maybe; id: Scalars['String']['output']; name: Scalars['String']['output']; url: Scalars['String']['output']; @@ -2060,6 +2067,7 @@ export type GQLTaxonomyEntity = { context?: Maybe; contextId?: Maybe; contexts: Array; + defaultUrl?: Maybe; id: Scalars['String']['output']; language?: Maybe; metadata: GQLTaxonomyMetadata; @@ -2100,6 +2108,7 @@ export type GQLTopic = GQLTaxBase & GQLTaxonomyEntity & GQLWithArticle & { context?: Maybe; contextId?: Maybe; contexts: Array; + defaultUrl?: Maybe; id: Scalars['String']['output']; isPrimary?: Maybe; language?: Maybe; @@ -3525,6 +3534,7 @@ export type GQLNodeResolvers, ParentType, ContextType>; contextId?: Resolver, ParentType, ContextType>; contexts?: Resolver, ParentType, ContextType>; + defaultUrl?: Resolver, ParentType, ContextType>; grepCodes?: Resolver>, ParentType, ContextType>; id?: Resolver; language?: Resolver, ParentType, ContextType>; @@ -3625,6 +3635,7 @@ export type GQLPodcastSeriesWithEpisodesResolvers = { contentUri?: Resolver, ParentType, ContextType>; contextId?: Resolver, ParentType, ContextType>; + defaultUrl?: Resolver, ParentType, ContextType>; desktopImage?: Resolver, ParentType, ContextType>; grades?: Resolver>, ParentType, ContextType>; id?: Resolver; @@ -3713,6 +3724,7 @@ export type GQLResourceResolvers, ParentType, ContextType>; contextId?: Resolver, ParentType, ContextType>; contexts?: Resolver, ParentType, ContextType>; + defaultUrl?: Resolver, ParentType, ContextType>; id?: Resolver; language?: Resolver, ParentType, ContextType>; learningpath?: Resolver, ParentType, ContextType>; @@ -3841,6 +3853,7 @@ export type GQLSubjectResolvers, ParentType, ContextType>; contextId?: Resolver, ParentType, ContextType>; contexts?: Resolver, ParentType, ContextType>; + defaultUrl?: Resolver, ParentType, ContextType>; grepCodes?: Resolver>, ParentType, ContextType>; id?: Resolver; language?: Resolver, ParentType, ContextType>; @@ -3916,6 +3929,7 @@ export type GQLTaxBaseResolvers = { breadcrumbs?: Resolver, ParentType, ContextType>; contextId?: Resolver; + defaultUrl?: Resolver; isActive?: Resolver; isArchived?: Resolver; name?: Resolver; @@ -3929,6 +3943,7 @@ export type GQLTaxonomyContextResolvers = { contextId?: Resolver; + defaultUrl?: Resolver, ParentType, ContextType>; id?: Resolver; name?: Resolver; url?: Resolver; @@ -3964,6 +3979,7 @@ export type GQLTopicResolvers, ParentType, ContextType>; contextId?: Resolver, ParentType, ContextType>; contexts?: Resolver, ParentType, ContextType>; + defaultUrl?: Resolver, ParentType, ContextType>; id?: Resolver; isPrimary?: Resolver, ParentType, ContextType>; language?: Resolver, ParentType, ContextType>; diff --git a/yarn.lock b/yarn.lock index 0637e717..12a78f2f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1653,10 +1653,10 @@ __metadata: languageName: node linkType: hard -"@ndla/types-taxonomy@npm:^1.0.51": - version: 1.0.51 - resolution: "@ndla/types-taxonomy@npm:1.0.51" - checksum: 10c0/cacff6ba938e842a4ff36225dd00e28ee3f0b2a6e229fd0ff9ce31a261f2fdab8cb97bbb5b434ea74c4e015dfed031e0d4dfa5d471aed2d91d99c370245e9769 +"@ndla/types-taxonomy@npm:^1.0.54": + version: 1.0.54 + resolution: "@ndla/types-taxonomy@npm:1.0.54" + checksum: 10c0/585fd0901081f7b5ad8bfe16567486f43e6407f4f58f9ec2bbb08e17701f2f19c21a68818b21dcb457005112387786146f34cfe422df904e41c33ff73a097097 languageName: node linkType: hard @@ -6327,7 +6327,7 @@ __metadata: "@ndla/licenses": "npm:^9.0.3" "@ndla/types-backend": "npm:^1.0.114" "@ndla/types-embed": "npm:^5.0.21-alpha.0" - "@ndla/types-taxonomy": "npm:^1.0.51" + "@ndla/types-taxonomy": "npm:^1.0.54" "@types/compression": "npm:^1.8.1" "@types/cors": "npm:^2.8.19" "@types/graphql": "npm:^14.5.0"