feat(form-system) Updated form builder to work with the new backend

.eslintrc.json

@@ -42,6 +42,7 @@
                 "onlyDependOnLibsWithTags": [
                   "lib:portals-admin",
                   "lib:application-system",
+                  "lib:form-system",
                   "lib:portals",
                   "lib:react-spa",
                   "lib:react",

apps/api/infra/api.ts

@@ -66,6 +66,7 @@ export const serviceSetup = (services: {
   authAdminApi: ServiceBuilder<'services-auth-admin-api'>
   universityGatewayApi: ServiceBuilder<'services-university-gateway'>
   userNotificationService: ServiceBuilder<'services-user-notification'>
+  formSystemService: ServiceBuilder<'api-domains-form-system'>
 }): ServiceBuilder<'api'> => {
   return service('api')
     .namespace('islandis')
@@ -193,10 +194,13 @@ export const serviceSetup = (services: {
       FINANCIAL_STATEMENTS_INAO_TOKEN_ENDPOINT:
         'https://login.microsoftonline.com/05a20268-aaea-4bb5-bb78-960b0462185e/oauth2/v2.0/token',
       FORM_SYSTEM_API_BASE_PATH: {
-        dev: 'https://profun.island.is/umsoknarkerfi',
+        dev: 'http://localhost:3434',
         staging: '',
         prod: '',
       },
+      // FORM_SYSTEM_API_BASE_PATH: ref(
+      //   (h) => `http://${h.svc(services.formSystemService)}`,
+      // ),
       CONSULTATION_PORTAL_CLIENT_BASE_PATH: {
         dev: 'https://samradapi-test.devland.is',
         staging: 'https://samradapi-test.devland.is',

apps/judicial-system/api/src/app/modules/file/file.controller.ts

@@ -31,7 +31,7 @@ export class FileController {
     private readonly fileService: FileService,
     @Inject(LOGGER_PROVIDER)
     private readonly logger: Logger,
-  ) {}
+  ) { }
 
   @Get('request')
   @Header('Content-Type', 'application/pdf')
@@ -191,8 +191,7 @@ export class FileController {
     @Query('subpoenaType') subpoenaType?: SubpoenaType,
   ): Promise<Response> {
     this.logger.debug(
-      `Getting subpoena ${
-        subpoenaId ?? 'draft'
+      `Getting subpoena ${subpoenaId ?? 'draft'
       } for defendant ${defendantId} of case ${id} as a pdf document`,
     )
 

apps/judicial-system/api/src/app/modules/file/limitedAccessFile.controller.ts

@@ -6,6 +6,7 @@ import {
   Header,
   Inject,
   Param,
+  Query,
   Req,
   Res,
   UseGuards,
@@ -19,7 +20,7 @@ import {
   CurrentHttpUser,
   JwtInjectBearerAuthGuard,
 } from '@island.is/judicial-system/auth'
-import type { User } from '@island.is/judicial-system/types'
+import type { SubpoenaType, User } from '@island.is/judicial-system/types'
 
 import { FileService } from './file.service'
 
@@ -29,7 +30,7 @@ export class LimitedAccessFileController {
   constructor(
     private readonly fileService: FileService,
     @Inject(LOGGER_PROVIDER) private readonly logger: Logger,
-  ) {}
+  ) { }
 
   @Get('request')
   @Header('Content-Type', 'application/pdf')

apps/judicial-system/backend/src/app/modules/case/pdf.service.ts

@@ -51,7 +51,7 @@ export class PdfService {
     private readonly subpoenaService: SubpoenaService,
     @InjectModel(Case) private readonly caseModel: typeof Case,
     @Inject(LOGGER_PROVIDER) private readonly logger: Logger,
-  ) {}
+  ) { }
 
   private formatMessage: FormatMessage = () => {
     throw new InternalServerErrorException('Format message not initialized')
@@ -93,7 +93,7 @@ export class PdfService {
         (caseFile1, caseFile2) =>
           (caseFile1.chapter ?? 0) - (caseFile2.chapter ?? 0) ||
           (caseFile1.orderWithinChapter ?? 0) -
-            (caseFile2.orderWithinChapter ?? 0),
+          (caseFile2.orderWithinChapter ?? 0),
       )
       ?.map((caseFile) => async () => {
         const buffer = await this.awsS3Service

apps/judicial-system/backend/src/app/modules/subpoena/limitedAccessSubpoena.controller.ts

@@ -51,7 +51,7 @@ export class LimitedAccessSubpoenaController {
   constructor(
     private readonly pdfService: PdfService,
     @Inject(LOGGER_PROVIDER) private readonly logger: Logger,
-  ) {}
+  ) { }
 
   @UseGuards(SubpoenaExistsGuard)
   @RolesRules(defenderGeneratedPdfRule)

apps/judicial-system/backend/src/app/modules/subpoena/subpoena.controller.ts

@@ -68,7 +68,7 @@ export class SubpoenaController {
     private readonly pdfService: PdfService,
     private readonly subpoenaService: SubpoenaService,
     @Inject(LOGGER_PROVIDER) private readonly logger: Logger,
-  ) {}
+  ) { }
 
   @RolesRules(
     prosecutorRule,
@@ -125,8 +125,7 @@ export class SubpoenaController {
     @Query('subpoenaType') subpoenaType?: SubpoenaType,
   ): Promise<void> {
     this.logger.debug(
-      `Getting subpoena ${
-        subpoenaId ?? 'draft'
+      `Getting subpoena ${subpoenaId ?? 'draft'
       } for defendant ${defendantId} of case ${caseId} as a pdf document`,
     )
 

apps/portals/admin/infra/portals-admin.ts

@@ -23,6 +23,7 @@ export const serviceSetup = (): ServiceBuilder<'portals-admin'> =>
       SI_PUBLIC_CONFIGCAT_SDK_KEY: '/k8s/configcat/CONFIGCAT_SDK_KEY',
       SI_PUBLIC_DD_RUM_APPLICATION_ID: '/k8s/DD_RUM_APPLICATION_ID',
       SI_PUBLIC_DD_RUM_CLIENT_TOKEN: '/k8s/DD_RUM_CLIENT_TOKEN',
+      FORM_SYSTEM_MIDEIND_KEY: '/k8s/portals-admin/FORM_SYSTEM_MIDEIND_KEY',
     })
     .ingress({
       primary: {

charts/islandis/values.dev.yaml

@@ -302,7 +302,7 @@ api:
     FINANCIAL_STATEMENTS_INAO_TOKEN_ENDPOINT: 'https://login.microsoftonline.com/05a20268-aaea-4bb5-bb78-960b0462185e/oauth2/v2.0/token'
     FISHING_LICENSE_XROAD_PROVIDER_ID: 'IS-DEV/GOV/10012/Fiskistofa-Protected/veidileyfi-v1'
     FISKISTOFA_ZENTER_CLIENT_ID: '1114'
-    FORM_SYSTEM_API_BASE_PATH: 'https://profun.island.is/umsoknarkerfi'
+    FORM_SYSTEM_API_BASE_PATH: 'http://localhost:3434'
     HSN_WEB_FORM_ID: '1dimJFHLFYtnhoYEA3JxRK'
     HUNTING_LICENSE_PASS_TEMPLATE_ID: '1da72d52-a93a-4d0f-8463-1933a2bd210b'
     ICELANDIC_NAMES_REGISTRY_BACKEND_URL: 'http://web-icelandic-names-registry-backend.icelandic-names-registry.svc.cluster.local'
@@ -1871,6 +1871,7 @@ portals-admin:
       memory: '256Mi'
   secrets:
     CONFIGCAT_SDK_KEY: '/k8s/configcat/CONFIGCAT_SDK_KEY'
+    FORM_SYSTEM_MIDEIND_KEY: '/k8s/portals-admin/FORM_SYSTEM_MIDEIND_KEY'
     SI_PUBLIC_CONFIGCAT_SDK_KEY: '/k8s/configcat/CONFIGCAT_SDK_KEY'
     SI_PUBLIC_DD_RUM_APPLICATION_ID: '/k8s/DD_RUM_APPLICATION_ID'
     SI_PUBLIC_DD_RUM_CLIENT_TOKEN: '/k8s/DD_RUM_CLIENT_TOKEN'

charts/islandis/values.prod.yaml

@@ -1738,6 +1738,7 @@ portals-admin:
       memory: '256Mi'
   secrets:
     CONFIGCAT_SDK_KEY: '/k8s/configcat/CONFIGCAT_SDK_KEY'
+    FORM_SYSTEM_MIDEIND_KEY: '/k8s/portals-admin/FORM_SYSTEM_MIDEIND_KEY'
     SI_PUBLIC_CONFIGCAT_SDK_KEY: '/k8s/configcat/CONFIGCAT_SDK_KEY'
     SI_PUBLIC_DD_RUM_APPLICATION_ID: '/k8s/DD_RUM_APPLICATION_ID'
     SI_PUBLIC_DD_RUM_CLIENT_TOKEN: '/k8s/DD_RUM_CLIENT_TOKEN'

charts/islandis/values.staging.yaml

@@ -1609,6 +1609,7 @@ portals-admin:
       memory: '256Mi'
   secrets:
     CONFIGCAT_SDK_KEY: '/k8s/configcat/CONFIGCAT_SDK_KEY'
+    FORM_SYSTEM_MIDEIND_KEY: '/k8s/portals-admin/FORM_SYSTEM_MIDEIND_KEY'
     SI_PUBLIC_CONFIGCAT_SDK_KEY: '/k8s/configcat/CONFIGCAT_SDK_KEY'
     SI_PUBLIC_DD_RUM_APPLICATION_ID: '/k8s/DD_RUM_APPLICATION_ID'
     SI_PUBLIC_DD_RUM_CLIENT_TOKEN: '/k8s/DD_RUM_CLIENT_TOKEN'

charts/services/api/values.dev.yaml

@@ -51,7 +51,7 @@ env:
   FINANCIAL_STATEMENTS_INAO_TOKEN_ENDPOINT: 'https://login.microsoftonline.com/05a20268-aaea-4bb5-bb78-960b0462185e/oauth2/v2.0/token'
   FISHING_LICENSE_XROAD_PROVIDER_ID: 'IS-DEV/GOV/10012/Fiskistofa-Protected/veidileyfi-v1'
   FISKISTOFA_ZENTER_CLIENT_ID: '1114'
-  FORM_SYSTEM_API_BASE_PATH: 'https://profun.island.is/umsoknarkerfi'
+  FORM_SYSTEM_API_BASE_PATH: 'http://localhost:3434'
   HSN_WEB_FORM_ID: '1dimJFHLFYtnhoYEA3JxRK'
   HUNTING_LICENSE_PASS_TEMPLATE_ID: '1da72d52-a93a-4d0f-8463-1933a2bd210b'
   ICELANDIC_NAMES_REGISTRY_BACKEND_URL: 'http://web-icelandic-names-registry-backend.icelandic-names-registry.svc.cluster.local'

charts/services/portals-admin/values.dev.yaml

@@ -75,6 +75,7 @@ resources:
     memory: '256Mi'
 secrets:
   CONFIGCAT_SDK_KEY: '/k8s/configcat/CONFIGCAT_SDK_KEY'
+  FORM_SYSTEM_MIDEIND_KEY: '/k8s/portals-admin/FORM_SYSTEM_MIDEIND_KEY'
   SI_PUBLIC_CONFIGCAT_SDK_KEY: '/k8s/configcat/CONFIGCAT_SDK_KEY'
   SI_PUBLIC_DD_RUM_APPLICATION_ID: '/k8s/DD_RUM_APPLICATION_ID'
   SI_PUBLIC_DD_RUM_CLIENT_TOKEN: '/k8s/DD_RUM_CLIENT_TOKEN'

charts/services/portals-admin/values.prod.yaml

@@ -78,6 +78,7 @@ resources:
     memory: '256Mi'
 secrets:
   CONFIGCAT_SDK_KEY: '/k8s/configcat/CONFIGCAT_SDK_KEY'
+  FORM_SYSTEM_MIDEIND_KEY: '/k8s/portals-admin/FORM_SYSTEM_MIDEIND_KEY'
   SI_PUBLIC_CONFIGCAT_SDK_KEY: '/k8s/configcat/CONFIGCAT_SDK_KEY'
   SI_PUBLIC_DD_RUM_APPLICATION_ID: '/k8s/DD_RUM_APPLICATION_ID'
   SI_PUBLIC_DD_RUM_CLIENT_TOKEN: '/k8s/DD_RUM_CLIENT_TOKEN'

charts/services/portals-admin/values.staging.yaml

@@ -75,6 +75,7 @@ resources:
     memory: '256Mi'
 secrets:
   CONFIGCAT_SDK_KEY: '/k8s/configcat/CONFIGCAT_SDK_KEY'
+  FORM_SYSTEM_MIDEIND_KEY: '/k8s/portals-admin/FORM_SYSTEM_MIDEIND_KEY'
   SI_PUBLIC_CONFIGCAT_SDK_KEY: '/k8s/configcat/CONFIGCAT_SDK_KEY'
   SI_PUBLIC_DD_RUM_APPLICATION_ID: '/k8s/DD_RUM_APPLICATION_ID'
   SI_PUBLIC_DD_RUM_CLIENT_TOKEN: '/k8s/DD_RUM_CLIENT_TOKEN'

infra/src/uber-charts/islandis.ts

@@ -65,6 +65,7 @@ import { serviceSetup as authAdminApiSetup } from '../../../apps/services/auth/a
 
 import { EnvironmentServices } from '.././dsl/types/charts'
 import { ServiceBuilder } from '../dsl/dsl'
+import { serviceSetup as formSystemApiSetup } from '../../../apps/services/form-system/infra/form-system'
 
 const endorsement = endorsementServiceSetup({})
 
@@ -105,6 +106,12 @@ const authAdminApi = authAdminApiSetup()
 const universityGatewayService = universityGatewaySetup()
 const universityGatewayWorker = universityGatewayWorkerSetup()
 
+// const userNotificationService = userNotificationServiceSetup({
+//   userProfileApi: servicePortalApi,
+// })
+
+const formSystemApi = formSystemApiSetup()
+
 const api = apiSetup({
   appSystemApi,
   servicePortalApi,
@@ -117,6 +124,7 @@ const api = apiSetup({
   authAdminApi,
   universityGatewayApi: universityGatewayService,
   userNotificationService,
+  formSystemService: formSystemApi,
 })
 
 const adminPortal = adminPortalSetup()

libs/api/domains/form-system/.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+  "workbench.colorTheme": "Default Dark+"
+}

libs/api/domains/form-system/README.md

@@ -5,3 +5,5 @@ This library was generated with [Nx](https://nx.dev).
 ## Running unit tests
 
 Run `nx test api/domains/form-system` to execute the unit tests via [Jest](https://jestjs.io).
+
+To generate the schema run yarn nx run api:codegen/backend-schema

libs/api/domains/form-system/project.json

@@ -1,5 +1,5 @@
 {
-  "name": "api/domains/form-system",
+  "name": "api-domains-form-system",
   "$schema": "../../../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "libs/api/domains/form-system/src",
   "projectType": "library",

libs/api/domains/form-system/src/dto/applicant.input.ts

@@ -0,0 +1,87 @@
+import { Field, InputType } from '@nestjs/graphql'
+import { LanguageTypeInput } from './languageType.input'
+import { DependencyInput } from './form.input'
+
+@InputType('FormSystemCreateApplicantDtoInput')
+export class FormSystemCreateApplicantDtoInput {
+  @Field(() => String, { nullable: true })
+  formId?: string
+
+  @Field(() => String, { nullable: true })
+  applicantTypeId?: string
+}
+
+@InputType('FormSystemUpdateApplicantDtoInput')
+export class FormSystemUpdateApplicantDtoInput {
+  @Field(() => LanguageTypeInput, { nullable: true })
+  name?: LanguageTypeInput
+}
+
+@InputType('FormSystemCreateApplicantInput')
+export class CreateApplicantInput {
+  @Field(() => FormSystemCreateApplicantDtoInput, { nullable: true })
+  createFormApplicantTypeDto?: FormSystemCreateApplicantDtoInput
+}
+
+@InputType('FormSystemDeleteApplicantInput')
+export class DeleteApplicantInput {
+  @Field(() => String, { nullable: true })
+  id?: string
+}
+
+@InputType('FormSystemUpdateApplicantInput')
+export class UpdateApplicantInput {
+  @Field(() => String, { nullable: true })
+  id?: string
+
+  @Field(() => FormSystemUpdateApplicantDtoInput, { nullable: true })
+  updateFormApplicantTypeDto?: FormSystemUpdateApplicantDtoInput
+}
+
+@InputType('FormSystemUpdateApplicationDependenciesInput')
+export class UpdateApplicationDependenciesInput {
+  @Field(() => [DependencyInput], { nullable: 'itemsAndList' })
+  dependencies?: DependencyInput[]
+
+  @Field(() => [String], { nullable: 'itemsAndList' })
+  completed?: string[]
+}
+
+@InputType('FormSystemFormApplicantInput')
+export class FormApplicantInput {
+  @Field(() => String, { nullable: true })
+  id?: string
+
+  @Field(() => LanguageTypeInput, { nullable: true })
+  description?: LanguageTypeInput
+
+  @Field(() => String, { nullable: true })
+  applicantTypeId?: string
+
+  @Field(() => LanguageTypeInput, { nullable: true })
+  name?: LanguageTypeInput
+
+  @Field(() => [LanguageTypeInput], { nullable: true })
+  nameSuggestions?: LanguageTypeInput[]
+}
+
+@InputType('FormSystemFormApplicantTypeDtoInput')
+export class FormApplicantTypeDtoInput {
+  @Field(() => LanguageTypeInput, { nullable: true })
+  name?: LanguageTypeInput
+}
+
+@InputType('FormSystemFormApplicantTypeUpdateInput')
+export class FormApplicantTypeUpdateInput {
+  @Field(() => String, { nullable: true })
+  id?: string
+
+  @Field(() => FormApplicantTypeDtoInput, { nullable: true })
+  updateFormApplicantTypeDto?: FormApplicantTypeDtoInput
+}
+
+@InputType('FormSystemFormApplicantTypeDeleteInput')
+export class FormApplicantTypeDeleteInput {
+  @Field(() => String, { nullable: true })
+  id?: string
+}