Merge branch 'main' into bose/2580

sanityv3/plugins/asset-source-fotoware/src/utils.ts

@@ -15,8 +15,8 @@ export const getAuthURL = (requestState: string): string | false => {
 
   const CLIENT_ID = process.env.SANITY_STUDIO_FOTOWARE_CLIENT_ID
   const TENANT_URL = process.env.SANITY_STUDIO_FOTOWARE_TENANT_URL
-
-  return `${TENANT_URL}/fotoweb/oauth2/authorize?response_type=token&client_id=${CLIENT_ID}&state=${requestState}`
+  const REDIRECT_URI = process.env.SANITY_STUDIO_FOTOWARE_REDIRECT_ORIGIN
+  return `${TENANT_URL}/fotoweb/oauth2/authorize?response_type=token&client_id=${CLIENT_ID}&state=${requestState}&redirect_uri=${REDIRECT_URI}`
 }
 
 export const getAccessToken = (): string | false => {

sanityv3/sanity.config.tsx

@@ -18,7 +18,7 @@ import type {
   DocumentBadgeComponent,
   DocumentFieldAction,
 } from 'sanity'
-import { deskTool, StructureBuilder } from 'sanity/desk'
+import { structureTool } from 'sanity/structure'
 import deskStructure, { defaultDocumentNodeResolver } from './deskStructure'
 import { schemaTypes } from './schemas'
 import { initialValueTemplates } from './initialValueTemplates'
@@ -88,8 +88,8 @@ const getConfig = (datasetParam: string, projectIdParam: string, isSecret = fals
   },
   plugins: [
     documentInternationalization(i18n),
-    deskTool({
-      structure: (S: StructureBuilder, context: ConfigContext) => {
+    structureTool({
+      structure: (S, context: ConfigContext) => {
         return deskStructure(S, context)
       },
       defaultDocumentNode: defaultDocumentNodeResolver,

sanityv3/schemas/documents/newsroom.ts

@@ -6,6 +6,8 @@ import { file } from '@equinor/eds-icons'
 import { EdsIcon } from '../../icons'
 import type { PortableTextBlock, Rule } from 'sanity'
 import { lang } from './langField'
+import routes from '../routes'
+import { filterByRoute } from '../../helpers/referenceFilters'
 
 const titleContentType = configureTitleBlockContent()
 const textContentType = configureBlockContent({
@@ -66,6 +68,42 @@ export default {
       type: 'array',
       of: [textContentType],
     },
+    {
+      name: 'subscriptionLink',
+      title: 'Link to the email subscription page',
+      type: 'reference',
+      to: routes,
+      options: {
+        filter: filterByRoute,
+      },
+    },
+    {
+      name: 'subscriptionLinkTitle',
+      title: 'Title for the subscription link',
+      type: 'string',
+    },
+    {
+      title: 'List of local news pages',
+      name: 'localNewsPages',
+      type: 'array',
+      of: [{ type: 'linkSelector', title: 'Link' }],
+    },
+    {
+      title: 'Image thumbnail fallbacks',
+      name: 'imageThumbnailFallbacks',
+      type: 'array',
+      of: [
+        {
+          type: 'image',
+          title: 'Fallback image',
+          options: {
+            hotspot: true,
+            collapsed: false,
+          },
+        },
+      ],
+      validation: (Rule: Rule) => Rule.max(3),
+    },
   ],
   preview: {
     select: {

sanityv3/schemas/documents/page.ts

@@ -74,6 +74,7 @@ export default {
         { type: 'videoPlayer' },
         { type: 'videoPlayerCarousel' },
         { type: 'table' },
+        { type: 'imageForText' },
         Flags.HAS_CAMPAIGN_BLOCKS && { type: 'grid' },
         Flags.HAS_CAMPAIGN_BLOCKS && { type: 'campaignBanner' },
         Flags.HAS_FORMS && { type: 'form' },

sanityv3/schemas/index.ts

@@ -81,6 +81,7 @@ import gridColorTheme from './objects/grid/theme'
 import transcript from './objects/transcript'
 import anchorLinkList from './objects/anchorLinkList/anchorLinkList'
 import anchorLinkReference from './objects/anchorLinkList/anchorLinkReference'
+import imageForText from './objects/imageForText'
 
 const {
   pageNotFound,
@@ -208,6 +209,7 @@ const RemainingSchemas = [
   transcript,
   anchorLinkList,
   anchorLinkReference,
+  imageForText,
 ]
 
 // Then we give our schema to the builder and provide the result to Sanity

sanityv3/schemas/objects/card.tsx

@@ -1,23 +1,21 @@
 /* eslint-disable react/display-name */
-import { forwardRef } from 'react'
 import { configureBlockContent } from '../editors'
 import type { PortableTextBlock } from 'sanity'
-import { Stack, Text, Card } from '@sanity/ui'
+import { Text, Card, Box } from '@sanity/ui'
 import blocksToText from '../../helpers/blocksToText'
 
-const CardField = forwardRef((props: any) => {
+const CardField = (props: any) => {
+  const { renderDefault } = props
   return (
-    <Stack>
-      <Card padding={3} borderLeft>
-        <Text muted size={2} align={'left'}>
+    <Box>
+        <Text muted size={2} align="left" style={{marginBottom: 20}}>
           If only title are used it will render only title as statement. If content below are used, both title and
           content will be rendered.
         </Text>
-      </Card>
-      <>{props.renderDefault(props)}</>
-    </Stack>
+      <>{renderDefault(props)}</>
+    </Box>
   )
-})
+}
 
 const blockConfig = {
   h2: false,

sanityv3/schemas/objects/imageForText.tsx

@@ -0,0 +1,67 @@
+import { info_circle } from '@equinor/eds-icons'
+import { PortableTextBlock, Rule } from 'sanity'
+import { EdsIcon } from '../../icons'
+import { configureBlockContent } from '../editors/blockContentType'
+import type { ImageWithAlt } from './imageWithAlt'
+
+const blockContentType = configureBlockContent({
+  h2: true,
+  h3: true,
+  h4: true,
+  internalLink: false,
+  externalLink: false,
+  lists: false,
+  attachment: false,
+  smallText: false,
+})
+
+export type ImageForText = {
+  _type: 'imageForText'
+  content?: PortableTextBlock[]
+  image?: ImageWithAlt
+}
+
+export default {
+  title: 'Image for text',
+  name: 'imageForText',
+  type: 'object',
+  fields: [
+    {
+      name: 'content',
+      title: 'Content',
+      type: 'array',
+      of: [blockContentType],
+      validation: (Rule: Rule) => Rule.required(),
+    },
+    {
+      name: 'image',
+      title: 'Image',
+      type: 'imageWithAlt',
+      validation: (Rule: Rule) => Rule.required(),
+    },
+    {
+      name: 'aspectRatio',
+      type: 'string',
+      description: '',
+      title: 'Aspect ratio',
+      options: {
+        list: [
+          { title: '16:9', value: '16:9' },
+          { title: 'Full width 16:9', value: 'fullWidth' },
+        ],
+      },
+      initialValue: '16:9',
+    },
+  ],
+  preview: {
+    select: {
+      imageUrl: 'image.asset.url',
+    },
+    prepare({ imageUrl }: { title: string; imageUrl: string }) {
+      return {
+        title: 'Image for text',
+        media: imageUrl ? <img src={imageUrl} alt="" style={{ height: '100%' }} /> : EdsIcon(info_circle),
+      }
+    },
+  },
+}

sanityv3/schemas/textSnippets.ts

@@ -16,8 +16,8 @@ export const groups = {
 }
 const snippets: textSnippet = {
   country_code_format: {
-    title: 'e.g. +47',
-    defaultValue: 'e.g. +47',
+    title: 'Enter country code with phone number',
+    defaultValue: 'Enter  country code with phone number',
     group: groups.form,
   },
   all_fields_mandatory: {
@@ -81,6 +81,16 @@ const snippets: textSnippet = {
     defaultValue: 'Search',
     group: groups.search,
   },
+  search_quick_search: {
+    title: 'Quick search',
+    defaultValue: 'Quick search',
+    group: groups.search,
+  },
+  search_quick_search_label: {
+    title: 'Quick search label',
+    defaultValue: 'Search among Equinor corporate-level news releases',
+    group: groups.search,
+  },
   search_news_tab: {
     title: 'News tab name',
     defaultValue: 'News',
@@ -116,6 +126,31 @@ const snippets: textSnippet = {
     defaultValue: 'Sorry, no results were found. Please try again with some different keywords.',
     group: groups.search,
   },
+  search_submit: {
+    title: 'Submit search',
+    defaultValue: 'Submit search',
+    group: groups.search,
+  },
+  search_reset: {
+    title: 'Reset',
+    defaultValue: 'Reset',
+    group: groups.search,
+  },
+  search_filter_by: {
+    title: 'Filter by',
+    defaultValue: 'Filter by',
+    group: groups.search,
+  },
+  search_pagination_first_page: {
+    title: 'First page',
+    defaultValue: 'First page',
+    group: groups.search,
+  },
+  search_pagination_last_page: {
+    title: 'Last page',
+    defaultValue: 'Last page',
+    group: groups.search,
+  },
   copyright: {
     title: 'Copyright',
     defaultValue: 'Copyright 2022 Equinor ASA',
@@ -636,7 +671,7 @@ const snippets: textSnippet = {
   careers_contact_form_supporting_documents: {
     title: 'Supporting Documents checkbox',
     defaultValue: 'Tick the box if you would like to send supporting documents, and we will get in touch with you',
-    group: groups.careerFairForm,
+    group: groups.careerContactForm,
   },
 
   form_sending: {
@@ -684,11 +719,36 @@ const snippets: textSnippet = {
     defaultValue: 'Reopen the form',
     group: groups.form,
   },
+  form_validation_maxChars: {
+    title: 'Max X chars',
+    defaultValue: 'Max {maxChars} characters',
+    group: groups.form,
+  },
+  form_antirobot_validation_required: {
+    title: 'Anti-Robot verification is required',
+    defaultValue: 'Anti-Robot verification is required',
+    group: groups.form,
+  },
   newsroom_topic_filter: {
     title: 'Topic filter heading',
     defaultValue: 'Topic',
     group: groups.newsroom,
   },
+  newsroom_filters_label: {
+    title: 'Filters label',
+    defaultValue: 'Filter by:',
+    group: groups.newsroom,
+  },
+  newsroom_filters_selected: {
+    title: 'Selected',
+    defaultValue: 'Selected',
+    group: groups.newsroom,
+  },
+  newsroom_filters_clear_all: {
+    title: 'Clear all',
+    defaultValue: 'Clear all',
+    group: groups.newsroom,
+  },
   newsroom_country_filter: {
     title: 'Country filter heading',
     defaultValue: 'Country',
@@ -720,6 +780,16 @@ const snippets: textSnippet = {
     defaultValue: 'Your search returned no results',
     group: groups.newsroom,
   },
+  newsroom_related_links: {
+    title: 'Related links',
+    defaultValue: 'Related links',
+    group: groups.newsroom,
+  },
+  newsroom_skip_to_news: {
+    title: 'Skip to list of news',
+    defaultValue: 'Skip to list of news',
+    group: groups.newsroom,
+  },
   magazineindex_list_header: {
     title: 'Magazine index: Stories list heading',
     defaultValue: 'Stories',
@@ -766,6 +836,26 @@ const snippets: textSnippet = {
     defaultValue: 'Switch to',
     group: groups.others,
   },
+  next: {
+    title: 'Next',
+    defaultValue: 'Next',
+    group: groups.others,
+  },
+  previous: {
+    title: 'Previous',
+    defaultValue: 'Previous',
+    group: groups.others,
+  },
+  page: {
+    title: 'Page',
+    defaultValue: 'Page',
+    group: groups.others,
+  },
+  remove: {
+    title: 'Remove',
+    defaultValue: 'Remove',
+    group: groups.others,
+  },
 }
 
 type textSnippetGroup = { title: string; hidden?: boolean }

sanityv3/tsconfig.json

@@ -1,5 +1,10 @@
 {
   "extends": "../tsconfig.base.json",
+  "compilerOptions": {
+    "paths": {
+      "react": ["./node_modules/@types/react"]
+    }
+  },
   "include": ["**/*.ts", "**/*.tsx"],
   "exclude": ["node_modules"]
 }

search/IndexSanityContent/common/news/SharedNewsFields.ts

@@ -1,4 +1,5 @@
 import { Page } from '../../../common'
+import { ImageWithAltAndCaption } from '../types'
 
 export type SharedNewsFields = Page & {
   title: string
@@ -18,4 +19,5 @@ export type SharedNewsFields = Page & {
     text: string
   }[]
   _id: string
+  heroImage?: ImageWithAltAndCaption
 }