diff --git a/libs/application/template-api-modules/src/lib/modules/templates/signature-collection/signature-list-creation/emailGenerators/applicationSubmitted.ts b/libs/application/template-api-modules/src/lib/modules/templates/signature-collection/signature-list-creation/emailGenerators/applicationSubmitted.ts index d33cdf8c124d..c6d5bd1d7cf6 100644 --- a/libs/application/template-api-modules/src/lib/modules/templates/signature-collection/signature-list-creation/emailGenerators/applicationSubmitted.ts +++ b/libs/application/template-api-modules/src/lib/modules/templates/signature-collection/signature-list-creation/emailGenerators/applicationSubmitted.ts @@ -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' diff --git a/libs/application/template-api-modules/src/lib/modules/templates/signature-collection/signature-list-creation/signature-list-creation.service.ts b/libs/application/template-api-modules/src/lib/modules/templates/signature-collection/signature-list-creation/signature-list-creation.service.ts index 9507b3fef0e1..fb6420d1176d 100644 --- a/libs/application/template-api-modules/src/lib/modules/templates/signature-collection/signature-list-creation/signature-list-creation.service.ts +++ b/libs/application/template-api-modules/src/lib/modules/templates/signature-collection/signature-list-creation/signature-list-creation.service.ts @@ -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' @@ -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) { diff --git a/libs/application/template-api-modules/src/lib/modules/templates/signature-collection/signature-list-signing/signature-list-signing.service.ts b/libs/application/template-api-modules/src/lib/modules/templates/signature-collection/signature-list-signing/signature-list-signing.service.ts index 04c162893627..bb7241b8a66d 100644 --- a/libs/application/template-api-modules/src/lib/modules/templates/signature-collection/signature-list-signing/signature-list-signing.service.ts +++ b/libs/application/template-api-modules/src/lib/modules/templates/signature-collection/signature-list-signing/signature-list-signing.service.ts @@ -7,7 +7,7 @@ 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() @@ -15,7 +15,7 @@ export class SignatureListSigningService extends BaseTemplateApiService { constructor( private signatureCollectionClientService: SignatureCollectionClientService, ) { - super(ApplicationTypes.SIGNATURE_LIST_SIGNING) + super(ApplicationTypes.PRESIDENTIAL_LIST_SIGNING) } async signList({ auth, application }: TemplateApiModuleActionProps) { diff --git a/libs/application/template-loader/src/lib/templateLoaders.ts b/libs/application/template-loader/src/lib/templateLoaders.ts index 1b0eac980988..b147ff0d9916 100644 --- a/libs/application/template-loader/src/lib/templateLoaders.ts +++ b/libs/application/template-loader/src/lib/templateLoaders.ts @@ -129,13 +129,13 @@ const templates: Record Promise> = { ), [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( diff --git a/libs/application/templates/signature-collection/README.md b/libs/application/templates/signature-collection/README.md index cd67dc4ff66e..e3db07244e75 100644 --- a/libs/application/templates/signature-collection/README.md +++ b/libs/application/templates/signature-collection/README.md @@ -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 diff --git a/libs/application/templates/signature-collection/signature-list-creation/.babelrc b/libs/application/templates/signature-collection/presidential-list-creation/.babelrc similarity index 100% rename from libs/application/templates/signature-collection/signature-list-creation/.babelrc rename to libs/application/templates/signature-collection/presidential-list-creation/.babelrc diff --git a/libs/application/templates/signature-collection/signature-list-creation/.eslintrc.json b/libs/application/templates/signature-collection/presidential-list-creation/.eslintrc.json similarity index 100% rename from libs/application/templates/signature-collection/signature-list-creation/.eslintrc.json rename to libs/application/templates/signature-collection/presidential-list-creation/.eslintrc.json diff --git a/libs/application/templates/signature-collection/presidential-list-creation/README.md b/libs/application/templates/signature-collection/presidential-list-creation/README.md new file mode 100644 index 000000000000..6440663b2ee2 --- /dev/null +++ b/libs/application/templates/signature-collection/presidential-list-creation/README.md @@ -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). diff --git a/libs/application/templates/signature-collection/signature-list-creation/jest.config.ts b/libs/application/templates/signature-collection/presidential-list-creation/jest.config.ts similarity index 77% rename from libs/application/templates/signature-collection/signature-list-creation/jest.config.ts rename to libs/application/templates/signature-collection/presidential-list-creation/jest.config.ts index e00b88fa5cdf..586ff6aca1e2 100644 --- a/libs/application/templates/signature-collection/signature-list-creation/jest.config.ts +++ b/libs/application/templates/signature-collection/presidential-list-creation/jest.config.ts @@ -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], @@ -9,5 +9,5 @@ export default { }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], coverageDirectory: - '/coverage/libs/application/templates/signature-collection/signature-list-creation', + '/coverage/libs/application/templates/signature-collection/presidential-list-creation', } diff --git a/libs/application/templates/signature-collection/signature-list-creation/project.json b/libs/application/templates/signature-collection/presidential-list-creation/project.json similarity index 70% rename from libs/application/templates/signature-collection/signature-list-creation/project.json rename to libs/application/templates/signature-collection/presidential-list-creation/project.json index 33a04c8019eb..37c363721338 100644 --- a/libs/application/templates/signature-collection/signature-list-creation/project.json +++ b/libs/application/templates/signature-collection/presidential-list-creation/project.json @@ -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": { @@ -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}'" } } } diff --git a/libs/application/templates/signature-collection/signature-list-creation/src/dataProviders/index.ts b/libs/application/templates/signature-collection/presidential-list-creation/src/dataProviders/index.ts similarity index 100% rename from libs/application/templates/signature-collection/signature-list-creation/src/dataProviders/index.ts rename to libs/application/templates/signature-collection/presidential-list-creation/src/dataProviders/index.ts diff --git a/libs/application/templates/signature-collection/signature-list-creation/src/fields/ListCreated/index.tsx b/libs/application/templates/signature-collection/presidential-list-creation/src/fields/ListCreated/index.tsx similarity index 100% rename from libs/application/templates/signature-collection/signature-list-creation/src/fields/ListCreated/index.tsx rename to libs/application/templates/signature-collection/presidential-list-creation/src/fields/ListCreated/index.tsx diff --git a/libs/application/templates/signature-collection/signature-list-creation/src/fields/ListsInOverview/index.tsx b/libs/application/templates/signature-collection/presidential-list-creation/src/fields/ListsInOverview/index.tsx similarity index 100% rename from libs/application/templates/signature-collection/signature-list-creation/src/fields/ListsInOverview/index.tsx rename to libs/application/templates/signature-collection/presidential-list-creation/src/fields/ListsInOverview/index.tsx diff --git a/libs/application/templates/signature-collection/signature-list-creation/src/fields/index.ts b/libs/application/templates/signature-collection/presidential-list-creation/src/fields/index.ts similarity index 100% rename from libs/application/templates/signature-collection/signature-list-creation/src/fields/index.ts rename to libs/application/templates/signature-collection/presidential-list-creation/src/fields/index.ts diff --git a/libs/application/templates/signature-collection/signature-list-creation/src/forms/Done.ts b/libs/application/templates/signature-collection/presidential-list-creation/src/forms/Done.ts similarity index 99% rename from libs/application/templates/signature-collection/signature-list-creation/src/forms/Done.ts rename to libs/application/templates/signature-collection/presidential-list-creation/src/forms/Done.ts index 856c65650c68..c738ff15fd26 100644 --- a/libs/application/templates/signature-collection/signature-list-creation/src/forms/Done.ts +++ b/libs/application/templates/signature-collection/presidential-list-creation/src/forms/Done.ts @@ -4,7 +4,6 @@ import { buildMultiField, buildSection, buildMessageWithLinkButtonField, - coreMessages, buildDescriptionField, } from '@island.is/application/core' import { Form, FormModes } from '@island.is/application/types' diff --git a/libs/application/templates/signature-collection/signature-list-creation/src/forms/Draft.ts b/libs/application/templates/signature-collection/presidential-list-creation/src/forms/Draft.ts similarity index 99% rename from libs/application/templates/signature-collection/signature-list-creation/src/forms/Draft.ts rename to libs/application/templates/signature-collection/presidential-list-creation/src/forms/Draft.ts index 8f2e76a2adbc..dbf2bf38c22b 100644 --- a/libs/application/templates/signature-collection/signature-list-creation/src/forms/Draft.ts +++ b/libs/application/templates/signature-collection/presidential-list-creation/src/forms/Draft.ts @@ -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, diff --git a/libs/application/templates/signature-collection/signature-list-creation/src/forms/Prerequisites.ts b/libs/application/templates/signature-collection/presidential-list-creation/src/forms/Prerequisites.ts similarity index 100% rename from libs/application/templates/signature-collection/signature-list-creation/src/forms/Prerequisites.ts rename to libs/application/templates/signature-collection/presidential-list-creation/src/forms/Prerequisites.ts diff --git a/libs/application/templates/signature-collection/signature-list-creation/src/index.ts b/libs/application/templates/signature-collection/presidential-list-creation/src/index.ts similarity index 100% rename from libs/application/templates/signature-collection/signature-list-creation/src/index.ts rename to libs/application/templates/signature-collection/presidential-list-creation/src/index.ts diff --git a/libs/application/templates/signature-collection/signature-list-creation/src/lib/CreateListTemplate.ts b/libs/application/templates/signature-collection/presidential-list-creation/src/lib/CreateListTemplate.ts similarity index 96% rename from libs/application/templates/signature-collection/signature-list-creation/src/lib/CreateListTemplate.ts rename to libs/application/templates/signature-collection/presidential-list-creation/src/lib/CreateListTemplate.ts index 54a3e853132a..774ec252300e 100644 --- a/libs/application/templates/signature-collection/signature-list-creation/src/lib/CreateListTemplate.ts +++ b/libs/application/templates/signature-collection/presidential-list-creation/src/lib/CreateListTemplate.ts @@ -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' @@ -29,10 +28,9 @@ const CreateListTemplate: ApplicationTemplate< ApplicationStateSchema, 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, diff --git a/libs/application/templates/signature-collection/signature-list-creation/src/lib/constants.ts b/libs/application/templates/signature-collection/presidential-list-creation/src/lib/constants.ts similarity index 100% rename from libs/application/templates/signature-collection/signature-list-creation/src/lib/constants.ts rename to libs/application/templates/signature-collection/presidential-list-creation/src/lib/constants.ts diff --git a/libs/application/templates/signature-collection/signature-list-creation/src/lib/dataSchema.ts b/libs/application/templates/signature-collection/presidential-list-creation/src/lib/dataSchema.ts similarity index 82% rename from libs/application/templates/signature-collection/signature-list-creation/src/lib/dataSchema.ts rename to libs/application/templates/signature-collection/presidential-list-creation/src/lib/dataSchema.ts index 22947e4bbcd6..fab821891988 100644 --- a/libs/application/templates/signature-collection/signature-list-creation/src/lib/dataSchema.ts +++ b/libs/application/templates/signature-collection/presidential-list-creation/src/lib/dataSchema.ts @@ -14,4 +14,4 @@ export const dataSchema = z.object({ }), }) -export type SignatureListSchema = z.TypeOf +export type PresidentialCreateListSchema = z.TypeOf diff --git a/libs/application/templates/signature-collection/signature-list-creation/src/lib/errors.ts b/libs/application/templates/signature-collection/presidential-list-creation/src/lib/errors.ts similarity index 100% rename from libs/application/templates/signature-collection/signature-list-creation/src/lib/errors.ts rename to libs/application/templates/signature-collection/presidential-list-creation/src/lib/errors.ts diff --git a/libs/application/templates/signature-collection/signature-list-creation/src/lib/messages.ts b/libs/application/templates/signature-collection/presidential-list-creation/src/lib/messages.ts similarity index 100% rename from libs/application/templates/signature-collection/signature-list-creation/src/lib/messages.ts rename to libs/application/templates/signature-collection/presidential-list-creation/src/lib/messages.ts diff --git a/libs/application/templates/signature-collection/signature-list-creation/src/lib/utils.ts b/libs/application/templates/signature-collection/presidential-list-creation/src/lib/utils.ts similarity index 100% rename from libs/application/templates/signature-collection/signature-list-creation/src/lib/utils.ts rename to libs/application/templates/signature-collection/presidential-list-creation/src/lib/utils.ts diff --git a/libs/application/templates/signature-collection/signature-list-creation/tsconfig.json b/libs/application/templates/signature-collection/presidential-list-creation/tsconfig.json similarity index 100% rename from libs/application/templates/signature-collection/signature-list-creation/tsconfig.json rename to libs/application/templates/signature-collection/presidential-list-creation/tsconfig.json diff --git a/libs/application/templates/signature-collection/signature-list-creation/tsconfig.lib.json b/libs/application/templates/signature-collection/presidential-list-creation/tsconfig.lib.json similarity index 100% rename from libs/application/templates/signature-collection/signature-list-creation/tsconfig.lib.json rename to libs/application/templates/signature-collection/presidential-list-creation/tsconfig.lib.json diff --git a/libs/application/templates/signature-collection/signature-list-creation/tsconfig.spec.json b/libs/application/templates/signature-collection/presidential-list-creation/tsconfig.spec.json similarity index 100% rename from libs/application/templates/signature-collection/signature-list-creation/tsconfig.spec.json rename to libs/application/templates/signature-collection/presidential-list-creation/tsconfig.spec.json diff --git a/libs/application/templates/signature-collection/signature-list-signing/.babelrc b/libs/application/templates/signature-collection/presidential-list-signing/.babelrc similarity index 100% rename from libs/application/templates/signature-collection/signature-list-signing/.babelrc rename to libs/application/templates/signature-collection/presidential-list-signing/.babelrc diff --git a/libs/application/templates/signature-collection/signature-list-signing/.eslintrc.json b/libs/application/templates/signature-collection/presidential-list-signing/.eslintrc.json similarity index 100% rename from libs/application/templates/signature-collection/signature-list-signing/.eslintrc.json rename to libs/application/templates/signature-collection/presidential-list-signing/.eslintrc.json diff --git a/libs/application/templates/signature-collection/presidential-list-signing/README.md b/libs/application/templates/signature-collection/presidential-list-signing/README.md new file mode 100644 index 000000000000..0baef989f9be --- /dev/null +++ b/libs/application/templates/signature-collection/presidential-list-signing/README.md @@ -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). diff --git a/libs/application/templates/signature-collection/signature-list-signing/jest.config.ts b/libs/application/templates/signature-collection/presidential-list-signing/jest.config.ts similarity index 77% rename from libs/application/templates/signature-collection/signature-list-signing/jest.config.ts rename to libs/application/templates/signature-collection/presidential-list-signing/jest.config.ts index 7cf30d5fd261..ba383c6dbc53 100644 --- a/libs/application/templates/signature-collection/signature-list-signing/jest.config.ts +++ b/libs/application/templates/signature-collection/presidential-list-signing/jest.config.ts @@ -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], @@ -9,5 +9,5 @@ export default { }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], coverageDirectory: - '/coverage/libs/application/templates/signature-collection/signature-list-signing', + '/coverage/libs/application/templates/signature-collection/presidential-list-signing', } diff --git a/libs/application/templates/signature-collection/signature-list-signing/project.json b/libs/application/templates/signature-collection/presidential-list-signing/project.json similarity index 71% rename from libs/application/templates/signature-collection/signature-list-signing/project.json rename to libs/application/templates/signature-collection/presidential-list-signing/project.json index e953abcbd01a..2accdb99264d 100644 --- a/libs/application/templates/signature-collection/signature-list-signing/project.json +++ b/libs/application/templates/signature-collection/presidential-list-signing/project.json @@ -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": { @@ -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}'" } } } diff --git a/libs/application/templates/signature-collection/signature-list-signing/src/dataProviders/index.ts b/libs/application/templates/signature-collection/presidential-list-signing/src/dataProviders/index.ts similarity index 100% rename from libs/application/templates/signature-collection/signature-list-signing/src/dataProviders/index.ts rename to libs/application/templates/signature-collection/presidential-list-signing/src/dataProviders/index.ts diff --git a/libs/application/templates/signature-collection/signature-list-signing/src/fields/ListSigned/index.tsx b/libs/application/templates/signature-collection/presidential-list-signing/src/fields/ListSigned/index.tsx similarity index 100% rename from libs/application/templates/signature-collection/signature-list-signing/src/fields/ListSigned/index.tsx rename to libs/application/templates/signature-collection/presidential-list-signing/src/fields/ListSigned/index.tsx diff --git a/libs/application/templates/signature-collection/signature-list-signing/src/fields/index.ts b/libs/application/templates/signature-collection/presidential-list-signing/src/fields/index.ts similarity index 100% rename from libs/application/templates/signature-collection/signature-list-signing/src/fields/index.ts rename to libs/application/templates/signature-collection/presidential-list-signing/src/fields/index.ts diff --git a/libs/application/templates/signature-collection/signature-list-signing/src/forms/Done.ts b/libs/application/templates/signature-collection/presidential-list-signing/src/forms/Done.ts similarity index 100% rename from libs/application/templates/signature-collection/signature-list-signing/src/forms/Done.ts rename to libs/application/templates/signature-collection/presidential-list-signing/src/forms/Done.ts diff --git a/libs/application/templates/signature-collection/signature-list-signing/src/forms/Draft.ts b/libs/application/templates/signature-collection/presidential-list-signing/src/forms/Draft.ts similarity index 100% rename from libs/application/templates/signature-collection/signature-list-signing/src/forms/Draft.ts rename to libs/application/templates/signature-collection/presidential-list-signing/src/forms/Draft.ts diff --git a/libs/application/templates/signature-collection/signature-list-signing/src/forms/Prerequisites.ts b/libs/application/templates/signature-collection/presidential-list-signing/src/forms/Prerequisites.ts similarity index 100% rename from libs/application/templates/signature-collection/signature-list-signing/src/forms/Prerequisites.ts rename to libs/application/templates/signature-collection/presidential-list-signing/src/forms/Prerequisites.ts diff --git a/libs/application/templates/signature-collection/signature-list-signing/src/index.ts b/libs/application/templates/signature-collection/presidential-list-signing/src/index.ts similarity index 100% rename from libs/application/templates/signature-collection/signature-list-signing/src/index.ts rename to libs/application/templates/signature-collection/presidential-list-signing/src/index.ts diff --git a/libs/application/templates/signature-collection/signature-list-signing/src/lib/SignListTemplate.ts b/libs/application/templates/signature-collection/presidential-list-signing/src/lib/SignListTemplate.ts similarity index 94% rename from libs/application/templates/signature-collection/signature-list-signing/src/lib/SignListTemplate.ts rename to libs/application/templates/signature-collection/presidential-list-signing/src/lib/SignListTemplate.ts index 93c8f922d423..9ca42c48c8ef 100644 --- a/libs/application/templates/signature-collection/signature-list-signing/src/lib/SignListTemplate.ts +++ b/libs/application/templates/signature-collection/presidential-list-signing/src/lib/SignListTemplate.ts @@ -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' @@ -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 > = { - 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], diff --git a/libs/application/templates/signature-collection/signature-list-signing/src/lib/constants.ts b/libs/application/templates/signature-collection/presidential-list-signing/src/lib/constants.ts similarity index 100% rename from libs/application/templates/signature-collection/signature-list-signing/src/lib/constants.ts rename to libs/application/templates/signature-collection/presidential-list-signing/src/lib/constants.ts diff --git a/libs/application/templates/signature-collection/signature-list-signing/src/lib/dataSchema.ts b/libs/application/templates/signature-collection/presidential-list-signing/src/lib/dataSchema.ts similarity index 79% rename from libs/application/templates/signature-collection/signature-list-signing/src/lib/dataSchema.ts rename to libs/application/templates/signature-collection/presidential-list-signing/src/lib/dataSchema.ts index 9ab3973b773b..ffaa43a1e288 100644 --- a/libs/application/templates/signature-collection/signature-list-signing/src/lib/dataSchema.ts +++ b/libs/application/templates/signature-collection/presidential-list-signing/src/lib/dataSchema.ts @@ -11,4 +11,4 @@ export const dataSchema = z.object({ listId: z.string().min(1), }) -export type SignatureListSchema = z.TypeOf +export type PresidentialSignListSchema = z.TypeOf diff --git a/libs/application/templates/signature-collection/signature-list-signing/src/lib/errors.ts b/libs/application/templates/signature-collection/presidential-list-signing/src/lib/errors.ts similarity index 100% rename from libs/application/templates/signature-collection/signature-list-signing/src/lib/errors.ts rename to libs/application/templates/signature-collection/presidential-list-signing/src/lib/errors.ts diff --git a/libs/application/templates/signature-collection/signature-list-signing/src/lib/messages.ts b/libs/application/templates/signature-collection/presidential-list-signing/src/lib/messages.ts similarity index 100% rename from libs/application/templates/signature-collection/signature-list-signing/src/lib/messages.ts rename to libs/application/templates/signature-collection/presidential-list-signing/src/lib/messages.ts diff --git a/libs/application/templates/signature-collection/signature-list-signing/tsconfig.json b/libs/application/templates/signature-collection/presidential-list-signing/tsconfig.json similarity index 100% rename from libs/application/templates/signature-collection/signature-list-signing/tsconfig.json rename to libs/application/templates/signature-collection/presidential-list-signing/tsconfig.json diff --git a/libs/application/templates/signature-collection/signature-list-signing/tsconfig.lib.json b/libs/application/templates/signature-collection/presidential-list-signing/tsconfig.lib.json similarity index 100% rename from libs/application/templates/signature-collection/signature-list-signing/tsconfig.lib.json rename to libs/application/templates/signature-collection/presidential-list-signing/tsconfig.lib.json diff --git a/libs/application/templates/signature-collection/signature-list-signing/tsconfig.spec.json b/libs/application/templates/signature-collection/presidential-list-signing/tsconfig.spec.json similarity index 100% rename from libs/application/templates/signature-collection/signature-list-signing/tsconfig.spec.json rename to libs/application/templates/signature-collection/presidential-list-signing/tsconfig.spec.json diff --git a/libs/application/templates/signature-collection/signature-list-creation/README.md b/libs/application/templates/signature-collection/signature-list-creation/README.md deleted file mode 100644 index eba941d45b6c..000000000000 --- a/libs/application/templates/signature-collection/signature-list-creation/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# application-templates-signature-list-creation - -This library was generated with [Nx](https://nx.dev). - -## Running unit tests - -Run `nx test application-templates-signature-list-creation` to execute the unit tests via [Jest](https://jestjs.io). diff --git a/libs/application/templates/signature-collection/signature-list-signing/README.md b/libs/application/templates/signature-collection/signature-list-signing/README.md deleted file mode 100644 index b853f6152455..000000000000 --- a/libs/application/templates/signature-collection/signature-list-signing/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# application-templates-signature-list-signing - -This library was generated with [Nx](https://nx.dev). - -## Running unit tests - -Run `nx test application-templates-signature-list-signing` to execute the unit tests via [Jest](https://jestjs.io). diff --git a/libs/application/types/src/lib/ApplicationTypes.ts b/libs/application/types/src/lib/ApplicationTypes.ts index 3991947ffd08..3182cd1b4329 100644 --- a/libs/application/types/src/lib/ApplicationTypes.ts +++ b/libs/application/types/src/lib/ApplicationTypes.ts @@ -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', @@ -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', }, diff --git a/libs/application/types/src/lib/InstitutionMapper.ts b/libs/application/types/src/lib/InstitutionMapper.ts index 1b35fe5d3575..73e16d31efa4 100644 --- a/libs/application/types/src/lib/InstitutionMapper.ts +++ b/libs/application/types/src/lib/InstitutionMapper.ts @@ -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, }, diff --git a/libs/feature-flags/src/lib/features.ts b/libs/feature-flags/src/lib/features.ts index 15fbb271a6c2..f90f782e7156 100644 --- a/libs/feature-flags/src/lib/features.ts +++ b/libs/feature-flags/src/lib/features.ts @@ -17,7 +17,6 @@ export enum Features { alcoholTaxRedemption = 'isAlcoholTaxRedemptionEnabled', consultationPortalApplication = 'isConsultationPortalEnabled', childrenResidenceChangeV2 = 'isChildrenResidenceChangeV2Enabled', - signatureListCreation = 'isSignatureListCreationEnabled', citizenship = 'isCitizenshipEnabled', energyFunds = 'isEnergyFundsEnabled', complaintsToAlthingiOmbudsman = 'isComplaintToAlthingiOmbudsmanEnabled', diff --git a/tsconfig.base.json b/tsconfig.base.json index 3e325d173dcc..a5b1a95ed6b3 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -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/*"