From 2761cc024d454dcdd4820267eb81fd4b4547fd4a Mon Sep 17 00:00:00 2001 From: runarvestmann Date: Mon, 23 Dec 2024 14:58:20 +0000 Subject: [PATCH 1/2] My pages links for directorate of labour --- .../hooks/useLinkResolver/useLinkResolver.ts | 4 + .../o/directorate-of-labour/my-pages/index.ts | 12 ++ .../s/vinnumalastofnun/minar-sidur/index.ts | 12 ++ .../DirectorateOfLabour/MyPages.strings.ts | 80 ++++++++ .../DirectorateOfLabour/MyPages.tsx | 176 ++++++++++++++++++ .../src/lib/generated/contentfulTypes.d.ts | 1 + libs/shared/types/src/lib/api-cms-domain.ts | 1 + 7 files changed, 286 insertions(+) create mode 100644 apps/web/pages/en/o/directorate-of-labour/my-pages/index.ts create mode 100644 apps/web/pages/s/vinnumalastofnun/minar-sidur/index.ts create mode 100644 apps/web/screens/Organization/DirectorateOfLabour/MyPages.strings.ts create mode 100644 apps/web/screens/Organization/DirectorateOfLabour/MyPages.tsx diff --git a/apps/web/hooks/useLinkResolver/useLinkResolver.ts b/apps/web/hooks/useLinkResolver/useLinkResolver.ts index ffd79008da34..cf2b2264bf5d 100644 --- a/apps/web/hooks/useLinkResolver/useLinkResolver.ts +++ b/apps/web/hooks/useLinkResolver/useLinkResolver.ts @@ -107,6 +107,10 @@ export const routesTemplate = { is: '/s/tryggingastofnun/reiknivel', en: '/en/o/social-insurance-administration/calculator', }, + directorateoflabourmypages: { + is: '/s/vinnumalastofnun/minar-sidur', + en: '/en/o/directorate-of-labour/my-pages', + }, digitalicelandservices: { is: '/s/stafraent-island/thjonustur', en: '/en/o/digital-iceland/island-services', diff --git a/apps/web/pages/en/o/directorate-of-labour/my-pages/index.ts b/apps/web/pages/en/o/directorate-of-labour/my-pages/index.ts new file mode 100644 index 000000000000..9cb0752dbce6 --- /dev/null +++ b/apps/web/pages/en/o/directorate-of-labour/my-pages/index.ts @@ -0,0 +1,12 @@ +import withApollo from '@island.is/web/graphql/withApollo' +import { withLocale } from '@island.is/web/i18n' +import MyPages from '@island.is/web/screens/Organization/DirectorateOfLabour/MyPages' +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('en')(MyPages)) + +export default Screen + +export const getServerSideProps = getServerSidePropsWrapper(Screen) diff --git a/apps/web/pages/s/vinnumalastofnun/minar-sidur/index.ts b/apps/web/pages/s/vinnumalastofnun/minar-sidur/index.ts new file mode 100644 index 000000000000..54fa63d3105b --- /dev/null +++ b/apps/web/pages/s/vinnumalastofnun/minar-sidur/index.ts @@ -0,0 +1,12 @@ +import withApollo from '@island.is/web/graphql/withApollo' +import { withLocale } from '@island.is/web/i18n' +import MyPages from '@island.is/web/screens/Organization/DirectorateOfLabour/MyPages' +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')(MyPages)) + +export default Screen + +export const getServerSideProps = getServerSidePropsWrapper(Screen) diff --git a/apps/web/screens/Organization/DirectorateOfLabour/MyPages.strings.ts b/apps/web/screens/Organization/DirectorateOfLabour/MyPages.strings.ts new file mode 100644 index 000000000000..18317d68ca6b --- /dev/null +++ b/apps/web/screens/Organization/DirectorateOfLabour/MyPages.strings.ts @@ -0,0 +1,80 @@ +import { defineMessages } from 'react-intl' + +export const m = defineMessages({ + mainTitle: { + id: 'web.directorateOfLabour.myPages:mainTitle', + defaultMessage: 'Mínar síður Vinnumálastofnunar', + description: 'Mínar síður Vinnumálastofnunar', + }, + individualsLabel: { + id: 'web.directorateOfLabour.myPages:individualsLabel', + defaultMessage: 'Einstaklingar', + description: 'Einstaklingar', + }, + individualsDescription: { + id: 'web.directorateOfLabour.myPages:individualsDescription', + defaultMessage: 'Mínar síður fyrir einstaklinga.', + description: 'Mínar síður fyrir einstaklinga.', + }, + individualsHref: { + id: 'web.directorateOfLabour.myPages:individualsHref', + defaultMessage: 'https://vinnumalastofnun.is/islandisatvinnuleitandi', + description: 'https://vinnumalastofnun.is/islandisatvinnuleitandi', + }, + individualsImageSrc: { + id: 'web.directorateOfLabour.myPages:individualsImageSrc', + defaultMessage: + 'https://images.ctfassets.net/8k0h54kbe6bj/74YI1HhTZ5ufC1qSsr2TEF/315ca87541dd256c196d6394a6ecf50b/Vinnumalastofnun-Logo.svg', + description: + 'https://images.ctfassets.net/8k0h54kbe6bj/74YI1HhTZ5ufC1qSsr2TEF/315ca87541dd256c196d6394a6ecf50b/Vinnumalastofnun-Logo.svg', + }, + companyLabel: { + id: 'web.directorateOfLabour.myPages:companyLabel', + defaultMessage: 'Fyrirtæki', + description: 'Fyrirtæki', + }, + companyDescription: { + id: 'web.directorateOfLabour.myPages:companyDescription', + defaultMessage: 'Mínar síður fyrir atvinnurekendur og fyrirtæki.', + description: 'Mínar síður fyrir atvinnurekendur og fyrirtæki.', + }, + companyHref: { + id: 'web.directorateOfLabour.myPages:companyHref', + defaultMessage: 'https://vinnumalastofnun.is/islandisatvinnurekandi', + description: 'https://vinnumalastofnun.is/islandisatvinnurekandi', + }, + companyImageSrc: { + id: 'web.directorateOfLabour.myPages:companyImageSrc', + defaultMessage: + 'https://images.ctfassets.net/8k0h54kbe6bj/74YI1HhTZ5ufC1qSsr2TEF/315ca87541dd256c196d6394a6ecf50b/Vinnumalastofnun-Logo.svg', + description: + 'https://images.ctfassets.net/8k0h54kbe6bj/74YI1HhTZ5ufC1qSsr2TEF/315ca87541dd256c196d6394a6ecf50b/Vinnumalastofnun-Logo.svg', + }, + parentalLeaveLabel: { + id: 'web.directorateOfLabour.myPages:parentalLeaveLabel', + defaultMessage: 'Fæðingarorlof', + description: 'Fæðingarorlof', + }, + parentalLeaveDescription: { + id: 'web.directorateOfLabour.myPages:parentalLeaveDescription', + defaultMessage: 'Innsend umsókn um fæðingarorlof.', + description: 'Innsend umsókn um fæðingarorlof.', + }, + parentalLeaveHref: { + id: 'web.directorateOfLabour.myPages:parentalLeaveHref', + defaultMessage: 'https://island.is/umsoknir/faedingarorlof/', + description: 'https://island.is/umsoknir/faedingarorlof/', + }, + parentalLeaveImageSrc: { + id: 'web.directorateOfLabour.myPages:parentalLeaveImageSrc', + defaultMessage: + 'https://images.ctfassets.net/8k0h54kbe6bj/5ijRCutRCFu4Y9aPS0ys4Z/b809c1cb81df9d27ea99a30e00c2d1e8/is-logo-stakt_2x.png', + description: + 'https://images.ctfassets.net/8k0h54kbe6bj/5ijRCutRCFu4Y9aPS0ys4Z/b809c1cb81df9d27ea99a30e00c2d1e8/is-logo-stakt_2x.png', + }, + loginLabel: { + id: 'web.directorateOfLabour.myPages:loginLabel', + defaultMessage: 'Innskráning', + description: 'Innskráning', + }, +}) diff --git a/apps/web/screens/Organization/DirectorateOfLabour/MyPages.tsx b/apps/web/screens/Organization/DirectorateOfLabour/MyPages.tsx new file mode 100644 index 000000000000..997f62bffed9 --- /dev/null +++ b/apps/web/screens/Organization/DirectorateOfLabour/MyPages.tsx @@ -0,0 +1,176 @@ +import { useIntl } from 'react-intl' +import { useRouter } from 'next/router' + +import { + Box, + CategoryCard, + GridColumn, + GridRow, + Stack, + Text, +} from '@island.is/island-ui/core' +import { + OrganizationFooter, + OrganizationWrapper, +} from '@island.is/web/components' +import { + ContentLanguage, + CustomPageUniqueIdentifier, + GetNamespaceQuery, + OrganizationPage, + Query, + QueryGetNamespaceArgs, + QueryGetOrganizationPageArgs, +} from '@island.is/web/graphql/schema' +import { useNamespace } from '@island.is/web/hooks' +import { useI18n } from '@island.is/web/i18n' +import { withMainLayout } from '@island.is/web/layouts/main' +import { CustomNextError } from '@island.is/web/units/errors' +import { getOrganizationSidebarNavigationItems } from '@island.is/web/utils/organization' +import { webRichText } from '@island.is/web/utils/richText' + +import { + CustomScreen, + withCustomPageWrapper, +} from '../../CustomPage/CustomPageWrapper' +import { GET_NAMESPACE_QUERY, GET_ORGANIZATION_PAGE_QUERY } from '../../queries' +import { m } from './MyPages.strings' + +interface MyPagesProps { + organizationPage: OrganizationPage + namespace: Record +} + +const MyPages: CustomScreen = ({ + organizationPage, + namespace, + customPageData, +}) => { + const n = useNamespace(namespace) + const router = useRouter() + const baseRouterPath = router.asPath.split('?')[0].split('#')[0] + const { activeLocale } = useI18n() + const { formatMessage } = useIntl() + + return ( + + + + + {formatMessage(m.mainTitle)} + + + + {webRichText( + customPageData?.content ?? [], + undefined, + activeLocale, + )} + + + + + + + + + + + + } + > + {organizationPage.organization && ( + + )} + + ) +} + +MyPages.getProps = async ({ apolloClient, locale }) => { + const organizationSlug = + locale === 'en' ? 'directorate-of-labour' : 'vinnumalastofnun' + + const [ + { + data: { getOrganizationPage }, + }, + namespace, + ] = await Promise.all([ + apolloClient.query({ + query: GET_ORGANIZATION_PAGE_QUERY, + variables: { + input: { + slug: organizationSlug, + lang: locale as ContentLanguage, + }, + }, + }), + apolloClient + .query({ + query: GET_NAMESPACE_QUERY, + variables: { + input: { + namespace: 'OrganizationPages', + lang: locale as ContentLanguage, + }, + }, + }) + .then((res) => + res.data.getNamespace?.fields + ? JSON.parse(res.data.getNamespace.fields) + : {}, + ), + ]) + + if (!getOrganizationPage) { + throw new CustomNextError(404, 'Organization page not found') + } + + return { + organizationPage: getOrganizationPage, + namespace, + } +} + +export default withMainLayout( + withCustomPageWrapper( + CustomPageUniqueIdentifier.DirectorateOfLabourMyPages, + MyPages, + ), + { + footerVersion: 'organization', + }, +) diff --git a/libs/cms/src/lib/generated/contentfulTypes.d.ts b/libs/cms/src/lib/generated/contentfulTypes.d.ts index 2f49a4508978..a89e0103bf9e 100644 --- a/libs/cms/src/lib/generated/contentfulTypes.d.ts +++ b/libs/cms/src/lib/generated/contentfulTypes.d.ts @@ -771,6 +771,7 @@ export interface ICustomPageFields { | 'OfficialJournalOfIceland' | 'Vacancies' | 'Grants' + | 'DirectorateOfLabourMyPages' | undefined /** Alert Banner */ diff --git a/libs/shared/types/src/lib/api-cms-domain.ts b/libs/shared/types/src/lib/api-cms-domain.ts index 3f34d00e515f..0cd76ef7a23b 100644 --- a/libs/shared/types/src/lib/api-cms-domain.ts +++ b/libs/shared/types/src/lib/api-cms-domain.ts @@ -7,6 +7,7 @@ export enum CustomPageUniqueIdentifier { OfficialJournalOfIceland = 'OfficialJournalOfIceland', Vacancies = 'Vacancies', Grants = 'Grants', + DirectorateOfLabourMyPages = 'DirectorateOfLabourMyPages', } export interface StatisticSourceValue { From 942a423213df275d2b55582491e023da17330d91 Mon Sep 17 00:00:00 2001 From: runarvestmann Date: Mon, 23 Dec 2024 15:02:54 +0000 Subject: [PATCH 2/2] Update codeowners --- .github/CODEOWNERS | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index fab199409190..139926a70c1f 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -18,6 +18,7 @@ /libs/portals/admin/ @island-is/aranja /libs/portals/core/ @island-is/aranja @island-is/hugsmidjan /libs/shared/connected/ @island-is/stefna +/libs/shared/types/src/lib/api-cms-domain.ts @island-is/stefna /* @island-is/core /libs/api/domains/identity/ @island-is/core