Merge branch 'main' into syslumenn-starfsleyfi

island-is · Apr 24, 2024 · 0275abf · 0275abf
2 parents 52e9505 + 5a223db
commit 0275abf
Show file tree

Hide file tree

Showing 788 changed files with 27,659 additions and 5,583 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -58,7 +58,7 @@
 /libs/shared/connected/src/lib/generalPetition/GeneralPetitionLists/                                     @island-is/juni
 /libs/shared/connected/src/lib/SignatureLists/                                                           @island-is/juni
 /libs/api/domains/communications/                                                                        @island-is/juni @island-is/stefna
-/apps/services/user-notification/                                                                        @island-is/juni
+/apps/services/user-notification/                                                                        @island-is/juni @island-is/aranja
 /apps/air-discount-scheme/                                                                               @island-is/hugsmidjan
 /libs/air-discount-scheme/                                                                               @island-is/hugsmidjan
 /libs/application/templates/p-sign/                                                                      @island-is/juni
@@ -127,6 +127,8 @@ libs/clients/rsk/relationships/
 /apps/services/user-profile/                                                                             @island-is/hugsmidjan @island-is/juni @island-is/aranja
 /apps/web/screens/Regulations/                                                                           @island-is/hugsmidjan
 /apps/web/components/Regulations/                                                                        @island-is/hugsmidjan
+/apps/web/screens/OfficialJournalOfIceland/                                                              @island-is/hugsmidjan
+/apps/web/components/OfficialJournalOfIceland/                                                           @island-is/hugsmidjan
 /libs/api/domains/air-discount-scheme                                                                    @island-is/hugsmidjan
 /libs/api/domains/documents/                                                                             @island-is/hugsmidjan
 /libs/api/domains/finance/                                                                               @island-is/hugsmidjan
@@ -147,8 +149,9 @@ libs/clients/rsk/relationships/
 /libs/api/domains/occupational-licenses/                                                                 @island-is/hugsmidjan
 /libs/api/domains/occupational-licenses-v2/                                                              @island-is/hugsmidjan
 /libs/api/domains/intellectual-properties/                                                               @island-is/hugsmidjan
-/libs/api/domains/ministry-of-justice/                                                                   @island-is/hugsmidjan
+/libs/api/domains/official-journal-of-iceland/                                                           @island-is/hugsmidjan
 /libs/api/domains/document-provider/                                                                     @island-is/hugsmidjan @island-is/core
+/libs/api/domains/housing-benefits/                                                                      @island-is/hugsmidjan
 /libs/clients/documents/                                                                                 @island-is/hugsmidjan
 /libs/clients/documents-v2/                                                                              @island-is/hugsmidjan
 /libs/clients/finance/                                                                                   @island-is/hugsmidjan
@@ -176,7 +179,7 @@ libs/clients/rsk/relationships/
 /libs/clients/regulations-admin/                                                                         @island-is/hugsmidjan
 /libs/clients/inna/                                                                                      @island-is/hugsmidjan
 /libs/clients/hms-loans/                                                                                 @island-is/hugsmidjan
-/libs/clients/dmr/                                                                                       @island-is/hugsmidjan
+/libs/clients/official-journal-of-iceland/                                                               @island-is/hugsmidjan
 /libs/clients/hms-housing-benefits/                                                                      @island-is/hugsmidjan
 /apps/services/license-api/                                                                              @island-is/hugsmidjan
 /libs/regulations/                                                                                       @island-is/hugsmidjan

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -603,13 +603,13 @@ jobs:
         if: steps.gather.outcome == 'success'
         run: ./scripts/ci/run-in-parallel.sh 90_$DOCKER_TYPE
         env:
-          EXTRA_DOCKER_BUILD_ARGS: '--build-arg DOCKER_IMAGE_REGISTRY=${{ env.DOCKER_BASE_IMAGE_REGISTRY }}'
+          EXTRA_DOCKER_BUILD_ARGS: '--build-arg DOCKER_IMAGE_REGISTRY=${{ env.DOCKER_BASE_IMAGE_REGISTRY }} --build-arg GIT_SHA=${{ github.sha }}'
 
       - name: Building Docker images Retry #This only exists until GHA starts supporting this
         if: steps.gather.outcome == 'success' && steps.dockerbuild.outcome == 'failure'
         run: ./scripts/ci/run-in-parallel.sh 90_$DOCKER_TYPE
         env:
-          EXTRA_DOCKER_BUILD_ARGS: '--build-arg DOCKER_IMAGE_REGISTRY=${{ env.DOCKER_BASE_IMAGE_REGISTRY }}'
+          EXTRA_DOCKER_BUILD_ARGS: '--build-arg DOCKER_IMAGE_REGISTRY=${{ env.DOCKER_BASE_IMAGE_REGISTRY }} --build-arg GIT_SHA=${{ github.sha }}'
 
   helm-docker-build:
     needs:

diff --git a/.yarn/patches/dd-trace-npm-3.29.1-4e4e5d3a0c.patch b/.yarn/patches/dd-trace-npm-3.29.1-4e4e5d3a0c.patch
diff --git a/.yarn/patches/dd-trace-npm-5.10.0-184ed36e96.patch b/.yarn/patches/dd-trace-npm-5.10.0-184ed36e96.patch
@@ -0,0 +1,44 @@
+diff --git a/packages/dd-trace/src/external-logger/src/index.js b/packages/dd-trace/src/external-logger/src/index.js
+index aa21b20b6e78336329f8f99214a36fde3b9c2c59..523c285768a9f34ba9bc353a5caff6962cf1ff5c 100644
+--- a/packages/dd-trace/src/external-logger/src/index.js
++++ b/packages/dd-trace/src/external-logger/src/index.js
+@@ -81,7 +81,7 @@ class ExternalLogger {
+     let encodedLogs
+
+     if (!this.queue.length) {
+-      setImmediate(() => cb())
++      setTimeout(() => cb(), 0)
+       return
+     }
+
+@@ -93,7 +93,7 @@ class ExternalLogger {
+       encodedLogs = JSON.stringify(logs)
+     } catch (error) {
+       tracerLogger.error(`failed to encode ${numLogs} logs`)
+-      setImmediate(() => cb(error))
++      setTimeout(() => cb(error), 0)
+       return
+     }
+
+diff --git a/packages/dd-trace/src/telemetry/dependencies.js b/packages/dd-trace/src/telemetry/dependencies.js
+index 992dde7d2ec7b6742b55e48bb0941f88d01669bf..9a0559d576663eaff4291edf0fdda6ea51da1456 100644
+--- a/packages/dd-trace/src/telemetry/dependencies.js
++++ b/packages/dd-trace/src/telemetry/dependencies.js
+@@ -32,7 +32,7 @@ function createBatchPayload (payload) {
+ }
+ function waitAndSend (config, application, host) {
+   if (!immediate) {
+-    immediate = setImmediate(() => {
++    immediate = setTimeout(() => {
+       immediate = null
+       if (savedDependenciesToSend.size > 0) {
+         const dependencies = Array.from(savedDependenciesToSend.values())
+@@ -69,7 +69,7 @@ function waitAndSend (config, application, host) {
+           waitAndSend(config, application, host)
+         }
+       }
+-    })
++    }, 0)
+     immediate.unref()
+   }
+ }
diff --git a/.yarn/patches/node-request-interceptor-npm-0.5.9-77e9d9c058.patch b/.yarn/patches/node-request-interceptor-npm-0.5.9-77e9d9c058.patch
@@ -0,0 +1,16 @@
+diff --git a/lib/interceptors/ClientRequest/ClientRequestOverride.js b/lib/interceptors/ClientRequest/ClientRequestOverride.js
+index e1e005c1055587ed12d1084dab3821b93572ca3d..9b2e40afa7ba62680c48df1ad033f738d4c5d3e7 100644
+--- a/lib/interceptors/ClientRequest/ClientRequestOverride.js
++++ b/lib/interceptors/ClientRequest/ClientRequestOverride.js
+@@ -122,9 +122,9 @@ function createClientRequestOverrideClass(middleware, performOriginalRequest, or
+                     callback();
+                 }
+             }
+-            setImmediate(function () {
++            setTimeout(function () {
+                 _this.emit('drain');
+-            });
++            }, 0);
+             return false;
+         };
+         this.end = function () {
diff --git a/apps/api/infra/api.ts b/apps/api/infra/api.ts
@@ -58,6 +58,7 @@ export const serviceSetup = (services: {
   sessionsApi: ServiceBuilder<'services-sessions'>
   authAdminApi: ServiceBuilder<'services-auth-admin-api'>
   universityGatewayApi: ServiceBuilder<'services-university-gateway'>
+  userNotificationService: ServiceBuilder<'services-user-notification'>
 }): ServiceBuilder<'api'> => {
   return service('api')
     .namespace('islandis')
@@ -68,6 +69,9 @@ export const serviceSetup = (services: {
       APPLICATION_SYSTEM_API_URL: ref(
         (h) => `http://${h.svc(services.appSystemApi)}`,
       ),
+      USER_NOTIFICATION_API_URL: ref(
+        (h) => `http://${h.svc(services.userNotificationService)}`,
+      ),
       ICELANDIC_NAMES_REGISTRY_BACKEND_URL: ref(
         (h) => `http://${h.svc(services.icelandicNameRegistryBackend)}`,
       ),
@@ -121,7 +125,7 @@ export const serviceSetup = (services: {
         staging: '[email protected]',
         prod: '[email protected]',
       },
-      SERVICE_USER_PROFILE_URL: ref(
+      USER_PROFILE_CLIENT_URL: ref(
         (h) => `http://${h.svc(services.servicePortalApi)}`,
       ),
       FILE_DOWNLOAD_BUCKET: {
@@ -162,11 +166,6 @@ export const serviceSetup = (services: {
         staging: 'https://identity-server.staging01.devland.is',
         prod: 'https://innskra.island.is',
       },
-      USER_NOTIFICATION_CLIENT_URL: {
-        dev: 'http://user-notification-xrd.internal.dev01.devland.is',
-        staging: 'http://user-notification-xrd.internal.staging01.devland.is',
-        prod: 'https://user-notification-xrd.internal.island.is',
-      },
       MUNICIPALITIES_FINANCIAL_AID_BACKEND_URL: {
         dev: 'http://web-financial-aid-backend',
         staging: 'http://web-financial-aid-backend',

diff --git a/apps/api/src/app/app.module.ts b/apps/api/src/app/app.module.ts
@@ -40,6 +40,7 @@ import { OccupationalLicensesModule } from '@island.is/api/domains/occupational-
 import { OccupationalLicensesV2Module } from '@island.is/api/domains/occupational-licenses-v2'
 import { HealthInsuranceModule } from '@island.is/api/domains/health-insurance'
 import { HmsLoansModule } from '@island.is/api/domains/hms-loans'
+import { HousingBenefitsModule } from '@island.is/api/domains/housing-benefits'
 import { HousingBenefitCalculatorModule } from '@island.is/api/domains/housing-benefit-calculator'
 import { IcelandicGovernmentInstitutionVacanciesModule } from '@island.is/api/domains/icelandic-government-institution-vacancies'
 import { IcelandicNamesModule } from '@island.is/api/domains/icelandic-names-registry'
@@ -49,7 +50,7 @@ import {
 } from '@island.is/api/domains/communications'
 import { IdentityModule } from '@island.is/api/domains/identity'
 import { LicenseServiceModule } from '@island.is/api/domains/license-service'
-import { MinistryOfJusticeModule } from '@island.is/api/domains/ministry-of-justice'
+import { OfficialJournalOfIcelandModule } from '@island.is/api/domains/official-journal-of-iceland'
 import { MortgageCertificateModule } from '@island.is/api/domains/mortgage-certificate'
 import { MunicipalitiesFinancialAidModule } from '@island.is/api/domains/municipalities-financial-aid'
 import { NationalRegistryXRoadModule } from '@island.is/api/domains/national-registry-x-road'
@@ -95,12 +96,18 @@ import { FirearmLicenseClientConfig } from '@island.is/clients/firearm-license'
 import { FishingLicenseClientConfig } from '@island.is/clients/fishing-license'
 import { FiskistofaClientConfig } from '@island.is/clients/fiskistofa'
 import { AircraftRegistryClientConfig } from '@island.is/clients/aircraft-registry'
-import { UserNotificationClientConfig } from '@island.is/clients/user-notification'
+import {
+  UserNotificationClientConfig,
+  UserNotificationSystemClientConfig,
+} from '@island.is/clients/user-notification'
 import {
   HealthDirectorateClientConfig,
   HealthDirectorateClientModule,
 } from '@island.is/clients/health-directorate'
-import { DmrClientConfig, DmrClientModule } from '@island.is/clients/dmr'
+import {
+  OfficialJournalOfIcelandClientConfig,
+  OfficialJournalOfIcelandClientModule,
+} from '@island.is/clients/official-journal-of-iceland'
 import { HmsLoansClientConfig } from '@island.is/clients/hms-loans'
 import { HousingBenefitCalculatorClientConfig } from '@island.is/clients/housing-benefit-calculator'
 import { IcelandicGovernmentInstitutionVacanciesClientConfig } from '@island.is/clients/icelandic-government-institution-vacancies'
@@ -167,6 +174,7 @@ import { GraphQLConfig } from './graphql.config'
 import { HealthController } from './health.controller'
 import { DocumentClientConfig } from '@island.is/clients/documents'
 import { HousingBenefitsConfig } from '@island.is/clients/hms-housing-benefits'
+import { UserProfileClientConfig } from '@island.is/clients/user-profile'
 
 const environment = getConfig
 
@@ -238,8 +246,6 @@ const environment = getConfig
       },
     }),
     UserProfileModule.register({
-      userProfileServiceBasePath:
-        environment.userProfile.userProfileServiceBasePath!,
       islykill: {
         cert: environment.islykill.cert!,
         passphrase: environment.islykill.passphrase!,
@@ -257,7 +263,7 @@ const environment = getConfig
     OccupationalLicensesV2Module,
     SocialInsuranceModule,
     HealthDirectorateClientModule,
-    DmrClientModule,
+    OfficialJournalOfIcelandClientModule,
     DisabilityLicenseModule,
     ElectronicRegistrationsModule,
     FiskistofaModule,
@@ -267,7 +273,7 @@ const environment = getConfig
     ShipRegistryModule,
     IntellectualPropertiesModule,
     StatisticsModule,
-    MinistryOfJusticeModule,
+    OfficialJournalOfIcelandModule,
     CompanyRegistryModule,
     IcelandicNamesModule.register({
       backendUrl: environment.icelandicNamesRegistry.backendUrl!,
@@ -283,6 +289,7 @@ const environment = getConfig
     RightsPortalModule,
     AssetsModule,
     HmsLoansModule,
+    HousingBenefitsModule,
     PassportModule,
     AirDiscountSchemeModule,
     NationalRegistryXRoadModule,
@@ -332,6 +339,7 @@ const environment = getConfig
         DrivingDigitalLicenseClientConfig,
         IntellectualPropertiesClientConfig,
         UserNotificationClientConfig,
+        UserNotificationSystemClientConfig,
         GraphQLConfig,
         VehiclesClientConfig,
         VehiclesMileageClientConfig,
@@ -371,7 +379,7 @@ const environment = getConfig
         JudicialAdministrationClientConfig,
         CommunicationsConfig,
         HealthDirectorateClientConfig,
-        DmrClientConfig,
+        OfficialJournalOfIcelandClientConfig,
         UniversityOfIcelandClientConfig,
         InnaClientConfig,
         SessionsApiClientConfig,
@@ -389,6 +397,7 @@ const environment = getConfig
         SignatureCollectionClientConfig,
         UniversityGatewayApiClientConfig,
         LicenseConfig,
+        UserProfileClientConfig,
       ],
     }),
   ],

diff --git a/apps/api/src/app/environments/environment.ts b/apps/api/src/app/environments/environment.ts
@@ -55,9 +55,6 @@ const prodConfig = () => ({
     username: process.env.XROAD_HEALTH_INSURANCE_V2_XROAD_USERNAME,
     password: process.env.XROAD_HEALTH_INSURANCE_V2_XROAD_PASSWORD,
   },
-  userProfile: {
-    userProfileServiceBasePath: process.env.SERVICE_USER_PROFILE_URL,
-  },
   auth: {
     issuer: process.env.IDENTITY_SERVER_ISSUER_URL,
     audience: ['@island.is', '@admin.island.is'],
@@ -177,9 +174,6 @@ const devConfig = () => ({
     username: process.env.XROAD_HEALTH_INSURANCE_V2_XROAD_USERNAME ?? '',
     password: process.env.XROAD_HEALTH_INSURANCE_V2_XROAD_PASSWORD ?? '',
   },
-  userProfile: {
-    userProfileServiceBasePath: 'http://localhost:3366',
-  },
   auth: {
     issuer: 'https://identity-server.dev01.devland.is',
     audience: ['@island.is', '@admin.island.is'],

diff --git a/apps/application-system/api/infra/application-system-api.ts b/apps/application-system/api/infra/application-system-api.ts
@@ -30,6 +30,7 @@ import {
   ArborgWorkpoint,
   Inna,
   OfficialJournalOfIceland,
+  VehiclesMileage,
 } from '../../../../infra/src/dsl/xroad'
 
 export const GRAPHQL_API_URL_ENV_VAR_NAME = 'GRAPHQL_API_URL' // This property is a part of a circular dependency that is treated specially in certain deployment types
@@ -266,6 +267,7 @@ export const serviceSetup = (services: {
       RskCompanyInfo,
       VehicleServiceFjsV1,
       Inna,
+      VehiclesMileage,
       TransportAuthority,
       Vehicles,
       Passports,

diff --git a/apps/application-system/api/src/app/app.module.ts b/apps/application-system/api/src/app/app.module.ts
@@ -36,7 +36,7 @@ import { ArborgWorkpoinClientConfig } from '@island.is/clients/workpoint/arborg'
 import { SocialInsuranceAdministrationClientConfig } from '@island.is/clients/social-insurance-administration'
 import { SignatureCollectionClientConfig } from '@island.is/clients/signature-collection'
 import { InnaClientConfig } from '@island.is/clients/inna'
-import { DmrClientConfig } from '@island.is/clients/dmr'
+import { OfficialJournalOfIcelandClientConfig } from '@island.is/clients/official-journal-of-iceland'
 
 @Module({
   imports: [
@@ -76,7 +76,7 @@ import { DmrClientConfig } from '@island.is/clients/dmr'
         SocialInsuranceAdministrationClientConfig,
         SignatureCollectionClientConfig,
         InnaClientConfig,
-        DmrClientConfig,
+        OfficialJournalOfIcelandClientConfig,
       ],
     }),
   ],

diff --git a/apps/consultation-portal/components/ActionCard/ActionCard.tsx b/apps/consultation-portal/components/ActionCard/ActionCard.tsx
@@ -59,7 +59,11 @@ const ActionCard = ({ heading, text, button, input }: Props) => {
       dataTestId="action-card"
     >
       <Box display="flex" flexDirection="column">
-        {!!heading && <Text variant="h3">{heading}</Text>}
+        {!!heading && (
+          <Text as="h2" variant="h3">
+            {heading}
+          </Text>
+        )}
         {!!text && <Text paddingTop={1}>{text}</Text>}
       </Box>
       {noInput ? (

diff --git a/apps/consultation-portal/components/Card/Card.css.ts b/apps/consultation-portal/components/Card/Card.css.ts
@@ -1,4 +1,5 @@
 import { style } from '@vanilla-extract/css'
+import { theme } from '@island.is/island-ui/theme'
 
 export const cardBox = style({
   minWidth: '287px',
@@ -12,4 +13,14 @@ export const seperator = style({
 
 export const title = style({
   overflow: 'hidden',
+  height: 100,
+})
+
+export const textContainer = style({
+  '@media': {
+    [`screen and (max-width: ${theme.breakpoints.md}px)`]: {
+      height: 68,
+      overflow: 'hidden',
+    },
+  },
 })
diff --git a/apps/consultation-portal/components/Card/Card.tsx b/apps/consultation-portal/components/Card/Card.tsx
@@ -69,14 +69,12 @@ const Card = ({
           truncate={false}
         />
 
-        <Box
-          style={{ height: showAttachment ? '100px' : '100px' }}
-          className={styles.title}
-          paddingY={2}
-        >
-          <Text as="h4" fontWeight="semiBold">
-            {card.title}
-          </Text>
+        <Box className={styles.title} paddingY={2}>
+          <Box className={styles.textContainer}>
+            <Text as="h2" fontWeight="semiBold">
+              {card.title}
+            </Text>
+          </Box>
         </Box>
         <Inline space={1} alignY={'center'}>
           <Text variant="eyebrow" color="dark400">

diff --git a/apps/consultation-portal/components/Error/Error404/Error404.tsx b/apps/consultation-portal/components/Error/Error404/Error404.tsx
@@ -9,7 +9,7 @@ export const Error404 = () => {
   return (
     <Layout seo={{ title: '404' }}>
       <CustomError statusCode={404} title={loc.title}>
-        <Text variant="h5" paddingBottom={3}>
+        <Text as="h2" variant="h5" paddingBottom={3}>
           {loc.notFoundText}
         </Text>
         <div>