Skip to content

Commit

Permalink
fix(signature-collection): renaming templates to presidential specific (
Browse files Browse the repository at this point in the history
#15328)

* fix(signature-collection): renaming templates to presidential specific

* minor tweaks

* chore: nx format:write update dirty files

* test commit

* build fix

---------

Co-authored-by: andes-it <builders@andes.is>
  • Loading branch information
albinagu and andes-it authored Jun 25, 2024
1 parent f7b065e commit 0f98314
Show file tree
Hide file tree
Showing 53 changed files with 60 additions and 63 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { EmailTemplateGenerator } from '../../../../../types'
import { CreateListSchema } from '@island.is/application/templates/signature-collection/signature-list-creation'
import { CreateListSchema } from '@island.is/application/templates/signature-collection/presidential-list-creation'
import { OwnerInput } from '@island.is/clients/signature-collection'
import { SignatureCollection } from '../types'
import { Message, Body } from '@island.is/email-service'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { ProviderErrorReason } from '@island.is/shared/problem'
import {
CreateListSchema,
errorMessages,
} from '@island.is/application/templates/signature-collection/signature-list-creation'
} from '@island.is/application/templates/signature-collection/presidential-list-creation'
import { TemplateApiError } from '@island.is/nest/problem'
import { SignatureCollection } from './types'
import type { Logger } from '@island.is/logging'
Expand All @@ -26,7 +26,7 @@ export class SignatureListCreationService extends BaseTemplateApiService {
private readonly sharedTemplateAPIService: SharedTemplateApiService,
private signatureCollectionClientService: SignatureCollectionClientService,
) {
super(ApplicationTypes.SIGNATURE_LIST_CREATION)
super(ApplicationTypes.PRESIDENTIAL_LIST_CREATION)
}

async createLists({ auth, application }: TemplateApiModuleActionProps) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ import {
SignatureCollectionClientService,
} from '@island.is/clients/signature-collection'
import { TemplateApiError } from '@island.is/nest/problem'
import { errorMessages } from '@island.is/application/templates/signature-collection/signature-list-signing'
import { errorMessages } from '@island.is/application/templates/signature-collection/presidential-list-signing'
import { ProviderErrorReason } from '@island.is/shared/problem'

@Injectable()
export class SignatureListSigningService extends BaseTemplateApiService {
constructor(
private signatureCollectionClientService: SignatureCollectionClientService,
) {
super(ApplicationTypes.SIGNATURE_LIST_SIGNING)
super(ApplicationTypes.PRESIDENTIAL_LIST_SIGNING)
}

async signList({ auth, application }: TemplateApiModuleActionProps) {
Expand Down
8 changes: 4 additions & 4 deletions libs/application/template-loader/src/lib/templateLoaders.ts
Original file line number Diff line number Diff line change
Expand Up @@ -129,13 +129,13 @@ const templates: Record<ApplicationTypes, () => Promise<unknown>> = {
),
[ApplicationTypes.CAR_RECYCLING]: () =>
import('@island.is/application/templates/car-recycling'),
[ApplicationTypes.SIGNATURE_LIST_CREATION]: () =>
[ApplicationTypes.PRESIDENTIAL_LIST_CREATION]: () =>
import(
'@island.is/application/templates/signature-collection/signature-list-creation'
'@island.is/application/templates/signature-collection/presidential-list-creation'
),
[ApplicationTypes.SIGNATURE_LIST_SIGNING]: () =>
[ApplicationTypes.PRESIDENTIAL_LIST_SIGNING]: () =>
import(
'@island.is/application/templates/signature-collection/signature-list-signing'
'@island.is/application/templates/signature-collection/presidential-list-signing'
),
[ApplicationTypes.CITIZENSHIP]: () =>
import(
Expand Down
7 changes: 5 additions & 2 deletions libs/application/templates/signature-collection/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,8 @@

Application folder containing two processes used for Signature Collection

- Signature List Creation
- Signature List Signing
- Presidential List Creation
- Presidential List Signing

- Parliamentary List Creation
- Parliamentary List Signing
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# application-templates-presidential-list-creation

This library was generated with [Nx](https://nx.dev).

## Running unit tests

Run `nx test application-templates-presidential-list-creation` to execute the unit tests via [Jest](https://jestjs.io).
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable */
export default {
displayName: 'application-templates-signature-list-creation',
displayName: 'application-templates-presidential-list-creation',
preset: './jest.preset.js',
rootDir: '../../../../..',
roots: [__dirname],
Expand All @@ -9,5 +9,5 @@ export default {
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
coverageDirectory:
'<rootDir>/coverage/libs/application/templates/signature-collection/signature-list-creation',
'<rootDir>/coverage/libs/application/templates/signature-collection/presidential-list-creation',
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "application-templates-signature-list-creation",
"name": "application-templates-presidential-list-creation",
"$schema": "../../../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/application/templates/signature-collection/signature-list-creation/src",
"sourceRoot": "libs/application/templates/signature-collection/presidential-list-creation/src",
"projectType": "library",
"tags": ["scope:application-system", "lib:application-system"],
"targets": {
Expand All @@ -10,24 +10,24 @@
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": [
"libs/application/templates/signature-collection/signature-list-creation/**/*.{ts,tsx,js,jsx}"
"libs/application/templates/signature-collection/presidential-list-creation/**/*.{ts,tsx,js,jsx}"
]
}
},
"test": {
"executor": "@nx/jest:jest",
"outputs": [
"{workspaceRoot}/coverage/libs/application/templates/signature-collection/signature-list-creation"
"{workspaceRoot}/coverage/libs/application/templates/signature-collection/presidential-list-creation"
],
"options": {
"jestConfig": "libs/application/templates/signature-collection/signature-list-creation/jest.config.ts",
"jestConfig": "libs/application/templates/signature-collection/presidential-list-creation/jest.config.ts",
"passWithNoTests": true
}
},
"extract-strings": {
"executor": "nx:run-commands",
"options": {
"command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/application/templates/signature-collection/signature-list-creation/src/**/*.{js,ts,tsx}'"
"command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/application/templates/signature-collection/presidential-list-creation/src/**/*.{js,ts,tsx}'"
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import {
buildMultiField,
buildSection,
buildMessageWithLinkButtonField,
coreMessages,
buildDescriptionField,
} from '@island.is/application/core'
import { Form, FormModes } from '@island.is/application/types'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import { formatPhone } from '../lib/utils'
import format from 'date-fns/format'

export const Draft: Form = buildForm({
id: 'SignatureListCreationDraft',
id: 'PresidentialListCreationDraft',
title: '',
mode: FormModes.DRAFT,
renderLastScreenButton: true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import {
UserProfileApi,
defineTemplateApi,
} from '@island.is/application/types'
import { Features } from '@island.is/feature-flags'
import { ApiActions, Events, Roles, States } from './constants'
import { dataSchema } from './dataSchema'
import { m } from './messages'
Expand All @@ -29,10 +28,9 @@ const CreateListTemplate: ApplicationTemplate<
ApplicationStateSchema<Events>,
Events
> = {
type: ApplicationTypes.SIGNATURE_LIST_CREATION,
type: ApplicationTypes.PRESIDENTIAL_LIST_CREATION,
name: m.applicationName,
institution: m.institution,
featureFlag: Features.signatureListCreation,
dataSchema,
stateMachineConfig: {
initial: States.PREREQUISITES,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ export const dataSchema = z.object({
}),
})

export type SignatureListSchema = z.TypeOf<typeof dataSchema>
export type PresidentialCreateListSchema = z.TypeOf<typeof dataSchema>
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# application-templates-presidential-list-signing

This library was generated with [Nx](https://nx.dev).

## Running unit tests

Run `nx test application-templates-presidential-list-signing` to execute the unit tests via [Jest](https://jestjs.io).
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable */
export default {
displayName: 'application-templates-signature-list-signing',
displayName: 'application-templates-presidential-list-signing',
preset: './jest.preset.js',
rootDir: '../../../../..',
roots: [__dirname],
Expand All @@ -9,5 +9,5 @@ export default {
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
coverageDirectory:
'<rootDir>/coverage/libs/application/templates/signature-collection/signature-list-signing',
'<rootDir>/coverage/libs/application/templates/signature-collection/presidential-list-signing',
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "application-templates-signature-list-signing",
"name": "application-templates-presidential-list-signing",
"$schema": "../../../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/application/templates/signature-collection/signature-list-signing/src",
"sourceRoot": "libs/application/templates/signature-collection/presidential-list-signing/src",
"projectType": "library",
"tags": ["scope:application-system", "lib:application-system"],
"targets": {
Expand All @@ -10,24 +10,24 @@
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": [
"libs/application/templates/signature-collection/signature-list-signing/**/*.{ts,tsx,js,jsx}"
"libs/application/templates/signature-collection/presidential-list-signing/**/*.{ts,tsx,js,jsx}"
]
}
},
"test": {
"executor": "@nx/jest:jest",
"outputs": [
"{workspaceRoot}/coverage/libs/application/templates/signature-collection/signature-list-signing"
"{workspaceRoot}/coverage/libs/application/templates/signature-collection/presidential-list-signing"
],
"options": {
"jestConfig": "libs/application/templates/signature-collection/signature-list-signing/jest.config.ts",
"jestConfig": "libs/application/templates/signature-collection/presidential-list-signing/jest.config.ts",
"passWithNoTests": true
}
},
"extract-strings": {
"executor": "nx:run-commands",
"options": {
"command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/application/templates/signature-collection/signature-list-signing/src/**/*.{js,ts,tsx}'"
"command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/application/templates/signature-collection/presidential-list-signing/src/**/*.{js,ts,tsx}'"
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import {
UserProfileApi,
defineTemplateApi,
} from '@island.is/application/types'
import { Features } from '@island.is/feature-flags'
import { ApiActions, Events, Roles, States } from './constants'
import { dataSchema } from './dataSchema'
import { m } from './messages'
Expand All @@ -26,17 +25,16 @@ export const WeekLifeCycle: StateLifeCycle = {
}

const configuration =
ApplicationConfigurations[ApplicationTypes.SIGNATURE_LIST_SIGNING]
ApplicationConfigurations[ApplicationTypes.PRESIDENTIAL_LIST_SIGNING]

const SignListTemplate: ApplicationTemplate<
ApplicationContext,
ApplicationStateSchema<Events>,
Events
> = {
type: ApplicationTypes.SIGNATURE_LIST_SIGNING,
type: ApplicationTypes.PRESIDENTIAL_LIST_SIGNING,
name: m.applicationName,
institution: m.institution,
featureFlag: Features.signatureListCreation,
initialQueryParameter: 'candidate',
dataSchema,
translationNamespaces: [configuration.translation],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ export const dataSchema = z.object({
listId: z.string().min(1),
})

export type SignatureListSchema = z.TypeOf<typeof dataSchema>
export type PresidentialSignListSchema = z.TypeOf<typeof dataSchema>

This file was deleted.

This file was deleted.

8 changes: 4 additions & 4 deletions libs/application/types/src/lib/ApplicationTypes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ export enum ApplicationTypes {
OLD_AGE_PENSION = 'OldAgePension',
HOUSEHOLD_SUPPLEMENT = 'HouseholdSupplement',
CAR_RECYCLING = 'CarRecycling',
SIGNATURE_LIST_CREATION = 'SignatureListCreation',
SIGNATURE_LIST_SIGNING = 'SignatureListSigning',
PRESIDENTIAL_LIST_CREATION = 'PresidentialListCreation',
PRESIDENTIAL_LIST_SIGNING = 'PresidentialListSigning',
CITIZENSHIP = 'Citizenship',
ADDITIONAL_SUPPORT_FOR_THE_ELDERLY = 'AdditionalSupportForTheElderly',
ENERGY_FUNDS = 'EnergyFunds',
Expand Down Expand Up @@ -277,11 +277,11 @@ export const ApplicationConfigurations = {
slug: 'skilavottord',
translation: 'rf.cr.application',
},
[ApplicationTypes.SIGNATURE_LIST_CREATION]: {
[ApplicationTypes.PRESIDENTIAL_LIST_CREATION]: {
slug: 'medmaelasofnun',
translation: 'slc.application',
},
[ApplicationTypes.SIGNATURE_LIST_SIGNING]: {
[ApplicationTypes.PRESIDENTIAL_LIST_SIGNING]: {
slug: 'maela-med-frambodi',
translation: 'sls.application',
},
Expand Down
4 changes: 2 additions & 2 deletions libs/application/types/src/lib/InstitutionMapper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -207,11 +207,11 @@ export const institutionMapper = {
nationalId: InstitutionNationalIds.URVINNSLUSJODUR,
slug: InstitutionTypes.URVINNSLUSJODUR,
},
[ApplicationTypes.SIGNATURE_LIST_CREATION]: {
[ApplicationTypes.PRESIDENTIAL_LIST_CREATION]: {
nationalId: InstitutionNationalIds.THJODSKRA,
slug: InstitutionTypes.THJODSKRA,
},
[ApplicationTypes.SIGNATURE_LIST_SIGNING]: {
[ApplicationTypes.PRESIDENTIAL_LIST_SIGNING]: {
nationalId: InstitutionNationalIds.THJODSKRA,
slug: InstitutionTypes.THJODSKRA,
},
Expand Down
1 change: 0 additions & 1 deletion libs/feature-flags/src/lib/features.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ export enum Features {
alcoholTaxRedemption = 'isAlcoholTaxRedemptionEnabled',
consultationPortalApplication = 'isConsultationPortalEnabled',
childrenResidenceChangeV2 = 'isChildrenResidenceChangeV2Enabled',
signatureListCreation = 'isSignatureListCreationEnabled',
citizenship = 'isCitizenshipEnabled',
energyFunds = 'isEnergyFundsEnabled',
complaintsToAlthingiOmbudsman = 'isComplaintToAlthingiOmbudsmanEnabled',
Expand Down
8 changes: 4 additions & 4 deletions tsconfig.base.json
Original file line number Diff line number Diff line change
Expand Up @@ -481,11 +481,11 @@
"@island.is/application/templates/reference-template": [
"libs/application/templates/reference-template/src/index.ts"
],
"@island.is/application/templates/signature-collection/signature-list-creation": [
"libs/application/templates/signature-collection/signature-list-creation/src/index.ts"
"@island.is/application/templates/signature-collection/presidential-list-creation": [
"libs/application/templates/signature-collection/presidential-list-creation/src/index.ts"
],
"@island.is/application/templates/signature-collection/signature-list-signing": [
"libs/application/templates/signature-collection/signature-list-signing/src/index.ts"
"@island.is/application/templates/signature-collection/presidential-list-signing": [
"libs/application/templates/signature-collection/presidential-list-signing/src/index.ts"
],
"@island.is/application/templates/social-insurance-administration-core/*": [
"libs/application/templates/social-insurance-administration/core/src/*"
Expand Down

0 comments on commit 0f98314

Please sign in to comment.