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

Fire Weather Map Updates #585

Merged
merged 4 commits into from
Nov 1, 2024
Merged

Fire Weather Map Updates #585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c0eb90d
Integrate Contentful w/ Fire Danger Map + map improvements
hinzed1127 Nov 1, 2024
7f7ae13
Remove console.logs and add clarifying comment
hinzed1127 Nov 1, 2024
595485e
Fix index error on danger levels, make title h1 instead of h2
hinzed1127 Nov 1, 2024
8d5e837
[No Issue] Improve fetching of content and metadata for the fire weat…
LouisFettet Nov 1, 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
112 changes: 112 additions & 0 deletions src/lib/services/server/contentful/schema.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1463,6 +1463,102 @@ enum EventEntryOrder {
sys_publishedVersion_DESC
}

"""
One-off content type for managing the description text on the fire danger page [See type definition](https://app.contentful.com/spaces/pc5e1rlgfrov/content_types/fireDangerMap)
"""
type FireDangerMap implements Entry & _Node {
_id: ID!
contentfulMetadata: ContentfulMetadata!
description(locale: String): FireDangerMapDescription
linkedFrom(allowedLocales: [String]): FireDangerMapLinkingCollections
pageMetadata(locale: String, preview: Boolean, where: PageMetadataFilter): PageMetadata
sys: Sys!
title(locale: String): String
}

type FireDangerMapCollection {
items: [FireDangerMap]!
limit: Int!
skip: Int!
total: Int!
}

type FireDangerMapDescription {
json: JSON!
links: FireDangerMapDescriptionLinks!
}

type FireDangerMapDescriptionAssets {
block: [Asset]!
hyperlink: [Asset]!
}

type FireDangerMapDescriptionEntries {
block: [Entry]!
hyperlink: [Entry]!
inline: [Entry]!
}

type FireDangerMapDescriptionLinks {
assets: FireDangerMapDescriptionAssets!
entries: FireDangerMapDescriptionEntries!
resources: FireDangerMapDescriptionResources!
}

type FireDangerMapDescriptionResources {
block: [FireDangerMapDescriptionResourcesBlock!]!
hyperlink: [FireDangerMapDescriptionResourcesHyperlink!]!
inline: [FireDangerMapDescriptionResourcesInline!]!
}

type FireDangerMapDescriptionResourcesBlock implements ResourceLink {
sys: ResourceSys!
}

type FireDangerMapDescriptionResourcesHyperlink implements ResourceLink {
sys: ResourceSys!
}

type FireDangerMapDescriptionResourcesInline implements ResourceLink {
sys: ResourceSys!
}

input FireDangerMapFilter {
AND: [FireDangerMapFilter]
OR: [FireDangerMapFilter]
contentfulMetadata: ContentfulMetadataFilter
description_contains: String
description_exists: Boolean
description_not_contains: String
pageMetadata: cfPageMetadataNestedFilter
pageMetadata_exists: Boolean
sys: SysFilter
title: String
title_contains: String
title_exists: Boolean
title_in: [String]
title_not: String
title_not_contains: String
title_not_in: [String]
}

type FireDangerMapLinkingCollections {
entryCollection(limit: Int = 100, locale: String, preview: Boolean, skip: Int = 0): EntryCollection
}

enum FireDangerMapOrder {
sys_firstPublishedAt_ASC
sys_firstPublishedAt_DESC
sys_id_ASC
sys_id_DESC
sys_publishedAt_ASC
sys_publishedAt_DESC
sys_publishedVersion_ASC
sys_publishedVersion_DESC
title_ASC
title_DESC
}

"""
Big wide image intended for the top of a page. [See type definition](https://app.contentful.com/spaces/pc5e1rlgfrov/content_types/heroImage)
"""
Expand Down Expand Up @@ -3101,6 +3197,7 @@ union PageMetadataInternalRedirect = EventEntry | News | PageMetadata
type PageMetadataLinkingCollections {
aggregationCollection(limit: Int = 100, locale: String, order: [PageMetadataLinkingCollectionsAggregationCollectionOrder], preview: Boolean, skip: Int = 0): AggregationCollection
entryCollection(limit: Int = 100, locale: String, preview: Boolean, skip: Int = 0): EntryCollection
fireDangerMapCollection(limit: Int = 100, locale: String, order: [PageMetadataLinkingCollectionsFireDangerMapCollectionOrder], preview: Boolean, skip: Int = 0): FireDangerMapCollection
homeCollection(limit: Int = 100, locale: String, order: [PageMetadataLinkingCollectionsHomeCollectionOrder], preview: Boolean, skip: Int = 0): HomeCollection
menuItemCollection(limit: Int = 100, locale: String, order: [PageMetadataLinkingCollectionsMenuItemCollectionOrder], preview: Boolean, skip: Int = 0): MenuItemCollection
officePageCollection(limit: Int = 100, locale: String, order: [PageMetadataLinkingCollectionsOfficePageCollectionOrder], preview: Boolean, skip: Int = 0): OfficePageCollection
Expand All @@ -3125,6 +3222,19 @@ enum PageMetadataLinkingCollectionsAggregationCollectionOrder {
title_DESC
}

enum PageMetadataLinkingCollectionsFireDangerMapCollectionOrder {
sys_firstPublishedAt_ASC
sys_firstPublishedAt_DESC
sys_id_ASC
sys_id_DESC
sys_publishedAt_ASC
sys_publishedAt_DESC
sys_publishedVersion_ASC
sys_publishedVersion_DESC
title_ASC
title_DESC
}

enum PageMetadataLinkingCollectionsHomeCollectionOrder {
commissionerByline_ASC
commissionerByline_DESC
Expand Down Expand Up @@ -3525,6 +3635,8 @@ type Query {
errorCollection(limit: Int = 100, locale: String, order: [ErrorOrder], preview: Boolean, skip: Int = 0, where: ErrorFilter): ErrorCollection
eventEntry(id: String!, locale: String, preview: Boolean): EventEntry
eventEntryCollection(limit: Int = 100, locale: String, order: [EventEntryOrder], preview: Boolean, skip: Int = 0, where: EventEntryFilter): EventEntryCollection
fireDangerMap(id: String!, locale: String, preview: Boolean): FireDangerMap
fireDangerMapCollection(limit: Int = 100, locale: String, order: [FireDangerMapOrder], preview: Boolean, skip: Int = 0, where: FireDangerMapFilter): FireDangerMapCollection
heroImage(id: String!, locale: String, preview: Boolean): HeroImage
heroImageCollection(limit: Int = 100, locale: String, order: [HeroImageOrder], preview: Boolean, skip: Int = 0, where: HeroImageFilter): HeroImageCollection
home(id: String!, locale: String, preview: Boolean): Home
Expand Down
181 changes: 181 additions & 0 deletions src/lib/services/server/contentful/schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2205,6 +2205,145 @@ export enum EventEntryOrder {
SysPublishedVersionDesc = 'sys_publishedVersion_DESC'
}

/** One-off content type for managing the description text on the fire danger page [See type definition](https://app.contentful.com/spaces/pc5e1rlgfrov/content_types/fireDangerMap) */
export type FireDangerMap = Entry & _Node & {
__typename?: 'FireDangerMap';
_id: Scalars['ID']['output'];
contentfulMetadata: ContentfulMetadata;
description?: Maybe<FireDangerMapDescription>;
linkedFrom?: Maybe<FireDangerMapLinkingCollections>;
pageMetadata?: Maybe<PageMetadata>;
sys: Sys;
title?: Maybe<Scalars['String']['output']>;
};


/** One-off content type for managing the description text on the fire danger page [See type definition](https://app.contentful.com/spaces/pc5e1rlgfrov/content_types/fireDangerMap) */
export type FireDangerMapDescriptionArgs = {
locale?: InputMaybe<Scalars['String']['input']>;
};


/** One-off content type for managing the description text on the fire danger page [See type definition](https://app.contentful.com/spaces/pc5e1rlgfrov/content_types/fireDangerMap) */
export type FireDangerMapLinkedFromArgs = {
allowedLocales?: InputMaybe<Array<InputMaybe<Scalars['String']['input']>>>;
};


/** One-off content type for managing the description text on the fire danger page [See type definition](https://app.contentful.com/spaces/pc5e1rlgfrov/content_types/fireDangerMap) */
export type FireDangerMapPageMetadataArgs = {
locale?: InputMaybe<Scalars['String']['input']>;
preview?: InputMaybe<Scalars['Boolean']['input']>;
where?: InputMaybe<PageMetadataFilter>;
};


/** One-off content type for managing the description text on the fire danger page [See type definition](https://app.contentful.com/spaces/pc5e1rlgfrov/content_types/fireDangerMap) */
export type FireDangerMapTitleArgs = {
locale?: InputMaybe<Scalars['String']['input']>;
};

export type FireDangerMapCollection = {
__typename?: 'FireDangerMapCollection';
items: Array<Maybe<FireDangerMap>>;
limit: Scalars['Int']['output'];
skip: Scalars['Int']['output'];
total: Scalars['Int']['output'];
};

export type FireDangerMapDescription = {
__typename?: 'FireDangerMapDescription';
json: Scalars['JSON']['output'];
links: FireDangerMapDescriptionLinks;
};

export type FireDangerMapDescriptionAssets = {
__typename?: 'FireDangerMapDescriptionAssets';
block: Array<Maybe<Asset>>;
hyperlink: Array<Maybe<Asset>>;
};

export type FireDangerMapDescriptionEntries = {
__typename?: 'FireDangerMapDescriptionEntries';
block: Array<Maybe<Entry>>;
hyperlink: Array<Maybe<Entry>>;
inline: Array<Maybe<Entry>>;
};

export type FireDangerMapDescriptionLinks = {
__typename?: 'FireDangerMapDescriptionLinks';
assets: FireDangerMapDescriptionAssets;
entries: FireDangerMapDescriptionEntries;
resources: FireDangerMapDescriptionResources;
};

export type FireDangerMapDescriptionResources = {
__typename?: 'FireDangerMapDescriptionResources';
block: Array<FireDangerMapDescriptionResourcesBlock>;
hyperlink: Array<FireDangerMapDescriptionResourcesHyperlink>;
inline: Array<FireDangerMapDescriptionResourcesInline>;
};

export type FireDangerMapDescriptionResourcesBlock = ResourceLink & {
__typename?: 'FireDangerMapDescriptionResourcesBlock';
sys: ResourceSys;
};

export type FireDangerMapDescriptionResourcesHyperlink = ResourceLink & {
__typename?: 'FireDangerMapDescriptionResourcesHyperlink';
sys: ResourceSys;
};

export type FireDangerMapDescriptionResourcesInline = ResourceLink & {
__typename?: 'FireDangerMapDescriptionResourcesInline';
sys: ResourceSys;
};

export type FireDangerMapFilter = {
AND?: InputMaybe<Array<InputMaybe<FireDangerMapFilter>>>;
OR?: InputMaybe<Array<InputMaybe<FireDangerMapFilter>>>;
contentfulMetadata?: InputMaybe<ContentfulMetadataFilter>;
description_contains?: InputMaybe<Scalars['String']['input']>;
description_exists?: InputMaybe<Scalars['Boolean']['input']>;
description_not_contains?: InputMaybe<Scalars['String']['input']>;
pageMetadata?: InputMaybe<CfPageMetadataNestedFilter>;
pageMetadata_exists?: InputMaybe<Scalars['Boolean']['input']>;
sys?: InputMaybe<SysFilter>;
title?: InputMaybe<Scalars['String']['input']>;
title_contains?: InputMaybe<Scalars['String']['input']>;
title_exists?: InputMaybe<Scalars['Boolean']['input']>;
title_in?: InputMaybe<Array<InputMaybe<Scalars['String']['input']>>>;
title_not?: InputMaybe<Scalars['String']['input']>;
title_not_contains?: InputMaybe<Scalars['String']['input']>;
title_not_in?: InputMaybe<Array<InputMaybe<Scalars['String']['input']>>>;
};

export type FireDangerMapLinkingCollections = {
__typename?: 'FireDangerMapLinkingCollections';
entryCollection?: Maybe<EntryCollection>;
};


export type FireDangerMapLinkingCollectionsEntryCollectionArgs = {
limit?: InputMaybe<Scalars['Int']['input']>;
locale?: InputMaybe<Scalars['String']['input']>;
preview?: InputMaybe<Scalars['Boolean']['input']>;
skip?: InputMaybe<Scalars['Int']['input']>;
};

export enum FireDangerMapOrder {
SysFirstPublishedAtAsc = 'sys_firstPublishedAt_ASC',
SysFirstPublishedAtDesc = 'sys_firstPublishedAt_DESC',
SysIdAsc = 'sys_id_ASC',
SysIdDesc = 'sys_id_DESC',
SysPublishedAtAsc = 'sys_publishedAt_ASC',
SysPublishedAtDesc = 'sys_publishedAt_DESC',
SysPublishedVersionAsc = 'sys_publishedVersion_ASC',
SysPublishedVersionDesc = 'sys_publishedVersion_DESC',
TitleAsc = 'title_ASC',
TitleDesc = 'title_DESC'
}

/** Big wide image intended for the top of a page. [See type definition](https://app.contentful.com/spaces/pc5e1rlgfrov/content_types/heroImage) */
export type HeroImage = Entry & _Node & {
__typename?: 'HeroImage';
Expand Down Expand Up @@ -4563,6 +4702,7 @@ export type PageMetadataLinkingCollections = {
__typename?: 'PageMetadataLinkingCollections';
aggregationCollection?: Maybe<AggregationCollection>;
entryCollection?: Maybe<EntryCollection>;
fireDangerMapCollection?: Maybe<FireDangerMapCollection>;
homeCollection?: Maybe<HomeCollection>;
menuItemCollection?: Maybe<MenuItemCollection>;
officePageCollection?: Maybe<OfficePageCollection>;
Expand Down Expand Up @@ -4590,6 +4730,15 @@ export type PageMetadataLinkingCollectionsEntryCollectionArgs = {
};


export type PageMetadataLinkingCollectionsFireDangerMapCollectionArgs = {
limit?: InputMaybe<Scalars['Int']['input']>;
locale?: InputMaybe<Scalars['String']['input']>;
order?: InputMaybe<Array<InputMaybe<PageMetadataLinkingCollectionsFireDangerMapCollectionOrder>>>;
preview?: InputMaybe<Scalars['Boolean']['input']>;
skip?: InputMaybe<Scalars['Int']['input']>;
};


export type PageMetadataLinkingCollectionsHomeCollectionArgs = {
limit?: InputMaybe<Scalars['Int']['input']>;
locale?: InputMaybe<Scalars['String']['input']>;
Expand Down Expand Up @@ -4667,6 +4816,19 @@ export enum PageMetadataLinkingCollectionsAggregationCollectionOrder {
TitleDesc = 'title_DESC'
}

export enum PageMetadataLinkingCollectionsFireDangerMapCollectionOrder {
SysFirstPublishedAtAsc = 'sys_firstPublishedAt_ASC',
SysFirstPublishedAtDesc = 'sys_firstPublishedAt_DESC',
SysIdAsc = 'sys_id_ASC',
SysIdDesc = 'sys_id_DESC',
SysPublishedAtAsc = 'sys_publishedAt_ASC',
SysPublishedAtDesc = 'sys_publishedAt_DESC',
SysPublishedVersionAsc = 'sys_publishedVersion_ASC',
SysPublishedVersionDesc = 'sys_publishedVersion_DESC',
TitleAsc = 'title_ASC',
TitleDesc = 'title_DESC'
}

export enum PageMetadataLinkingCollectionsHomeCollectionOrder {
CommissionerBylineAsc = 'commissionerByline_ASC',
CommissionerBylineDesc = 'commissionerByline_DESC',
Expand Down Expand Up @@ -5189,6 +5351,8 @@ export type Query = {
errorCollection?: Maybe<ErrorCollection>;
eventEntry?: Maybe<EventEntry>;
eventEntryCollection?: Maybe<EventEntryCollection>;
fireDangerMap?: Maybe<FireDangerMap>;
fireDangerMapCollection?: Maybe<FireDangerMapCollection>;
heroImage?: Maybe<HeroImage>;
heroImageCollection?: Maybe<HeroImageCollection>;
home?: Maybe<Home>;
Expand Down Expand Up @@ -5413,6 +5577,23 @@ export type QueryEventEntryCollectionArgs = {
};


export type QueryFireDangerMapArgs = {
id: Scalars['String']['input'];
locale?: InputMaybe<Scalars['String']['input']>;
preview?: InputMaybe<Scalars['Boolean']['input']>;
};


export type QueryFireDangerMapCollectionArgs = {
limit?: InputMaybe<Scalars['Int']['input']>;
locale?: InputMaybe<Scalars['String']['input']>;
order?: InputMaybe<Array<InputMaybe<FireDangerMapOrder>>>;
preview?: InputMaybe<Scalars['Boolean']['input']>;
skip?: InputMaybe<Scalars['Int']['input']>;
where?: InputMaybe<FireDangerMapFilter>;
};


export type QueryHeroImageArgs = {
id: Scalars['String']['input'];
locale?: InputMaybe<Scalars['String']['input']>;
Expand Down
Loading
Loading