Merge branch 'main' of github.com:island-is/island.is into j-s/indict…

…ment-case-new-subpoena

apps/judicial-system/web/src/routes/Prosecutor/Indictments/Processing/Processing.tsx

@@ -112,9 +112,7 @@ const Processing: FC = () => {
     civilClaimantNationalIdUpdate?.nationalId,
   )
 
-  const stepIsValid =
-    isProcessingStepValidIndictments(workingCase) &&
-    nationalIdNotFound === false
+  const stepIsValid = isProcessingStepValidIndictments(workingCase)
 
   const handleUpdateDefendant = useCallback(
     (updatedDefendant: UpdateDefendantInput) => {

apps/native/app/src/screens/applications/components/applications-preview.tsx

@@ -68,11 +68,15 @@ export const ApplicationsPreview = ({
             />
           }
           progress={
-            type !== 'incomplete'
-              ? undefined
-              : application.actionCard?.draftFinishedSteps ?? 0
+            type === 'incomplete'
+              ? application.actionCard?.draftFinishedSteps ?? 0
+              : undefined
+          }
+          progressTotalSteps={
+            type === 'incomplete'
+              ? application.actionCard?.draftTotalSteps ?? 0
+              : undefined
           }
-          progressTotalSteps={application.actionCard?.draftTotalSteps ?? 0}
           progressMessage={intl.formatMessage(
             {
               id: 'applicationStatusCard.draftProgress',

apps/services/auth/admin-api/infra/auth-admin-api.ts

@@ -62,7 +62,7 @@ export const serviceSetup = (): ServiceBuilder<'services-auth-admin-api'> => {
       SYSLUMENN_HOST: {
         dev: 'https://api.syslumenn.is/staging',
         staging: 'https://api.syslumenn.is/staging',
-        prod: 'https://api.syslumenn.is',
+        prod: 'https://api.syslumenn.is/api',
       },
       SYSLUMENN_TIMEOUT: '3000',
       ZENDESK_CONTACT_FORM_SUBDOMAIN: {

apps/services/auth/delegation-api/infra/delegation-api.ts

@@ -57,7 +57,7 @@ export const serviceSetup = (services: {
       SYSLUMENN_HOST: {
         dev: 'https://api.syslumenn.is/staging',
         staging: 'https://api.syslumenn.is/staging',
-        prod: 'https://api.syslumenn.is',
+        prod: 'https://api.syslumenn.is/api',
       },
       SYSLUMENN_TIMEOUT: '3000',
     })

apps/services/auth/ids-api/infra/ids-api.ts

@@ -86,7 +86,7 @@ export const serviceSetup = (): ServiceBuilder<'services-auth-ids-api'> => {
       SYSLUMENN_HOST: {
         dev: 'https://api.syslumenn.is/staging',
         staging: 'https://api.syslumenn.is/staging',
-        prod: 'https://api.syslumenn.is',
+        prod: 'https://api.syslumenn.is/api',
       },
       SYSLUMENN_TIMEOUT: '3000',
     })

apps/services/auth/personal-representative/infra/personal-representative.ts

@@ -45,7 +45,7 @@ export const serviceSetup =
         SYSLUMENN_HOST: {
           dev: 'https://api.syslumenn.is/staging',
           staging: 'https://api.syslumenn.is/staging',
-          prod: 'https://api.syslumenn.is',
+          prod: 'https://api.syslumenn.is/api',
         },
         SYSLUMENN_TIMEOUT: '3000',
       })

apps/services/auth/public-api/infra/auth-public-api.ts

@@ -66,7 +66,7 @@ export const serviceSetup = (): ServiceBuilder<'services-auth-public-api'> => {
       SYSLUMENN_HOST: {
         dev: 'https://api.syslumenn.is/staging',
         staging: 'https://api.syslumenn.is/staging',
-        prod: 'https://api.syslumenn.is',
+        prod: 'https://api.syslumenn.is/api',
       },
       SYSLUMENN_TIMEOUT: '3000',
     })

apps/web/components/Organization/Wrapper/OrganizationWrapper.css.ts

@@ -105,6 +105,29 @@ export const rikissaksoknariHeaderGridContainerWidth = style([
 export const rikissaksoknariHeaderGridContainerSubpage =
   rikissaksoknariHeaderGridContainerBase
 
+export const hsaHeaderGridContainerBase = style({
+  display: 'grid',
+  maxWidth: '1342px',
+  margin: '0 auto',
+  ...themeUtils.responsiveStyle({
+    lg: {
+      gridTemplateRows: '315px',
+      gridTemplateColumns: '65fr 35fr',
+    },
+  }),
+})
+
+export const hsaHeaderGridContainerWidthSubpage = hsaHeaderGridContainerBase
+
+export const hsaHeaderGridContainerWidth = style([
+  hsaHeaderGridContainerBase,
+  themeUtils.responsiveStyle({
+    lg: {
+      background: `url('https://images.ctfassets.net/8k0h54kbe6bj/uc45ywvPOYsIUEQTNfE6s/72fd0f2229407e18c6e2908fb13f51c3/Header_HSA.png') no-repeat right bottom,linear-gradient(90deg, #CCDFFF 0%, #F6F6F6 84.85%)`,
+    },
+  }),
+])
+
 export const rikislogmadurHeaderGridContainerWidthBase = style({
   display: 'grid',
   maxWidth: '1342px',

apps/web/components/Organization/Wrapper/OrganizationWrapper.tsx

@@ -478,7 +478,16 @@ export const OrganizationHeader: React.FC<
         />
       )
     case 'hsa':
-      return (
+      return n('usingDefaultHeader', false) ? (
+        <DefaultHeader
+          {...defaultProps}
+          className={
+            isSubpage
+              ? styles.hsaHeaderGridContainerWidthSubpage
+              : styles.hsaHeaderGridContainerWidth
+          }
+        />
+      ) : (
         <HeilbrigdisstofnunAusturlandsHeader
           organizationPage={organizationPage}
           logoAltText={logoAltText}

charts/identity-server/values.prod.yaml

@@ -222,7 +222,7 @@ services-auth-admin-api:
     LOG_LEVEL: 'info'
     NODE_OPTIONS: '--max-old-space-size=691 -r dd-trace/init'
     SERVERSIDE_FEATURES_ON: 'driving-license-use-v1-endpoint-for-v2-comms'
-    SYSLUMENN_HOST: 'https://api.syslumenn.is'
+    SYSLUMENN_HOST: 'https://api.syslumenn.is/api'
     SYSLUMENN_TIMEOUT: '3000'
     XROAD_BASE_PATH: 'http://securityserver.island.is'
     XROAD_BASE_PATH_WITH_ENV: 'http://securityserver.island.is/r1/IS'
@@ -312,7 +312,7 @@ services-auth-delegation-api:
     LOG_LEVEL: 'info'
     NODE_OPTIONS: '--max-old-space-size=460 -r dd-trace/init'
     SERVERSIDE_FEATURES_ON: 'driving-license-use-v1-endpoint-for-v2-comms'
-    SYSLUMENN_HOST: 'https://api.syslumenn.is'
+    SYSLUMENN_HOST: 'https://api.syslumenn.is/api'
     SYSLUMENN_TIMEOUT: '3000'
     USER_NOTIFICATION_API_URL: 'https://user-notification.internal.island.is'
     XROAD_BASE_PATH: 'http://securityserver.island.is'
@@ -412,7 +412,7 @@ services-auth-ids-api:
     PUBLIC_URL: 'https://innskra.island.is/api'
     REDIS_NODES: '["clustercfg.general-redis-cluster-group.dnugi2.euw1.cache.amazonaws.com:6379"]'
     SERVERSIDE_FEATURES_ON: 'driving-license-use-v1-endpoint-for-v2-comms'
-    SYSLUMENN_HOST: 'https://api.syslumenn.is'
+    SYSLUMENN_HOST: 'https://api.syslumenn.is/api'
     SYSLUMENN_TIMEOUT: '3000'
     USER_PROFILE_CLIENT_SCOPE: '["@island.is/user-profile:read"]'
     USER_PROFILE_CLIENT_URL: 'https://service-portal-api.internal.island.is'
@@ -586,7 +586,7 @@ services-auth-personal-representative:
     LOG_LEVEL: 'info'
     NODE_OPTIONS: '--max-old-space-size=460 -r dd-trace/init'
     SERVERSIDE_FEATURES_ON: 'driving-license-use-v1-endpoint-for-v2-comms'
-    SYSLUMENN_HOST: 'https://api.syslumenn.is'
+    SYSLUMENN_HOST: 'https://api.syslumenn.is/api'
     SYSLUMENN_TIMEOUT: '3000'
     XROAD_BASE_PATH: 'http://securityserver.island.is'
     XROAD_BASE_PATH_WITH_ENV: 'http://securityserver.island.is/r1/IS'
@@ -743,7 +743,7 @@ services-auth-public-api:
     PUBLIC_URL: 'https://innskra.island.is/api'
     REDIS_NODES: '["clustercfg.general-redis-cluster-group.dnugi2.euw1.cache.amazonaws.com:6379"]'
     SERVERSIDE_FEATURES_ON: 'driving-license-use-v1-endpoint-for-v2-comms'
-    SYSLUMENN_HOST: 'https://api.syslumenn.is'
+    SYSLUMENN_HOST: 'https://api.syslumenn.is/api'
     SYSLUMENN_TIMEOUT: '3000'
     XROAD_BASE_PATH: 'http://securityserver.island.is'
     XROAD_BASE_PATH_WITH_ENV: 'http://securityserver.island.is/r1/IS'

libs/application/templates/announcement-of-death/src/lib/dataSchema.ts

@@ -118,6 +118,21 @@ export const dataSchema = z.object({
         dateOfBirth: z.string().min(1).optional(),
         dummy: z.boolean().optional(),
       })
+      .refine(
+        ({ name, relation, nationalId, foreignCitizenship, dateOfBirth }) => {
+          const hasNameAndRelation = name && relation
+
+          if (foreignCitizenship && foreignCitizenship.length !== 0) {
+            return Boolean(dateOfBirth) && hasNameAndRelation
+          } else {
+            return Boolean(nationalId) && hasNameAndRelation
+          }
+        },
+        {
+          message: m.errorNoDateOfBirthProvided.defaultMessage,
+          path: ['dateOfBirth'],
+        },
+      )
       .array()
       .optional(),
     encountered: z.boolean().optional(),

libs/application/templates/announcement-of-death/src/lib/messages.ts

@@ -558,6 +558,11 @@ Ef ekkert á við sem hér að ofan er talið rennur arfur í ríkissjóð. Nán
     defaultMessage: 'Númer má ekki vera tómt',
     description: 'Invalid general asset number error message',
   },
+  errorNoDateOfBirthProvided: {
+    id: 'aod.application:error.errorNoDateOfBirthProvided',
+    defaultMessage: 'Fæðingardagur þarf að vera fylltur út',
+    description: 'Date of birth is required',
+  },
 
   /* Announcement */
   announcementTitle: {

libs/application/templates/aosh/register-new-machine/src/forms/RegisterMachineForm/MachineSection/MachineBasicInformation.ts

@@ -1,6 +1,7 @@
 import {
   NO,
   YES,
+  buildAlertMessageField,
   buildCustomField,
   buildDescriptionField,
   buildMultiField,
@@ -11,6 +12,8 @@ import {
 import { information, machine } from '../../../lib/messages'
 import { NEW, USED } from '../../../shared/types'
 import { getAllCountryCodes } from '@island.is/shared/utils'
+import { isNotCEmarked } from '../../../utils'
+import { FormValue } from '@island.is/application/types'
 
 export const MachineBasicInformation = buildSubSection({
   id: 'machineBasicInformation',
@@ -131,6 +134,13 @@ export const MachineBasicInformation = buildSubSection({
           width: 'half',
           maxLength: 50,
         }),
+        buildAlertMessageField({
+          id: 'machine.basicInformation.alert',
+          title: machine.labels.basicMachineInformation.alertTitle,
+          message: machine.labels.basicMachineInformation.alertMessage,
+          alertType: 'warning',
+          condition: (answer: FormValue) => isNotCEmarked(answer),
+        }),
       ],
     }),
   ],

libs/application/templates/aosh/register-new-machine/src/lib/messages/machine.ts

@@ -168,6 +168,17 @@ export const machine = {
         defaultMessage: 'Farmskrárnúmer',
         description: `Basic machine information cargo file number label`,
       },
+      alertTitle: {
+        id: 'aosh.rnm.application:machine.labels.basicMachineInformation.alertTitle',
+        defaultMessage: 'CE merking',
+        description: `Basic machine information alert title`,
+      },
+      alertMessage: {
+        id: 'aosh.rnm.application:machine.labels.basicMachineInformation.alertMessage',
+        defaultMessage:
+          'Ef tæki er ekki CE merkt þarf að skila inn samræmisyfirlýsingu og fleiri viðbótargögnum.',
+        description: `Basic machine information alert message`,
+      },
     }),
     technicalMachineInformation: defineMessages({
       sectionTitle: {

libs/application/templates/aosh/register-new-machine/src/utils/index.ts

@@ -10,3 +10,4 @@ export * from './formatPhoneNumber'
 export * from './formatDate'
 export * from './doOwnerAndImporterHaveSameNationalId'
 export * from './doOwnerAndOperatorHaveSameNationalId'
+export * from './isNotCEmarked'

libs/application/templates/aosh/register-new-machine/src/utils/isNotCEmarked.ts

@@ -0,0 +1,12 @@
+import { getValueViaPath } from '@island.is/application/core'
+import { FormValue, NO, YES } from '@island.is/application/types'
+
+export const isNotCEmarked = (answers: FormValue) => {
+  const markedCE = getValueViaPath(
+    answers,
+    'machine.basicInformation.markedCE',
+    YES,
+  ) as typeof NO | typeof YES
+
+  return markedCE === NO
+}

libs/application/templates/driving-license/src/fields/QualityPhoto/QualityPhoto.tsx

@@ -3,7 +3,6 @@ import React, { FC } from 'react'
 import {
   Box,
   Text,
-  ContentBlock,
   AlertMessage,
   SkeletonLoader,
 } from '@island.is/island-ui/core'

libs/application/templates/driving-license/src/forms/draft/subSectionQualityPhoto.ts

@@ -20,7 +20,7 @@ export const subSectionQualityPhoto = buildSubSection({
   id: 'photoStep',
   title: m.applicationQualityPhotoTitle,
   condition: isVisible(
-    isApplicationForCondition(B_FULL || B_FULL_RENEWAL_65),
+    isApplicationForCondition([B_FULL, B_FULL_RENEWAL_65]),
     hasNoDrivingLicenseInOtherCountry,
   ),
   children: [

libs/application/templates/driving-license/src/forms/prerequisites/sectionDigitalLicenseInfo.ts

@@ -1,5 +1,6 @@
 import {
   buildAlertMessageField,
+  buildDescriptionField,
   buildMultiField,
   buildSubSection,
 } from '@island.is/application/core'
@@ -24,6 +25,12 @@ export const sectionDigitalLicenseInfo = buildSubSection({
               : m.digitalLicenseInfoAlertMessageBFull,
           alertType: 'info',
         }),
+        buildDescriptionField({
+          id: 'extraInfo',
+          title: '',
+          marginTop: 2,
+          description: m.digitalLicenseInfoAlertMessageExtraInfo,
+        }),
       ],
     }),
   ],

libs/application/templates/driving-license/src/lib/messages.ts

@@ -122,18 +122,18 @@ export const m = defineMessages({
   },
   healthDeclarationSectionTitle: {
     id: 'dl.application:healthDeclarationSection.title',
-    defaultMessage: 'Heilbrigðisyfirlýsing',
+    defaultMessage: 'Læknisvottorð',
     description: 'Health declaration',
   },
   healthDeclarationMultiFieldTitle: {
     id: 'dl.application:healthDeclarationMultiField.title',
-    defaultMessage: 'Heilbrigðisyfirlýsing',
+    defaultMessage: 'Læknisvottorð',
     description: 'Health declaration',
   },
   healthDeclarationMultiField65Description: {
     id: 'dl.application:healthDeclarationMultiField65Description#markdown',
     defaultMessage:
-      'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam auctor, nunc nec ultricies ultricies, nunc nisl ultricies nunc, nec ultricies nunc nisl nec nunc. Nullam auctor, nunc nec ultricies ultricies, nunc nisl ultricies nunc, nec ultricies nunc nisl nec nunc.',
+      'Þú þarft að skila inn læknisvottorði vegna ökuleyfis til að endurnýja ökuskírteini þitt. Læknisvottorðið þarf að vera frá **heimilislækni** og vegna ökuleyfis. Þegar búið er að ljúka umsókn þarf að skila inn læknisvottorði á valið sýslumannsembætti til að hægt sé að panta skírteinið.  **Athugið að skírteinið verður ekki pantað fyrr en búið er að skila inn vottorði.**',
     description: 'Health declaration',
   },
   healthDeclarationMultiFieldSubTitle: {
@@ -486,6 +486,12 @@ export const m = defineMessages({
       'Þú ert að sækja um fullnaðarökuskírteini. Ökuskírteini þitt verður núna einungis gefið út sem stafrænt ökuskírteini og verður aðgengilegt fyrir þig þegar þú hefur lokið þessari pöntun um fullnaðarökuskírteini. Fullnaðarökuskírteini þitt verður framleitt í plasti í byrjun febrúar 2025 og sent til þín með Póstinum, á skráð lögheimili þitt um leið og plastökuskírteinið er tilbúið.',
     description: 'Digital driving license',
   },
+  digitalLicenseInfoAlertMessageExtraInfo: {
+    id: 'dl.application:digitalLicenseInfoAlertMessageExtraInfo#markdown',
+    defaultMessage:
+      'Upplýsingar um stafrænt ökuskírteini, hvernig þú sækir það og hleður því í símannn þinn eru aðgengilegar hér [https://island.is/okuskirteini](https://island.is/okuskirteini)',
+    description: 'Digital driving license',
+  },
   congratulationsTempHelpText: {
     id: 'dl.application:congratulationsTempHelpText',
     defaultMessage:

libs/application/templates/driving-license/src/lib/utils/formUtils.ts

@@ -36,14 +36,13 @@ export const isVisible =
   }
 
 export const isApplicationForCondition =
-  (result: DrivingLicenseApplicationFor) => (answers: FormValue) => {
-    const applicationFor =
-      getValueViaPath<DrivingLicenseApplicationFor>(
-        answers,
-        'applicationFor',
-      ) ?? B_FULL
+  (result: DrivingLicenseApplicationFor | DrivingLicenseApplicationFor[]) =>
+  (answers: FormValue) => {
+    const strings = Array.isArray(result) ? result : [result]
 
-    return applicationFor === result
+    return strings.some(
+      (x) => x === getValueViaPath(answers, 'applicationFor') ?? B_FULL,
+    )
   }
 
 export const hasNoDrivingLicenseInOtherCountry = (answers: FormValue) =>

libs/cms/src/lib/models/latestGenericListItems.model.ts

@@ -44,13 +44,18 @@ const mapSeeMorePage = (seeMorePage: IOrganizationSubpage | undefined) => {
   return mapOrganizationSubpage({
     ...seeMorePage,
     fields: {
-      ...seeMorePage.fields,
+      title: seeMorePage.fields?.title,
+      slug: seeMorePage.fields?.slug,
       organizationPage: {
-        ...seeMorePage.fields.organizationPage,
+        ...seeMorePage.fields?.organizationPage,
         fields: {
-          ...seeMorePage.fields.organizationPage?.fields,
-          slices: [],
-          bottomSlices: [],
+          title: seeMorePage.fields?.organizationPage?.fields?.title,
+          slug: seeMorePage.fields?.organizationPage?.fields?.slug,
+          featuredImage:
+            seeMorePage.fields?.organizationPage?.fields?.featuredImage,
+          organization:
+            seeMorePage.fields?.organizationPage?.fields?.organization,
+          theme: seeMorePage.fields?.organizationPage?.fields?.theme,
         },
       },
     },

libs/cms/src/lib/search/contentful.service.ts

@@ -475,7 +475,7 @@ export class ContentfulService {
     let idsChunk = idsCopy.splice(-MAX_REQUEST_COUNT, MAX_REQUEST_COUNT)
 
     while (idsChunk.length > 0) {
-      const size = 1000
+      const size = 100
       let page = 1
 
       const items: string[] = []