Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions src/resolvers/programmeResolvers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};
Expand Down
9 changes: 9 additions & 0 deletions src/schema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -443,6 +443,7 @@ export const typeDefs = gql`
id: String!
name: String!
url: String
defaultUrl: String
}

interface TaxonomyEntity {
Expand All @@ -458,6 +459,7 @@ export const typeDefs = gql`
supportedLanguages: [String!]!
resourceTypes: [ResourceType!]
url: String
defaultUrl: String
language: String
nodeType: String!
}
Expand All @@ -482,6 +484,7 @@ export const typeDefs = gql`
supportedLanguages: [String!]!
resourceTypes: [ResourceType!]
url: String
defaultUrl: String
language: String
nodeType: String!
connectionId: String
Expand Down Expand Up @@ -511,6 +514,7 @@ export const typeDefs = gql`
supportedLanguages: [String!]!
resourceTypes: [ResourceType!]
url: String
defaultUrl: String
language: String
nodeType: String!
rank: Int
Expand All @@ -526,13 +530,15 @@ export const typeDefs = gql`
contextId: String!
name: String!
url: String!
defaultUrl: String
}

type TaxonomyContext {
contextId: String!
breadcrumbs: [String!]!
name: String!
url: String!
defaultUrl: String!
parentIds: [String!]!
rootId: String!
relevance: String!
Expand All @@ -555,6 +561,7 @@ export const typeDefs = gql`
supportedLanguages: [String!]!
resourceTypes: [ResourceType!]
url: String
defaultUrl: String
language: String
nodeType: String!
meta: Meta
Expand Down Expand Up @@ -916,6 +923,7 @@ export const typeDefs = gql`
supportedLanguages: [String!]!
resourceTypes: [ResourceType!]
url: String
defaultUrl: String
language: String
nodeType: String!
subjectpage: SubjectPage
Expand All @@ -927,6 +935,7 @@ export const typeDefs = gql`
contextId: String
title: Title!
url: String
defaultUrl: String
contentUri: String
metaDescription: String
desktopImage: MetaImage
Expand Down
16 changes: 16 additions & 0 deletions src/types/schema.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1296,6 +1296,7 @@ export type GQLNode = GQLTaxBase & GQLTaxonomyEntity & GQLWithArticle & {
context?: Maybe<GQLTaxonomyContext>;
contextId?: Maybe<Scalars['String']['output']>;
contexts: Array<GQLTaxonomyContext>;
defaultUrl?: Maybe<Scalars['String']['output']>;
grepCodes?: Maybe<Array<Scalars['String']['output']>>;
id: Scalars['String']['output'];
language?: Maybe<Scalars['String']['output']>;
Expand Down Expand Up @@ -1413,6 +1414,7 @@ export type GQLProgrammePage = {
__typename?: 'ProgrammePage';
contentUri?: Maybe<Scalars['String']['output']>;
contextId?: Maybe<Scalars['String']['output']>;
defaultUrl?: Maybe<Scalars['String']['output']>;
desktopImage?: Maybe<GQLMetaImage>;
grades?: Maybe<Array<GQLGrade>>;
id: Scalars['String']['output'];
Expand Down Expand Up @@ -1809,6 +1811,7 @@ export type GQLResource = GQLTaxBase & GQLTaxonomyEntity & GQLWithArticle & {
context?: Maybe<GQLTaxonomyContext>;
contextId?: Maybe<Scalars['String']['output']>;
contexts: Array<GQLTaxonomyContext>;
defaultUrl?: Maybe<Scalars['String']['output']>;
id: Scalars['String']['output'];
language?: Maybe<Scalars['String']['output']>;
learningpath?: Maybe<GQLLearningpath>;
Expand Down Expand Up @@ -1950,6 +1953,7 @@ export type GQLSubject = GQLTaxBase & GQLTaxonomyEntity & {
context?: Maybe<GQLTaxonomyContext>;
contextId?: Maybe<Scalars['String']['output']>;
contexts: Array<GQLTaxonomyContext>;
defaultUrl?: Maybe<Scalars['String']['output']>;
grepCodes?: Maybe<Array<Scalars['String']['output']>>;
id: Scalars['String']['output'];
language?: Maybe<Scalars['String']['output']>;
Expand Down Expand Up @@ -2026,6 +2030,7 @@ export type GQLTags = {
};

export type GQLTaxBase = {
defaultUrl?: Maybe<Scalars['String']['output']>;
id: Scalars['String']['output'];
name: Scalars['String']['output'];
url?: Maybe<Scalars['String']['output']>;
Expand All @@ -2035,6 +2040,7 @@ export type GQLTaxonomyContext = {
__typename?: 'TaxonomyContext';
breadcrumbs: Array<Scalars['String']['output']>;
contextId: Scalars['String']['output'];
defaultUrl: Scalars['String']['output'];
isActive: Scalars['Boolean']['output'];
isArchived: Scalars['Boolean']['output'];
name: Scalars['String']['output'];
Expand All @@ -2049,6 +2055,7 @@ export type GQLTaxonomyContext = {
export type GQLTaxonomyCrumb = GQLTaxBase & {
__typename?: 'TaxonomyCrumb';
contextId: Scalars['String']['output'];
defaultUrl?: Maybe<Scalars['String']['output']>;
id: Scalars['String']['output'];
name: Scalars['String']['output'];
url: Scalars['String']['output'];
Expand All @@ -2060,6 +2067,7 @@ export type GQLTaxonomyEntity = {
context?: Maybe<GQLTaxonomyContext>;
contextId?: Maybe<Scalars['String']['output']>;
contexts: Array<GQLTaxonomyContext>;
defaultUrl?: Maybe<Scalars['String']['output']>;
id: Scalars['String']['output'];
language?: Maybe<Scalars['String']['output']>;
metadata: GQLTaxonomyMetadata;
Expand Down Expand Up @@ -2100,6 +2108,7 @@ export type GQLTopic = GQLTaxBase & GQLTaxonomyEntity & GQLWithArticle & {
context?: Maybe<GQLTaxonomyContext>;
contextId?: Maybe<Scalars['String']['output']>;
contexts: Array<GQLTaxonomyContext>;
defaultUrl?: Maybe<Scalars['String']['output']>;
id: Scalars['String']['output'];
isPrimary?: Maybe<Scalars['Boolean']['output']>;
language?: Maybe<Scalars['String']['output']>;
Expand Down Expand Up @@ -3525,6 +3534,7 @@ export type GQLNodeResolvers<ContextType = any, ParentType extends GQLResolversP
context?: Resolver<Maybe<GQLResolversTypes['TaxonomyContext']>, ParentType, ContextType>;
contextId?: Resolver<Maybe<GQLResolversTypes['String']>, ParentType, ContextType>;
contexts?: Resolver<Array<GQLResolversTypes['TaxonomyContext']>, ParentType, ContextType>;
defaultUrl?: Resolver<Maybe<GQLResolversTypes['String']>, ParentType, ContextType>;
grepCodes?: Resolver<Maybe<Array<GQLResolversTypes['String']>>, ParentType, ContextType>;
id?: Resolver<GQLResolversTypes['String'], ParentType, ContextType>;
language?: Resolver<Maybe<GQLResolversTypes['String']>, ParentType, ContextType>;
Expand Down Expand Up @@ -3625,6 +3635,7 @@ export type GQLPodcastSeriesWithEpisodesResolvers<ContextType = any, ParentType
export type GQLProgrammePageResolvers<ContextType = any, ParentType extends GQLResolversParentTypes['ProgrammePage'] = GQLResolversParentTypes['ProgrammePage']> = {
contentUri?: Resolver<Maybe<GQLResolversTypes['String']>, ParentType, ContextType>;
contextId?: Resolver<Maybe<GQLResolversTypes['String']>, ParentType, ContextType>;
defaultUrl?: Resolver<Maybe<GQLResolversTypes['String']>, ParentType, ContextType>;
desktopImage?: Resolver<Maybe<GQLResolversTypes['MetaImage']>, ParentType, ContextType>;
grades?: Resolver<Maybe<Array<GQLResolversTypes['Grade']>>, ParentType, ContextType>;
id?: Resolver<GQLResolversTypes['String'], ParentType, ContextType>;
Expand Down Expand Up @@ -3713,6 +3724,7 @@ export type GQLResourceResolvers<ContextType = any, ParentType extends GQLResolv
context?: Resolver<Maybe<GQLResolversTypes['TaxonomyContext']>, ParentType, ContextType>;
contextId?: Resolver<Maybe<GQLResolversTypes['String']>, ParentType, ContextType>;
contexts?: Resolver<Array<GQLResolversTypes['TaxonomyContext']>, ParentType, ContextType>;
defaultUrl?: Resolver<Maybe<GQLResolversTypes['String']>, ParentType, ContextType>;
id?: Resolver<GQLResolversTypes['String'], ParentType, ContextType>;
language?: Resolver<Maybe<GQLResolversTypes['String']>, ParentType, ContextType>;
learningpath?: Resolver<Maybe<GQLResolversTypes['Learningpath']>, ParentType, ContextType>;
Expand Down Expand Up @@ -3841,6 +3853,7 @@ export type GQLSubjectResolvers<ContextType = any, ParentType extends GQLResolve
context?: Resolver<Maybe<GQLResolversTypes['TaxonomyContext']>, ParentType, ContextType>;
contextId?: Resolver<Maybe<GQLResolversTypes['String']>, ParentType, ContextType>;
contexts?: Resolver<Array<GQLResolversTypes['TaxonomyContext']>, ParentType, ContextType>;
defaultUrl?: Resolver<Maybe<GQLResolversTypes['String']>, ParentType, ContextType>;
grepCodes?: Resolver<Maybe<Array<GQLResolversTypes['String']>>, ParentType, ContextType>;
id?: Resolver<GQLResolversTypes['String'], ParentType, ContextType>;
language?: Resolver<Maybe<GQLResolversTypes['String']>, ParentType, ContextType>;
Expand Down Expand Up @@ -3916,6 +3929,7 @@ export type GQLTaxBaseResolvers<ContextType = any, ParentType extends GQLResolve
export type GQLTaxonomyContextResolvers<ContextType = any, ParentType extends GQLResolversParentTypes['TaxonomyContext'] = GQLResolversParentTypes['TaxonomyContext']> = {
breadcrumbs?: Resolver<Array<GQLResolversTypes['String']>, ParentType, ContextType>;
contextId?: Resolver<GQLResolversTypes['String'], ParentType, ContextType>;
defaultUrl?: Resolver<GQLResolversTypes['String'], ParentType, ContextType>;
isActive?: Resolver<GQLResolversTypes['Boolean'], ParentType, ContextType>;
isArchived?: Resolver<GQLResolversTypes['Boolean'], ParentType, ContextType>;
name?: Resolver<GQLResolversTypes['String'], ParentType, ContextType>;
Expand All @@ -3929,6 +3943,7 @@ export type GQLTaxonomyContextResolvers<ContextType = any, ParentType extends GQ

export type GQLTaxonomyCrumbResolvers<ContextType = any, ParentType extends GQLResolversParentTypes['TaxonomyCrumb'] = GQLResolversParentTypes['TaxonomyCrumb']> = {
contextId?: Resolver<GQLResolversTypes['String'], ParentType, ContextType>;
defaultUrl?: Resolver<Maybe<GQLResolversTypes['String']>, ParentType, ContextType>;
id?: Resolver<GQLResolversTypes['String'], ParentType, ContextType>;
name?: Resolver<GQLResolversTypes['String'], ParentType, ContextType>;
url?: Resolver<GQLResolversTypes['String'], ParentType, ContextType>;
Expand Down Expand Up @@ -3964,6 +3979,7 @@ export type GQLTopicResolvers<ContextType = any, ParentType extends GQLResolvers
context?: Resolver<Maybe<GQLResolversTypes['TaxonomyContext']>, ParentType, ContextType>;
contextId?: Resolver<Maybe<GQLResolversTypes['String']>, ParentType, ContextType>;
contexts?: Resolver<Array<GQLResolversTypes['TaxonomyContext']>, ParentType, ContextType>;
defaultUrl?: Resolver<Maybe<GQLResolversTypes['String']>, ParentType, ContextType>;
id?: Resolver<GQLResolversTypes['String'], ParentType, ContextType>;
isPrimary?: Resolver<Maybe<GQLResolversTypes['Boolean']>, ParentType, ContextType>;
language?: Resolver<Maybe<GQLResolversTypes['String']>, ParentType, ContextType>;
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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"
Expand Down
Loading