feat(ojoi): add Cases in progress screen for OJOI

apps/web/components/OfficialJournalOfIceland/OJOIHomeIntro.tsx

@@ -1,5 +1,3 @@
-import { ReactNode } from 'react'
-
 import {
   Box,
   GridColumn,
@@ -17,7 +15,7 @@ import * as s from './OJOIHomeIntro.css'
 
 export type OJOIHomeIntroProps = {
   organization?: Organization
-  breadCrumbs: ReactNode
+  breadCrumbs: React.ReactNode
   searchPlaceholder: string
   quickLinks: Array<{ title: string; href: string; variant?: TagVariant }>
   searchUrl: string

apps/web/components/OfficialJournalOfIceland/OJOISearchListView.tsx

@@ -1,11 +1,10 @@
-import format from 'date-fns/format'
-import is from 'date-fns/locale/is'
-
 import { LinkV2, Table as T, Text } from '@island.is/island-ui/core'
 import { Locale } from '@island.is/shared/types'
 import { OfficialJournalOfIcelandAdvertsResponse } from '@island.is/web/graphql/schema'
 import { useLinkResolver } from '@island.is/web/hooks'
 
+import { formatDate } from './OJOIUtils'
+
 export const OJOISearchListView = ({
   adverts,
   locale,
@@ -31,9 +30,7 @@ export const OJOISearchListView = ({
           <T.Row key={ad.id}>
             <T.Data>
               <Text variant="small" whiteSpace="nowrap">
-                {format(new Date(ad.publicationDate), 'dd.MM.yyyy', {
-                  locale: is,
-                })}
+                {formatDate(ad.publicationDate)}
               </Text>
             </T.Data>
             <T.Data>

apps/web/components/OfficialJournalOfIceland/OJOIWrapper.tsx

@@ -7,6 +7,9 @@ import {
   BreadCrumbItem,
   Breadcrumbs,
   Button,
+  GridColumn,
+  GridContainer,
+  GridRow,
   LinkV2,
   Text,
 } from '@island.is/island-ui/core'
@@ -28,6 +31,7 @@ type WrapperProps = {
   sidebarContent?: ReactNode
   goBackUrl?: string
   hideTitle?: boolean
+  isHomePage?: boolean
 }
 
 export const OJOIWrapper = ({
@@ -40,6 +44,7 @@ export const OJOIWrapper = ({
   sidebarContent,
   goBackUrl,
   hideTitle,
+  isHomePage,
 }: WrapperProps) => {
   const { width } = useWindowSize()
   const [isMobile, setIsMobile] = useState<boolean | undefined>()
@@ -133,7 +138,46 @@ export const OJOIWrapper = ({
         </SidebarLayout>
       )}
 
-      {!sidebarContent && children}
+      {!sidebarContent && !isHomePage && (
+        <GridContainer>
+          <GridRow>
+            <GridColumn span="12/12">
+              {breadcrumbItems && (
+                <Breadcrumbs
+                  items={breadcrumbItems ?? []}
+                  renderLink={(link, item) => {
+                    return item?.href ? (
+                      <NextLink href={item?.href} legacyBehavior>
+                        {link}
+                      </NextLink>
+                    ) : (
+                      link
+                    )
+                  }}
+                />
+              )}
+
+              {!hideTitle && (
+                <Text as="h1" variant="h1" marginTop={2} marginBottom={3}>
+                  {pageTitle}
+                </Text>
+              )}
+
+              {pageDescription && (
+                <Box className="rs_read" marginTop={3} paddingBottom={4}>
+                  <Text variant="default">{pageDescription}</Text>
+                </Box>
+              )}
+
+              <Box className="rs_read" marginBottom={'containerGutter'}>
+                {children}
+              </Box>
+            </GridColumn>
+          </GridRow>
+        </GridContainer>
+      )}
+
+      {!sidebarContent && isHomePage && children}
 
       <Box className="rs_read" background="blue100">
         <WebFooter

apps/web/pages/stjornartidindi/mal-i-vinnslu/index.ts

@@ -0,0 +1,11 @@
+import withApollo from '@island.is/web/graphql/withApollo'
+import { withLocale } from '@island.is/web/i18n'
+import OJOICasesInProgress from '@island.is/web/screens/OfficialJournalOfIceland/OJOICasesInProgress'
+import { getServerSidePropsWrapper } from '@island.is/web/utils/getServerSidePropsWrapper'
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore make web strict
+const Screen = withApollo(withLocale('is')(OJOICasesInProgress))
+
+export default Screen
+
+export const getServerSideProps = getServerSidePropsWrapper(Screen)

apps/web/screens/OfficialJournalOfIceland/OJOICasesInProgress.tsx

@@ -0,0 +1,170 @@
+import { useIntl } from 'react-intl'
+
+import { Table as T } from '@island.is/island-ui/core'
+import { Locale } from '@island.is/shared/types'
+import {
+  ContentLanguage,
+  CustomPageUniqueIdentifier,
+  OfficialJournalOfIcelandCase,
+  Query,
+  QueryGetOrganizationArgs,
+  QueryOfficialJournalOfIcelandCasesInProgressArgs,
+} from '@island.is/web/graphql/schema'
+import { useLinkResolver } from '@island.is/web/hooks'
+import { withMainLayout } from '@island.is/web/layouts/main'
+import { CustomNextError } from '@island.is/web/units/errors'
+
+import {
+  formatDate,
+  OJOIWrapper,
+} from '../../components/OfficialJournalOfIceland'
+import {
+  CustomScreen,
+  withCustomPageWrapper,
+} from '../CustomPage/CustomPageWrapper'
+import { GET_ORGANIZATION_QUERY } from '../queries'
+import { CASES_IN_PROGRESS_QUERY } from '../queries/OfficialJournalOfIceland'
+import { m } from './messages'
+
+const OJOICasesInProgressPage: CustomScreen<OJOICasesInProgressProps> = ({
+  cases,
+  organization,
+  locale,
+}) => {
+  const { formatMessage } = useIntl()
+  const { linkResolver } = useLinkResolver()
+
+  const baseUrl = linkResolver('ojoihome', [], locale).href
+
+  const breadcrumbItems = [
+    {
+      title: 'Ísland.is',
+      href: linkResolver('homepage', [], locale).href,
+    },
+    {
+      title: organization?.title ?? '',
+      href: baseUrl,
+    },
+    {
+      title: 'Mál í vinnslu',
+    },
+  ]
+
+  return (
+    <OJOIWrapper
+      pageTitle={formatMessage(m.casesInProgress.title)}
+      pageDescription={formatMessage(m.casesInProgress.description)}
+      organization={organization ?? undefined}
+      pageFeaturedImage={formatMessage(m.home.featuredImage)}
+      goBackUrl={baseUrl}
+      breadcrumbItems={breadcrumbItems}
+    >
+      {!cases || cases.length === 0 ? (
+        <p>{formatMessage(m.casesInProgress.notFoundMessage)}</p>
+      ) : (
+        <T.Table>
+          <T.Head>
+            <T.Row>
+              <T.HeadData>
+                {formatMessage(m.casesInProgress.createdAt)}
+              </T.HeadData>
+              <T.HeadData>
+                {formatMessage(m.casesInProgress.requestedPublicationDate)}
+              </T.HeadData>
+              <T.HeadData>
+                {formatMessage(m.casesInProgress.advertTitle)}
+              </T.HeadData>
+              <T.HeadData>
+                {formatMessage(m.casesInProgress.involvedParty)}
+              </T.HeadData>
+            </T.Row>
+          </T.Head>
+          <T.Body>
+            {cases.map((c) => (
+              <T.Row key={c.id}>
+                <T.Data>{formatDate(c.createdAt)}</T.Data>
+                <T.Data>{formatDate(c.requestedPublicationDate)}</T.Data>
+                <T.Data>{c.advertType.title + ' ' + c.advertTitle}</T.Data>
+                <T.Data>{c.involvedParty.title}</T.Data>
+              </T.Row>
+            ))}
+          </T.Body>
+        </T.Table>
+      )}
+    </OJOIWrapper>
+  )
+}
+
+interface OJOICasesInProgressProps {
+  cases?: Array<OfficialJournalOfIcelandCase>
+  organization?: Query['getOrganization']
+  locale: Locale
+}
+
+const OJOICasesInProgress: CustomScreen<OJOICasesInProgressProps> = ({
+  cases,
+  organization,
+  customPageData,
+  locale,
+}) => {
+  return (
+    <OJOICasesInProgressPage
+      cases={cases}
+      organization={organization}
+      locale={locale}
+      customPageData={customPageData}
+    />
+  )
+}
+
+OJOICasesInProgress.getProps = async ({ apolloClient, locale }) => {
+  const organizationSlug = 'stjornartidindi'
+
+  const [
+    {
+      data: { officialJournalOfIcelandCasesInProgress },
+    },
+    {
+      data: { getOrganization },
+    },
+  ] = await Promise.all([
+    apolloClient.query<Query, QueryOfficialJournalOfIcelandCasesInProgressArgs>(
+      {
+        query: CASES_IN_PROGRESS_QUERY,
+        variables: {
+          params: {},
+        },
+      },
+    ),
+    apolloClient.query<Query, QueryGetOrganizationArgs>({
+      query: GET_ORGANIZATION_QUERY,
+      variables: {
+        input: {
+          slug: organizationSlug,
+          lang: locale as ContentLanguage,
+        },
+      },
+    }),
+  ])
+
+  if (!getOrganization?.hasALandingPage) {
+    throw new CustomNextError(404, 'Organization page not found')
+  }
+
+  return {
+    cases: officialJournalOfIcelandCasesInProgress?.cases,
+    organization: getOrganization,
+    locale: locale as Locale,
+    showSearchInHeader: false,
+    themeConfig: {
+      footerVersion: 'organization',
+    },
+  }
+}
+
+export default withMainLayout(
+  withCustomPageWrapper(
+    CustomPageUniqueIdentifier.OfficialJournalOfIceland,
+    OJOICasesInProgress,
+  ),
+)

apps/web/screens/OfficialJournalOfIceland/OJOIHome.tsx

@@ -93,6 +93,7 @@ const OJOIHomePage: CustomScreen<OJOIHomeProps> = ({
       pageDescription={formatMessage(m.home.description)}
       organization={organization ?? undefined}
       pageFeaturedImage={formatMessage(m.home.featuredImage)}
+      isHomePage
     >
       <Stack space={SLICE_SPACING}>
         <OJOIHomeIntro

apps/web/screens/OfficialJournalOfIceland/messages.ts

@@ -262,4 +262,35 @@ export const m = {
       defaultMessage: 'Sækja PDF',
     },
   }),
+
+  casesInProgress: defineMessages({
+    title: {
+      id: 'web.ojoi:casesInProgress.title',
+      defaultMessage: 'Mál í vinnslu',
+    },
+    description: {
+      id: 'web.ojoi:casesInProgress.description',
+      defaultMessage: 'Listi yfir mál sem hafa ekki verið gefin út.',
+    },
+    notFoundMessage: {
+      id: 'web.ojoi:casesInProgress.notFoundMessage',
+      defaultMessage: 'Engin mál í vinnslu',
+    },
+    createdAt: {
+      id: 'web.ojoi:casesInProgress.createdAt',
+      defaultMessage: 'Innsending',
+    },
+    requestedPublicationDate: {
+      id: 'web.ojoi:casesInProgress.requestedPublicationDate',
+      defaultMessage: 'Áætl. útgáfud.',
+    },
+    advertTitle: {
+      id: 'web.ojoi:casesInProgress.advertTitle',
+      defaultMessage: 'Heiti',
+    },
+    involvedParty: {
+      id: 'web.ojoi:casesInProgress.involvedParty',
+      defaultMessage: 'Stofnun',
+    },
+  }),
 }

apps/web/screens/queries/OfficialJournalOfIceland.ts

@@ -188,3 +188,32 @@ export const MAIN_CATEGORIES_QUERY = gql`
     }
   }
 `
+
+export const CASES_IN_PROGRESS_QUERY = gql`
+  query CasesInProgress($params: OfficialJournalOfIcelandQueryInput!) {
+    officialJournalOfIcelandCasesInProgress(params: $params) {
+      cases {
+        id
+        advertType {
+          title
+        }
+        advertTitle
+        involvedParty {
+          title
+        }
+        createdAt
+        requestedPublicationDate
+      }
+      paging {
+        page
+        pageSize
+        totalPages
+        totalItems
+        hasNextPage
+        hasPreviousPage
+        nextPage
+        previousPage
+      }
+    }
+  }
+`

libs/api/domains/official-journal-of-iceland/src/lib/models/advert.input.ts

@@ -29,10 +29,10 @@ export class AdvertsInput {
   involvedParty?: string[]
 
   @Field(() => Date, { nullable: true })
-  dateFrom?: Date
+  dateFrom?: string
 
   @Field(() => Date, { nullable: true })
-  dateTo?: Date
+  dateTo?: string
 }
 
 @InputType('OfficialJournalOfIcelandTypesInput')