diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index f62ea26605..7c5c3ab3fa 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -111,14 +111,13 @@ jobs: - name: Set up Yarn cache uses: c-hive/gha-yarn-cache@v2 - - name: Install dependencies - run: | - yarn --immutable - - name: Install dependencies run: yarn workspaces focus @domifa/portail-usagers - - name: Run front-end tests + - name: Build common dependencies + run: yarn workspace @domifa/common build + + - name: Run "Mon DomiFa" tests run: yarn workspace @domifa/portail-usagers test --coverage --detectOpenHandles --forceExit - name: Archive code coverage @@ -141,13 +140,21 @@ jobs: with: node-version: "16.19" + - name: Change TimeZone + uses: szenius/set-timezone@v1.2 + with: + timezoneLinux: "Europe/Paris" + - name: Set up Yarn cache uses: c-hive/gha-yarn-cache@v2 - name: Install dependencies run: yarn workspaces focus @domifa/portail-admins - - name: Run front-end tests + - name: Build common dependencies + run: yarn workspace @domifa/common build + + - name: Run "Portail Admin" tests run: yarn workspace @domifa/portail-admins test --coverage --detectOpenHandles --forceExit - name: Archive code coverage diff --git a/package.json b/package.json index 7071449c43..fe74b53cee 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "prepare": "husky install" }, "devDependencies": { - "@babel/runtime": "^7.22.15", + "@babel/runtime": "^7.23.2", "@commitlint/cli": "^18.2.0", "@commitlint/config-conventional": "^18.1.0", "@socialgouv/sre-secrets": "^1.14.5", diff --git a/packages/backend/package.json b/packages/backend/package.json index 67bf019a21..d04799d938 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -34,7 +34,7 @@ }, "dependencies": { "@domifa/common": "workspace:^", - "@faker-js/faker": "^8.1.0", + "@faker-js/faker": "^8.2.0", "@nestjs/axios": "^3.0.1", "@nestjs/common": "^10.0.5", "@nestjs/core": "^10.0.5", @@ -47,17 +47,17 @@ "@nestjs/terminus": "^10.0.1", "@nestjs/testing": "^10.0.5", "@ntegral/nestjs-sentry": "^4.0.0", - "@opentelemetry/api": "^1.6.0", - "@opentelemetry/core": "^1.17.0", - "@opentelemetry/instrumentation-express": "^0.33.0", - "@opentelemetry/instrumentation-http": "^0.44.0", - "@opentelemetry/instrumentation-nestjs-core": "^0.33.0", - "@opentelemetry/instrumentation-net": "^0.32.0", - "@opentelemetry/instrumentation-pg": "^0.36.0", - "@opentelemetry/sdk-node": "^0.44.0", - "@opentelemetry/semantic-conventions": "^1.17.0", - "@sentry/node": "^7.76.0", - "@sentry/opentelemetry-node": "^7.76.0", + "@opentelemetry/api": "^1.7.0", + "@opentelemetry/core": "^1.18.1", + "@opentelemetry/instrumentation-express": "^0.33.2", + "@opentelemetry/instrumentation-http": "^0.45.1", + "@opentelemetry/instrumentation-nestjs-core": "^0.33.2", + "@opentelemetry/instrumentation-net": "^0.32.2", + "@opentelemetry/instrumentation-pg": "^0.36.2", + "@opentelemetry/sdk-node": "^0.45.1", + "@opentelemetry/semantic-conventions": "^1.18.1", + "@sentry/node": "^7.79.0", + "@sentry/opentelemetry-node": "^7.79.0", "@socialgouv/streaming-file-encryption": "^1.1.0", "@types/source-map-support": "^0.5.4", "axios": "^1.4.0", @@ -83,14 +83,14 @@ "nodemailer": "^6.9.1", "nunjucks": "^3.2.3", "passport": "^0.6.0", - "passport-jwt": "^4.0.0", + "passport-jwt": "^4.0.1", "pg": "^8.7.1", "pino": "^8.7.0", "pino-pretty": "^10.0.1", "pino-std-serializers": "^6.1.0", "pizzip": "^3.0.6", "reflect-metadata": "^0.1.13", - "rimraf": "^5.0.0", + "rimraf": "^5.0.5", "rxjs": "^7.6.0", "sanitize-filename": "^1.6.3", "sanitize-html": "^2.11.0", @@ -102,23 +102,23 @@ "typeorm": "^0.3.17", "uuid": "^9.0.1", "xlsx": "^0.18.5", - "yup": "^0.32.9", + "yup": "^0.32.11", "yup-phone": "^1.3.2" }, "devDependencies": { "@nestjs/cli": "^10.1.1", "@socialgouv/eslint-config-typescript": "^1.131.0", - "@types/bcryptjs": "^2.4.5", - "@types/compression": "^1.7.4", + "@types/bcryptjs": "^2.4.6", + "@types/compression": "^1.7.5", "@types/cron": "^2.0.1", "@types/dotenv": "^8.2.0", "@types/email-templates": "^10.0.2", "@types/express": "4.17.20", - "@types/faker": "^6.6.8", - "@types/fs-extra": "^11.0.2", - "@types/geojson": "^7946.0.10", - "@types/jest": "^29.2.4", - "@types/lodash.isequal": "^4.5.6", + "@types/faker": "^6.6.9", + "@types/fs-extra": "^11.0.4", + "@types/geojson": "^7946.0.13", + "@types/jest": "^29.5.8", + "@types/lodash.isequal": "^4.5.8", "@types/multer": "^1.4.6", "@types/node": "^20.3.3", "@types/node-pdftk": "^2.1.6", @@ -134,10 +134,10 @@ "@types/uuid": "^9.0.4", "@typescript-eslint/eslint-plugin": "^6.0.0", "@typescript-eslint/parser": "^6.0.0", - "eslint": "^8.50.0", + "eslint": "^8.53.0", "eslint-config-prettier": "^9.0.0", - "eslint-plugin-import": "^2.28.1", - "eslint-plugin-prettier": "^5.0.0", + "eslint-plugin-import": "^2.29.0", + "eslint-plugin-prettier": "^5.0.1", "eslint-plugin-promise": "^6.1.1", "jest": "^29.7.0", "lint-staged": "^15.0.0", @@ -149,7 +149,7 @@ "ts-jest": "^29.1.1", "ts-node": "10.9.1", "ts-node-dev": "^2.0.0", - "tsconfig-paths": "^4.0.0", + "tsconfig-paths": "^4.2.0", "typescript": "4.9.5" }, "lint-staged": { diff --git a/packages/backend/src/_common/model/_portail-usager/PortailUsagerPublic.type.ts b/packages/backend/src/_common/model/_portail-usager/PortailUsagerPublic.type.ts index 8838665b1d..ca4146e9bd 100644 --- a/packages/backend/src/_common/model/_portail-usager/PortailUsagerPublic.type.ts +++ b/packages/backend/src/_common/model/_portail-usager/PortailUsagerPublic.type.ts @@ -1,12 +1,14 @@ import { Telephone } from "./../telephone/Telephone.type"; +import { UsagerOptions } from ".."; +import { AppEntity } from "../_core"; import { + UsagerRdv, + UsagerSexe, + UsagerLastInteraction, UsagerAyantDroit, UsagerDecision, - UsagerOptions, UsagerTypeDom, -} from ".."; -import { AppEntity } from "../_core"; -import { UsagerRdv, UsagerSexe, UsagerLastInteraction } from "@domifa/common"; +} from "@domifa/common"; export type PortailUsagerPublic = AppEntity & { customRef: string; // valeur par défaut: 'ref' diff --git a/packages/backend/src/_common/model/usager/Usager.type.ts b/packages/backend/src/_common/model/usager/Usager.type.ts index 889d760005..6ae87afeaa 100644 --- a/packages/backend/src/_common/model/usager/Usager.type.ts +++ b/packages/backend/src/_common/model/usager/Usager.type.ts @@ -1,17 +1,18 @@ import { AppEntity } from "../_core/AppEntity.type"; -import { UsagerAyantDroit } from "./UsagerAyantDroit.type"; -import { UsagerDecision } from "./UsagerDecision.type"; + import { UsagerImport } from "./UsagerImport.type"; import { UsagerNote } from "./UsagerNote.type"; import { UsagerOptions } from "./options/UsagerOptions.type"; -import { UsagerTypeDom } from "./UsagerTypeDom.type"; import { Telephone } from "../telephone/Telephone.type"; import { UsagerLastInteraction, UsagerEntretien, UsagerRdv, UsagerSexe, + UsagerAyantDroit, + UsagerTypeDom, + UsagerDecision, } from "@domifa/common"; export type Usager = AppEntity & { diff --git a/packages/backend/src/_common/model/usager/UsagerAyantDroit.type.ts b/packages/backend/src/_common/model/usager/UsagerAyantDroit.type.ts deleted file mode 100644 index b96807aeaf..0000000000 --- a/packages/backend/src/_common/model/usager/UsagerAyantDroit.type.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { AyantDroiLienParent } from "@domifa/common"; - -export type UsagerAyantDroit = { - nom: string; - prenom: string; - dateNaissance: Date; - lien: AyantDroiLienParent; -}; diff --git a/packages/backend/src/_common/model/usager/UsagerDecision.type.ts b/packages/backend/src/_common/model/usager/UsagerDecision.type.ts deleted file mode 100644 index e691296319..0000000000 --- a/packages/backend/src/_common/model/usager/UsagerDecision.type.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { - UsagerDecisionStatut, - UsagerDecisionMotif, - UsagerDecisionOrientation, -} from "@domifa/common"; -import { UsagerTypeDom } from "./UsagerTypeDom.type"; - -export type UsagerDecision = { - uuid: string; // permet d'identifier une décision en cas de suppression de l'historique - - dateDecision: Date; // Now() - - dateDebut: Date | null; - dateFin: Date | null; - - typeDom?: UsagerTypeDom; - statut: UsagerDecisionStatut; - - // Motif de refus ou radiation - motif?: UsagerDecisionMotif | null; - motifDetails?: string; - - // Orientation si refus - orientation?: UsagerDecisionOrientation; - orientationDetails?: string; - - userId: number; // UserStructure.id - userName: string; // UserStructure.nom / prenom -}; diff --git a/packages/backend/src/_common/model/usager/UsagerTypeDom.type.ts b/packages/backend/src/_common/model/usager/UsagerTypeDom.type.ts deleted file mode 100644 index 174be3cafe..0000000000 --- a/packages/backend/src/_common/model/usager/UsagerTypeDom.type.ts +++ /dev/null @@ -1 +0,0 @@ -export type UsagerTypeDom = "PREMIERE_DOM" | "RENOUVELLEMENT"; diff --git a/packages/backend/src/_common/model/usager/index.ts b/packages/backend/src/_common/model/usager/index.ts index 61b8fabf91..55cb037644 100644 --- a/packages/backend/src/_common/model/usager/index.ts +++ b/packages/backend/src/_common/model/usager/index.ts @@ -3,10 +3,7 @@ export * from "./cerfa"; export * from "./history"; export * from "./options"; export * from "./Usager.type"; -export * from "./UsagerAyantDroit.type"; -export * from "./UsagerDecision.type"; export * from "./UsagerDoc.type"; export * from "./UsagerImport.type"; export * from "./UsagerLight.type"; export * from "./UsagerNote.type"; -export * from "./UsagerTypeDom.type"; diff --git a/packages/backend/src/_migrations/1698876391788-optimize-migration.ts b/packages/backend/src/_migrations/1698876391788-optimize-migration.ts deleted file mode 100644 index 41e1d0cb92..0000000000 --- a/packages/backend/src/_migrations/1698876391788-optimize-migration.ts +++ /dev/null @@ -1,56 +0,0 @@ -import { MigrationInterface, QueryRunner } from "typeorm"; -import { appLogger } from "../util"; -import { domifaConfig } from "../config"; - -export class OptimizeInteractionsMigration1698876391788 - implements MigrationInterface -{ - name = "OptimizeInteractionsMigration1698876391788"; - - public async up(queryRunner: QueryRunner): Promise { - if (domifaConfig().envId === "dev") { - appLogger.info("[MIGRATION] Skipped"); - return; - } - - appLogger.info("[MIGRATION] Delete deleted interactions"); - await queryRunner.query(`DELETE from interactions where event = 'delete'`); - - appLogger.info("[MIGRATION] DROP columns previousValue & event"); - await queryRunner.query( - `ALTER TABLE "interactions" DROP COLUMN "previousValue"` - ); - await queryRunner.query(`ALTER TABLE "interactions" DROP COLUMN "event"`); - - appLogger.info("[MIGRATION] Create new indexes"); - await queryRunner.query( - `CREATE INDEX "idx_structure_statut" ON "usager" ("structureId", "decision") ` - ); - await queryRunner.query( - `CREATE INDEX "idx_usagers" ON "usager" ("structureId", "ref") ` - ); - - appLogger.info("[MIGRATION] DROP useless indexes"); - await queryRunner.query( - `DROP INDEX "public"."IDX_0c5d7e9585c77ff002d4072c3c"` - ); - - await queryRunner.query( - `ALTER TABLE "interactions" DROP CONSTRAINT "FK_495b59d0dd15e43b262f2da8907"` - ); - } - - public async down(queryRunner: QueryRunner): Promise { - await queryRunner.query(`DROP INDEX "public"."idx_usagers"`); - await queryRunner.query(`DROP INDEX "public"."idx_structure_statut"`); - await queryRunner.query( - `ALTER TABLE "interactions" ADD "event" text NOT NULL DEFAULT 'create'` - ); - await queryRunner.query( - `ALTER TABLE "interactions" ADD "previousValue" jsonb` - ); - await queryRunner.query( - `CREATE INDEX "IDX_3bc72392a39f586374f0f7d577" ON "interactions" ("event") ` - ); - } -} diff --git a/packages/backend/src/_migrations/1699283083901-auto-migration.ts b/packages/backend/src/_migrations/1699283083901-auto-migration.ts deleted file mode 100644 index acd59a92af..0000000000 --- a/packages/backend/src/_migrations/1699283083901-auto-migration.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { MigrationInterface, QueryRunner } from "typeorm"; -import { domifaConfig } from "../config"; -import { appLogger } from "../util"; - -export class AutoMigration1699283083901 implements MigrationInterface { - name = "AutoMigration1699283083901"; - - public async up(queryRunner: QueryRunner): Promise { - if (domifaConfig().envId === "dev") { - appLogger.info("[MIGRATION] Skipped"); - return; - } - await queryRunner.query( - `CREATE INDEX "idx_interactions_type" ON "interactions" ("structureId", "usagerUUID", "type") ` - ); - await queryRunner.query( - `CREATE INDEX "idx_interactions_date" ON "interactions" ("structureId", "usagerUUID", "dateInteraction") ` - ); - } - - public async down(queryRunner: QueryRunner): Promise { - await queryRunner.query(`DROP INDEX "public"."idx_interactions_date"`); - await queryRunner.query(`DROP INDEX "public"."idx_interactions_type"`); - } -} diff --git a/packages/backend/src/_migrations/1699283951968-auto-migration.ts b/packages/backend/src/_migrations/1699283951968-auto-migration.ts deleted file mode 100644 index 07979d6c6d..0000000000 --- a/packages/backend/src/_migrations/1699283951968-auto-migration.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { MigrationInterface, QueryRunner } from "typeorm"; -import { domifaConfig } from "../config"; -import { appLogger } from "../util"; - -export class AutoMigration1699283951968 implements MigrationInterface { - name = "AutoMigration1699283951968"; - - public async up(queryRunner: QueryRunner): Promise { - if (domifaConfig().envId === "dev") { - appLogger.info("[MIGRATION] Skipped"); - return; - } - await queryRunner.query( - `DROP INDEX "public"."IDX_416154ec3c1e8fe5a96715b855"` - ); - await queryRunner.query( - `DROP INDEX "public"."IDX_9992157cbe54583ff7002ae4c0"` - ); - } - - public async down(queryRunner: QueryRunner): Promise { - await queryRunner.query( - `CREATE INDEX "IDX_9992157cbe54583ff7002ae4c0" ON "interactions" ("userId") ` - ); - await queryRunner.query( - `CREATE INDEX "IDX_416154ec3c1e8fe5a96715b855" ON "interactions" ("nbCourrier") ` - ); - } -} diff --git a/packages/backend/src/database/entities/usager/UsagerTable.typeorm.ts b/packages/backend/src/database/entities/usager/UsagerTable.typeorm.ts index 17ae672958..a9b48d7e8f 100644 --- a/packages/backend/src/database/entities/usager/UsagerTable.typeorm.ts +++ b/packages/backend/src/database/entities/usager/UsagerTable.typeorm.ts @@ -9,14 +9,7 @@ import { OneToOne, Unique, } from "typeorm"; -import { - Usager, - UsagerOptions, - UsagerTypeDom, - Telephone, - UsagerAyantDroit, - UsagerDecision, -} from "../../../_common/model"; +import { Usager, UsagerOptions, Telephone } from "../../../_common/model"; import { UsagerNote } from "../../../_common/model/usager/UsagerNote.type"; import { StructureTable } from "../structure/StructureTable.typeorm"; @@ -28,6 +21,9 @@ import { UsagerRdv, UsagerSexe, UsagerLastInteraction, + UsagerTypeDom, + UsagerAyantDroit, + UsagerDecision, } from "@domifa/common"; // https://typeorm.io/#/entities/column-types-for-postgres diff --git a/packages/backend/src/database/services/_scripts/data-anonymizer/dataUsagerAnonymizer.ts b/packages/backend/src/database/services/_scripts/data-anonymizer/dataUsagerAnonymizer.ts index 8439a06898..b05a6ba99f 100644 --- a/packages/backend/src/database/services/_scripts/data-anonymizer/dataUsagerAnonymizer.ts +++ b/packages/backend/src/database/services/_scripts/data-anonymizer/dataUsagerAnonymizer.ts @@ -1,12 +1,7 @@ import { fakerFR as faker } from "@faker-js/faker"; import { appLogger } from "../../../../util"; -import { - Usager, - UsagerAyantDroit, - UsagerDecision, - UsagerOptions, -} from "../../../../_common/model"; +import { Usager, UsagerOptions } from "../../../../_common/model"; import { usagerDocsRepository, usagerEntretienRepository, @@ -16,6 +11,7 @@ import { import { usagerRepository } from "../../usager/usagerRepository.service"; import { dataGenerator } from "./dataGenerator.service"; import { dataStructureAnonymizer } from "./dataStructureAnonymizer"; +import { UsagerAyantDroit, UsagerDecision } from "@domifa/common"; export const dataUsagerAnonymizer = { anonymizeUsagers, diff --git a/packages/backend/src/excel/export-structure-usagers/worksheet-renderer/exportListeParticipantsWorksheetRenderer.ts b/packages/backend/src/excel/export-structure-usagers/worksheet-renderer/exportListeParticipantsWorksheetRenderer.ts index 896f70a60e..7503ac4d8a 100644 --- a/packages/backend/src/excel/export-structure-usagers/worksheet-renderer/exportListeParticipantsWorksheetRenderer.ts +++ b/packages/backend/src/excel/export-structure-usagers/worksheet-renderer/exportListeParticipantsWorksheetRenderer.ts @@ -1,6 +1,6 @@ import { Column, Workbook } from "exceljs"; -import { COUNTRY_CODES, UsagerDecision } from "../../../_common/model"; +import { COUNTRY_CODES } from "../../../_common/model"; import { WorksheetRenderer, xlFormater, @@ -8,8 +8,11 @@ import { XlRowModel, } from "../../xlLib"; import { StructureUsagersExportModel } from "../StructureUsagersExportModel.type"; -import { generateMotifLabel } from "./../../../usagers/services/generateMotifLabel.service"; -import { USAGER_DECISION_STATUT_LABELS } from "@domifa/common"; +import { + USAGER_DECISION_STATUT_LABELS, + UsagerDecision, + generateMotifLabel, +} from "@domifa/common"; export const exportListeParticipantsWorksheetRenderer = { renderWorksheet, diff --git a/packages/backend/src/usagers/controllers/import/step3-create/usagersImportBuilder.service.ts b/packages/backend/src/usagers/controllers/import/step3-create/usagersImportBuilder.service.ts index 29a181c224..80db93a129 100644 --- a/packages/backend/src/usagers/controllers/import/step3-create/usagersImportBuilder.service.ts +++ b/packages/backend/src/usagers/controllers/import/step3-create/usagersImportBuilder.service.ts @@ -1,12 +1,6 @@ import { setHours } from "date-fns"; -import { - Usager, - UsagerAyantDroit, - UsagerDecision, - UserStructure, -} from "../../../../_common/model"; - +import { Usager, UserStructure } from "../../../../_common/model"; import { v4 as uuidv4 } from "uuid"; import { UsagersImportUsager } from "../step2-validate-row/schema"; @@ -14,6 +8,8 @@ import { UsagerDecisionMotif, UsagerEntretien, ETAPE_DOSSIER_COMPLET, + UsagerAyantDroit, + UsagerDecision, } from "@domifa/common"; export const usagersImportBuilder = { diff --git a/packages/backend/src/usagers/controllers/usagers-decision.controller.ts b/packages/backend/src/usagers/controllers/usagers-decision.controller.ts index a563cd3517..022da18b29 100644 --- a/packages/backend/src/usagers/controllers/usagers-decision.controller.ts +++ b/packages/backend/src/usagers/controllers/usagers-decision.controller.ts @@ -26,11 +26,7 @@ import { UserStructureAuthenticated, } from "../../_common/model"; import { CheckDuplicateUsagerRefDto, DecisionDto } from "../dto"; -import { - UsagersService, - usagerHistoryStateManager, - generateNoteForDecision, -} from "../services"; +import { UsagersService, usagerHistoryStateManager } from "../services"; import { AllowUserStructureRoles, CurrentUser, @@ -38,7 +34,13 @@ import { } from "../../auth/decorators"; import { AppUserGuard, UsagerAccessGuard } from "../../auth/guards"; import { Not } from "typeorm"; -import { ETAPE_ETAT_CIVIL, ETAPE_DECISION } from "@domifa/common"; +import { + ETAPE_ETAT_CIVIL, + ETAPE_DECISION, + USAGER_DECISION_STATUT_LABELS_PROFIL, + UsagerDecision, +} from "@domifa/common"; +import { format } from "date-fns"; @Controller("usagers-decision") @ApiTags("usagers-decision") @@ -164,7 +166,7 @@ export class UsagersDecisionController { }; const newNote: Partial = { - message: generateNoteForDecision(deletedDecision), + message: this.generateNoteForDecision(deletedDecision), usagerUUID: usager.uuid, usagerRef: usager.ref, structureId: usager.structureId, @@ -183,4 +185,19 @@ export class UsagersDecisionController { return res.status(HttpStatus.OK).json(result); } + + private generateNoteForDecision = (decision: UsagerDecision): string => { + let strDecision = `Suppression de la décision : \n ${ + USAGER_DECISION_STATUT_LABELS_PROFIL[decision.statut] + }`; + const dateDebut = format(new Date(decision.dateDebut), "dd/MM/yyyy"); + + if (decision.statut === "VALIDE") { + const dateFin = format(new Date(decision.dateFin), "dd/MM/yyyy"); + strDecision = `${strDecision} du ${dateDebut} au ${dateFin}\n`; + } else { + strDecision = `${strDecision} le ${dateDebut}\n`; + } + return strDecision; + }; } diff --git a/packages/backend/src/usagers/dto/decision.dto.ts b/packages/backend/src/usagers/dto/decision.dto.ts index 682b43d3d4..4fb4f05220 100644 --- a/packages/backend/src/usagers/dto/decision.dto.ts +++ b/packages/backend/src/usagers/dto/decision.dto.ts @@ -10,14 +10,15 @@ import { MinLength, ValidateIf, } from "class-validator"; -import { StripTagsTransform } from "../../_common/decorators"; -import { UsagerDecision } from "../../_common/model"; +import {} from "../../_common/model"; import { UsagerDecisionStatut, UsagerDecisionMotif, UsagerDecisionOrientation, + UsagerDecision, } from "@domifa/common"; +import { StripTagsTransform } from "../../_common/decorators"; export class DecisionDto implements UsagerDecision { @ApiProperty({ diff --git a/packages/backend/src/usagers/services/cerfa/generateCerfaData.service.ts b/packages/backend/src/usagers/services/cerfa/generateCerfaData.service.ts index b6a8aee64c..a6848fd40c 100644 --- a/packages/backend/src/usagers/services/cerfa/generateCerfaData.service.ts +++ b/packages/backend/src/usagers/services/cerfa/generateCerfaData.service.ts @@ -6,11 +6,14 @@ import { UserStructureAuthenticated } from "../../../_common/model"; import { DateCerfa, Usager, - UsagerAyantDroit, UsagerCerfaFields, } from "../../../_common/model/usager"; -import { generateMotifLabel } from "../generateMotifLabel.service"; -import { CerfaDocType } from "@domifa/common"; + +import { + CerfaDocType, + UsagerAyantDroit, + generateMotifLabel, +} from "@domifa/common"; import { isNil } from "lodash"; export const generateCerfaData = ( diff --git a/packages/backend/src/usagers/services/custom-docs/buildCustomDoc.service.ts b/packages/backend/src/usagers/services/custom-docs/buildCustomDoc.service.ts index a00d75ce3b..3d0a3a16f6 100644 --- a/packages/backend/src/usagers/services/custom-docs/buildCustomDoc.service.ts +++ b/packages/backend/src/usagers/services/custom-docs/buildCustomDoc.service.ts @@ -2,8 +2,6 @@ import { STRUCTURE_TYPE_LABELS } from "../../../_common/model/structure/constant import { StructureCommon, Usager } from "../../../_common/model"; import { StructureCustomDocTags } from "../../../_common/model/structure-doc/StructureCustomDocTags.type"; -import { UsagerDecision } from "../../../_common/model/usager/UsagerDecision.type"; -import { generateMotifLabel } from "../generateMotifLabel.service"; import { format } from "date-fns"; import { utcToZonedTime, zonedTimeToUtc } from "date-fns-tz"; @@ -17,6 +15,8 @@ import { ENTRETIEN_RAISON_DEMANDE, ENTRETIEN_TYPE_MENAGE, ENTRETIEN_RESIDENCE, + UsagerDecision, + generateMotifLabel, } from "@domifa/common"; export const DATE_FORMAT = { diff --git a/packages/backend/src/usagers/services/generateMotifLabel.service.spec.ts b/packages/backend/src/usagers/services/generateMotifLabel.service.spec.ts deleted file mode 100644 index 5e9f8d135f..0000000000 --- a/packages/backend/src/usagers/services/generateMotifLabel.service.spec.ts +++ /dev/null @@ -1,39 +0,0 @@ -import { USAGER_REFUS_MOCK, USAGER_VALIDE_MOCK } from "../../_common/mocks"; -import { generateMotifLabel } from "./generateMotifLabel.service"; - -describe("generateMotifLabel", () => { - it("generateMotifLabel ", async () => { - expect(generateMotifLabel(USAGER_VALIDE_MOCK.decision)).toEqual(""); - - USAGER_REFUS_MOCK.decision.motif = "HORS_AGREMENT"; - expect(generateMotifLabel(USAGER_REFUS_MOCK.decision)).toEqual( - "En dehors des critères du public domicilié" - ); - - USAGER_REFUS_MOCK.decision.motif = "LIEN_COMMUNE"; - - expect(generateMotifLabel(USAGER_REFUS_MOCK.decision)).toEqual( - "Absence de lien avec la commune" - ); - - USAGER_REFUS_MOCK.decision.motif = "SATURATION"; - - expect(generateMotifLabel(USAGER_REFUS_MOCK.decision)).toEqual( - "Nombre maximal domiciliations atteint" - ); - - USAGER_REFUS_MOCK.decision.motif = "AUTRE"; - USAGER_REFUS_MOCK.decision.motifDetails = - "Nombre maximal domiciliations atteint"; - - expect(generateMotifLabel(USAGER_REFUS_MOCK.decision)).toEqual( - "Autre motif: Nombre maximal domiciliations atteint" - ); - - USAGER_REFUS_MOCK.decision.motifDetails = null; - - expect(generateMotifLabel(USAGER_REFUS_MOCK.decision)).toEqual( - "Autre motif: non précisé" - ); - }); -}); diff --git a/packages/backend/src/usagers/services/generateMotifLabel.service.ts b/packages/backend/src/usagers/services/generateMotifLabel.service.ts deleted file mode 100644 index fec0e6711d..0000000000 --- a/packages/backend/src/usagers/services/generateMotifLabel.service.ts +++ /dev/null @@ -1,39 +0,0 @@ -import { - MOTIFS_REFUS_LABELS, - MOTIFS_RADIATION_LABELS, - USAGER_DECISION_STATUT_LABELS_PROFIL, - UsagerDecisionMotif, -} from "@domifa/common"; -import { UsagerDecision } from "../../_common/model"; -import { format } from "date-fns"; - -export const generateMotifLabel = (decision: UsagerDecision): string => { - if (!decision) { - return ""; - } - - if (decision.motif === "AUTRE") { - const motifDetails = decision.motifDetails ?? "non précisé"; - return `Autre motif: ${motifDetails}`; - } - - const motifsLabels = - decision.statut === "REFUS" ? MOTIFS_REFUS_LABELS : MOTIFS_RADIATION_LABELS; - - return motifsLabels[decision.motif as UsagerDecisionMotif] ?? ""; -}; - -export const generateNoteForDecision = (decision: UsagerDecision): string => { - let strDecision = `Suppression de la décision : \n ${ - USAGER_DECISION_STATUT_LABELS_PROFIL[decision.statut] - }`; - const dateDebut = format(new Date(decision.dateDebut), "dd/MM/yyyy"); - - if (decision.statut === "VALIDE") { - const dateFin = format(new Date(decision.dateFin), "dd/MM/yyyy"); - strDecision = `${strDecision} du ${dateDebut} au ${dateFin}\n`; - } else { - strDecision = `${strDecision} le ${dateDebut}\n`; - } - return strDecision; -}; diff --git a/packages/backend/src/usagers/services/index.ts b/packages/backend/src/usagers/services/index.ts index 3b10334300..83d482c010 100644 --- a/packages/backend/src/usagers/services/index.ts +++ b/packages/backend/src/usagers/services/index.ts @@ -1,6 +1,5 @@ // @index('./*service.ts', f => `export * from '${f.path}'`) export * from "./deleteUsagerFolder.service"; -export * from "./generateMotifLabel.service"; export * from "./usagerHistoryStateManager.service"; export * from "./usagerOptionsHistory.service"; export * from "./usagers.service"; diff --git a/packages/backend/src/usagers/services/tests/generateMotifLabel.service.spec.ts b/packages/backend/src/usagers/services/tests/generateMotifLabel.service.spec.ts deleted file mode 100644 index fdc897e24a..0000000000 --- a/packages/backend/src/usagers/services/tests/generateMotifLabel.service.spec.ts +++ /dev/null @@ -1,40 +0,0 @@ -import { USAGER_REFUS_MOCK, USAGER_VALIDE_MOCK } from "../../../_common/mocks"; - -import { generateMotifLabel } from "../generateMotifLabel.service"; - -describe("generateMotifLabel", () => { - it("generateMotifLabel ", async () => { - expect(generateMotifLabel(USAGER_VALIDE_MOCK.decision)).toEqual(""); - - USAGER_REFUS_MOCK.decision.motif = "HORS_AGREMENT"; - expect(generateMotifLabel(USAGER_REFUS_MOCK.decision)).toEqual( - "En dehors des critères du public domicilié" - ); - - USAGER_REFUS_MOCK.decision.motif = "LIEN_COMMUNE"; - - expect(generateMotifLabel(USAGER_REFUS_MOCK.decision)).toEqual( - "Absence de lien avec la commune" - ); - - USAGER_REFUS_MOCK.decision.motif = "SATURATION"; - - expect(generateMotifLabel(USAGER_REFUS_MOCK.decision)).toEqual( - "Nombre maximal domiciliations atteint" - ); - - USAGER_REFUS_MOCK.decision.motif = "AUTRE"; - USAGER_REFUS_MOCK.decision.motifDetails = - "Nombre maximal domiciliations atteint"; - - expect(generateMotifLabel(USAGER_REFUS_MOCK.decision)).toEqual( - "Autre motif: Nombre maximal domiciliations atteint" - ); - - USAGER_REFUS_MOCK.decision.motifDetails = null; - - expect(generateMotifLabel(USAGER_REFUS_MOCK.decision)).toEqual( - "Autre motif: non précisé" - ); - }); -}); diff --git a/packages/backend/src/usagers/services/usagerVisibleHistoryManager.service.ts b/packages/backend/src/usagers/services/usagerVisibleHistoryManager.service.ts index d156872100..f10bec5e72 100644 --- a/packages/backend/src/usagers/services/usagerVisibleHistoryManager.service.ts +++ b/packages/backend/src/usagers/services/usagerVisibleHistoryManager.service.ts @@ -1,4 +1,5 @@ -import { Usager, UsagerDecision } from "../../_common/model"; +import { UsagerDecision } from "@domifa/common"; +import { Usager } from "../../_common/model"; export const usagerVisibleHistoryManager = { addDecisionToVisibleHistory, diff --git a/packages/backend/src/usagers/services/usagers.service.ts b/packages/backend/src/usagers/services/usagers.service.ts index ebf77aeee7..2bde49f388 100644 --- a/packages/backend/src/usagers/services/usagers.service.ts +++ b/packages/backend/src/usagers/services/usagers.service.ts @@ -8,8 +8,6 @@ import { Usager, UserStructure, UserStructureProfile, - UsagerTypeDom, - UsagerDecision, UserStructureAuthenticated, } from "../../_common/model"; import { usagerHistoryStateManager } from "./usagerHistoryStateManager.service"; @@ -25,6 +23,8 @@ import { ETAPE_DOSSIER_COMPLET, ETAPE_DECISION, ETAPE_ENTRETIEN, + UsagerTypeDom, + UsagerDecision, } from "@domifa/common"; @Injectable() diff --git a/packages/common/jest.config.ts b/packages/common/jest.config.ts new file mode 100644 index 0000000000..ac84dda13a --- /dev/null +++ b/packages/common/jest.config.ts @@ -0,0 +1,11 @@ +import type { Config } from "jest"; + +const jestConfig: Config = { + collectCoverage: false, + coverageReporters: ["cobertura"], + coverageDirectory: "./coverage/", + modulePathIgnorePatterns: ["/dist/"], + preset: "ts-jest/presets/js-with-ts", +}; + +export default jestConfig; diff --git a/packages/common/package.json b/packages/common/package.json index 1f460f653a..f8a7700745 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -20,16 +20,16 @@ }, "devDependencies": { "@eslint/create-config": "^0.4.6", - "@types/jest": "^29.4.0", + "@types/jest": "^29.5.8", "@types/rimraf": "^4.0.5", "@typescript-eslint/eslint-plugin": "^6.0.0", "@typescript-eslint/parser": "^6.0.0", - "eslint": "^8.50.0", - "eslint-config-standard-with-typescript": "^39.1.0", - "eslint-plugin-import": "^2.28.1", - "eslint-plugin-jest": "^27.4.0", - "eslint-plugin-n": "^16.1.0", - "eslint-plugin-prettier": "^5.0.0", + "eslint": "^8.53.0", + "eslint-config-standard-with-typescript": "^39.1.1", + "eslint-plugin-import": "^2.29.0", + "eslint-plugin-jest": "^27.6.0", + "eslint-plugin-n": "^16.3.0", + "eslint-plugin-prettier": "^5.0.1", "eslint-plugin-promise": "^6.1.1", "jest": "^29.7.0", "license-check-and-add": "^4.0.5", @@ -39,7 +39,8 @@ "typescript": "^4.3.5" }, "dependencies": { - "rimraf": "^5.0.0" + "date-fns": "^2.30.0", + "rimraf": "^5.0.5" }, "lint-staged": { "*": "prettier --ignore-unknown -w", diff --git a/packages/common/src/mocks/USAGER_ACTIF.mock.ts b/packages/common/src/mocks/USAGER_ACTIF.mock.ts new file mode 100644 index 0000000000..81e5b088c0 --- /dev/null +++ b/packages/common/src/mocks/USAGER_ACTIF.mock.ts @@ -0,0 +1,129 @@ +import { ETAPE_DOSSIER_COMPLET } from "../usager"; + +export const USAGER_ACTIF_MOCK = { + numeroDistribution: null, + decision: { + statut: "VALIDE", + dateDebut: new Date("2020-02-12T00:00:00.000Z"), + dateDecision: new Date("2020-02-12T00:00:00.000Z"), + dateFin: new Date("2021-02-12T00:00:00.000Z"), + motif: "LIEN_COMMUNE", + typeDom: "PREMIERE_DOM", + orientation: "other", + orientationDetails: "DETAILS", + motifDetails: "DETAILS", + userId: 30, + userName: "Testeur Robin", + }, + lastInteraction: { + colisIn: 0, + courrierIn: 0, + enAttente: false, + recommandeIn: 0, + dateInteraction: new Date("2020-12-01T14:11:28.167Z"), + }, + pinnedNote: null, + options: { + transfert: { + actif: false, + nom: null, + adresse: null, + dateDebut: null, + dateFin: null, + }, + procurations: [ + { + nom: null, + prenom: null, + dateFin: null, + dateDebut: null, + dateNaissance: null, + }, + ], + npai: { + actif: false, + dateDebut: null, + }, + portailUsagerEnabled: false, + }, + contactByPhone: false, + rdv: { dateRdv: null, userId: 0, userName: "" }, + ayantsDroits: [ + { + nom: "Karamoko", + prenom: "Mauricette", + dateNaissance: new Date("1978-12-20T00:00:00.000Z"), + lien: "CONJOINT", + }, + ], + datePremiereDom: new Date("2018-01-11T00:00:00.000Z"), + + email: "domicilie2@yopmail.com", + entretien: { + typeMenage: "COUPLE_AVEC_ENFANT", + domiciliation: false, + revenus: false, + orientation: true, + orientationDetail: "Test orientation", + raison: "PRESTATIONS_SOCIALES", + liencommune: "SOCIAL", + liencommuneDetail: "Suivi social", + residence: "DOMICILE_MOBILE", + cause: "EXPULSION", + commentaires: "Ceci est un commentaire", + revenusDetail: null, + residenceDetail: null, + causeDetail: null, + rattachement: null, + raisonDetail: null, + accompagnement: null, + accompagnementDetail: null, + }, + etapeDemande: ETAPE_DOSSIER_COMPLET, + historique: [ + { + statut: "VALIDE", + dateDebut: new Date("2020-02-12T00:00:00.000Z"), + dateDecision: new Date("2020-02-12T00:00:00.000Z"), + dateFin: new Date("2021-02-12T00:00:00.000Z"), + motif: null, + typeDom: "PREMIERE_DOM", + orientation: null, + orientationDetails: null, + motifDetails: "", + userId: 30, + userName: "Testeur Robin", + }, + { + dateDebut: new Date("2020-12-01T10:00:24.980Z"), + dateDecision: new Date("2020-12-01T10:00:24.980Z"), + dateFin: new Date("2020-12-01T10:00:24.980Z"), + motif: null, + motifDetails: null, + statut: "INSTRUCTION", + orientation: null, + orientationDetails: null, + userId: 30, + userName: "Testeur Robin", + typeDom: "PREMIERE_DOM", + }, + ], + telephone: { countryCode: "FR", numero: "0606060606" }, + surnom: "", + import: { + date: new Date("2020-12-01T10:00:24.980Z"), + userId: 30, + userName: "Testeur Robin", + }, + typeDom: "RENOUVELLEMENT", + customRef: "5", + dateNaissance: new Date("1998-08-07T00:00:00.000Z"), + nom: "Martine", + prenom: "Sembat", + sexe: "femme", + structureId: 1, + villeNaissance: "Bouaké, Côte d'Ivoire", + ref: 5, + createdAt: new Date("2020-12-01T10:00:24.984Z"), + updatedAt: new Date("2020-12-21T17:07:12.911Z"), +}; diff --git a/packages/common/src/mocks/USAGER_REFUS.mock.ts b/packages/common/src/mocks/USAGER_REFUS.mock.ts new file mode 100644 index 0000000000..0a62a18d27 --- /dev/null +++ b/packages/common/src/mocks/USAGER_REFUS.mock.ts @@ -0,0 +1,117 @@ +import { ETAPE_DOSSIER_COMPLET } from "../usager"; + +export const USAGER_REFUS_MOCK = { + numeroDistribution: null, + + decision: { + orientationDetails: null, + orientation: null, + statut: "REFUS", + dateDebut: new Date("2020-02-12T00:00:00.000Z"), + dateDecision: new Date("2020-02-12T00:00:00.000Z"), + dateFin: new Date("2021-02-12T00:00:00.000Z"), + motif: "NON_MANIFESTATION_3_MOIS", + typeDom: "PREMIERE_DOM", + motifDetails: "", + userId: 30, + userName: "Testeur Robin", + }, + lastInteraction: { + colisIn: 0, + courrierIn: 0, + enAttente: false, + recommandeIn: 0, + dateInteraction: new Date("2020-12-01T14:11:28.167Z"), + }, + options: { + transfert: { + actif: false, + nom: null, + adresse: null, + dateDebut: null, + dateFin: null, + }, + procurations: [ + { + nom: null, + prenom: null, + dateFin: null, + dateDebut: null, + dateNaissance: null, + }, + ], + npai: { + actif: false, + dateDebut: null, + }, + portailUsagerEnabled: false, + }, + contactByPhone: false, + + rdv: { dateRdv: null, userId: 0, userName: "" }, + ayantsDroits: [ + { + nom: "Karamoko", + prenom: "Mauricette", + dateNaissance: new Date("1978-12-20T00:00:00.000Z"), + lien: "CONJOINT", + }, + ], + datePremiereDom: new Date("2018-01-11T00:00:00.000Z"), + pinnedNote: null, + email: "domicilie2@yopmail.com", + entretien: { + typeMenage: "COUPLE_AVEC_ENFANT", + domiciliation: false, + revenus: false, + orientation: true, + orientationDetail: "Test orientation", + raison: "PRESTATIONS_SOCIALES", + liencommune: "SOCIAL", + liencommuneDetail: "Suivi social", + residence: "DOMICILE_MOBILE", + cause: "EXPULSION", + commentaires: "Ceci est un commentaire", + revenusDetail: null, + residenceDetail: null, + causeDetail: null, + rattachement: null, + raisonDetail: null, + accompagnement: null, + accompagnementDetail: null, + }, + etapeDemande: ETAPE_DOSSIER_COMPLET, + historique: [ + { + dateDebut: new Date("2020-12-01T10:00:24.980Z"), + dateDecision: new Date("2020-12-01T10:00:24.980Z"), + dateFin: new Date("2020-12-01T10:00:24.980Z"), + motif: null, + orientation: null, + motifDetails: null, + orientationDetails: null, + statut: "INSTRUCTION", + userId: 30, + userName: "Testeur Robin", + typeDom: "PREMIERE_DOM", + }, + ], + telephone: { countryCode: "FR", numero: "0606060606" }, + surnom: "", + import: { + date: new Date("2020-12-01T10:00:24.980Z"), + userId: 30, + userName: "Testeur Robin", + }, + typeDom: "RENOUVELLEMENT", + customRef: "5", + dateNaissance: new Date("1998-08-07T00:00:00.000Z"), + nom: "Martine", + prenom: "Sembat", + sexe: "femme", + structureId: 1, + villeNaissance: "Bouaké, Côte d'Ivoire", + ref: 5, + createdAt: new Date("2020-12-01T10:00:24.984Z"), + updatedAt: new Date("2020-12-21T17:07:12.911Z"), +}; diff --git a/packages/common/src/mocks/index.ts b/packages/common/src/mocks/index.ts new file mode 100644 index 0000000000..541c8a884a --- /dev/null +++ b/packages/common/src/mocks/index.ts @@ -0,0 +1,3 @@ +// @index('./*', f => `export * from '${f.path}'`) +export * from "./USAGER_ACTIF.mock"; +export * from "./USAGER_REFUS.mock"; diff --git a/packages/common/src/structure/index.ts b/packages/common/src/structure/index.ts index 273b4df924..b9723b0efe 100644 --- a/packages/common/src/structure/index.ts +++ b/packages/common/src/structure/index.ts @@ -1,3 +1,4 @@ // @index('./*', f => `export * from '${f.path}'`) export * from "./constants"; +export * from "./interfaces"; export * from "./types"; diff --git a/packages/frontend/src/app/modules/structures/types/StructureAddresseCourrier.interface.ts b/packages/common/src/structure/interfaces/StructureAddresseCourrier.interface.ts similarity index 100% rename from packages/frontend/src/app/modules/structures/types/StructureAddresseCourrier.interface.ts rename to packages/common/src/structure/interfaces/StructureAddresseCourrier.interface.ts diff --git a/packages/common/src/structure/interfaces/index.ts b/packages/common/src/structure/interfaces/index.ts new file mode 100644 index 0000000000..3072a5f621 --- /dev/null +++ b/packages/common/src/structure/interfaces/index.ts @@ -0,0 +1,2 @@ +// @index('./*', f => `export * from '${f.path}'`) +export * from "./StructureAddresseCourrier.interface"; diff --git a/packages/common/src/usager/constants/ENTRETIEN_SECTIONS.const.ts b/packages/common/src/usager/constants/ENTRETIEN_SECTIONS.const.ts index 135f3e5e13..8d89481bb7 100644 --- a/packages/common/src/usager/constants/ENTRETIEN_SECTIONS.const.ts +++ b/packages/common/src/usager/constants/ENTRETIEN_SECTIONS.const.ts @@ -1,10 +1,10 @@ -import { type UsagerEntretienResidence } from "../entretien/UsagerEntretienResidence.type"; +import { type UsagerEntretienResidence } from "../types/entretien/UsagerEntretienResidence.type"; import { type UsagerEntretienCause, type UsagerEntretienLienCommune, type UsagerEntretienRaisonDemande, type UsagerEntretienTypeMenage, -} from "../entretien"; +} from "../types/entretien"; export const ENTRETIEN_LIEN_COMMUNE: { [key in UsagerEntretienLienCommune]: string; diff --git a/packages/common/src/usager/functions/generateMotifLabel.service.spec.ts b/packages/common/src/usager/functions/generateMotifLabel.service.spec.ts new file mode 100644 index 0000000000..ced8504102 --- /dev/null +++ b/packages/common/src/usager/functions/generateMotifLabel.service.spec.ts @@ -0,0 +1,66 @@ +import { type UsagerDecision } from "../interfaces"; +import { generateMotifLabel } from "./generateMotifLabel.service"; + +describe("generateMotifLabel", () => { + const decisionValide: UsagerDecision = { + statut: "VALIDE", + dateDebut: new Date("2020-02-12T00:00:00.000Z"), + dateDecision: new Date("2020-02-12T00:00:00.000Z"), + dateFin: new Date("2021-02-12T00:00:00.000Z"), + motif: "LIEN_COMMUNE", + typeDom: "PREMIERE_DOM", + orientation: "other", + orientationDetails: "DETAILS", + motifDetails: "DETAILS", + userId: 30, + userName: "Testeur Robin", + uuid: "x", + }; + + const decisionRefus: UsagerDecision = { + statut: "REFUS", + dateDebut: new Date("2020-02-12T00:00:00.000Z"), + dateDecision: new Date("2020-02-12T00:00:00.000Z"), + dateFin: new Date("2021-02-12T00:00:00.000Z"), + motif: "NON_MANIFESTATION_3_MOIS", + typeDom: "PREMIERE_DOM", + motifDetails: "", + userId: 30, + userName: "Testeur Robin", + uuid: "x", + }; + + it("generateMotifLabel ", async () => { + expect(generateMotifLabel(decisionValide)).toEqual(""); + + decisionRefus.motif = "HORS_AGREMENT"; + expect(generateMotifLabel(decisionRefus)).toEqual( + "En dehors des critères du public domicilié" + ); + + decisionRefus.motif = "LIEN_COMMUNE"; + + expect(generateMotifLabel(decisionRefus)).toEqual( + "Absence de lien avec la commune" + ); + + decisionRefus.motif = "SATURATION"; + + expect(generateMotifLabel(decisionRefus)).toEqual( + "Nombre maximal domiciliations atteint" + ); + + decisionRefus.motif = "AUTRE"; + decisionRefus.motifDetails = "Nombre maximal domiciliations atteint"; + + expect(generateMotifLabel(decisionRefus)).toEqual( + "Autre motif: Nombre maximal domiciliations atteint" + ); + + decisionRefus.motifDetails = undefined; + + expect(generateMotifLabel(decisionRefus)).toEqual( + "Autre motif: non précisé" + ); + }); +}); diff --git a/packages/frontend/src/app/modules/usager-shared/utils/generateMotifLabel.service.ts b/packages/common/src/usager/functions/generateMotifLabel.service.ts similarity index 60% rename from packages/frontend/src/app/modules/usager-shared/utils/generateMotifLabel.service.ts rename to packages/common/src/usager/functions/generateMotifLabel.service.ts index ad33e385c9..5ffd02e708 100644 --- a/packages/frontend/src/app/modules/usager-shared/utils/generateMotifLabel.service.ts +++ b/packages/common/src/usager/functions/generateMotifLabel.service.ts @@ -1,7 +1,9 @@ -import { MOTIFS_REFUS_LABELS, MOTIFS_RADIATION_LABELS } from "@domifa/common"; -import { UsagerDecision } from "../../../../_common/model"; +import { MOTIFS_REFUS_LABELS, MOTIFS_RADIATION_LABELS } from "../constants"; +import { type UsagerDecision } from "../interfaces"; -export const generateMotifLabel = (decision: UsagerDecision): string => { +export const generateMotifLabel = ( + decision: Pick +): string => { if (!decision) { return ""; } diff --git a/packages/frontend/src/app/modules/usager-shared/utils/getRdvInfos.service.spec.ts b/packages/common/src/usager/functions/getRdvInfos.service.spec.ts similarity index 86% rename from packages/frontend/src/app/modules/usager-shared/utils/getRdvInfos.service.spec.ts rename to packages/common/src/usager/functions/getRdvInfos.service.spec.ts index 84ff5ccc25..e1b32baf5e 100644 --- a/packages/frontend/src/app/modules/usager-shared/utils/getRdvInfos.service.spec.ts +++ b/packages/common/src/usager/functions/getRdvInfos.service.spec.ts @@ -1,10 +1,10 @@ -import { USAGER_ACTIF_MOCK } from "../../../../_common/mocks"; +import { USAGER_ACTIF_MOCK } from "../../mocks"; import { ETAPE_RENDEZ_VOUS, - ETAPE_DECISION, - UsagerRdv, ETAPE_DOSSIER_COMPLET, -} from "@domifa/common"; + ETAPE_DECISION, +} from "../constants"; + import { getRdvInfos } from "./getRdvInfos.service"; beforeAll(() => { @@ -15,7 +15,8 @@ beforeAll(() => { describe("Création des rendez-vous", () => { it("Rendez-vous dans le futur : affichage warning", () => { - const usager = USAGER_ACTIF_MOCK; + // eslint-disable-next-line @typescript-eslint/no-explicit-any + const usager = { ...USAGER_ACTIF_MOCK } as any; usager.rdv = { dateRdv: new Date(2021, 2, 20, 19, 20), userId: 1, @@ -38,7 +39,7 @@ describe("Création des rendez-vous", () => { }); it("Rendez-vous dans le passé", () => { - const usager = USAGER_ACTIF_MOCK; + const usager = USAGER_ACTIF_MOCK as any; usager.rdv = { dateRdv: new Date(2020, 6, 20, 19, 20), userId: 1, @@ -69,14 +70,14 @@ describe("Création des rendez-vous", () => { display: false, }); - usager.rdv.dateRdv = null as Date; + usager.rdv.dateRdv = null; expect(getRdvInfos(usager)).toEqual({ class: "", content: "", display: false, }); - usager.rdv = undefined as UsagerRdv; + usager.rdv = null as any; expect(getRdvInfos(usager)).toEqual({ class: "", content: "", diff --git a/packages/frontend/src/app/modules/usager-shared/utils/getRdvInfos.service.ts b/packages/common/src/usager/functions/getRdvInfos.service.ts similarity index 75% rename from packages/frontend/src/app/modules/usager-shared/utils/getRdvInfos.service.ts rename to packages/common/src/usager/functions/getRdvInfos.service.ts index 92a9f310ee..caafc37177 100644 --- a/packages/frontend/src/app/modules/usager-shared/utils/getRdvInfos.service.ts +++ b/packages/common/src/usager/functions/getRdvInfos.service.ts @@ -1,9 +1,11 @@ import fr from "date-fns/locale/fr"; import { format } from "date-fns"; -import { UsagerLight, UsagerRdvInfos } from "../../../../_common/model"; -import { ETAPE_ENTRETIEN } from "@domifa/common"; +import { ETAPE_ENTRETIEN, type UsagerRdv, type UsagerRdvInfos } from "../.."; -export const getRdvInfos = (usager?: Partial): UsagerRdvInfos => { +export const getRdvInfos = (usager?: { + etapeDemande: number; + rdv: UsagerRdv | null; +}): UsagerRdvInfos => { const rdvDisplay: UsagerRdvInfos = { display: false, class: "", diff --git a/packages/common/src/usager/functions/index.ts b/packages/common/src/usager/functions/index.ts new file mode 100644 index 0000000000..135cf1343c --- /dev/null +++ b/packages/common/src/usager/functions/index.ts @@ -0,0 +1,3 @@ +// @index('./*.service.ts', f => `export * from '${f.path}'`) +export * from "./generateMotifLabel.service"; +export * from "./getRdvInfos.service"; diff --git a/packages/common/src/usager/index.ts b/packages/common/src/usager/index.ts index 424355ec5c..a784849455 100644 --- a/packages/common/src/usager/index.ts +++ b/packages/common/src/usager/index.ts @@ -1,6 +1,6 @@ // @index('./*', f => `export * from '${f.path}'`) export * from "./constants"; -export * from "./entretien"; +export * from "./functions"; export * from "./interfaces"; export * from "./options"; export * from "./types"; diff --git a/packages/common/src/usager/interfaces/UsagerEntretien.interface.ts b/packages/common/src/usager/interfaces/UsagerEntretien.interface.ts index b3e438c9fd..dd3d879cda 100644 --- a/packages/common/src/usager/interfaces/UsagerEntretien.interface.ts +++ b/packages/common/src/usager/interfaces/UsagerEntretien.interface.ts @@ -4,7 +4,7 @@ import { type UsagerEntretienCause, type UsagerEntretienRaisonDemande, type UsagerEntretienTypeMenage, -} from "../entretien"; +} from "../types/entretien"; export interface UsagerEntretien { uuid?: string; diff --git a/packages/frontend/src/_common/model/usager/rdv/UsagerRdvInfos.type.ts b/packages/common/src/usager/interfaces/UsagerRdvInfos.interface.ts similarity index 67% rename from packages/frontend/src/_common/model/usager/rdv/UsagerRdvInfos.type.ts rename to packages/common/src/usager/interfaces/UsagerRdvInfos.interface.ts index e7bbcccc0d..74bfe497bb 100644 --- a/packages/frontend/src/_common/model/usager/rdv/UsagerRdvInfos.type.ts +++ b/packages/common/src/usager/interfaces/UsagerRdvInfos.interface.ts @@ -1,5 +1,5 @@ -export type UsagerRdvInfos = { +export interface UsagerRdvInfos { display: boolean; class: "danger" | "warning" | ""; content: string; -}; +} diff --git a/packages/common/src/usager/interfaces/index.ts b/packages/common/src/usager/interfaces/index.ts index 28ca2a14d7..9172a55701 100644 --- a/packages/common/src/usager/interfaces/index.ts +++ b/packages/common/src/usager/interfaces/index.ts @@ -5,3 +5,4 @@ export * from "./UsagerDoc.interface"; export * from "./UsagerEntretien.interface"; export * from "./UsagerLastInteraction.interface"; export * from "./UsagerRdv.interface"; +export * from "./UsagerRdvInfos.interface"; diff --git a/packages/common/src/usager/entretien/UsagerEntretienCause.type.ts b/packages/common/src/usager/types/entretien/UsagerEntretienCause.type.ts similarity index 100% rename from packages/common/src/usager/entretien/UsagerEntretienCause.type.ts rename to packages/common/src/usager/types/entretien/UsagerEntretienCause.type.ts diff --git a/packages/common/src/usager/entretien/UsagerEntretienLienCommune.type.ts b/packages/common/src/usager/types/entretien/UsagerEntretienLienCommune.type.ts similarity index 100% rename from packages/common/src/usager/entretien/UsagerEntretienLienCommune.type.ts rename to packages/common/src/usager/types/entretien/UsagerEntretienLienCommune.type.ts diff --git a/packages/common/src/usager/entretien/UsagerEntretienRaisonDemande.type.ts b/packages/common/src/usager/types/entretien/UsagerEntretienRaisonDemande.type.ts similarity index 100% rename from packages/common/src/usager/entretien/UsagerEntretienRaisonDemande.type.ts rename to packages/common/src/usager/types/entretien/UsagerEntretienRaisonDemande.type.ts diff --git a/packages/common/src/usager/entretien/UsagerEntretienResidence.type.ts b/packages/common/src/usager/types/entretien/UsagerEntretienResidence.type.ts similarity index 100% rename from packages/common/src/usager/entretien/UsagerEntretienResidence.type.ts rename to packages/common/src/usager/types/entretien/UsagerEntretienResidence.type.ts diff --git a/packages/common/src/usager/entretien/UsagerEntretienTypeMenage.type.ts b/packages/common/src/usager/types/entretien/UsagerEntretienTypeMenage.type.ts similarity index 100% rename from packages/common/src/usager/entretien/UsagerEntretienTypeMenage.type.ts rename to packages/common/src/usager/types/entretien/UsagerEntretienTypeMenage.type.ts diff --git a/packages/common/src/usager/entretien/index.ts b/packages/common/src/usager/types/entretien/index.ts similarity index 100% rename from packages/common/src/usager/entretien/index.ts rename to packages/common/src/usager/types/entretien/index.ts diff --git a/packages/common/src/usager/types/index.ts b/packages/common/src/usager/types/index.ts index cc8059dcd5..93468d2d84 100644 --- a/packages/common/src/usager/types/index.ts +++ b/packages/common/src/usager/types/index.ts @@ -1,6 +1,7 @@ // @index('./*', f => `export * from '${f.path}'`) export * from "./AyantDroitLienParente.type"; export * from "./CerfaDoc.type"; +export * from "./entretien"; export * from "./UsagerDecisionMotif.type"; export * from "./UsagerDecisionOrientation.type"; export * from "./UsagerDecisionStatut.type"; diff --git a/packages/common/tsconfig.json b/packages/common/tsconfig.json index 1d766eb389..c1ab8fd7d8 100644 --- a/packages/common/tsconfig.json +++ b/packages/common/tsconfig.json @@ -19,7 +19,7 @@ "strict": true, "strictFunctionTypes": true, "target": "esnext", - "typeRoots": ["node_modules/@types"] + "typeRoots": ["node_modules/@types", "../../node_modules/@types"] }, "exclude": ["node_modules", "dist"] } diff --git a/packages/frontend/package.json b/packages/frontend/package.json index 99bc13fe43..f2c864e420 100644 --- a/packages/frontend/package.json +++ b/packages/frontend/package.json @@ -39,7 +39,7 @@ "@ngrx/store-devtools": "^15.4.0", "@popperjs/core": "^2.11.8", "@schematics/angular": "^15.2.10", - "@sentry/angular": "^7.76.0", + "@sentry/angular": "^7.79.0", "@swimlane/ngx-charts": "^20.4.1", "angular-user-idle": "^4.0.0", "bootstrap": "^5.2.0", @@ -54,7 +54,7 @@ "ngx-matomo-client": "^5.0.4", "rxjs": "^7.6.0", "tslib": "^2.3.0", - "validator": "^13.9.0", + "validator": "^13.11.0", "zone.js": "~0.14.0" }, "devDependencies": { @@ -71,20 +71,20 @@ "@angular/compiler-cli": "^15.2.10", "@angular/language-service": "^15.2.10", "@schematics/update": "^0.1102.19", - "@types/file-saver": "^2.0.5", - "@types/google-libphonenumber": "^7.4.23", - "@types/jest": "^29.2.4", + "@types/file-saver": "^2.0.7", + "@types/google-libphonenumber": "^7.4.30", + "@types/jest": "^29.5.8", "@types/node": "^20.3.3", "@typescript-eslint/eslint-plugin": "^6.0.0", "@typescript-eslint/parser": "6.10.0", - "eslint": "^8.50.0", - "eslint-config-standard-with-typescript": "^39.1.0", - "eslint-plugin-import": "^2.28.1", - "eslint-plugin-n": "^16.1.0", + "eslint": "^8.53.0", + "eslint-config-standard-with-typescript": "^39.1.1", + "eslint-plugin-import": "^2.29.0", + "eslint-plugin-n": "^16.3.0", "eslint-plugin-no-lookahead-lookbehind-regexp": "^0.3.0", - "eslint-plugin-prettier": "^5.0.0", + "eslint-plugin-prettier": "^5.0.1", "jest": "^29.7.0", - "jest-preset-angular": "^13.1.2", + "jest-preset-angular": "^13.1.3", "lint-staged": "^15.0.0", "ng-lint-staged": "^12.0.4", "prettier": "2.8.8", diff --git a/packages/frontend/src/_common/mocks/USAGER_ACTIF.mock.ts b/packages/frontend/src/_common/mocks/USAGER_ACTIF.mock.ts index 887dbf38c3..6787a01642 100644 --- a/packages/frontend/src/_common/mocks/USAGER_ACTIF.mock.ts +++ b/packages/frontend/src/_common/mocks/USAGER_ACTIF.mock.ts @@ -5,6 +5,7 @@ import { ETAPE_DOSSIER_COMPLET } from "@domifa/common"; export const USAGER_ACTIF_MOCK: UsagerLight = { numeroDistribution: null, decision: { + uuid: "x", statut: "VALIDE", dateDebut: new Date("2020-02-12T00:00:00.000Z"), dateDecision: new Date("2020-02-12T00:00:00.000Z"), @@ -84,6 +85,7 @@ export const USAGER_ACTIF_MOCK: UsagerLight = { etapeDemande: ETAPE_DOSSIER_COMPLET, historique: [ { + uuid: "x", statut: "VALIDE", dateDebut: new Date("2020-02-12T00:00:00.000Z"), dateDecision: new Date("2020-02-12T00:00:00.000Z"), @@ -97,6 +99,7 @@ export const USAGER_ACTIF_MOCK: UsagerLight = { userName: "Testeur Robin", }, { + uuid: "x", dateDebut: new Date("2020-12-01T10:00:24.980Z"), dateDecision: new Date("2020-12-01T10:00:24.980Z"), dateFin: new Date("2020-12-01T10:00:24.980Z"), diff --git a/packages/frontend/src/_common/mocks/USAGER_REFUS.mock.ts b/packages/frontend/src/_common/mocks/USAGER_REFUS.mock.ts index be98a76e70..d5116bbbd7 100644 --- a/packages/frontend/src/_common/mocks/USAGER_REFUS.mock.ts +++ b/packages/frontend/src/_common/mocks/USAGER_REFUS.mock.ts @@ -4,8 +4,8 @@ import { ETAPE_DOSSIER_COMPLET } from "@domifa/common"; export const USAGER_REFUS_MOCK: UsagerLight = { numeroDistribution: null, - decision: { + uuid: "x", orientationDetails: null, orientation: null, statut: "REFUS", @@ -85,6 +85,7 @@ export const USAGER_REFUS_MOCK: UsagerLight = { etapeDemande: ETAPE_DOSSIER_COMPLET, historique: [ { + uuid: "x", dateDebut: new Date("2020-12-01T10:00:24.980Z"), dateDecision: new Date("2020-12-01T10:00:24.980Z"), dateFin: new Date("2020-12-01T10:00:24.980Z"), diff --git a/packages/frontend/src/_common/model/usager/Usager.type.ts b/packages/frontend/src/_common/model/usager/Usager.type.ts index 3687380072..e6805e0fdf 100644 --- a/packages/frontend/src/_common/model/usager/Usager.type.ts +++ b/packages/frontend/src/_common/model/usager/Usager.type.ts @@ -2,14 +2,9 @@ import { AppEntity, Telephone, UsagerEcheanceInfos, - UsagerRdvInfos, } from "../../../_common/model"; import { UsagerEntretien } from "./entretien"; - -import { UsagerDecision } from "./decision/types/UsagerDecision.type"; - import { UsagerImport } from "./UsagerImport.type"; - import { UsagerNote } from "./UsagerNote.type"; import { UsagerOptions } from "./options/UsagerOptions.type"; @@ -19,6 +14,8 @@ import { UsagerSexe, UsagerTypeDom, UsagerLastInteraction, + UsagerDecision, + UsagerRdvInfos, } from "@domifa/common"; export type Usager = AppEntity & { diff --git a/packages/frontend/src/_common/model/usager/decision/types/UsagerDecision.type.ts b/packages/frontend/src/_common/model/usager/decision/types/UsagerDecision.type.ts deleted file mode 100644 index 1bd9a2f4c9..0000000000 --- a/packages/frontend/src/_common/model/usager/decision/types/UsagerDecision.type.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { - UsagerTypeDom, - UsagerDecisionMotif, - UsagerDecisionOrientation, - UsagerDecisionStatut, -} from "@domifa/common"; - -export type UsagerDecision = { - uuid?: string; // permet d'identifier une décision en cas de suppression de l'historique - - dateDebut: Date | null; - dateFin: Date | null; - dateDecision: Date; // Now() - - typeDom: UsagerTypeDom; - statut: UsagerDecisionStatut; - - // Motif de refus ou radiation - motif: UsagerDecisionMotif | null; - motifDetails: string | null; - - // Orientation si refus - orientation: UsagerDecisionOrientation | null; - orientationDetails: string | null; - - userId: number | null; // UserStructure.id - userName: string; // UserStructure.nom / prenom -}; diff --git a/packages/frontend/src/_common/model/usager/decision/types/UsagerDecisionStatusColor.type.ts b/packages/frontend/src/_common/model/usager/decision/types/UsagerDecisionStatusColor.type.ts deleted file mode 100644 index 321499a718..0000000000 --- a/packages/frontend/src/_common/model/usager/decision/types/UsagerDecisionStatusColor.type.ts +++ /dev/null @@ -1,5 +0,0 @@ -export type UsagerDecisionStatusColor = - | "status-green" - | "status-red" - | "status-orange" - | "status-grey"; diff --git a/packages/frontend/src/_common/model/usager/decision/types/index.ts b/packages/frontend/src/_common/model/usager/decision/types/index.ts index 53e5e6398b..b0e1da07f3 100644 --- a/packages/frontend/src/_common/model/usager/decision/types/index.ts +++ b/packages/frontend/src/_common/model/usager/decision/types/index.ts @@ -1,6 +1,4 @@ // @index('./*', f => `export * from '${f.path}'`) -export * from "./UsagerDecision.type"; export * from "./UsagerDecisionRadiationForm.type"; export * from "./UsagerDecisionRefusForm.type"; -export * from "./UsagerDecisionStatusColor.type"; export * from "./UsagerDecisionValideForm"; diff --git a/packages/frontend/src/_common/model/usager/rdv/index.ts b/packages/frontend/src/_common/model/usager/rdv/index.ts index 9b1ab43b66..7d10963d57 100644 --- a/packages/frontend/src/_common/model/usager/rdv/index.ts +++ b/packages/frontend/src/_common/model/usager/rdv/index.ts @@ -1,3 +1,2 @@ //@index('./*', f => `export * from '${f.path}'`) export * from "./RdvForm.type"; -export * from "./UsagerRdvInfos.type"; diff --git a/packages/frontend/src/app/modules/manage-usagers/components/manage-usagers-page/manage-usagers-page.component.ts b/packages/frontend/src/app/modules/manage-usagers/components/manage-usagers-page/manage-usagers-page.component.ts index fe86db9acf..b53fab8428 100644 --- a/packages/frontend/src/app/modules/manage-usagers/components/manage-usagers-page/manage-usagers-page.component.ts +++ b/packages/frontend/src/app/modules/manage-usagers/components/manage-usagers-page/manage-usagers-page.component.ts @@ -408,23 +408,6 @@ export class ManageUsagersPageComponent implements OnInit, OnDestroy { return filters === null ? {} : JSON.parse(filters); } - // private loadTallyScript(): void { - // // eslint-disable-next-line @typescript-eslint/no-explicit-any - // const tally: any = window["Tally" as unknown as any]; - // if (tally) { - // tally.openPopup("31k1RO", { - // layout: "popup", - // overlay: true, - // showOnce: true, - // emoji: { - // text: "👋", - // animation: "wave", - // }, - // doNotShowAfterSubmit: true, - // }); - // } - // } - @HostListener("window:scroll", ["$event"]) public onScroll(): void { const pos = diff --git a/packages/frontend/src/app/modules/structures/types/Structure.type.ts b/packages/frontend/src/app/modules/structures/types/Structure.type.ts index 46f6be37f5..44b6201fc1 100644 --- a/packages/frontend/src/app/modules/structures/types/Structure.type.ts +++ b/packages/frontend/src/app/modules/structures/types/Structure.type.ts @@ -1,7 +1,6 @@ -import { StructureType } from "@domifa/common"; +import { StructureType, StructureAddresseCourrier } from "@domifa/common"; import { AppEntity, Telephone } from "../../../../_common/model"; import { TimeZone } from "../../../../app/shared/territoires/types/TimeZone.type"; -import { StructureAddresseCourrier } from "./StructureAddresseCourrier.interface"; import { StructurePortailUsagerParams } from "./StructurePortailUsagerParams.type"; import { StructureResponsable } from "./StructureResponsable.type"; import { StructureSmsParams } from "./StructureSmsParams.type"; diff --git a/packages/frontend/src/app/modules/structures/types/StructureCommonWeb.class.ts b/packages/frontend/src/app/modules/structures/types/StructureCommonWeb.class.ts index 9d65d1dbe9..bb7c89cdcc 100644 --- a/packages/frontend/src/app/modules/structures/types/StructureCommonWeb.class.ts +++ b/packages/frontend/src/app/modules/structures/types/StructureCommonWeb.class.ts @@ -2,12 +2,11 @@ import { Telephone } from "../../../../_common/model"; import { TimeZone } from "../../../shared/territoires/types/TimeZone.type"; import { CountryISO } from "ngx-intl-tel-input"; -import { StructureAddresseCourrier } from "./StructureAddresseCourrier.interface"; import { StructureCommon } from "./StructureCommon.type"; import { StructurePortailUsagerParams } from "./StructurePortailUsagerParams.type"; import { StructureResponsable } from "./StructureResponsable.type"; import { StructureSmsParams } from "./StructureSmsParams.type"; -import { StructureType } from "@domifa/common"; +import { StructureType, StructureAddresseCourrier } from "@domifa/common"; export class StructureCommonWeb implements StructureCommon { public id = 0; diff --git a/packages/frontend/src/app/modules/structures/types/index.ts b/packages/frontend/src/app/modules/structures/types/index.ts index 32590ee754..01225b719f 100644 --- a/packages/frontend/src/app/modules/structures/types/index.ts +++ b/packages/frontend/src/app/modules/structures/types/index.ts @@ -1,6 +1,5 @@ // @index('./*', f => `export * from '${f.path}'`) export * from "./Structure.type"; -export * from "./StructureAddresseCourrier.interface"; export * from "./StructureCommon.type"; export * from "./StructureCommonWeb.class"; export * from "./StructurePortailUsagerParams.type"; diff --git a/packages/frontend/src/app/modules/usager-profil/components/_historiques/profil-historique-decisions/profil-historique-decisions.component.ts b/packages/frontend/src/app/modules/usager-profil/components/_historiques/profil-historique-decisions/profil-historique-decisions.component.ts index 17a0ab955e..179f83bdb5 100644 --- a/packages/frontend/src/app/modules/usager-profil/components/_historiques/profil-historique-decisions/profil-historique-decisions.component.ts +++ b/packages/frontend/src/app/modules/usager-profil/components/_historiques/profil-historique-decisions/profil-historique-decisions.component.ts @@ -1,7 +1,10 @@ import { Component, Input } from "@angular/core"; import { UsagerFormModel } from "../../../../usager-shared/interfaces"; -import { USAGER_DECISION_STATUT_LABELS_PROFIL } from "@domifa/common"; -import { UsagerDecision, UserStructure } from "../../../../../../_common/model"; +import { + USAGER_DECISION_STATUT_LABELS_PROFIL, + UsagerDecision, +} from "@domifa/common"; +import { UserStructure } from "../../../../../../_common/model"; import { UsagersFilterCriteriaSortValues } from "../../../../manage-usagers/components/usager-filter"; @Component({ diff --git a/packages/frontend/src/app/modules/usager-shared/interfaces/UsagerFormModel.ts b/packages/frontend/src/app/modules/usager-shared/interfaces/UsagerFormModel.ts index 7e833e6188..e3531b6092 100644 --- a/packages/frontend/src/app/modules/usager-shared/interfaces/UsagerFormModel.ts +++ b/packages/frontend/src/app/modules/usager-shared/interfaces/UsagerFormModel.ts @@ -2,14 +2,12 @@ import { CountryISO } from "ngx-intl-tel-input"; import { Entretien, Rdv, Decision, Options } from "."; import { UsagerNote, - UsagerDecision, UsagerEcheanceInfos, - UsagerRdvInfos, Telephone, UsagerLight, } from "../../../../_common/model"; -import { getEcheanceInfos, getRdvInfos } from "../utils"; +import { getEcheanceInfos } from "../utils"; import { ETAPE_ETAT_CIVIL, USAGER_DECISION_STATUT_COLORS, @@ -18,6 +16,9 @@ import { UsagerTypeDom, UsagerAyantDroit, INTERACTIONS_IN, + getRdvInfos, + UsagerDecision, + UsagerRdvInfos, } from "@domifa/common"; export class UsagerFormModel { @@ -136,7 +137,11 @@ export class UsagerFormModel { color: USAGER_DECISION_STATUT_COLORS[this.decision.statut], }; this.echeanceInfos = getEcheanceInfos(usager); - this.rdvInfos = getRdvInfos(usager); + this.rdvInfos = getRdvInfos({ + rdv: this.rdv, + etapeDemande: this.etapeDemande, + }); + this.totalInteractionsEnAttente = 0; INTERACTIONS_IN.forEach((interaction) => { this.totalInteractionsEnAttente += this.lastInteraction[interaction]; diff --git a/packages/frontend/src/app/modules/usager-shared/interfaces/decision.ts b/packages/frontend/src/app/modules/usager-shared/interfaces/decision.ts index 12eeda27be..e729021902 100644 --- a/packages/frontend/src/app/modules/usager-shared/interfaces/decision.ts +++ b/packages/frontend/src/app/modules/usager-shared/interfaces/decision.ts @@ -3,13 +3,13 @@ import { UsagerTypeDom, UsagerDecisionStatut, UsagerDecisionMotif, + UsagerDecision, + generateMotifLabel, UsagerDecisionOrientation, } from "@domifa/common"; -import { UsagerDecision } from "../../../../_common/model"; -import { generateMotifLabel } from "../utils"; export class Decision implements UsagerDecision { - public uuid?: string; + public uuid: string; public dateDebut: Date | null; public dateFin: Date | null; public dateDecision: Date; diff --git a/packages/frontend/src/app/modules/usager-shared/utils/generateMotifLabel.service.spec.ts b/packages/frontend/src/app/modules/usager-shared/utils/generateMotifLabel.service.spec.ts deleted file mode 100644 index 61263c03bd..0000000000 --- a/packages/frontend/src/app/modules/usager-shared/utils/generateMotifLabel.service.spec.ts +++ /dev/null @@ -1,42 +0,0 @@ -import { - USAGER_ACTIF_MOCK, - USAGER_REFUS_MOCK, -} from "../../../../_common/mocks"; -import { generateMotifLabel } from "./generateMotifLabel.service"; - -describe("generateMotifLabel", () => { - it("generateMotifLabel ", async () => { - expect(generateMotifLabel(USAGER_ACTIF_MOCK.decision)).toEqual(""); - - USAGER_REFUS_MOCK.decision.motif = "HORS_AGREMENT"; - expect(generateMotifLabel(USAGER_REFUS_MOCK.decision)).toEqual( - "En dehors des critères du public domicilié" - ); - - USAGER_REFUS_MOCK.decision.motif = "LIEN_COMMUNE"; - - expect(generateMotifLabel(USAGER_REFUS_MOCK.decision)).toEqual( - "Absence de lien avec la commune" - ); - - USAGER_REFUS_MOCK.decision.motif = "SATURATION"; - - expect(generateMotifLabel(USAGER_REFUS_MOCK.decision)).toEqual( - "Nombre maximal domiciliations atteint" - ); - - USAGER_REFUS_MOCK.decision.motif = "AUTRE"; - USAGER_REFUS_MOCK.decision.motifDetails = - "Nombre maximal domiciliations atteint"; - - expect(generateMotifLabel(USAGER_REFUS_MOCK.decision)).toEqual( - "Autre motif: Nombre maximal domiciliations atteint" - ); - - USAGER_REFUS_MOCK.decision.motifDetails = null; - - expect(generateMotifLabel(USAGER_REFUS_MOCK.decision)).toEqual( - "Autre motif: non précisé" - ); - }); -}); diff --git a/packages/frontend/src/app/modules/usager-shared/utils/index.ts b/packages/frontend/src/app/modules/usager-shared/utils/index.ts index 379c6aab25..a4c1078dd2 100644 --- a/packages/frontend/src/app/modules/usager-shared/utils/index.ts +++ b/packages/frontend/src/app/modules/usager-shared/utils/index.ts @@ -1,5 +1,3 @@ // @index('./*service.ts', f => `export * from '${f.path}'`) -export * from "./generateMotifLabel.service"; export * from "./getEcheanceInfos.service"; -export * from "./getRdvInfos.service"; export * from "./getUrlUsagerProfil.service"; diff --git a/packages/frontend/src/app/shared/store/ngRxAppStore.service.ts b/packages/frontend/src/app/shared/store/ngRxAppStore.service.ts index 3f0722ad17..4b92a328c0 100644 --- a/packages/frontend/src/app/shared/store/ngRxAppStore.service.ts +++ b/packages/frontend/src/app/shared/store/ngRxAppStore.service.ts @@ -7,11 +7,9 @@ import { USAGER_DECISION_STATUT_LABELS, USAGER_DECISION_STATUT_COLORS, INTERACTIONS_IN, -} from "@domifa/common"; -import { - getEcheanceInfos, getRdvInfos, -} from "../../modules/usager-shared/utils"; +} from "@domifa/common"; +import { getEcheanceInfos } from "../../modules/usager-shared/utils"; import { Options, UsagerFormModel, @@ -231,7 +229,10 @@ export const setUsagerInformations = (usager: UsagerLight): any => { color: USAGER_DECISION_STATUT_COLORS[usager?.decision?.statut], }, echeanceInfos: getEcheanceInfos(usager), - rdvInfos: getRdvInfos(usager), + rdvInfos: getRdvInfos({ + rdv: usager.rdv, + etapeDemande: usager.etapeDemande, + }), totalInteractionsEnAttente, historique: [], options: new Options(usager.options), diff --git a/packages/frontend/src/index.html b/packages/frontend/src/index.html index 14c619e953..45000c679a 100644 --- a/packages/frontend/src/index.html +++ b/packages/frontend/src/index.html @@ -60,6 +60,5 @@ - diff --git a/packages/portail-admins/Dockerfile b/packages/portail-admins/Dockerfile index 7aa6c75895..5151bb9fa3 100644 --- a/packages/portail-admins/Dockerfile +++ b/packages/portail-admins/Dockerfile @@ -1,4 +1,4 @@ -FROM node:18.16.1 AS builder +FROM node:18.16.1 AS deps RUN apt-get update -y && apt-get install gettext-base && rm -rf /var/lib/apt/lists/* @@ -8,6 +8,13 @@ COPY yarn.lock .yarnrc.yml ./ COPY .yarn .yarn RUN yarn fetch workspaces focus @domifa/portail-admins +FROM deps AS builder-common +COPY ./packages/common ./packages/common +RUN yarn workspace @domifa/common build + +FROM deps AS builder +COPY --from=builder-common /app/packages/common ./packages/common + COPY ./packages/portail-admins ./packages/portail-admins # these variables are needed at build time because we produce a *static* app diff --git a/packages/portail-admins/package.json b/packages/portail-admins/package.json index 9dfcc556f8..aa152854f9 100644 --- a/packages/portail-admins/package.json +++ b/packages/portail-admins/package.json @@ -27,20 +27,22 @@ "@angular/platform-browser": "^15.2.10", "@angular/platform-browser-dynamic": "^15.2.10", "@angular/router": "^15.2.10", + "@domifa/common": "workspace:^", "@fortawesome/angular-fontawesome": "0.12.1", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-regular-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", "@ng-bootstrap/ng-bootstrap": "^14.2.0", "@popperjs/core": "^2.11.8", - "@sentry/angular": "^7.76.0", - "@sentry/browser": "^7.76.0", - "@sentry/tracing": "^7.76.0", + "@sentry/angular": "^7.79.0", + "@sentry/browser": "^7.79.0", + "@sentry/tracing": "^7.79.0", "bootstrap": "^5.2.0", "class-validator": "^0.14.0", "date-fns": "^2.30.0", "file-saver": "^2.0.5", "redux": "^4.1.0", + "rimraf": "^5.0.5", "rxjs": "^7.6.0", "zone.js": "~0.14.0" }, @@ -59,18 +61,19 @@ "@angular/language-service": "^15.2.10", "@schematics/update": "^0.1102.19", "@types/d3": "^7.4.1", - "@types/file-saver": "^2.0.5", - "@types/jest": "^29.2.4", + "@types/file-saver": "^2.0.7", + "@types/jest": "^29.5.8", "@types/node": "^20.3.3", + "@types/rimraf": "^4.0.5", "@typescript-eslint/eslint-plugin": "6.10.0", "@typescript-eslint/parser": "6.10.0", - "eslint": "^8.50.0", + "eslint": "^8.53.0", "eslint-config-prettier": "^9.0.0", - "eslint-plugin-import": "^2.28.1", + "eslint-plugin-import": "^2.29.0", "eslint-plugin-no-lookahead-lookbehind-regexp": "^0.3.0", - "eslint-plugin-prettier": "^5.0.0", + "eslint-plugin-prettier": "^5.0.1", "jest": "^29.7.0", - "jest-preset-angular": "^13.1.2", + "jest-preset-angular": "^13.1.3", "lint-staged": "^15.0.0", "ng-lint-staged": "^12.0.4", "prettier": "2.8.8", diff --git a/packages/portail-usagers/.eslintrc.json b/packages/portail-usagers/.eslintrc.json index d4ceb145fb..d25dd46bc4 100644 --- a/packages/portail-usagers/.eslintrc.json +++ b/packages/portail-usagers/.eslintrc.json @@ -52,6 +52,7 @@ "files": ["*.html"], "extends": ["plugin:@angular-eslint/template/recommended"], "rules": { + "@angular-eslint/template/no-call-expression": "warn", "@angular-eslint/component-max-inline-declarations": "error", "@angular-eslint/template/accessibility-interactive-supports-focus": "error", "@angular-eslint/template/eqeqeq": "error", diff --git a/packages/portail-usagers/Dockerfile b/packages/portail-usagers/Dockerfile index f953e678ac..5b34438980 100644 --- a/packages/portail-usagers/Dockerfile +++ b/packages/portail-usagers/Dockerfile @@ -1,4 +1,4 @@ -FROM node:18.16.1 AS builder +FROM node:18.16.1 AS deps RUN apt-get update -y && apt-get install gettext-base && rm -rf /var/lib/apt/lists/* @@ -8,6 +8,13 @@ COPY yarn.lock .yarnrc.yml ./ COPY .yarn .yarn RUN yarn fetch workspaces focus @domifa/portail-usagers +FROM deps AS builder-common +COPY ./packages/common ./packages/common +RUN yarn workspace @domifa/common build + +FROM deps AS builder +COPY --from=builder-common /app/packages/common ./packages/common + COPY ./packages/portail-usagers ./packages/portail-usagers # these variables are needed at build time because we produce a *static* app diff --git a/packages/portail-usagers/package.json b/packages/portail-usagers/package.json index a5454c8970..a3c638d5f5 100644 --- a/packages/portail-usagers/package.json +++ b/packages/portail-usagers/package.json @@ -26,13 +26,14 @@ "@angular/platform-browser": "^15.2.10", "@angular/platform-browser-dynamic": "^15.2.10", "@angular/router": "^15.2.10", + "@domifa/common": "workspace:^", "@fortawesome/angular-fontawesome": "0.12.1", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-regular-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", "@ng-bootstrap/ng-bootstrap": "^14.2.0", "@popperjs/core": "^2.11.8", - "@sentry/angular": "^7.76.0", + "@sentry/angular": "^7.79.0", "angular-user-idle": "^4.0.0", "bootstrap": "5.2.3", "date-fns": "^2.30.0", @@ -54,19 +55,19 @@ "@angular/cli": "15.2.10", "@angular/compiler-cli": "^15.2.10", "@angular/language-service": "^15.2.10", - "@types/google-libphonenumber": "^7.4.23", - "@types/jest": "^29.2.4", + "@types/google-libphonenumber": "^7.4.30", + "@types/jest": "^29.5.8", "@types/node": "^20.3.3", "@typescript-eslint/eslint-plugin": "6.10.0", "@typescript-eslint/parser": "6.10.0", - "eslint": "^8.50.0", - "eslint-config-standard-with-typescript": "^39.1.0", - "eslint-plugin-import": "^2.28.1", - "eslint-plugin-n": "^16.1.0", + "eslint": "^8.53.0", + "eslint-config-standard-with-typescript": "^39.1.1", + "eslint-plugin-import": "^2.29.0", + "eslint-plugin-n": "^16.3.0", "eslint-plugin-no-lookahead-lookbehind-regexp": "^0.3.0", - "eslint-plugin-prettier": "^5.0.0", + "eslint-plugin-prettier": "^5.0.1", "jest": "^29.7.0", - "jest-preset-angular": "^13.1.2", + "jest-preset-angular": "^13.1.3", "lint-staged": "^15.0.0", "ng-lint-staged": "^12.0.4", "prettier": "2.8.8", diff --git a/packages/portail-usagers/src/_common/_portail-usager/PortailUsagerAuthApiResponse.type.ts b/packages/portail-usagers/src/_common/_portail-usager/PortailUsagerAuthApiResponse.interface.ts similarity index 70% rename from packages/portail-usagers/src/_common/_portail-usager/PortailUsagerAuthApiResponse.type.ts rename to packages/portail-usagers/src/_common/_portail-usager/PortailUsagerAuthApiResponse.interface.ts index 1cb1c5d05c..08828748a2 100644 --- a/packages/portail-usagers/src/_common/_portail-usager/PortailUsagerAuthApiResponse.type.ts +++ b/packages/portail-usagers/src/_common/_portail-usager/PortailUsagerAuthApiResponse.interface.ts @@ -1,6 +1,6 @@ import { PortailUsagerProfile } from "./PortailUsagerProfile.type"; -export type PortailUsagerAuthApiResponse = { +export interface PortailUsagerAuthApiResponse { token: string; profile: PortailUsagerProfile; -}; +} diff --git a/packages/portail-usagers/src/_common/_portail-usager/PortailUsagerAuthLoginForm.interface.ts b/packages/portail-usagers/src/_common/_portail-usager/PortailUsagerAuthLoginForm.interface.ts new file mode 100644 index 0000000000..7c1491b7e2 --- /dev/null +++ b/packages/portail-usagers/src/_common/_portail-usager/PortailUsagerAuthLoginForm.interface.ts @@ -0,0 +1,4 @@ +export interface PortailUsagerAuthLoginForm { + login: string; + password: string; +} diff --git a/packages/portail-usagers/src/_common/_portail-usager/PortailUsagerAuthLoginForm.type.ts b/packages/portail-usagers/src/_common/_portail-usager/PortailUsagerAuthLoginForm.type.ts deleted file mode 100644 index ddf11312c8..0000000000 --- a/packages/portail-usagers/src/_common/_portail-usager/PortailUsagerAuthLoginForm.type.ts +++ /dev/null @@ -1,4 +0,0 @@ -export type PortailUsagerAuthLoginForm = { - login: string; - password: string; -}; diff --git a/packages/portail-usagers/src/_common/_portail-usager/PortailUsagerPublic.type.ts b/packages/portail-usagers/src/_common/_portail-usager/PortailUsagerPublic.type.ts index 9afe885e71..8f317385e8 100644 --- a/packages/portail-usagers/src/_common/_portail-usager/PortailUsagerPublic.type.ts +++ b/packages/portail-usagers/src/_common/_portail-usager/PortailUsagerPublic.type.ts @@ -1,14 +1,14 @@ +import { UsagerOptions } from "../usager"; +import { Telephone } from "../common"; +import { AppEntity } from "../_core"; import { - UsagerAyantDroit, - UsagerDecision, - UsagerLastInteractions, - UsagerOptions, - UsagerRdv, UsagerSexe, UsagerTypeDom, -} from "../usager"; -import { Telephone } from "../common"; -import { AppEntity } from "../_core"; + UsagerLastInteraction, + UsagerRdv, + UsagerAyantDroit, + UsagerDecision, +} from "@domifa/common"; export type PortailUsagerPublic = AppEntity & { ref: number; // unique par structure @@ -47,7 +47,7 @@ export type PortailUsagerPublic = AppEntity & { historique: UsagerDecision[]; // INTERACTIONS - lastInteraction: UsagerLastInteractions; + lastInteraction: UsagerLastInteraction; options: UsagerOptions; }; diff --git a/packages/portail-usagers/src/_common/_portail-usager/index.ts b/packages/portail-usagers/src/_common/_portail-usager/index.ts index d0b1c96c68..9b9052af93 100644 --- a/packages/portail-usagers/src/_common/_portail-usager/index.ts +++ b/packages/portail-usagers/src/_common/_portail-usager/index.ts @@ -1,4 +1,4 @@ -export * from "./PortailUsagerAuthApiResponse.type"; -export * from "./PortailUsagerAuthLoginForm.type"; +export * from "./PortailUsagerAuthApiResponse.interface"; +export * from "./PortailUsagerAuthLoginForm.interface"; export * from "./PortailUsagerProfile.type"; export * from "./PortailUsagerPublic.type"; diff --git a/packages/portail-usagers/src/_common/index.ts b/packages/portail-usagers/src/_common/index.ts index 277301b9e0..58d9a67796 100644 --- a/packages/portail-usagers/src/_common/index.ts +++ b/packages/portail-usagers/src/_common/index.ts @@ -3,5 +3,4 @@ export * from "./_core"; export * from "./_portail-usager"; export * from "./common"; export * from "./mocks"; -export * from "./structure"; export * from "./usager"; diff --git a/packages/portail-usagers/src/_common/mocks/DEFAULT_USAGER.const.ts b/packages/portail-usagers/src/_common/mocks/DEFAULT_USAGER.const.ts index 9c7edbb5ef..9e772d7a5e 100644 --- a/packages/portail-usagers/src/_common/mocks/DEFAULT_USAGER.const.ts +++ b/packages/portail-usagers/src/_common/mocks/DEFAULT_USAGER.const.ts @@ -13,6 +13,7 @@ export const DEFAULT_USAGER: PortailUsagerPublic = { dateNaissance: new Date("1998-08-07T00:00:00.000Z"), datePremiereDom: new Date("2018-01-11T00:00:00.000Z"), decision: { + uuid: "x", dateDebut: new Date("2020-02-12T00:00:00.000Z"), dateDecision: new Date("2020-02-12T00:00:00.000Z"), dateFin: new Date("2021-02-12T00:00:00.000Z"), diff --git a/packages/portail-usagers/src/_common/mocks/USAGER_REFUS.mock.ts b/packages/portail-usagers/src/_common/mocks/USAGER_REFUS.mock.ts index 220b57a72e..66e388bdfa 100644 --- a/packages/portail-usagers/src/_common/mocks/USAGER_REFUS.mock.ts +++ b/packages/portail-usagers/src/_common/mocks/USAGER_REFUS.mock.ts @@ -2,6 +2,7 @@ import { PortailUsagerPublic } from ".."; export const USAGER_REFUS_MOCK: PortailUsagerPublic = { decision: { + uuid: "x", orientationDetails: "", statut: "REFUS", dateDebut: new Date("2020-02-12T00:00:00.000Z"), @@ -47,6 +48,7 @@ export const USAGER_REFUS_MOCK: PortailUsagerPublic = { etapeDemande: 5, historique: [ { + uuid: "x", dateDebut: new Date("2020-12-01T10:00:24.980Z"), dateDecision: new Date("2020-12-01T10:00:24.980Z"), dateFin: new Date("2020-12-01T10:00:24.980Z"), @@ -60,9 +62,7 @@ export const USAGER_REFUS_MOCK: PortailUsagerPublic = { telephone: { countryCode: "fr", numero: "0142424242" }, surnom: "", - typeDom: "RENOUVELLEMENT", - customRef: "5", dateNaissance: new Date("1998-08-07T00:00:00.000Z"), nom: "Martine", diff --git a/packages/portail-usagers/src/_common/structure/StructureAddresseCourrier.type.ts b/packages/portail-usagers/src/_common/structure/StructureAddresseCourrier.type.ts deleted file mode 100644 index 1790461df1..0000000000 --- a/packages/portail-usagers/src/_common/structure/StructureAddresseCourrier.type.ts +++ /dev/null @@ -1,6 +0,0 @@ -export type StructureAddresseCourrier = { - actif: boolean; - adresse: string; - ville: string; - codePostal: string; -}; diff --git a/packages/portail-usagers/src/_common/structure/StructureType.type.ts b/packages/portail-usagers/src/_common/structure/StructureType.type.ts deleted file mode 100644 index 0d2d8298af..0000000000 --- a/packages/portail-usagers/src/_common/structure/StructureType.type.ts +++ /dev/null @@ -1 +0,0 @@ -export type StructureType = "asso" | "ccas" | "cias"; diff --git a/packages/portail-usagers/src/_common/structure/index.ts b/packages/portail-usagers/src/_common/structure/index.ts deleted file mode 100644 index 3705f6d975..0000000000 --- a/packages/portail-usagers/src/_common/structure/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -//@index('./*', f => `export * from '${f.path}'`) -export * from "./StructureAddresseCourrier.type"; -export * from "./StructureType.type"; diff --git a/packages/portail-usagers/src/_common/usager/AyantDroitLienParente.type.ts b/packages/portail-usagers/src/_common/usager/AyantDroitLienParente.type.ts deleted file mode 100644 index 736900194d..0000000000 --- a/packages/portail-usagers/src/_common/usager/AyantDroitLienParente.type.ts +++ /dev/null @@ -1 +0,0 @@ -export type AyantDroiLienParent = "AUTRE" | "CONJOINT" | "ENFANT" | "PARENT"; diff --git a/packages/portail-usagers/src/_common/usager/UsagerAyantDroit.type.ts b/packages/portail-usagers/src/_common/usager/UsagerAyantDroit.type.ts deleted file mode 100644 index 1c22e70360..0000000000 --- a/packages/portail-usagers/src/_common/usager/UsagerAyantDroit.type.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { AyantDroiLienParent } from "./AyantDroitLienParente.type"; - -export type UsagerAyantDroit = { - nom: string; - prenom: string; - dateNaissance: Date; - lien: AyantDroiLienParent; -}; diff --git a/packages/portail-usagers/src/_common/usager/UsagerDecision.type.ts b/packages/portail-usagers/src/_common/usager/UsagerDecision.type.ts deleted file mode 100644 index d637ed8a9e..0000000000 --- a/packages/portail-usagers/src/_common/usager/UsagerDecision.type.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { UsagerDecisionMotif } from "./UsagerDecisionMotif.type"; -import { UsagerDecisionOrientation } from "./UsagerDecisionOrientation.type"; -import { UsagerDecisionStatut } from "./UsagerDecisionStatut.type"; -import { UsagerTypeDom } from "./UsagerTypeDom.type"; - -export type UsagerDecision = { - uuid?: string; // permet d'identifier une décision en cas de suppression de l'historique - - dateDebut: Date; - dateFin?: Date; - dateDecision: Date; // Now() - - typeDom: UsagerTypeDom; - statut: UsagerDecisionStatut; - - // Motif de refus ou radiation - motif?: UsagerDecisionMotif; - motifDetails?: string | null; - - // Orientation si refus - orientation?: UsagerDecisionOrientation; - orientationDetails?: string; - - userId: number; // UserStructure.id - userName: string; // UserStructure.nom / prenom -}; diff --git a/packages/portail-usagers/src/_common/usager/UsagerDecisionMotif.type.ts b/packages/portail-usagers/src/_common/usager/UsagerDecisionMotif.type.ts deleted file mode 100644 index dd2bfe44be..0000000000 --- a/packages/portail-usagers/src/_common/usager/UsagerDecisionMotif.type.ts +++ /dev/null @@ -1,16 +0,0 @@ -export type UsagerDecisionMotif = - // RADIATIOn - | "A_SA_DEMANDE" - | "PLUS_DE_LIEN_COMMUNE" - | "FIN_DE_DOMICILIATION" - | "NON_MANIFESTATION_3_MOIS" - | "NON_RESPECT_REGLEMENT" - | "ENTREE_LOGEMENT" - - // REFUS - | "HORS_AGREMENT" - | "LIEN_COMMUNE" - | "SATURATION" - - // AUTRE - | "AUTRE"; diff --git a/packages/portail-usagers/src/_common/usager/UsagerDecisionOrientation.type.ts b/packages/portail-usagers/src/_common/usager/UsagerDecisionOrientation.type.ts deleted file mode 100644 index 16f3673a92..0000000000 --- a/packages/portail-usagers/src/_common/usager/UsagerDecisionOrientation.type.ts +++ /dev/null @@ -1 +0,0 @@ -export type UsagerDecisionOrientation = "ccas" | "asso"; diff --git a/packages/portail-usagers/src/_common/usager/UsagerDecisionStatusColor.type.ts b/packages/portail-usagers/src/_common/usager/UsagerDecisionStatusColor.type.ts deleted file mode 100644 index 321499a718..0000000000 --- a/packages/portail-usagers/src/_common/usager/UsagerDecisionStatusColor.type.ts +++ /dev/null @@ -1,5 +0,0 @@ -export type UsagerDecisionStatusColor = - | "status-green" - | "status-red" - | "status-orange" - | "status-grey"; diff --git a/packages/portail-usagers/src/_common/usager/UsagerDecisionStatut.type.ts b/packages/portail-usagers/src/_common/usager/UsagerDecisionStatut.type.ts deleted file mode 100644 index 419b224b9b..0000000000 --- a/packages/portail-usagers/src/_common/usager/UsagerDecisionStatut.type.ts +++ /dev/null @@ -1,6 +0,0 @@ -export type UsagerDecisionStatut = - | "VALIDE" - | "INSTRUCTION" - | "ATTENTE_DECISION" - | "REFUS" - | "RADIE"; diff --git a/packages/portail-usagers/src/_common/usager/UsagerLastInteractions.type.ts b/packages/portail-usagers/src/_common/usager/UsagerLastInteractions.type.ts deleted file mode 100644 index 9c26e932be..0000000000 --- a/packages/portail-usagers/src/_common/usager/UsagerLastInteractions.type.ts +++ /dev/null @@ -1,7 +0,0 @@ -export type UsagerLastInteractions = { - dateInteraction: Date; - enAttente: boolean; - courrierIn: number; - recommandeIn: number; - colisIn: number; -}; diff --git a/packages/portail-usagers/src/_common/usager/UsagerRdv.type.ts b/packages/portail-usagers/src/_common/usager/UsagerRdv.type.ts deleted file mode 100644 index 9d4375079d..0000000000 --- a/packages/portail-usagers/src/_common/usager/UsagerRdv.type.ts +++ /dev/null @@ -1,5 +0,0 @@ -export type UsagerRdv = { - dateRdv: Date; - userId: number; // UserStructure - userName: string; // UserStructure -}; diff --git a/packages/portail-usagers/src/_common/usager/UsagerRdvInfos.type.ts b/packages/portail-usagers/src/_common/usager/UsagerRdvInfos.type.ts deleted file mode 100644 index 3ce7165360..0000000000 --- a/packages/portail-usagers/src/_common/usager/UsagerRdvInfos.type.ts +++ /dev/null @@ -1,5 +0,0 @@ -export type UsagerRdvInfos = { - display: boolean; - class: string; - content: string; -}; diff --git a/packages/portail-usagers/src/_common/usager/UsagerSexe.type.ts b/packages/portail-usagers/src/_common/usager/UsagerSexe.type.ts deleted file mode 100644 index 523cae30f6..0000000000 --- a/packages/portail-usagers/src/_common/usager/UsagerSexe.type.ts +++ /dev/null @@ -1 +0,0 @@ -export type UsagerSexe = "homme" | "femme"; diff --git a/packages/portail-usagers/src/_common/usager/UsagerTypeDom.type.ts b/packages/portail-usagers/src/_common/usager/UsagerTypeDom.type.ts deleted file mode 100644 index 174be3cafe..0000000000 --- a/packages/portail-usagers/src/_common/usager/UsagerTypeDom.type.ts +++ /dev/null @@ -1 +0,0 @@ -export type UsagerTypeDom = "PREMIERE_DOM" | "RENOUVELLEMENT"; diff --git a/packages/portail-usagers/src/_common/usager/constants/ETAPES_DEMANDE.const.ts b/packages/portail-usagers/src/_common/usager/constants/ETAPES_DEMANDE.const.ts deleted file mode 100644 index 907447cb17..0000000000 --- a/packages/portail-usagers/src/_common/usager/constants/ETAPES_DEMANDE.const.ts +++ /dev/null @@ -1,6 +0,0 @@ -export const ETAPE_ETAT_CIVIL = 0; -export const ETAPE_RENDEZ_VOUS = 1; -export const ETAPE_ENTRETIEN = 2; -export const ETAPE_DOCUMENTS = 3; -export const ETAPE_DECISION = 4; -export const ETAPE_DOSSIER_COMPLET = 5; diff --git a/packages/portail-usagers/src/_common/usager/constants/LIEN_PARENTE_LABELS.const.ts b/packages/portail-usagers/src/_common/usager/constants/LIEN_PARENTE_LABELS.const.ts deleted file mode 100644 index 196edc6fcc..0000000000 --- a/packages/portail-usagers/src/_common/usager/constants/LIEN_PARENTE_LABELS.const.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { AyantDroiLienParent } from "../AyantDroitLienParente.type"; - -export const LIEN_PARENTE_LABELS: { [key in AyantDroiLienParent]: string } = { - AUTRE: "Autre personne à la charge du domicilié", - CONJOINT: "Conjoint.e", - ENFANT: "Enfant", - PARENT: "Parent", -}; diff --git a/packages/portail-usagers/src/_common/usager/constants/MOTIFS_RADIATION_LABELS.const.ts b/packages/portail-usagers/src/_common/usager/constants/MOTIFS_RADIATION_LABELS.const.ts deleted file mode 100644 index 6314214458..0000000000 --- a/packages/portail-usagers/src/_common/usager/constants/MOTIFS_RADIATION_LABELS.const.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { UsagerDecisionMotif } from ".."; - -export const MOTIFS_RADIATION_LABELS: { - [key in UsagerDecisionMotif]?: string; -} = { - A_SA_DEMANDE: "À la demande de la personne", - PLUS_DE_LIEN_COMMUNE: "Plus de lien avec la commune", - FIN_DE_DOMICILIATION: - "La domiciliation est arrivée à échéance (1 an) et son renouvellement n'a pas été sollicité", - NON_MANIFESTATION_3_MOIS: - "Non-manifestation de la personne pendant plus de 3 mois consécutifs", - NON_RESPECT_REGLEMENT: "Non-respect du règlement", - ENTREE_LOGEMENT: "Entrée dans un logement/hébergement stable", -}; diff --git a/packages/portail-usagers/src/_common/usager/constants/MOTIFS_REFUS_LABELS.const.ts b/packages/portail-usagers/src/_common/usager/constants/MOTIFS_REFUS_LABELS.const.ts deleted file mode 100644 index 975005ebfb..0000000000 --- a/packages/portail-usagers/src/_common/usager/constants/MOTIFS_REFUS_LABELS.const.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { UsagerDecisionMotif } from ".."; - -export const MOTIFS_REFUS_LABELS: { - [key in UsagerDecisionMotif]?: string; -} = { - HORS_AGREMENT: "En dehors des critères du public domicilié", - LIEN_COMMUNE: "Absence de lien avec la commune", - SATURATION: "Nombre maximal domiciliations atteint", -}; diff --git a/packages/portail-usagers/src/_common/usager/constants/STRUCTURE_TYPE_LABELS.const.ts b/packages/portail-usagers/src/_common/usager/constants/STRUCTURE_TYPE_LABELS.const.ts deleted file mode 100644 index fb93ab2b1d..0000000000 --- a/packages/portail-usagers/src/_common/usager/constants/STRUCTURE_TYPE_LABELS.const.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { StructureType } from "../../structure/StructureType.type"; - -/* TYPE DE STRUCTURE */ -export const STRUCTURE_TYPE_LABELS: { [key in StructureType]: string } = { - asso: "Organisme agrée", - ccas: "CCAS", - cias: "CIAS", -}; diff --git a/packages/portail-usagers/src/_common/usager/constants/USAGER_DECISION_STATUT_COLORS.const.ts b/packages/portail-usagers/src/_common/usager/constants/USAGER_DECISION_STATUT_COLORS.const.ts deleted file mode 100644 index 553128beae..0000000000 --- a/packages/portail-usagers/src/_common/usager/constants/USAGER_DECISION_STATUT_COLORS.const.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { UsagerDecisionStatut } from ".."; - -export const USAGER_DECISION_STATUT_COLORS: { - [key in UsagerDecisionStatut]: string; -} = { - VALIDE: "green-status", - INSTRUCTION: "grey-status", - ATTENTE_DECISION: "orange-status", - REFUS: "red-status", - RADIE: "red-status", -}; diff --git a/packages/portail-usagers/src/_common/usager/constants/USAGER_DECISION_STATUT_LABELS.const.ts b/packages/portail-usagers/src/_common/usager/constants/USAGER_DECISION_STATUT_LABELS.const.ts deleted file mode 100644 index b1e8c91d74..0000000000 --- a/packages/portail-usagers/src/_common/usager/constants/USAGER_DECISION_STATUT_LABELS.const.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { UsagerDecisionStatut } from ".."; - -export const USAGER_DECISION_STATUT_LABELS: { - [key in UsagerDecisionStatut]: string; -} = { - VALIDE: "Actif", - INSTRUCTION: "Instruction", - ATTENTE_DECISION: "À valider", - REFUS: "Refusé", - RADIE: "Radié", -}; diff --git a/packages/portail-usagers/src/_common/usager/constants/USAGER_DECISION_STATUT_LABELS_PROFIL.const.ts b/packages/portail-usagers/src/_common/usager/constants/USAGER_DECISION_STATUT_LABELS_PROFIL.const.ts deleted file mode 100644 index 93a197f7a7..0000000000 --- a/packages/portail-usagers/src/_common/usager/constants/USAGER_DECISION_STATUT_LABELS_PROFIL.const.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { UsagerDecisionStatut } from ".."; - -/* DÉCISIONS */ -export const USAGER_DECISION_STATUT_LABELS_PROFIL: { - [key in UsagerDecisionStatut]: string; -} = { - ATTENTE_DECISION: "Demande de domiciliation déposée", - INSTRUCTION: "Instruction du dossier", - RADIE: "Radiation", - REFUS: "Demande refusée", - VALIDE: "Domiciliation acceptée", -}; diff --git a/packages/portail-usagers/src/_common/usager/constants/index.ts b/packages/portail-usagers/src/_common/usager/constants/index.ts deleted file mode 100644 index ea90853331..0000000000 --- a/packages/portail-usagers/src/_common/usager/constants/index.ts +++ /dev/null @@ -1,8 +0,0 @@ -export * from "./ETAPES_DEMANDE.const"; -export * from "./LIEN_PARENTE_LABELS.const"; -export * from "./MOTIFS_RADIATION_LABELS.const"; -export * from "./MOTIFS_REFUS_LABELS.const"; -export * from "./STRUCTURE_TYPE_LABELS.const"; -export * from "./USAGER_DECISION_STATUT_COLORS.const"; -export * from "./USAGER_DECISION_STATUT_LABELS_PROFIL.const"; -export * from "./USAGER_DECISION_STATUT_LABELS.const"; diff --git a/packages/portail-usagers/src/_common/usager/index.ts b/packages/portail-usagers/src/_common/usager/index.ts index 3e5fae6dd0..a34e21c18d 100644 --- a/packages/portail-usagers/src/_common/usager/index.ts +++ b/packages/portail-usagers/src/_common/usager/index.ts @@ -1,16 +1,3 @@ //@index('./*', f => `export * from '${f.path}'`) -export * from "./AyantDroitLienParente.type"; -export * from "./constants"; export * from "./options"; -export * from "./UsagerAyantDroit.type"; -export * from "./UsagerDecision.type"; -export * from "./UsagerDecisionMotif.type"; -export * from "./UsagerDecisionOrientation.type"; -export * from "./UsagerDecisionStatusColor.type"; -export * from "./UsagerDecisionStatut.type"; export * from "./UsagerEcheanceInfos.type"; -export * from "./UsagerLastInteractions.type"; -export * from "./UsagerRdv.type"; -export * from "./UsagerRdvInfos.type"; -export * from "./UsagerSexe.type"; -export * from "./UsagerTypeDom.type"; diff --git a/packages/portail-usagers/src/_common/usager/options/UsagerOptionsHistory.type.ts b/packages/portail-usagers/src/_common/usager/options/UsagerOptionsHistory.type.ts deleted file mode 100644 index 93875cc9ed..0000000000 --- a/packages/portail-usagers/src/_common/usager/options/UsagerOptionsHistory.type.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { AppEntity } from "../../_core"; -import { UsagerOptionsHistoryAction } from "./UsagerOptionsHistoryAction.type"; -import { UsagerOptionsHistoryType } from "./UsagerOptionsHistoryType.type"; - -export type UsagerOptionsHistory = AppEntity & { - usagerUUID: string; - userId: number; - userName: string; - structureId: number; - action: UsagerOptionsHistoryAction; - type: UsagerOptionsHistoryType; - nom: string; - prenom?: string; - adresse?: string; - actif: boolean; - dateDebut?: Date; - dateFin?: Date; - dateNaissance?: Date; -}; diff --git a/packages/portail-usagers/src/_common/usager/options/UsagerOptionsHistoryAction.type.ts b/packages/portail-usagers/src/_common/usager/options/UsagerOptionsHistoryAction.type.ts deleted file mode 100644 index 3d735ba87b..0000000000 --- a/packages/portail-usagers/src/_common/usager/options/UsagerOptionsHistoryAction.type.ts +++ /dev/null @@ -1 +0,0 @@ -export type UsagerOptionsHistoryAction = "EDIT" | "CREATION" | "DELETE"; diff --git a/packages/portail-usagers/src/_common/usager/options/UsagerOptionsHistoryType.type.ts b/packages/portail-usagers/src/_common/usager/options/UsagerOptionsHistoryType.type.ts deleted file mode 100644 index 85cf28a7ae..0000000000 --- a/packages/portail-usagers/src/_common/usager/options/UsagerOptionsHistoryType.type.ts +++ /dev/null @@ -1 +0,0 @@ -export type UsagerOptionsHistoryType = "transfert" | "procuration"; diff --git a/packages/portail-usagers/src/_common/usager/options/index.ts b/packages/portail-usagers/src/_common/usager/options/index.ts index 33b3fceb19..acc8e9c581 100644 --- a/packages/portail-usagers/src/_common/usager/options/index.ts +++ b/packages/portail-usagers/src/_common/usager/options/index.ts @@ -1,7 +1,4 @@ //@index('./*', f => `export * from '${f.path}'`) export * from "./UsagerOptions.type"; -export * from "./UsagerOptionsHistory.type"; -export * from "./UsagerOptionsHistoryAction.type"; -export * from "./UsagerOptionsHistoryType.type"; export * from "./UsagerOptionsProcuration.type"; export * from "./UsagerOptionsTransfert.type"; diff --git a/packages/portail-usagers/src/app/modules/usager-account/components/home-usager/home-usager.component.ts b/packages/portail-usagers/src/app/modules/usager-account/components/home-usager/home-usager.component.ts index ab0df93187..f7bcfdf21d 100644 --- a/packages/portail-usagers/src/app/modules/usager-account/components/home-usager/home-usager.component.ts +++ b/packages/portail-usagers/src/app/modules/usager-account/components/home-usager/home-usager.component.ts @@ -25,5 +25,23 @@ export class HomeUsagerComponent implements OnInit { this.usagerProfile = apiResponse; }, ); + + this.loadTallyScript(); + } + + private loadTallyScript(): void { + // eslint-disable-next-line @typescript-eslint/no-explicit-any + const tally: any = window["Tally" as unknown as any]; + if (tally) { + tally.openPopup("n0B5MA", { + layout: "popup", + overlay: true, + emoji: { + text: "👋", + animation: "wave", + }, + doNotShowAfterSubmit: true, + }); + } } } diff --git a/packages/portail-usagers/src/app/modules/usager-account/components/section-infos/section-infos.component.ts b/packages/portail-usagers/src/app/modules/usager-account/components/section-infos/section-infos.component.ts index 6650d9ed99..96a936efc9 100644 --- a/packages/portail-usagers/src/app/modules/usager-account/components/section-infos/section-infos.component.ts +++ b/packages/portail-usagers/src/app/modules/usager-account/components/section-infos/section-infos.component.ts @@ -2,12 +2,15 @@ import { Component, Input, OnInit } from "@angular/core"; import { PortailUsagerPublic, UsagerEcheanceInfos, - UsagerRdvInfos, } from "../../../../../_common"; import { DEFAULT_USAGER_PROFILE } from "../../../../../_common/mocks/DEFAULT_USAGER.const"; -import { USAGER_DECISION_STATUT_LABELS } from "../../../../../_common/usager/constants"; + import { getEcheanceInfos } from "../../interfaces/getEcheanceInfos.service"; -import { getRdvInfos } from "../../interfaces/getRdvInfos.service"; +import { + USAGER_DECISION_STATUT_LABELS, + getRdvInfos, + UsagerRdvInfos, +} from "@domifa/common"; @Component({ selector: "app-section-infos", @@ -29,6 +32,9 @@ export class SectionInfosComponent implements OnInit { ngOnInit(): void { this.echeanceInfos = getEcheanceInfos(this.usager); - this.rdvInfos = getRdvInfos(this.usager); + this.rdvInfos = getRdvInfos({ + etapeDemande: this.usager.etapeDemande, + rdv: this.usager.rdv, + }); } } diff --git a/packages/portail-usagers/src/app/modules/usager-account/components/section-options/section-options.component.html b/packages/portail-usagers/src/app/modules/usager-account/components/section-options/section-options.component.html index d6f615ae5c..b36f696217 100644 --- a/packages/portail-usagers/src/app/modules/usager-account/components/section-options/section-options.component.html +++ b/packages/portail-usagers/src/app/modules/usager-account/components/section-options/section-options.component.html @@ -7,7 +7,6 @@ >

Transfert et procurations

-
{ - it("generateMotifLabel ", async () => { - expect(generateMotifLabel(DEFAULT_USAGER.decision)).toEqual(""); - - USAGER_REFUS_MOCK.decision.motif = "HORS_AGREMENT"; - expect(generateMotifLabel(USAGER_REFUS_MOCK.decision)).toEqual( - "En dehors des critères du public domicilié", - ); - - USAGER_REFUS_MOCK.decision.motif = "LIEN_COMMUNE"; - - expect(generateMotifLabel(USAGER_REFUS_MOCK.decision)).toEqual( - "Absence de lien avec la commune", - ); - - USAGER_REFUS_MOCK.decision.motif = "SATURATION"; - - expect(generateMotifLabel(USAGER_REFUS_MOCK.decision)).toEqual( - "Nombre maximal domiciliations atteint", - ); - - USAGER_REFUS_MOCK.decision.motif = "AUTRE"; - USAGER_REFUS_MOCK.decision.motifDetails = - "Nombre maximal domiciliations atteint"; - - expect(generateMotifLabel(USAGER_REFUS_MOCK.decision)).toEqual( - "Autre motif: Nombre maximal domiciliations atteint", - ); - - USAGER_REFUS_MOCK.decision.motifDetails = null; - - expect(generateMotifLabel(USAGER_REFUS_MOCK.decision)).toEqual( - "Autre motif: non précisé", - ); - }); -}); diff --git a/packages/portail-usagers/src/app/modules/usager-account/interfaces/generateMotifLabel.service.ts b/packages/portail-usagers/src/app/modules/usager-account/interfaces/generateMotifLabel.service.ts deleted file mode 100644 index f652497046..0000000000 --- a/packages/portail-usagers/src/app/modules/usager-account/interfaces/generateMotifLabel.service.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { - UsagerDecision, - MOTIFS_REFUS_LABELS, - MOTIFS_RADIATION_LABELS, - UsagerDecisionMotif, -} from "../../../../_common"; - -export const generateMotifLabel = (decision: UsagerDecision): string => { - if (!decision) { - return ""; - } - - if (decision.motif === "AUTRE") { - const motifDetails = decision.motifDetails ?? "non précisé"; - return `Autre motif: ${motifDetails}`; - } - - const motifsLabels = - decision.statut === "REFUS" ? MOTIFS_REFUS_LABELS : MOTIFS_RADIATION_LABELS; - - return motifsLabels[decision.motif as UsagerDecisionMotif] ?? ""; -}; diff --git a/packages/portail-usagers/src/app/modules/usager-account/interfaces/getRdvInfos.service.spec.ts b/packages/portail-usagers/src/app/modules/usager-account/interfaces/getRdvInfos.service.spec.ts deleted file mode 100644 index ded279df64..0000000000 --- a/packages/portail-usagers/src/app/modules/usager-account/interfaces/getRdvInfos.service.spec.ts +++ /dev/null @@ -1,48 +0,0 @@ -import { ETAPE_RENDEZ_VOUS } from "../../../../_common/usager/constants"; -import { DEFAULT_USAGER } from "./../../../../_common/mocks/DEFAULT_USAGER.const"; - -import { getRdvInfos } from "./getRdvInfos.service"; - -describe("Création des rendez-vous", () => { - beforeAll(() => { - // Date de réféce : 20 Décembre 2020 - jest.useFakeTimers(); - jest.setSystemTime(new Date(2020, 11, 20, 19, 20)); - }); - - it("Rendez-vous dans le futur", () => { - const usager = DEFAULT_USAGER; - usager.rdv = { - dateRdv: new Date(2021, 2, 20, 19, 20), - userId: 1, - userName: "name", - }; - - usager.etapeDemande = ETAPE_RENDEZ_VOUS; - expect(getRdvInfos(usager)).toEqual({ - class: "", - content: "Rendez-vous le 20/03/2021 à 19:20", - display: true, - }); - }); - - it("Rendez-vous dans le passé", () => { - const usager = DEFAULT_USAGER; - usager.rdv = { - dateRdv: new Date(2020, 6, 20, 19, 20), - userId: 1, - userName: "name", - }; - - usager.etapeDemande = ETAPE_RENDEZ_VOUS; - expect(getRdvInfos(usager)).toEqual({ - class: "", - content: "Rendez-vous le 20/07/2020 à 19:20", - display: false, - }); - }); - - afterAll(() => { - jest.useRealTimers(); - }); -}); diff --git a/packages/portail-usagers/src/app/modules/usager-account/interfaces/getRdvInfos.service.ts b/packages/portail-usagers/src/app/modules/usager-account/interfaces/getRdvInfos.service.ts deleted file mode 100644 index 6a0ad8b331..0000000000 --- a/packages/portail-usagers/src/app/modules/usager-account/interfaces/getRdvInfos.service.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { PortailUsagerPublic } from "./../../../../_common/_portail-usager/PortailUsagerPublic.type"; -import { format } from "date-fns"; -import { UsagerRdvInfos } from "../../../../_common"; - -export const getRdvInfos = ( - usager: Partial, -): UsagerRdvInfos => { - const rdvDisplay: UsagerRdvInfos = { - display: false, - class: "", - content: "", - }; - - if (!usager?.rdv?.dateRdv) { - return rdvDisplay; - } - - const dateRdv = new Date(usager.rdv.dateRdv); - - rdvDisplay.content = `Rendez-vous le ${format( - dateRdv, - "dd/MM/yyyy", - )} à ${format(dateRdv, "HH:mm")}`; - - if (dateRdv > new Date()) { - rdvDisplay.display = true; - } - - return rdvDisplay; -}; diff --git a/packages/portail-usagers/src/index.html b/packages/portail-usagers/src/index.html index d4f00e101a..fd64e6fe57 100644 --- a/packages/portail-usagers/src/index.html +++ b/packages/portail-usagers/src/index.html @@ -58,5 +58,6 @@ + diff --git a/tech.yaml b/tech.yaml index ec8fda10bd..f8875f8827 100644 --- a/tech.yaml +++ b/tech.yaml @@ -28,13 +28,13 @@ stack: common: - Typescript frontend: - - Angular 13 + - Angular 15 - Typescript portail-admins: - - Angular 13 + - Angular 15 - Typescript portail-usagers: - - Angular 13 + - Angular 15 - Typescript backend: - NestJS diff --git a/yarn.lock b/yarn.lock index 24d4bd547c..bcbecfea89 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1970,7 +1970,7 @@ __metadata: languageName: node linkType: hard -"@babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.22.15, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.2": +"@babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.2": version: 7.22.15 resolution: "@babel/runtime@npm:7.22.15" dependencies: @@ -1979,6 +1979,15 @@ __metadata: languageName: node linkType: hard +"@babel/runtime@npm:^7.23.2": + version: 7.23.2 + resolution: "@babel/runtime@npm:7.23.2" + dependencies: + regenerator-runtime: ^0.14.0 + checksum: 6c4df4839ec75ca10175f636d6362f91df8a3137f86b38f6cd3a4c90668a0fe8e9281d320958f4fbd43b394988958585a17c3aab2a4ea6bf7316b22916a371fb + languageName: node + linkType: hard + "@babel/template@npm:7.20.7": version: 7.20.7 resolution: "@babel/template@npm:7.20.7" @@ -2260,7 +2269,7 @@ __metadata: resolution: "@domifa/backend@workspace:packages/backend" dependencies: "@domifa/common": "workspace:^" - "@faker-js/faker": ^8.1.0 + "@faker-js/faker": ^8.2.0 "@nestjs/axios": ^3.0.1 "@nestjs/cli": ^10.1.1 "@nestjs/common": ^10.0.5 @@ -2274,30 +2283,30 @@ __metadata: "@nestjs/terminus": ^10.0.1 "@nestjs/testing": ^10.0.5 "@ntegral/nestjs-sentry": ^4.0.0 - "@opentelemetry/api": ^1.6.0 - "@opentelemetry/core": ^1.17.0 - "@opentelemetry/instrumentation-express": ^0.33.0 - "@opentelemetry/instrumentation-http": ^0.44.0 - "@opentelemetry/instrumentation-nestjs-core": ^0.33.0 - "@opentelemetry/instrumentation-net": ^0.32.0 - "@opentelemetry/instrumentation-pg": ^0.36.0 - "@opentelemetry/sdk-node": ^0.44.0 - "@opentelemetry/semantic-conventions": ^1.17.0 - "@sentry/node": ^7.76.0 - "@sentry/opentelemetry-node": ^7.76.0 + "@opentelemetry/api": ^1.7.0 + "@opentelemetry/core": ^1.18.1 + "@opentelemetry/instrumentation-express": ^0.33.2 + "@opentelemetry/instrumentation-http": ^0.45.1 + "@opentelemetry/instrumentation-nestjs-core": ^0.33.2 + "@opentelemetry/instrumentation-net": ^0.32.2 + "@opentelemetry/instrumentation-pg": ^0.36.2 + "@opentelemetry/sdk-node": ^0.45.1 + "@opentelemetry/semantic-conventions": ^1.18.1 + "@sentry/node": ^7.79.0 + "@sentry/opentelemetry-node": ^7.79.0 "@socialgouv/eslint-config-typescript": ^1.131.0 "@socialgouv/streaming-file-encryption": ^1.1.0 - "@types/bcryptjs": ^2.4.5 - "@types/compression": ^1.7.4 + "@types/bcryptjs": ^2.4.6 + "@types/compression": ^1.7.5 "@types/cron": ^2.0.1 "@types/dotenv": ^8.2.0 "@types/email-templates": ^10.0.2 "@types/express": 4.17.20 - "@types/faker": ^6.6.8 - "@types/fs-extra": ^11.0.2 - "@types/geojson": ^7946.0.10 - "@types/jest": ^29.2.4 - "@types/lodash.isequal": ^4.5.6 + "@types/faker": ^6.6.9 + "@types/fs-extra": ^11.0.4 + "@types/geojson": ^7946.0.13 + "@types/jest": ^29.5.8 + "@types/lodash.isequal": ^4.5.8 "@types/multer": ^1.4.6 "@types/node": ^20.3.3 "@types/node-pdftk": ^2.1.6 @@ -2324,10 +2333,10 @@ __metadata: docxtemplater: ^3.37.12 dotenv: ^16.3.1 email-templates: ^10.0.0 - eslint: ^8.50.0 + eslint: ^8.53.0 eslint-config-prettier: ^9.0.0 - eslint-plugin-import: ^2.28.1 - eslint-plugin-prettier: ^5.0.0 + eslint-plugin-import: ^2.29.0 + eslint-plugin-prettier: ^5.0.1 eslint-plugin-promise: ^6.1.1 exceljs: ^4.2.1 express: ^4.18.2 @@ -2345,7 +2354,7 @@ __metadata: nodemon: ^3.0.0 nunjucks: ^3.2.3 passport: ^0.6.0 - passport-jwt: ^4.0.0 + passport-jwt: ^4.0.1 pg: ^8.7.1 pino: ^8.7.0 pino-pretty: ^10.0.1 @@ -2353,7 +2362,7 @@ __metadata: pizzip: ^3.0.6 prettier: ^2.8.8 reflect-metadata: ^0.1.13 - rimraf: ^5.0.0 + rimraf: ^5.0.5 rxjs: ^7.6.0 sanitize-filename: ^1.6.3 sanitize-html: ^2.11.0 @@ -2367,12 +2376,12 @@ __metadata: ts-jest: ^29.1.1 ts-node: 10.9.1 ts-node-dev: ^2.0.0 - tsconfig-paths: ^4.0.0 + tsconfig-paths: ^4.2.0 typeorm: ^0.3.17 typescript: 4.9.5 uuid: ^9.0.1 xlsx: ^0.18.5 - yup: ^0.32.9 + yup: ^0.32.11 yup-phone: ^1.3.2 languageName: unknown linkType: soft @@ -2382,22 +2391,23 @@ __metadata: resolution: "@domifa/common@workspace:packages/common" dependencies: "@eslint/create-config": ^0.4.6 - "@types/jest": ^29.4.0 + "@types/jest": ^29.5.8 "@types/rimraf": ^4.0.5 "@typescript-eslint/eslint-plugin": ^6.0.0 "@typescript-eslint/parser": ^6.0.0 - eslint: ^8.50.0 - eslint-config-standard-with-typescript: ^39.1.0 - eslint-plugin-import: ^2.28.1 - eslint-plugin-jest: ^27.4.0 - eslint-plugin-n: ^16.1.0 - eslint-plugin-prettier: ^5.0.0 + date-fns: ^2.30.0 + eslint: ^8.53.0 + eslint-config-standard-with-typescript: ^39.1.1 + eslint-plugin-import: ^2.29.0 + eslint-plugin-jest: ^27.6.0 + eslint-plugin-n: ^16.3.0 + eslint-plugin-prettier: ^5.0.1 eslint-plugin-promise: ^6.1.1 jest: ^29.7.0 license-check-and-add: ^4.0.5 lint-staged: ^15.0.0 prettier: 2.8.8 - rimraf: ^5.0.0 + rimraf: ^5.0.5 ts-jest: ^29.1.1 typescript: ^4.3.5 languageName: unknown @@ -2442,28 +2452,28 @@ __metadata: "@popperjs/core": ^2.11.8 "@schematics/angular": ^15.2.10 "@schematics/update": ^0.1102.19 - "@sentry/angular": ^7.76.0 + "@sentry/angular": ^7.79.0 "@swimlane/ngx-charts": ^20.4.1 - "@types/file-saver": ^2.0.5 - "@types/google-libphonenumber": ^7.4.23 - "@types/jest": ^29.2.4 + "@types/file-saver": ^2.0.7 + "@types/google-libphonenumber": ^7.4.30 + "@types/jest": ^29.5.8 "@types/node": ^20.3.3 "@typescript-eslint/eslint-plugin": ^6.0.0 "@typescript-eslint/parser": 6.10.0 angular-user-idle: ^4.0.0 bootstrap: ^5.2.0 date-fns: ^2.30.0 - eslint: ^8.50.0 - eslint-config-standard-with-typescript: ^39.1.0 - eslint-plugin-import: ^2.28.1 - eslint-plugin-n: ^16.1.0 + eslint: ^8.53.0 + eslint-config-standard-with-typescript: ^39.1.1 + eslint-plugin-import: ^2.29.0 + eslint-plugin-n: ^16.3.0 eslint-plugin-no-lookahead-lookbehind-regexp: ^0.3.0 - eslint-plugin-prettier: ^5.0.0 + eslint-plugin-prettier: ^5.0.1 file-saver: ^2.0.5 google-libphonenumber: ^3.2.33 intl-tel-input: 18.2.1 jest: ^29.7.0 - jest-preset-angular: ^13.1.2 + jest-preset-angular: ^13.1.3 jwt-decode: ^3.1.2 lint-staged: ^15.0.0 ng-lint-staged: ^12.0.4 @@ -2478,7 +2488,7 @@ __metadata: ts-node: ~10.9.1 tslib: ^2.3.0 typescript: 4.9.5 - validator: ^13.9.0 + validator: ^13.11.0 zone.js: ~0.14.0 languageName: unknown linkType: soft @@ -2509,6 +2519,7 @@ __metadata: "@angular/platform-browser": ^15.2.10 "@angular/platform-browser-dynamic": ^15.2.10 "@angular/router": ^15.2.10 + "@domifa/common": "workspace:^" "@fortawesome/angular-fontawesome": 0.12.1 "@fortawesome/fontawesome-svg-core": ^6.2.1 "@fortawesome/free-regular-svg-icons": ^6.2.1 @@ -2516,30 +2527,32 @@ __metadata: "@ng-bootstrap/ng-bootstrap": ^14.2.0 "@popperjs/core": ^2.11.8 "@schematics/update": ^0.1102.19 - "@sentry/angular": ^7.76.0 - "@sentry/browser": ^7.76.0 - "@sentry/tracing": ^7.76.0 + "@sentry/angular": ^7.79.0 + "@sentry/browser": ^7.79.0 + "@sentry/tracing": ^7.79.0 "@types/d3": ^7.4.1 - "@types/file-saver": ^2.0.5 - "@types/jest": ^29.2.4 + "@types/file-saver": ^2.0.7 + "@types/jest": ^29.5.8 "@types/node": ^20.3.3 + "@types/rimraf": ^4.0.5 "@typescript-eslint/eslint-plugin": 6.10.0 "@typescript-eslint/parser": 6.10.0 bootstrap: ^5.2.0 class-validator: ^0.14.0 date-fns: ^2.30.0 - eslint: ^8.50.0 + eslint: ^8.53.0 eslint-config-prettier: ^9.0.0 - eslint-plugin-import: ^2.28.1 + eslint-plugin-import: ^2.29.0 eslint-plugin-no-lookahead-lookbehind-regexp: ^0.3.0 - eslint-plugin-prettier: ^5.0.0 + eslint-plugin-prettier: ^5.0.1 file-saver: ^2.0.5 jest: ^29.7.0 - jest-preset-angular: ^13.1.2 + jest-preset-angular: ^13.1.3 lint-staged: ^15.0.0 ng-lint-staged: ^12.0.4 prettier: 2.8.8 redux: ^4.1.0 + rimraf: ^5.0.5 rxjs: ^7.6.0 source-map-explorer: ^2.5.3 tslib: ^2.3.0 @@ -2574,30 +2587,31 @@ __metadata: "@angular/platform-browser": ^15.2.10 "@angular/platform-browser-dynamic": ^15.2.10 "@angular/router": ^15.2.10 + "@domifa/common": "workspace:^" "@fortawesome/angular-fontawesome": 0.12.1 "@fortawesome/fontawesome-svg-core": ^6.2.1 "@fortawesome/free-regular-svg-icons": ^6.2.1 "@fortawesome/free-solid-svg-icons": ^6.2.1 "@ng-bootstrap/ng-bootstrap": ^14.2.0 "@popperjs/core": ^2.11.8 - "@sentry/angular": ^7.76.0 - "@types/google-libphonenumber": ^7.4.23 - "@types/jest": ^29.2.4 + "@sentry/angular": ^7.79.0 + "@types/google-libphonenumber": ^7.4.30 + "@types/jest": ^29.5.8 "@types/node": ^20.3.3 "@typescript-eslint/eslint-plugin": 6.10.0 "@typescript-eslint/parser": 6.10.0 angular-user-idle: ^4.0.0 bootstrap: 5.2.3 date-fns: ^2.30.0 - eslint: ^8.50.0 - eslint-config-standard-with-typescript: ^39.1.0 - eslint-plugin-import: ^2.28.1 - eslint-plugin-n: ^16.1.0 + eslint: ^8.53.0 + eslint-config-standard-with-typescript: ^39.1.1 + eslint-plugin-import: ^2.29.0 + eslint-plugin-n: ^16.3.0 eslint-plugin-no-lookahead-lookbehind-regexp: ^0.3.0 - eslint-plugin-prettier: ^5.0.0 + eslint-plugin-prettier: ^5.0.1 google-libphonenumber: ^3.2.33 jest: ^29.7.0 - jest-preset-angular: ^13.1.2 + jest-preset-angular: ^13.1.3 lint-staged: ^15.0.0 ng-lint-staged: ^12.0.4 ngx-matomo-client: ^5.0.4 @@ -2972,9 +2986,9 @@ __metadata: languageName: node linkType: hard -"@eslint/eslintrc@npm:^2.1.2": - version: 2.1.2 - resolution: "@eslint/eslintrc@npm:2.1.2" +"@eslint/eslintrc@npm:^2.1.3": + version: 2.1.3 + resolution: "@eslint/eslintrc@npm:2.1.3" dependencies: ajv: ^6.12.4 debug: ^4.3.2 @@ -2985,21 +2999,21 @@ __metadata: js-yaml: ^4.1.0 minimatch: ^3.1.2 strip-json-comments: ^3.1.1 - checksum: bc742a1e3b361f06fedb4afb6bf32cbd27171292ef7924f61c62f2aed73048367bcc7ac68f98c06d4245cd3fabc43270f844e3c1699936d4734b3ac5398814a7 + checksum: 5c6c3878192fe0ddffa9aff08b4e2f3bcc8f1c10d6449b7295a5f58b662019896deabfc19890455ffd7e60a5bd28d25d0eaefb2f78b2d230aae3879af92b89e5 languageName: node linkType: hard -"@eslint/js@npm:8.50.0": - version: 8.50.0 - resolution: "@eslint/js@npm:8.50.0" - checksum: 302478f2acaaa7228729ec6a04f56641590185e1d8cd1c836a6db8a6b8009f80a57349341be9fbb9aa1721a7a569d1be3ffc598a33300d22816f11832095386c +"@eslint/js@npm:8.53.0": + version: 8.53.0 + resolution: "@eslint/js@npm:8.53.0" + checksum: e0d5cfb0000aaee237c8e6d6d6e366faa60b1ef7f928ce17778373aa44d3b886368f6d5e1f97f913f0f16801aad016db8b8df78418c9d18825c15590328028af languageName: node linkType: hard -"@faker-js/faker@npm:^8.1.0": - version: 8.1.0 - resolution: "@faker-js/faker@npm:8.1.0" - checksum: 76036cbad2f0735fe2a2834bb3e16233e7c1aa4998cf90dbd097631465f3fcd4e7022c901f80b6de1c25b47154880f06916609a81dacb039a25f9cb000a3ab4e +"@faker-js/faker@npm:^8.2.0": + version: 8.2.0 + resolution: "@faker-js/faker@npm:8.2.0" + checksum: febc17018acfb841a348591bfe415e815ea981bf7fa0a12670ac2b449479ad7e9e7b130c42878ec30210da964c13a620a3303dc00d63cb13ded00c6fc701e2be languageName: node linkType: hard @@ -3173,14 +3187,14 @@ __metadata: languageName: node linkType: hard -"@humanwhocodes/config-array@npm:^0.11.11": - version: 0.11.11 - resolution: "@humanwhocodes/config-array@npm:0.11.11" +"@humanwhocodes/config-array@npm:^0.11.13": + version: 0.11.13 + resolution: "@humanwhocodes/config-array@npm:0.11.13" dependencies: - "@humanwhocodes/object-schema": ^1.2.1 + "@humanwhocodes/object-schema": ^2.0.1 debug: ^4.1.1 minimatch: ^3.0.5 - checksum: db84507375ab77b8ffdd24f498a5b49ad6b64391d30dd2ac56885501d03964d29637e05b1ed5aefa09d57ac667e28028bc22d2da872bfcd619652fbdb5f4ca19 + checksum: f8ea57b0d7ed7f2d64cd3944654976829d9da91c04d9c860e18804729a33f7681f78166ef4c761850b8c324d362f7d53f14c5c44907a6b38b32c703ff85e4805 languageName: node linkType: hard @@ -3191,10 +3205,10 @@ __metadata: languageName: node linkType: hard -"@humanwhocodes/object-schema@npm:^1.2.1": - version: 1.2.1 - resolution: "@humanwhocodes/object-schema@npm:1.2.1" - checksum: a824a1ec31591231e4bad5787641f59e9633827d0a2eaae131a288d33c9ef0290bd16fda8da6f7c0fcb014147865d12118df10db57f27f41e20da92369fcb3f1 +"@humanwhocodes/object-schema@npm:^2.0.1": + version: 2.0.1 + resolution: "@humanwhocodes/object-schema@npm:2.0.1" + checksum: 24929487b1ed48795d2f08346a0116cc5ee4634848bce64161fb947109352c562310fd159fc64dda0e8b853307f5794605191a9547f7341158559ca3c8262a45 languageName: node linkType: hard @@ -4784,118 +4798,122 @@ __metadata: languageName: node linkType: hard -"@opentelemetry/api-logs@npm:0.44.0": - version: 0.44.0 - resolution: "@opentelemetry/api-logs@npm:0.44.0" +"@opentelemetry/api-logs@npm:0.45.1": + version: 0.45.1 + resolution: "@opentelemetry/api-logs@npm:0.45.1" dependencies: "@opentelemetry/api": ^1.0.0 - checksum: 550fa16b9f9da94062fac63154f7ccaf5ad4515da7a0ad09d52c461c8e08bf88698ab819a5d2918d00e4d90cb2eb9224e9709a6ecbe8b3da021582232254d900 + checksum: cd4e9664e84ba3e166596a3c6fedf03620ea54019f5d2025e7c42b16720e4a7f5312aefa17503a7db3875aee3dfcd7d2b92b2526650372573ed0f3e72eda9c93 languageName: node linkType: hard -"@opentelemetry/api@npm:^1.0.0, @opentelemetry/api@npm:^1.6.0": +"@opentelemetry/api@npm:^1.0.0": version: 1.6.0 resolution: "@opentelemetry/api@npm:1.6.0" checksum: 3283b78b62a39f6568eaa050ac7045fcca747679e255874f6d2107cb8e1a3b2e10bfbf553c3e82a72500fb5fdca49dc07a5fe27fd6980debac24506cca638859 languageName: node linkType: hard -"@opentelemetry/context-async-hooks@npm:1.17.1": - version: 1.17.1 - resolution: "@opentelemetry/context-async-hooks@npm:1.17.1" +"@opentelemetry/api@npm:^1.7.0": + version: 1.7.0 + resolution: "@opentelemetry/api@npm:1.7.0" + checksum: 2398cbe65f199c3a7050125b3ad9c835f789bb0a616665e9c7f4475a29ac8334b6a3c15f38db48d345b522180c41c00b04cc174cd0eeffba98eb4874a565fa7e + languageName: node + linkType: hard + +"@opentelemetry/context-async-hooks@npm:1.18.1": + version: 1.18.1 + resolution: "@opentelemetry/context-async-hooks@npm:1.18.1" peerDependencies: - "@opentelemetry/api": ">=1.0.0 <1.7.0" - checksum: f812d9872ab932d103c125b375351b2ee945e6cad75afe5e205ed6c90cd75dd709bb45a54d229d71ee5f4d1780a328ca15b68d9c95d9eca0c67628ffe5966206 + "@opentelemetry/api": ">=1.0.0 <1.8.0" + checksum: 6730b9780d0fa2d17c8b04aac19d3450ad4273c969bf154bc31779cf34a8b3531a489fc10633c9a9e97c33f2147d85688f27679d34af2ac92fedb38dbc4eb8b8 languageName: node linkType: hard -"@opentelemetry/core@npm:1.17.1, @opentelemetry/core@npm:^1.1.0, @opentelemetry/core@npm:^1.17.0, @opentelemetry/core@npm:^1.8.0": - version: 1.17.1 - resolution: "@opentelemetry/core@npm:1.17.1" +"@opentelemetry/core@npm:1.18.1, @opentelemetry/core@npm:^1.18.1": + version: 1.18.1 + resolution: "@opentelemetry/core@npm:1.18.1" dependencies: - "@opentelemetry/semantic-conventions": 1.17.1 + "@opentelemetry/semantic-conventions": 1.18.1 peerDependencies: - "@opentelemetry/api": ">=1.0.0 <1.7.0" - checksum: 06157f4a51dd1b3c98487c0d29a927a5a0fbbc997a81b04ccc4923968424582f517969b91c4f4f19dc1718f27a97f43b0b07af1310a5c240a96c5ff14c4b5cec + "@opentelemetry/api": ">=1.0.0 <1.8.0" + checksum: dfb3181836ce04d2e983c0e8382e4bd0228ec42280e0a3f5330e2742903c0fb1db0efc2792479d27f928533a386f163c2e0fce2a2f45b05e66b2809d268915dc languageName: node linkType: hard -"@opentelemetry/exporter-jaeger@npm:1.17.1": +"@opentelemetry/core@npm:^1.1.0, @opentelemetry/core@npm:^1.8.0": version: 1.17.1 - resolution: "@opentelemetry/exporter-jaeger@npm:1.17.1" + resolution: "@opentelemetry/core@npm:1.17.1" dependencies: - "@opentelemetry/core": 1.17.1 - "@opentelemetry/sdk-trace-base": 1.17.1 "@opentelemetry/semantic-conventions": 1.17.1 - jaeger-client: ^3.15.0 peerDependencies: - "@opentelemetry/api": ^1.0.0 - checksum: f643f98ee7e7c2c6e938b808195da6595a788a458e661d3f0c80be4ce2676e1280d0ef00e818e0915a91fa49e571ddb785f3f20651b93a5600e5eb72d216faa4 + "@opentelemetry/api": ">=1.0.0 <1.7.0" + checksum: 06157f4a51dd1b3c98487c0d29a927a5a0fbbc997a81b04ccc4923968424582f517969b91c4f4f19dc1718f27a97f43b0b07af1310a5c240a96c5ff14c4b5cec languageName: node linkType: hard -"@opentelemetry/exporter-trace-otlp-grpc@npm:0.44.0": - version: 0.44.0 - resolution: "@opentelemetry/exporter-trace-otlp-grpc@npm:0.44.0" +"@opentelemetry/exporter-trace-otlp-grpc@npm:0.45.1": + version: 0.45.1 + resolution: "@opentelemetry/exporter-trace-otlp-grpc@npm:0.45.1" dependencies: "@grpc/grpc-js": ^1.7.1 - "@opentelemetry/core": 1.17.1 - "@opentelemetry/otlp-grpc-exporter-base": 0.44.0 - "@opentelemetry/otlp-transformer": 0.44.0 - "@opentelemetry/resources": 1.17.1 - "@opentelemetry/sdk-trace-base": 1.17.1 + "@opentelemetry/core": 1.18.1 + "@opentelemetry/otlp-grpc-exporter-base": 0.45.1 + "@opentelemetry/otlp-transformer": 0.45.1 + "@opentelemetry/resources": 1.18.1 + "@opentelemetry/sdk-trace-base": 1.18.1 peerDependencies: "@opentelemetry/api": ^1.0.0 - checksum: 5f1bb138e3be6f3d16799cb115f0c7e6e11ab81cc38bb23f5e827529a4f845ab5d3d9dce4a177f3208d304e927a7a1649e9f3406af5958ab2d0c06b2e4a68335 + checksum: eb3d4c7983252d8e08913947bc1f802d05a6ff481d46f4adc23dc062477ce47459442f830faa0f364dc53756b4c050582203edc255b690a0f20b3a17fd65a444 languageName: node linkType: hard -"@opentelemetry/exporter-trace-otlp-http@npm:0.44.0": - version: 0.44.0 - resolution: "@opentelemetry/exporter-trace-otlp-http@npm:0.44.0" +"@opentelemetry/exporter-trace-otlp-http@npm:0.45.1": + version: 0.45.1 + resolution: "@opentelemetry/exporter-trace-otlp-http@npm:0.45.1" dependencies: - "@opentelemetry/core": 1.17.1 - "@opentelemetry/otlp-exporter-base": 0.44.0 - "@opentelemetry/otlp-transformer": 0.44.0 - "@opentelemetry/resources": 1.17.1 - "@opentelemetry/sdk-trace-base": 1.17.1 + "@opentelemetry/core": 1.18.1 + "@opentelemetry/otlp-exporter-base": 0.45.1 + "@opentelemetry/otlp-transformer": 0.45.1 + "@opentelemetry/resources": 1.18.1 + "@opentelemetry/sdk-trace-base": 1.18.1 peerDependencies: "@opentelemetry/api": ^1.0.0 - checksum: 0b08097817d78c6dbf2ddb1d172ee0094d119bf58deb8b6ea763ebf6a342e6ccc6e280de20ef05d0f3d57f93f86a70440c80a0e99376915c0a9ac91888e4d679 + checksum: 5c330b5dca1006133c70e1f6210044c74cb8274c0619abae3e2bd201b250fd5aebbc2ac9808e8311a339905caad6c24d40390f856fb54c746e5a7d5d585cb303 languageName: node linkType: hard -"@opentelemetry/exporter-trace-otlp-proto@npm:0.44.0": - version: 0.44.0 - resolution: "@opentelemetry/exporter-trace-otlp-proto@npm:0.44.0" +"@opentelemetry/exporter-trace-otlp-proto@npm:0.45.1": + version: 0.45.1 + resolution: "@opentelemetry/exporter-trace-otlp-proto@npm:0.45.1" dependencies: - "@opentelemetry/core": 1.17.1 - "@opentelemetry/otlp-exporter-base": 0.44.0 - "@opentelemetry/otlp-proto-exporter-base": 0.44.0 - "@opentelemetry/otlp-transformer": 0.44.0 - "@opentelemetry/resources": 1.17.1 - "@opentelemetry/sdk-trace-base": 1.17.1 + "@opentelemetry/core": 1.18.1 + "@opentelemetry/otlp-exporter-base": 0.45.1 + "@opentelemetry/otlp-proto-exporter-base": 0.45.1 + "@opentelemetry/otlp-transformer": 0.45.1 + "@opentelemetry/resources": 1.18.1 + "@opentelemetry/sdk-trace-base": 1.18.1 peerDependencies: "@opentelemetry/api": ^1.0.0 - checksum: d00334dcf1ae5c15a02b3e5692c365ff55d21c82b8e3c663c8440887e9d030d14708d8cf2e6cd2f73eaa3f9bde7a843212e10ce14e03b322eeed49b83cf89429 + checksum: fba882926af88c66bfcc51296ad4b4244daebbbe87506b8f0a72c638a49c39224c8824da98f2d5c2d656edca3e679874a8987d52abce992f53312e80eb11dcd2 languageName: node linkType: hard -"@opentelemetry/exporter-zipkin@npm:1.17.1": - version: 1.17.1 - resolution: "@opentelemetry/exporter-zipkin@npm:1.17.1" +"@opentelemetry/exporter-zipkin@npm:1.18.1": + version: 1.18.1 + resolution: "@opentelemetry/exporter-zipkin@npm:1.18.1" dependencies: - "@opentelemetry/core": 1.17.1 - "@opentelemetry/resources": 1.17.1 - "@opentelemetry/sdk-trace-base": 1.17.1 - "@opentelemetry/semantic-conventions": 1.17.1 + "@opentelemetry/core": 1.18.1 + "@opentelemetry/resources": 1.18.1 + "@opentelemetry/sdk-trace-base": 1.18.1 + "@opentelemetry/semantic-conventions": 1.18.1 peerDependencies: "@opentelemetry/api": ^1.0.0 - checksum: f9b9f4c07628be912090db2b7e497a852523a6f5a333f5954b3c72c03b24f12ed32f6e7f2ccbfeb45828248a4d9405c898a140f610a95eb351e885de88874684 + checksum: d52ed77698df53ac08c97d1dc545bcbee09bf2af30d53eb591ee8dff0c7cd3113126712ccf8500b8da6575b20e202189efd69c719e4583c2915a7c9e7d8aedcc languageName: node linkType: hard -"@opentelemetry/instrumentation-express@npm:^0.33.0": +"@opentelemetry/instrumentation-express@npm:^0.33.2": version: 0.33.2 resolution: "@opentelemetry/instrumentation-express@npm:0.33.2" dependencies: @@ -4909,21 +4927,21 @@ __metadata: languageName: node linkType: hard -"@opentelemetry/instrumentation-http@npm:^0.44.0": - version: 0.44.0 - resolution: "@opentelemetry/instrumentation-http@npm:0.44.0" +"@opentelemetry/instrumentation-http@npm:^0.45.1": + version: 0.45.1 + resolution: "@opentelemetry/instrumentation-http@npm:0.45.1" dependencies: - "@opentelemetry/core": 1.17.1 - "@opentelemetry/instrumentation": 0.44.0 - "@opentelemetry/semantic-conventions": 1.17.1 + "@opentelemetry/core": 1.18.1 + "@opentelemetry/instrumentation": 0.45.1 + "@opentelemetry/semantic-conventions": 1.18.1 semver: ^7.5.2 peerDependencies: "@opentelemetry/api": ^1.3.0 - checksum: 1baadaa0be299d44705cc9727dbdd8ebbdab21b5955dac4a103d5aa9452f0c3decca1d655f99e4df9202ef8bc16009b7cb05d030865775c56b6d8c9d343eec53 + checksum: 059a975c82025efa9f73bdfa73cca0f67fae3e832140b5e20d1e237668ea8b017b1685297ec730cd87c898b951402efd05acac27b81d4f3366b6f391efda8f64 languageName: node linkType: hard -"@opentelemetry/instrumentation-nestjs-core@npm:^0.33.0": +"@opentelemetry/instrumentation-nestjs-core@npm:^0.33.2": version: 0.33.2 resolution: "@opentelemetry/instrumentation-nestjs-core@npm:0.33.2" dependencies: @@ -4935,7 +4953,7 @@ __metadata: languageName: node linkType: hard -"@opentelemetry/instrumentation-net@npm:^0.32.0": +"@opentelemetry/instrumentation-net@npm:^0.32.2": version: 0.32.2 resolution: "@opentelemetry/instrumentation-net@npm:0.32.2" dependencies: @@ -4947,7 +4965,7 @@ __metadata: languageName: node linkType: hard -"@opentelemetry/instrumentation-pg@npm:^0.36.0": +"@opentelemetry/instrumentation-pg@npm:^0.36.2": version: 0.36.2 resolution: "@opentelemetry/instrumentation-pg@npm:0.36.2" dependencies: @@ -4963,7 +4981,22 @@ __metadata: languageName: node linkType: hard -"@opentelemetry/instrumentation@npm:0.44.0, @opentelemetry/instrumentation@npm:^0.44.0": +"@opentelemetry/instrumentation@npm:0.45.1": + version: 0.45.1 + resolution: "@opentelemetry/instrumentation@npm:0.45.1" + dependencies: + "@types/shimmer": ^1.0.2 + import-in-the-middle: 1.4.2 + require-in-the-middle: ^7.1.1 + semver: ^7.5.2 + shimmer: ^1.2.1 + peerDependencies: + "@opentelemetry/api": ^1.3.0 + checksum: 4692d93f9bdb82c9e8c9facc45ef1a3affdcaf7e062edd261239e88486bacfa979ecadcdda0581a2275ddd2b04e457385536a2c80aa9d10cab72f6b8c5940cbd + languageName: node + linkType: hard + +"@opentelemetry/instrumentation@npm:^0.44.0": version: 0.44.0 resolution: "@opentelemetry/instrumentation@npm:0.44.0" dependencies: @@ -4978,180 +5011,186 @@ __metadata: languageName: node linkType: hard -"@opentelemetry/otlp-exporter-base@npm:0.44.0": - version: 0.44.0 - resolution: "@opentelemetry/otlp-exporter-base@npm:0.44.0" +"@opentelemetry/otlp-exporter-base@npm:0.45.1": + version: 0.45.1 + resolution: "@opentelemetry/otlp-exporter-base@npm:0.45.1" dependencies: - "@opentelemetry/core": 1.17.1 + "@opentelemetry/core": 1.18.1 peerDependencies: "@opentelemetry/api": ^1.0.0 - checksum: e9dd8b4ccc93728bf898d434303a74020d0e71ce15116a2e8d30259a0d4769a475b33a521c63f3db33de0b4338d141b49e7aa7b0414242b45ea5614d88481199 + checksum: f5ea31d0af18ce936fdc4bfdf45f013bf532aaf05e2d7f214ff89b33b5de41ee953ee3565f0d66159ef39e8bd9655e3fc4a325a15580b92ac5fdeafd6835b925 languageName: node linkType: hard -"@opentelemetry/otlp-grpc-exporter-base@npm:0.44.0": - version: 0.44.0 - resolution: "@opentelemetry/otlp-grpc-exporter-base@npm:0.44.0" +"@opentelemetry/otlp-grpc-exporter-base@npm:0.45.1": + version: 0.45.1 + resolution: "@opentelemetry/otlp-grpc-exporter-base@npm:0.45.1" dependencies: "@grpc/grpc-js": ^1.7.1 - "@opentelemetry/core": 1.17.1 - "@opentelemetry/otlp-exporter-base": 0.44.0 + "@opentelemetry/core": 1.18.1 + "@opentelemetry/otlp-exporter-base": 0.45.1 protobufjs: ^7.2.3 peerDependencies: "@opentelemetry/api": ^1.0.0 - checksum: cd79e0c6029118478d4e2f42c00ac06d2a6ebbada232ab8cda74d037aa90e6d2f6875ed9b6c275b54ec6395388871196538f4827d66ac279f2edc2a6829690b6 + checksum: 1a1b5878c510b3de82ec5b0e02fe66a600cfdfb664ed9ca80cb47873eb783f25d68c0d9d5f86380fed783d52f3d5949a01e65e8bc38410d0d2a92a8365b75c41 languageName: node linkType: hard -"@opentelemetry/otlp-proto-exporter-base@npm:0.44.0": - version: 0.44.0 - resolution: "@opentelemetry/otlp-proto-exporter-base@npm:0.44.0" +"@opentelemetry/otlp-proto-exporter-base@npm:0.45.1": + version: 0.45.1 + resolution: "@opentelemetry/otlp-proto-exporter-base@npm:0.45.1" dependencies: - "@opentelemetry/core": 1.17.1 - "@opentelemetry/otlp-exporter-base": 0.44.0 + "@opentelemetry/core": 1.18.1 + "@opentelemetry/otlp-exporter-base": 0.45.1 protobufjs: ^7.2.3 peerDependencies: "@opentelemetry/api": ^1.0.0 - checksum: b2f78b276d484bfaddaaade11ed65a10edb082a52daa8cf0406f92cbcd7d245e86f3dde0d3992589bb64f5c8245d3da1b84b355eac4fd642ab6f391f1d108713 + checksum: 9d025252a8a13e9f97fe69d5e8952458cc46665b20ce80f6add69d3d6edb67a4c7e10b454057adb4d4b81442af249fd999dac95cf8001e83a8c52b46820e9679 languageName: node linkType: hard -"@opentelemetry/otlp-transformer@npm:0.44.0": - version: 0.44.0 - resolution: "@opentelemetry/otlp-transformer@npm:0.44.0" +"@opentelemetry/otlp-transformer@npm:0.45.1": + version: 0.45.1 + resolution: "@opentelemetry/otlp-transformer@npm:0.45.1" dependencies: - "@opentelemetry/api-logs": 0.44.0 - "@opentelemetry/core": 1.17.1 - "@opentelemetry/resources": 1.17.1 - "@opentelemetry/sdk-logs": 0.44.0 - "@opentelemetry/sdk-metrics": 1.17.1 - "@opentelemetry/sdk-trace-base": 1.17.1 + "@opentelemetry/api-logs": 0.45.1 + "@opentelemetry/core": 1.18.1 + "@opentelemetry/resources": 1.18.1 + "@opentelemetry/sdk-logs": 0.45.1 + "@opentelemetry/sdk-metrics": 1.18.1 + "@opentelemetry/sdk-trace-base": 1.18.1 peerDependencies: - "@opentelemetry/api": ">=1.3.0 <1.7.0" - checksum: 74f826f9d33eb8de72c8e698d9d5e680936e09b63e26ffa5e080f455bf070a08fd6d0768bdb9e7e43a352d0ef8fd90183193ea85e8498005734005e75d8d232a + "@opentelemetry/api": ">=1.3.0 <1.8.0" + checksum: 0df899070aa73c2d65b851f27ecfa5cd01c30a0055ea9ce98945071bcc24e9e2ab5185e5f35d30e7b293649246d1b0403b39bb9787ce30fd88ea596d73e476b1 languageName: node linkType: hard -"@opentelemetry/propagator-b3@npm:1.17.1": - version: 1.17.1 - resolution: "@opentelemetry/propagator-b3@npm:1.17.1" +"@opentelemetry/propagator-b3@npm:1.18.1": + version: 1.18.1 + resolution: "@opentelemetry/propagator-b3@npm:1.18.1" dependencies: - "@opentelemetry/core": 1.17.1 + "@opentelemetry/core": 1.18.1 peerDependencies: - "@opentelemetry/api": ">=1.0.0 <1.7.0" - checksum: 1d6ec934ae4b1820f1568f80aae6973ecb84217078056646bf0bce562158841f64a5377b13267f4b14ee4c27398e03cc69f3f89db709408f56c7ef0597662dbf + "@opentelemetry/api": ">=1.0.0 <1.8.0" + checksum: 4592a3969446c22d42fbcac351f0a305f7f91a1ef1a43f3b93531ea12bf9089dc51ccbc290b431162e7a690cc75bba157c7886ef4b0db74210344d0ea1bce271 languageName: node linkType: hard -"@opentelemetry/propagator-jaeger@npm:1.17.1": - version: 1.17.1 - resolution: "@opentelemetry/propagator-jaeger@npm:1.17.1" +"@opentelemetry/propagator-jaeger@npm:1.18.1": + version: 1.18.1 + resolution: "@opentelemetry/propagator-jaeger@npm:1.18.1" dependencies: - "@opentelemetry/core": 1.17.1 + "@opentelemetry/core": 1.18.1 peerDependencies: - "@opentelemetry/api": ">=1.0.0 <1.7.0" - checksum: 95a9b830512296229a7bcc1da4dbf7b7cf6b942cf6c1448974c94724249e29ffbc8f26c7c179117a303c8c1c557d683006d49df61ebbf5d29332c9d15f498907 + "@opentelemetry/api": ">=1.0.0 <1.8.0" + checksum: bae4ec3c03e7a90c916667bebe10a9ea7fa33250592c8b0b2f4872af29541d3085f71d6274b67c98007b9f39cfee40c9361557ffcdf931644e2d65ddc6b7ce5d languageName: node linkType: hard -"@opentelemetry/resources@npm:1.17.1": - version: 1.17.1 - resolution: "@opentelemetry/resources@npm:1.17.1" +"@opentelemetry/resources@npm:1.18.1": + version: 1.18.1 + resolution: "@opentelemetry/resources@npm:1.18.1" dependencies: - "@opentelemetry/core": 1.17.1 - "@opentelemetry/semantic-conventions": 1.17.1 + "@opentelemetry/core": 1.18.1 + "@opentelemetry/semantic-conventions": 1.18.1 peerDependencies: - "@opentelemetry/api": ">=1.0.0 <1.7.0" - checksum: ea4ec5568f5b67626be6eb2b975614d140dab4f6eb7ca73ee30d0f1957ef9779953956d1d44c35bb124c75e311b34a05e2036b32fcf31cf50ae983154df9ee3d + "@opentelemetry/api": ">=1.0.0 <1.8.0" + checksum: b3311734802dca77eb379331ae7c409867ffe82cf17bca0e362de49e2d28313441a0177f62fc8c6c1f605bfc82c50e80ac065f17d81fc4fa131afff146db6432 languageName: node linkType: hard -"@opentelemetry/sdk-logs@npm:0.44.0": - version: 0.44.0 - resolution: "@opentelemetry/sdk-logs@npm:0.44.0" +"@opentelemetry/sdk-logs@npm:0.45.1": + version: 0.45.1 + resolution: "@opentelemetry/sdk-logs@npm:0.45.1" dependencies: - "@opentelemetry/core": 1.17.1 - "@opentelemetry/resources": 1.17.1 + "@opentelemetry/core": 1.18.1 + "@opentelemetry/resources": 1.18.1 peerDependencies: - "@opentelemetry/api": ">=1.4.0 <1.7.0" + "@opentelemetry/api": ">=1.4.0 <1.8.0" "@opentelemetry/api-logs": ">=0.39.1" - checksum: 627dec80cd1d6c8836235c8f1f1c912f2322883c5855918f16b36cbc22d58f46ca408f3fa9ff826b534a3a0baa03c780258c60703bf3373e3857a38addeba892 + checksum: c0db4a8f6b93a451c628ca51a2d3c1970441e22ba5a4e24d05c0b53a849df690556c9d9e80c4f42c8fa876fe1b9c17fb0d0a20ca641902ace3ae0be3e5185f66 languageName: node linkType: hard -"@opentelemetry/sdk-metrics@npm:1.17.1": - version: 1.17.1 - resolution: "@opentelemetry/sdk-metrics@npm:1.17.1" +"@opentelemetry/sdk-metrics@npm:1.18.1": + version: 1.18.1 + resolution: "@opentelemetry/sdk-metrics@npm:1.18.1" dependencies: - "@opentelemetry/core": 1.17.1 - "@opentelemetry/resources": 1.17.1 + "@opentelemetry/core": 1.18.1 + "@opentelemetry/resources": 1.18.1 lodash.merge: ^4.6.2 peerDependencies: - "@opentelemetry/api": ">=1.3.0 <1.7.0" - checksum: 6f6a59c5f594ebfc75da7ba203cb35a9271f4536ed4c2499c83f5953b3a2486d306d7aa17f0d7c2fde0efb8cbe9ac4346988adab0e039d082ec95d8d32703509 + "@opentelemetry/api": ">=1.3.0 <1.8.0" + checksum: ed2b87ea6380adc04bf50955cf7ae65220c6f35292b7d0535562c2e83d8b672306103c48fd45f3cc03ab3d640a8d2c6e367b265f5f4b0cbe03b0f51eb85759c7 languageName: node linkType: hard -"@opentelemetry/sdk-node@npm:^0.44.0": - version: 0.44.0 - resolution: "@opentelemetry/sdk-node@npm:0.44.0" - dependencies: - "@opentelemetry/api-logs": 0.44.0 - "@opentelemetry/core": 1.17.1 - "@opentelemetry/exporter-jaeger": 1.17.1 - "@opentelemetry/exporter-trace-otlp-grpc": 0.44.0 - "@opentelemetry/exporter-trace-otlp-http": 0.44.0 - "@opentelemetry/exporter-trace-otlp-proto": 0.44.0 - "@opentelemetry/exporter-zipkin": 1.17.1 - "@opentelemetry/instrumentation": 0.44.0 - "@opentelemetry/resources": 1.17.1 - "@opentelemetry/sdk-logs": 0.44.0 - "@opentelemetry/sdk-metrics": 1.17.1 - "@opentelemetry/sdk-trace-base": 1.17.1 - "@opentelemetry/sdk-trace-node": 1.17.1 - "@opentelemetry/semantic-conventions": 1.17.1 +"@opentelemetry/sdk-node@npm:^0.45.1": + version: 0.45.1 + resolution: "@opentelemetry/sdk-node@npm:0.45.1" + dependencies: + "@opentelemetry/api-logs": 0.45.1 + "@opentelemetry/core": 1.18.1 + "@opentelemetry/exporter-trace-otlp-grpc": 0.45.1 + "@opentelemetry/exporter-trace-otlp-http": 0.45.1 + "@opentelemetry/exporter-trace-otlp-proto": 0.45.1 + "@opentelemetry/exporter-zipkin": 1.18.1 + "@opentelemetry/instrumentation": 0.45.1 + "@opentelemetry/resources": 1.18.1 + "@opentelemetry/sdk-logs": 0.45.1 + "@opentelemetry/sdk-metrics": 1.18.1 + "@opentelemetry/sdk-trace-base": 1.18.1 + "@opentelemetry/sdk-trace-node": 1.18.1 + "@opentelemetry/semantic-conventions": 1.18.1 peerDependencies: - "@opentelemetry/api": ">=1.3.0 <1.7.0" - checksum: 000c6339d0eb4fc8cc22f0b9822d7b778714bdfe476fdeeb4f55fbc429f9ff099b9d2c39f6fc1ef11779629798c72f8da8e6ad6e30f7e3f479fede874e064453 + "@opentelemetry/api": ">=1.3.0 <1.8.0" + checksum: 7554f149356988107c28ad418a6ef80b1196840442003fa05e862b77b8e1649a2a8121f9e5bd7ed3c05a844081ed60c4fba68f08632d814bcae838831dc1ed0a languageName: node linkType: hard -"@opentelemetry/sdk-trace-base@npm:1.17.1": - version: 1.17.1 - resolution: "@opentelemetry/sdk-trace-base@npm:1.17.1" +"@opentelemetry/sdk-trace-base@npm:1.18.1": + version: 1.18.1 + resolution: "@opentelemetry/sdk-trace-base@npm:1.18.1" dependencies: - "@opentelemetry/core": 1.17.1 - "@opentelemetry/resources": 1.17.1 - "@opentelemetry/semantic-conventions": 1.17.1 + "@opentelemetry/core": 1.18.1 + "@opentelemetry/resources": 1.18.1 + "@opentelemetry/semantic-conventions": 1.18.1 peerDependencies: - "@opentelemetry/api": ">=1.0.0 <1.7.0" - checksum: 1400666e673f003f3daceb8d2c55d099b6a2b7c4fa419b844a0fc9df0acb8835ce8dd35df27c180a806397fc01d5182d2f9ae114979f21ddb87afb73ddcab22e + "@opentelemetry/api": ">=1.0.0 <1.8.0" + checksum: 44215b359675e0565b4cf7a1922c7f757873a0715f42f3058ed575e3c664e6baa17f683626ed2866e6db3fa10580270aa8a9a19d3213a2ae211db2945eb40d49 languageName: node linkType: hard -"@opentelemetry/sdk-trace-node@npm:1.17.1": - version: 1.17.1 - resolution: "@opentelemetry/sdk-trace-node@npm:1.17.1" +"@opentelemetry/sdk-trace-node@npm:1.18.1": + version: 1.18.1 + resolution: "@opentelemetry/sdk-trace-node@npm:1.18.1" dependencies: - "@opentelemetry/context-async-hooks": 1.17.1 - "@opentelemetry/core": 1.17.1 - "@opentelemetry/propagator-b3": 1.17.1 - "@opentelemetry/propagator-jaeger": 1.17.1 - "@opentelemetry/sdk-trace-base": 1.17.1 + "@opentelemetry/context-async-hooks": 1.18.1 + "@opentelemetry/core": 1.18.1 + "@opentelemetry/propagator-b3": 1.18.1 + "@opentelemetry/propagator-jaeger": 1.18.1 + "@opentelemetry/sdk-trace-base": 1.18.1 semver: ^7.5.2 peerDependencies: - "@opentelemetry/api": ">=1.0.0 <1.7.0" - checksum: 5f7b46e8deb189c70460e1a4b8dce7f67748a976bce22138bbc7272de60a89bf358c93cb249ee9e391d4257a8c23411fa5e89b7f171174705d6094c489f9e160 + "@opentelemetry/api": ">=1.0.0 <1.8.0" + checksum: 70117de52581966a29a6c679d2f1dcdfb8df9c4078267b62e84259856227f2690b2ff7a4c84a0575725d2beef5f0ea827a673b238272e825856957dd9ddb99bc languageName: node linkType: hard -"@opentelemetry/semantic-conventions@npm:1.17.1, @opentelemetry/semantic-conventions@npm:^1.0.0, @opentelemetry/semantic-conventions@npm:^1.17.0": +"@opentelemetry/semantic-conventions@npm:1.17.1, @opentelemetry/semantic-conventions@npm:^1.0.0": version: 1.17.1 resolution: "@opentelemetry/semantic-conventions@npm:1.17.1" checksum: 16161f70526d2abcd37a39771229ffe01a25d569f76c86e97200dc20399e7fa87b231c557a9654629b4789e945350e4fc55f88df979a502911f1dde4643ad416 languageName: node linkType: hard +"@opentelemetry/semantic-conventions@npm:1.18.1, @opentelemetry/semantic-conventions@npm:^1.18.1": + version: 1.18.1 + resolution: "@opentelemetry/semantic-conventions@npm:1.18.1" + checksum: b60c008c01067c0e8f130ab5d61f5207c85b6db08fa926f629c854ab9917ca93fbabd7ae8d1586f9f82e3b29706b0444ded9d6781f7fb7a003eeb27d89af468f + languageName: node + linkType: hard + "@opentelemetry/sql-common@npm:^0.40.0": version: 0.40.0 resolution: "@opentelemetry/sql-common@npm:0.40.0" @@ -5329,120 +5368,120 @@ __metadata: languageName: node linkType: hard -"@sentry-internal/tracing@npm:7.76.0": - version: 7.76.0 - resolution: "@sentry-internal/tracing@npm:7.76.0" +"@sentry-internal/tracing@npm:7.79.0": + version: 7.79.0 + resolution: "@sentry-internal/tracing@npm:7.79.0" dependencies: - "@sentry/core": 7.76.0 - "@sentry/types": 7.76.0 - "@sentry/utils": 7.76.0 - checksum: b64ea35aa315f3a81c0866715459359173e6a07f3b5973cde4607e56b21dbd67e8ffb5e12a66fa838119bf1983f4893c8cd7573adc8877834261012aa67dc60c + "@sentry/core": 7.79.0 + "@sentry/types": 7.79.0 + "@sentry/utils": 7.79.0 + checksum: 3598935354428621caaf47d144de18e44a6e05de897b26cee3acf7fbd1b68cf439242b2714ee6f7c638bbccece2b87587e7999b095ee1278e58d7cfb58b44c77 languageName: node linkType: hard -"@sentry/angular@npm:^7.76.0": - version: 7.76.0 - resolution: "@sentry/angular@npm:7.76.0" +"@sentry/angular@npm:^7.79.0": + version: 7.79.0 + resolution: "@sentry/angular@npm:7.79.0" dependencies: - "@sentry/browser": 7.76.0 - "@sentry/types": 7.76.0 - "@sentry/utils": 7.76.0 + "@sentry/browser": 7.79.0 + "@sentry/types": 7.79.0 + "@sentry/utils": 7.79.0 tslib: ^2.4.1 peerDependencies: "@angular/common": ">= 10.x <= 15.x" "@angular/core": ">= 10.x <= 15.x" "@angular/router": ">= 10.x <= 15.x" rxjs: ^6.5.5 || ^7.x - checksum: 5a97b2407ef7f7ba40b60e3c3762d4f83f6d0b11a871eb704e1b8739f6fb6612271ebc14988da81f8bc3066af7e0e5abecbfad5eaf3daf4c8bad3c474421b593 + checksum: 6be8522ec00e29c7eb121b58dd914558868443c1276c2f9577d310e877836d2e0fa071719624dac87e904250e63456e66f0c0de969b09348a702ff37204d4da7 languageName: node linkType: hard -"@sentry/browser@npm:7.76.0, @sentry/browser@npm:^7.76.0": - version: 7.76.0 - resolution: "@sentry/browser@npm:7.76.0" +"@sentry/browser@npm:7.79.0, @sentry/browser@npm:^7.79.0": + version: 7.79.0 + resolution: "@sentry/browser@npm:7.79.0" dependencies: - "@sentry-internal/tracing": 7.76.0 - "@sentry/core": 7.76.0 - "@sentry/replay": 7.76.0 - "@sentry/types": 7.76.0 - "@sentry/utils": 7.76.0 - checksum: c3c9cee50912245112f804aa1419f90fb2cde456e1c0bb61b83b98d42cd61b04dd423aeff069c66b5e677f6b2a54ace0c30b5f763112c341ddaf0dc326ec6032 + "@sentry-internal/tracing": 7.79.0 + "@sentry/core": 7.79.0 + "@sentry/replay": 7.79.0 + "@sentry/types": 7.79.0 + "@sentry/utils": 7.79.0 + checksum: 5c3aaf5e92431c66d431e576ff300bed0e6a122cc5d3dece2b7ade2bb02ddfa34c26b59e2b5d88aa189b53f0ad158b271dc01c09e8f7a29ad0c54c9154150a46 languageName: node linkType: hard -"@sentry/core@npm:7.76.0": - version: 7.76.0 - resolution: "@sentry/core@npm:7.76.0" +"@sentry/core@npm:7.79.0": + version: 7.79.0 + resolution: "@sentry/core@npm:7.79.0" dependencies: - "@sentry/types": 7.76.0 - "@sentry/utils": 7.76.0 - checksum: 76b4fedd76f31e5b0e7eef53aa557b4fb17ad89f50bf9078916983dbab33e7a0ab3fc679a47fcf53119f04e0abbb186617beef58ae733971c0dc007d6cf5b275 + "@sentry/types": 7.79.0 + "@sentry/utils": 7.79.0 + checksum: 807ac5154088c1e134b7452224badbb82385d7d473df11991f4f307778ff4ea2cffd1c51e1cedaef135035b5ab892d6b421a8925ed5094b87df1957f4bc8fc57 languageName: node linkType: hard -"@sentry/node@npm:^7.76.0": - version: 7.76.0 - resolution: "@sentry/node@npm:7.76.0" +"@sentry/node@npm:^7.79.0": + version: 7.79.0 + resolution: "@sentry/node@npm:7.79.0" dependencies: - "@sentry-internal/tracing": 7.76.0 - "@sentry/core": 7.76.0 - "@sentry/types": 7.76.0 - "@sentry/utils": 7.76.0 + "@sentry-internal/tracing": 7.79.0 + "@sentry/core": 7.79.0 + "@sentry/types": 7.79.0 + "@sentry/utils": 7.79.0 https-proxy-agent: ^5.0.0 - checksum: cb50c598f8d51c702174793c0811a39ef6cd7fcfb3f7bfd31bc4f5e6a7df6449c66af8ec60a84089d2f0bc8c6ddf8dc61749c9c0df4b19af930b7c4f8d94f502 + checksum: 5aeb98b46df32c93d49196a14f190860db57cf6db53864102ea5efda422f50256248413d62a2ff20fb25c784f24afcc6799247761802ea3049e89d9f88c9e999 languageName: node linkType: hard -"@sentry/opentelemetry-node@npm:^7.76.0": - version: 7.76.0 - resolution: "@sentry/opentelemetry-node@npm:7.76.0" +"@sentry/opentelemetry-node@npm:^7.79.0": + version: 7.79.0 + resolution: "@sentry/opentelemetry-node@npm:7.79.0" dependencies: - "@sentry/core": 7.76.0 - "@sentry/types": 7.76.0 - "@sentry/utils": 7.76.0 + "@sentry/core": 7.79.0 + "@sentry/types": 7.79.0 + "@sentry/utils": 7.79.0 peerDependencies: "@opentelemetry/api": 1.x "@opentelemetry/core": 1.x "@opentelemetry/sdk-trace-base": 1.x "@opentelemetry/semantic-conventions": 1.x - checksum: abf2e86e4c65dd710134436c416630a3991570a4fd58c065b405c8afb7d0b16c7e33a0c25408ab51430db015ce60d19801730e8bbc356c3a9901c530c0aca090 + checksum: 38c2b680e4072a4d670ae22f36db8347e1b4100132ca985a744c4c3775a09dbdda00400a67559ce918e1b0bedad5d82e7cc0dc92726a751b116c55b97665b563 languageName: node linkType: hard -"@sentry/replay@npm:7.76.0": - version: 7.76.0 - resolution: "@sentry/replay@npm:7.76.0" +"@sentry/replay@npm:7.79.0": + version: 7.79.0 + resolution: "@sentry/replay@npm:7.79.0" dependencies: - "@sentry-internal/tracing": 7.76.0 - "@sentry/core": 7.76.0 - "@sentry/types": 7.76.0 - "@sentry/utils": 7.76.0 - checksum: e695889812fdf754f201f63d7ec2d27f5f93232cb2e078c12dfbeffdf2d29af7b7b82fbabb22747f76e68312ebbdd2479dab9e8a0f76f7a175d832a77d3ce9d2 + "@sentry-internal/tracing": 7.79.0 + "@sentry/core": 7.79.0 + "@sentry/types": 7.79.0 + "@sentry/utils": 7.79.0 + checksum: 3a4f823061fdc4ca5286787ca01d7ba66dbf070a6d544d25460a1c62a2268a2212fac7be71a71d65610216f8fbd73ccaf9429c44ecabc79636dbd1ce8bbf79dc languageName: node linkType: hard -"@sentry/tracing@npm:^7.76.0": - version: 7.76.0 - resolution: "@sentry/tracing@npm:7.76.0" +"@sentry/tracing@npm:^7.79.0": + version: 7.79.0 + resolution: "@sentry/tracing@npm:7.79.0" dependencies: - "@sentry-internal/tracing": 7.76.0 - checksum: 0119226dcf82cf1dad32ac5db35a9d1f058d6b054b2ff4890492acaaf2a9f395c59c250b80d7b4d92063926fdfdda93ec429ba3f78eddfa2c8a9df2210e239aa + "@sentry-internal/tracing": 7.79.0 + checksum: 1f2574b8e23a19243c00b752a766531e3acddca679a3df2af6a9b47d3aa3f159f049cece5e82d933c84579faf72217f3d357d747dd6daa98829abadbc45ea7b6 languageName: node linkType: hard -"@sentry/types@npm:7.76.0": - version: 7.76.0 - resolution: "@sentry/types@npm:7.76.0" - checksum: 8978b0b1e680cabc0f9f04881452832e53d636e37bfd0599a8c988ee8bbd244539a286102eba322b4b2019428ceb9c662edb69e3ec88255c8cb217e0ba84f9ce +"@sentry/types@npm:7.79.0": + version: 7.79.0 + resolution: "@sentry/types@npm:7.79.0" + checksum: a68ff2af32e8ff29ac132b609b101093a121597dd6a5a24a02065e36f0e99a35d79f37a8ba4945f3b313927a01dfe3fdf8182729af306171dbe1e3c01e8911f9 languageName: node linkType: hard -"@sentry/utils@npm:7.76.0": - version: 7.76.0 - resolution: "@sentry/utils@npm:7.76.0" +"@sentry/utils@npm:7.79.0": + version: 7.79.0 + resolution: "@sentry/utils@npm:7.79.0" dependencies: - "@sentry/types": 7.76.0 - checksum: 6a9e796835da6daa04893817b57af180cf1b04fb6c61d7523635cf7c41f616be6fb8ba485b6f6bdd626006398dc3491b3e4c981219e4874772b7e59f545b206f + "@sentry/types": 7.79.0 + checksum: e91dfa4cd836fca680c0c3153542a728e6a2fe287aa5816688c1a6cf1c18b213868f60587af6a9089677d69d1b0914f6cf6e8a3636ad45ca91f84747894bf028 languageName: node linkType: hard @@ -5690,10 +5729,10 @@ __metadata: languageName: node linkType: hard -"@types/bcryptjs@npm:^2.4.5": - version: 2.4.5 - resolution: "@types/bcryptjs@npm:2.4.5" - checksum: f721d72d8e1374ee2a342ce90cc902e2308cd059317af6e663d752537e704ea73bb119a2d34a6a68475f80abc1342635f48570119e0381f83a202724974f1e9f +"@types/bcryptjs@npm:^2.4.6": + version: 2.4.6 + resolution: "@types/bcryptjs@npm:2.4.6" + checksum: 25ae1fd1e8a9bd688e22a8de905581d6d7bf26e823b797f895d2c488100b1f15d3c12a7d1a94f553087b010d316bf3978106df860e8e58fd13f52b4c708df5fd languageName: node linkType: hard @@ -5716,12 +5755,12 @@ __metadata: languageName: node linkType: hard -"@types/compression@npm:^1.7.4": - version: 1.7.4 - resolution: "@types/compression@npm:1.7.4" +"@types/compression@npm:^1.7.5": + version: 1.7.5 + resolution: "@types/compression@npm:1.7.5" dependencies: "@types/express": "*" - checksum: 0994e68158ae991d1839f950c553141cf95606a2660bcedf11d68eeb7609caf21b03f256aed1ea4243e89cf8adf358d0a2920513316ea2ec6a2d3e2eacfa02c7 + checksum: 2fc6e4376027d44a4dde304d3b7763ba3d6e229b9417f4a92738e07ae9e5f06708268db5226f5fc7de46c3b9c0c4e3576701c550432b04148778f0de0dcc15f9 languageName: node linkType: hard @@ -6123,39 +6162,46 @@ __metadata: languageName: node linkType: hard -"@types/faker@npm:^6.6.8": - version: 6.6.8 - resolution: "@types/faker@npm:6.6.8" +"@types/faker@npm:^6.6.9": + version: 6.6.9 + resolution: "@types/faker@npm:6.6.9" dependencies: faker: "*" - checksum: 21267dcb169acc9e424018d692c8eb60ff97c5d81d2c02de8f68f3a1f0397d7b7e28117c8b089760cb278ccb313c0d6c28b5a5673bcd56dc81a92e864f31f19d + checksum: 8fb069b6f2bf2cefec42a214395f49695b881d70e651a215a61c2fa7494bb173d1a598c895882ff89df3702ab51c49c23433b3d4bcfd8323cf4f608ed9fb6ce8 languageName: node linkType: hard -"@types/file-saver@npm:^2.0.5": - version: 2.0.5 - resolution: "@types/file-saver@npm:2.0.5" - checksum: a31d6ee2abf99598647139f8f35b37b6e1bacf6c7ddf05c66651b9b0e6e53381aa0e8ed13f37faa6e496e0eb1da87c97e6c70fd589d5b83b0c95c57cb64ce92a +"@types/file-saver@npm:^2.0.7": + version: 2.0.7 + resolution: "@types/file-saver@npm:2.0.7" + checksum: c3d1cd80eab1214767922cabac97681f3fb688e82b74890450d70deaca49537949bbc96d80d363d91e8f0a4752c7164909cc8902d9721c5c4809baafc42a3801 languageName: node linkType: hard -"@types/fs-extra@npm:^11.0.2": - version: 11.0.2 - resolution: "@types/fs-extra@npm:11.0.2" +"@types/fs-extra@npm:^11.0.4": + version: 11.0.4 + resolution: "@types/fs-extra@npm:11.0.4" dependencies: "@types/jsonfile": "*" "@types/node": "*" - checksum: 5b3e30343ee62d2e393e1029355f13f64bab6f3416226e22492483f99da840e2e53ca22cbfa4ac3749f2f83f7086d19c009005c8fa175da01df0fae59c2d73e1 + checksum: 242cb84157631f057f76495c8220707541882c00a00195b603d937fb55e471afecebcb089bab50233ed3a59c69fd68bf65c1f69dd7fafe2347e139cc15b9b0e5 languageName: node linkType: hard -"@types/geojson@npm:*, @types/geojson@npm:^7946.0.10": +"@types/geojson@npm:*": version: 7946.0.10 resolution: "@types/geojson@npm:7946.0.10" checksum: 12c407c2dc93ecb26c08af533ee732f1506a9b29456616ba7ba1d525df96206c28ddf44a528f6a5415d7d22893e9d967420940a9c095ee5e539c1eba5fefc1f4 languageName: node linkType: hard +"@types/geojson@npm:^7946.0.13": + version: 7946.0.13 + resolution: "@types/geojson@npm:7946.0.13" + checksum: b3b68457c89bc3f0445dc9eb54d07e6f89658672867c54989bc7f71f87d54e562195b291d43e1b84476493351271d7ccb9f5c6ab2012b29fbafbb0e8e43c4bca + languageName: node + linkType: hard + "@types/glob@npm:^7.1.1": version: 7.2.0 resolution: "@types/glob@npm:7.2.0" @@ -6173,6 +6219,13 @@ __metadata: languageName: node linkType: hard +"@types/google-libphonenumber@npm:^7.4.30": + version: 7.4.30 + resolution: "@types/google-libphonenumber@npm:7.4.30" + checksum: 09270ed030076a0e69965ad5bad564e672a110e1e83c9092f6d264c3e0355921631521cb9afd022018a51cddfd19ba52d0421f4682d7b68b836dbb52537320de + languageName: node + linkType: hard + "@types/graceful-fs@npm:^4.1.3": version: 4.1.6 resolution: "@types/graceful-fs@npm:4.1.6" @@ -6230,13 +6283,13 @@ __metadata: languageName: node linkType: hard -"@types/jest@npm:^29.2.4, @types/jest@npm:^29.4.0": - version: 29.5.4 - resolution: "@types/jest@npm:29.5.4" +"@types/jest@npm:^29.5.8": + version: 29.5.8 + resolution: "@types/jest@npm:29.5.8" dependencies: expect: ^29.0.0 pretty-format: ^29.0.0 - checksum: 38ed5942f44336452efd0f071eab60aaa57cd8d46530348d0a3aa5a691dcbf1366c4ca8f6ee8364efb45b4413bfefae443e5d4f469246a472a03b21ac11cd4ed + checksum: ca8438a5b4c098c8c023e9d5b279ea306494a1d0b5291cfb498100fa780377145f068b2a021d545b0398bbe0328dcc37044dd3aaf3c6c0fe9b0bef7b46a63453 languageName: node linkType: hard @@ -6283,12 +6336,12 @@ __metadata: languageName: node linkType: hard -"@types/lodash.isequal@npm:^4.5.6": - version: 4.5.6 - resolution: "@types/lodash.isequal@npm:4.5.6" +"@types/lodash.isequal@npm:^4.5.8": + version: 4.5.8 + resolution: "@types/lodash.isequal@npm:4.5.8" dependencies: "@types/lodash": "*" - checksum: 0f065989408a9e0584e6c27495be2cd4602e62650f55266aa195812582444463c0c8570c674ae84f947c11748f49ab43fd5b482fa120e08eeee4c23b162edc38 + checksum: f3180c2d2925514fff1908a1303c11468c9f39b47fd7b053416aad3f1447f8e4a9894dd0460187ac9ac19387e25aec8dd8214d13a50a0967e0dc9cca8e4c5353 languageName: node linkType: hard @@ -6306,7 +6359,14 @@ __metadata: languageName: node linkType: hard -"@types/luxon@npm:*, @types/luxon@npm:~3.3.0": +"@types/luxon@npm:*": + version: 3.3.4 + resolution: "@types/luxon@npm:3.3.4" + checksum: aa4862bd62d748e7966f9a0ec76058e9d74397ee426c7d64f61c677d83de0303c303cc78515001833df3f4ad16c95f572b0e2ffaee6e55bc50b80857e8437f3a + languageName: node + linkType: hard + +"@types/luxon@npm:~3.3.0": version: 3.3.3 resolution: "@types/luxon@npm:3.3.3" checksum: 072dd39eea3f63453788fab2fcfc83eb33917afcaffe178ce08ecd8b016824b8ab3bfa991f66266f2fc1927768a56b4334945f2eb1d83638e325c0c43d7d0e86 @@ -7064,6 +7124,13 @@ __metadata: languageName: node linkType: hard +"@ungap/structured-clone@npm:^1.2.0": + version: 1.2.0 + resolution: "@ungap/structured-clone@npm:1.2.0" + checksum: 4f656b7b4672f2ce6e272f2427d8b0824ed11546a601d8d5412b9d7704e83db38a8d9f402ecdf2b9063fc164af842ad0ec4a55819f621ed7e7ea4d1efcc74524 + languageName: node + linkType: hard + "@webassemblyjs/ast@npm:1.11.1": version: 1.11.1 resolution: "@webassemblyjs/ast@npm:1.11.1" @@ -7671,13 +7738,6 @@ __metadata: languageName: node linkType: hard -"ansi-color@npm:^0.2.1": - version: 0.2.1 - resolution: "ansi-color@npm:0.2.1" - checksum: f3b809a91db1b2ec869a3bf5c0af13a4a8fa971d69a3404852b09d27e7789e1ca885ecd61d7c36f446d9c9f04980393ee099f9d02223d588a0dae19be033c4f3 - languageName: node - linkType: hard - "ansi-colors@npm:4.1.3, ansi-colors@npm:^4.1.1": version: 4.1.3 resolution: "ansi-colors@npm:4.1.3" @@ -7957,7 +8017,7 @@ __metadata: languageName: node linkType: hard -"array-includes@npm:^3.1.4, array-includes@npm:^3.1.6": +"array-includes@npm:^3.1.4": version: 3.1.6 resolution: "array-includes@npm:3.1.6" dependencies: @@ -7970,6 +8030,19 @@ __metadata: languageName: node linkType: hard +"array-includes@npm:^3.1.7": + version: 3.1.7 + resolution: "array-includes@npm:3.1.7" + dependencies: + call-bind: ^1.0.2 + define-properties: ^1.2.0 + es-abstract: ^1.22.1 + get-intrinsic: ^1.2.1 + is-string: ^1.0.7 + checksum: 06f9e4598fac12a919f7c59a3f04f010ea07f0b7f0585465ed12ef528a60e45f374e79d1bddbb34cdd4338357d00023ddbd0ac18b0be36964f5e726e8965d7fc + languageName: node + linkType: hard + "array-timsort@npm:^1.0.3": version: 1.0.3 resolution: "array-timsort@npm:1.0.3" @@ -7984,20 +8057,20 @@ __metadata: languageName: node linkType: hard -"array.prototype.findlastindex@npm:^1.2.2": - version: 1.2.2 - resolution: "array.prototype.findlastindex@npm:1.2.2" +"array.prototype.findlastindex@npm:^1.2.3": + version: 1.2.3 + resolution: "array.prototype.findlastindex@npm:1.2.3" dependencies: call-bind: ^1.0.2 - define-properties: ^1.1.4 - es-abstract: ^1.20.4 + define-properties: ^1.2.0 + es-abstract: ^1.22.1 es-shim-unscopables: ^1.0.0 - get-intrinsic: ^1.1.3 - checksum: 8a166359f69a2a751c843f26b9c8cd03d0dc396a92cdcb85f4126b5f1cecdae5b2c0c616a71ea8aff026bde68165b44950b3664404bb73db0673e288495ba264 + get-intrinsic: ^1.2.1 + checksum: 31f35d7b370c84db56484618132041a9af401b338f51899c2e78ef7690fbba5909ee7ca3c59a7192085b328cc0c68c6fd1f6d1553db01a689a589ae510f3966e languageName: node linkType: hard -"array.prototype.flat@npm:^1.2.5, array.prototype.flat@npm:^1.3.1": +"array.prototype.flat@npm:^1.2.5": version: 1.3.1 resolution: "array.prototype.flat@npm:1.3.1" dependencies: @@ -8009,15 +8082,27 @@ __metadata: languageName: node linkType: hard -"array.prototype.flatmap@npm:^1.3.1": - version: 1.3.1 - resolution: "array.prototype.flatmap@npm:1.3.1" +"array.prototype.flat@npm:^1.3.2": + version: 1.3.2 + resolution: "array.prototype.flat@npm:1.3.2" dependencies: call-bind: ^1.0.2 - define-properties: ^1.1.4 - es-abstract: ^1.20.4 + define-properties: ^1.2.0 + es-abstract: ^1.22.1 es-shim-unscopables: ^1.0.0 - checksum: 8c1c43a4995f12cf12523436da28515184c753807b3f0bc2ca6c075f71c470b099e2090cc67dba8e5280958fea401c1d0c59e1db0143272aef6cd1103921a987 + checksum: 5d6b4bf102065fb3f43764bfff6feb3295d372ce89591e6005df3d0ce388527a9f03c909af6f2a973969a4d178ab232ffc9236654149173e0e187ec3a1a6b87b + languageName: node + linkType: hard + +"array.prototype.flatmap@npm:^1.3.2": + version: 1.3.2 + resolution: "array.prototype.flatmap@npm:1.3.2" + dependencies: + call-bind: ^1.0.2 + define-properties: ^1.2.0 + es-abstract: ^1.22.1 + es-shim-unscopables: ^1.0.0 + checksum: ce09fe21dc0bcd4f30271f8144083aa8c13d4639074d6c8dc82054b847c7fc9a0c97f857491f4da19d4003e507172a78f4bcd12903098adac8b9cd374f734be3 languageName: node linkType: hard @@ -8035,6 +8120,21 @@ __metadata: languageName: node linkType: hard +"arraybuffer.prototype.slice@npm:^1.0.2": + version: 1.0.2 + resolution: "arraybuffer.prototype.slice@npm:1.0.2" + dependencies: + array-buffer-byte-length: ^1.0.0 + call-bind: ^1.0.2 + define-properties: ^1.2.0 + es-abstract: ^1.22.1 + get-intrinsic: ^1.2.1 + is-array-buffer: ^3.0.2 + is-shared-array-buffer: ^1.0.2 + checksum: c200faf437786f5b2c80d4564ff5481c886a16dee642ef02abdc7306c7edd523d1f01d1dd12b769c7eb42ac9bc53874510db19a92a2c035c0f6696172aafa5d3 + languageName: node + linkType: hard + "arrify@npm:^1.0.1": version: 1.0.1 resolution: "arrify@npm:1.0.1" @@ -8669,18 +8769,6 @@ __metadata: languageName: node linkType: hard -"bufrw@npm:^1.2.1": - version: 1.3.0 - resolution: "bufrw@npm:1.3.0" - dependencies: - ansi-color: ^0.2.1 - error: ^7.0.0 - hexer: ^1.5.0 - xtend: ^4.0.0 - checksum: e0cdfae2d1f4c0a2ffdc4e352ce3dbd547c4683c76072d48b98322945c318cbb0b6c2ccb5719d7de14abbe2076d68796f7d905b9b2c859fa29259fe66894b6c6 - languageName: node - linkType: hard - "builtins@npm:^1.0.3": version: 1.0.3 resolution: "builtins@npm:1.0.3" @@ -8859,6 +8947,17 @@ __metadata: languageName: node linkType: hard +"call-bind@npm:^1.0.4, call-bind@npm:^1.0.5": + version: 1.0.5 + resolution: "call-bind@npm:1.0.5" + dependencies: + function-bind: ^1.1.2 + get-intrinsic: ^1.2.1 + set-function-length: ^1.1.1 + checksum: 449e83ecbd4ba48e7eaac5af26fea3b50f8f6072202c2dd7c5a6e7a6308f2421abe5e13a3bbd55221087f76320c5e09f25a8fdad1bab2b77c68ae74d92234ea5 + languageName: node + linkType: hard + "callsites@npm:^3.0.0": version: 3.1.0 resolution: "callsites@npm:3.1.0" @@ -10458,6 +10557,17 @@ __metadata: languageName: node linkType: hard +"define-data-property@npm:^1.0.1, define-data-property@npm:^1.1.1": + version: 1.1.1 + resolution: "define-data-property@npm:1.1.1" + dependencies: + get-intrinsic: ^1.2.1 + gopd: ^1.0.1 + has-property-descriptors: ^1.0.0 + checksum: a29855ad3f0630ea82e3c5012c812efa6ca3078d5c2aa8df06b5f597c1cde6f7254692df41945851d903e05a1668607b6d34e778f402b9ff9ffb38111f1a3f0d + languageName: node + linkType: hard + "define-lazy-prop@npm:^2.0.0": version: 2.0.0 resolution: "define-lazy-prop@npm:2.0.0" @@ -10761,7 +10871,7 @@ __metadata: version: 0.0.0-use.local resolution: "domifa@workspace:." dependencies: - "@babel/runtime": ^7.22.15 + "@babel/runtime": ^7.23.2 "@commitlint/cli": ^18.2.0 "@commitlint/config-conventional": ^18.1.0 "@socialgouv/sre-secrets": ^1.14.5 @@ -11086,26 +11196,7 @@ __metadata: languageName: node linkType: hard -"error@npm:7.0.2": - version: 7.0.2 - resolution: "error@npm:7.0.2" - dependencies: - string-template: ~0.2.1 - xtend: ~4.0.0 - checksum: 407ff5faa73f5da3424a81d0160a1d3c6b5144e87cb1266334e7a4c2c7a69ae653e1b544032d7dbd8b210006858eea909ea0f46694b0484cd7555ba3086be0a8 - languageName: node - linkType: hard - -"error@npm:^7.0.0": - version: 7.2.1 - resolution: "error@npm:7.2.1" - dependencies: - string-template: ~0.2.1 - checksum: 9c790d20a386947acfeabb0d1c39173efe8e5a38cb732b5f06c11a25c23ce8ac4dafbb7aa240565e034580a49aba0703e743d0274c6228500ddf947a1b998568 - languageName: node - linkType: hard - -"es-abstract@npm:^1.19.0, es-abstract@npm:^1.20.4, es-abstract@npm:^1.21.2": +"es-abstract@npm:^1.19.0, es-abstract@npm:^1.20.4": version: 1.22.1 resolution: "es-abstract@npm:1.22.1" dependencies: @@ -11152,6 +11243,53 @@ __metadata: languageName: node linkType: hard +"es-abstract@npm:^1.22.1": + version: 1.22.3 + resolution: "es-abstract@npm:1.22.3" + dependencies: + array-buffer-byte-length: ^1.0.0 + arraybuffer.prototype.slice: ^1.0.2 + available-typed-arrays: ^1.0.5 + call-bind: ^1.0.5 + es-set-tostringtag: ^2.0.1 + es-to-primitive: ^1.2.1 + function.prototype.name: ^1.1.6 + get-intrinsic: ^1.2.2 + get-symbol-description: ^1.0.0 + globalthis: ^1.0.3 + gopd: ^1.0.1 + has-property-descriptors: ^1.0.0 + has-proto: ^1.0.1 + has-symbols: ^1.0.3 + hasown: ^2.0.0 + internal-slot: ^1.0.5 + is-array-buffer: ^3.0.2 + is-callable: ^1.2.7 + is-negative-zero: ^2.0.2 + is-regex: ^1.1.4 + is-shared-array-buffer: ^1.0.2 + is-string: ^1.0.7 + is-typed-array: ^1.1.12 + is-weakref: ^1.0.2 + object-inspect: ^1.13.1 + object-keys: ^1.1.1 + object.assign: ^4.1.4 + regexp.prototype.flags: ^1.5.1 + safe-array-concat: ^1.0.1 + safe-regex-test: ^1.0.0 + string.prototype.trim: ^1.2.8 + string.prototype.trimend: ^1.0.7 + string.prototype.trimstart: ^1.0.7 + typed-array-buffer: ^1.0.0 + typed-array-byte-length: ^1.0.0 + typed-array-byte-offset: ^1.0.0 + typed-array-length: ^1.0.4 + unbox-primitive: ^1.0.2 + which-typed-array: ^1.1.13 + checksum: b1bdc962856836f6e72be10b58dc128282bdf33771c7a38ae90419d920fc3b36cc5d2b70a222ad8016e3fc322c367bf4e9e89fc2bc79b7e933c05b218e83d79a + languageName: node + linkType: hard + "es-get-iterator@npm:^1.1.2": version: 1.1.3 resolution: "es-get-iterator@npm:1.1.3" @@ -11476,9 +11614,9 @@ __metadata: languageName: node linkType: hard -"eslint-config-standard-with-typescript@npm:^39.1.0": - version: 39.1.0 - resolution: "eslint-config-standard-with-typescript@npm:39.1.0" +"eslint-config-standard-with-typescript@npm:^39.1.1": + version: 39.1.1 + resolution: "eslint-config-standard-with-typescript@npm:39.1.1" dependencies: "@typescript-eslint/parser": ^6.4.0 eslint-config-standard: 17.1.0 @@ -11489,7 +11627,7 @@ __metadata: eslint-plugin-n: "^15.0.0 || ^16.0.0 " eslint-plugin-promise: ^6.0.0 typescript: "*" - checksum: 550d155db40b69eb6b896af86abde02add4f7f9c3e8e1160fdf486589672123f040cb735ad374d09b16d9cd048d8ac241c8b752c5e92fc057818b82aacc407f2 + checksum: 803e22fb5ac413044ae33771042ead2666214fe0e034545c8c7e0725106f8e09bfda87fa3a9553ab94346f3921a10e795a7d798442955af19addce2cd3a0c664 languageName: node linkType: hard @@ -11505,7 +11643,7 @@ __metadata: languageName: node linkType: hard -"eslint-import-resolver-node@npm:^0.3.6, eslint-import-resolver-node@npm:^0.3.7": +"eslint-import-resolver-node@npm:^0.3.6, eslint-import-resolver-node@npm:^0.3.9": version: 0.3.9 resolution: "eslint-import-resolver-node@npm:0.3.9" dependencies: @@ -11559,30 +11697,30 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-import@npm:^2.28.1": - version: 2.28.1 - resolution: "eslint-plugin-import@npm:2.28.1" +"eslint-plugin-import@npm:^2.29.0": + version: 2.29.0 + resolution: "eslint-plugin-import@npm:2.29.0" dependencies: - array-includes: ^3.1.6 - array.prototype.findlastindex: ^1.2.2 - array.prototype.flat: ^1.3.1 - array.prototype.flatmap: ^1.3.1 + array-includes: ^3.1.7 + array.prototype.findlastindex: ^1.2.3 + array.prototype.flat: ^1.3.2 + array.prototype.flatmap: ^1.3.2 debug: ^3.2.7 doctrine: ^2.1.0 - eslint-import-resolver-node: ^0.3.7 + eslint-import-resolver-node: ^0.3.9 eslint-module-utils: ^2.8.0 - has: ^1.0.3 - is-core-module: ^2.13.0 + hasown: ^2.0.0 + is-core-module: ^2.13.1 is-glob: ^4.0.3 minimatch: ^3.1.2 - object.fromentries: ^2.0.6 - object.groupby: ^1.0.0 - object.values: ^1.1.6 + object.fromentries: ^2.0.7 + object.groupby: ^1.0.1 + object.values: ^1.1.7 semver: ^6.3.1 tsconfig-paths: ^3.14.2 peerDependencies: eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 - checksum: e8ae6dd8f06d8adf685f9c1cfd46ac9e053e344a05c4090767e83b63a85c8421ada389807a39e73c643b9bff156715c122e89778169110ed68d6428e12607edf + checksum: 19ee541fb95eb7a796f3daebe42387b8d8262bbbcc4fd8a6e92f63a12035f3d2c6cb8bc0b6a70864fa14b1b50ed6b8e6eed5833e625e16cb6bb98b665beff269 languageName: node linkType: hard @@ -11609,9 +11747,9 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-jest@npm:^27.4.0": - version: 27.4.0 - resolution: "eslint-plugin-jest@npm:27.4.0" +"eslint-plugin-jest@npm:^27.6.0": + version: 27.6.0 + resolution: "eslint-plugin-jest@npm:27.6.0" dependencies: "@typescript-eslint/utils": ^5.10.0 peerDependencies: @@ -11623,7 +11761,7 @@ __metadata: optional: true jest: optional: true - checksum: c33593dba87e750123555c2de32fb174d6f2c92342571492f8dbde01bf61a8ac229dff31bd08fea16c3ca2c4843fc2fec985459c351319c019016767ed1cd78e + checksum: 4c42641f9bf2d597761637028083e20b9f81762308e98baae40eb805d3e81ff8d837f06f4f0c1a2fd249e2be2fb24d33b7aafeaa8942de805c2b8d7c3b6fc4e4 languageName: node linkType: hard @@ -11645,9 +11783,9 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-n@npm:^16.1.0": - version: 16.1.0 - resolution: "eslint-plugin-n@npm:16.1.0" +"eslint-plugin-n@npm:^16.3.0": + version: 16.3.0 + resolution: "eslint-plugin-n@npm:16.3.0" dependencies: "@eslint-community/eslint-utils": ^4.4.0 builtins: ^5.0.1 @@ -11660,7 +11798,7 @@ __metadata: semver: ^7.5.3 peerDependencies: eslint: ">=7.0.0" - checksum: 6b70bf8eec74395a440ca585745eb19aba143ee00513f76893c44944675630bd898227d1b4e0ebef66fd0c84cdcf223d6613b2beee0727b5c572cd705fb50d3a + checksum: 1463618c4935203d86f7ebe5076b2a9b5da9a7b57db588527e21243190a4aa2a0a401d74bd5cb9b8b3d39ca40741996a35d9e891c29c8c876fa1185af46ac7cf languageName: node linkType: hard @@ -11676,9 +11814,9 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-prettier@npm:^5.0.0": - version: 5.0.0 - resolution: "eslint-plugin-prettier@npm:5.0.0" +"eslint-plugin-prettier@npm:^5.0.1": + version: 5.0.1 + resolution: "eslint-plugin-prettier@npm:5.0.1" dependencies: prettier-linter-helpers: ^1.0.0 synckit: ^0.8.5 @@ -11691,7 +11829,7 @@ __metadata: optional: true eslint-config-prettier: optional: true - checksum: 84e88744b9050f2d5ef31b94e85294dda16f3a53c2449f9d33eac8ae6264889b459bf35a68e438fb6b329c2a1d6491aac4bfa00d86317e7009de3dad0311bec6 + checksum: c2261033b97bafe99ccb7cc47c2fac6fa85b8bbc8b128042e52631f906b69e12afed2cdd9d7e3021cc892ee8dd4204a3574e1f32a0b718b4bb3b440944b6983b languageName: node linkType: hard @@ -11792,17 +11930,18 @@ __metadata: languageName: node linkType: hard -"eslint@npm:^8.50.0": - version: 8.50.0 - resolution: "eslint@npm:8.50.0" +"eslint@npm:^8.53.0": + version: 8.53.0 + resolution: "eslint@npm:8.53.0" dependencies: "@eslint-community/eslint-utils": ^4.2.0 "@eslint-community/regexpp": ^4.6.1 - "@eslint/eslintrc": ^2.1.2 - "@eslint/js": 8.50.0 - "@humanwhocodes/config-array": ^0.11.11 + "@eslint/eslintrc": ^2.1.3 + "@eslint/js": 8.53.0 + "@humanwhocodes/config-array": ^0.11.13 "@humanwhocodes/module-importer": ^1.0.1 "@nodelib/fs.walk": ^1.2.8 + "@ungap/structured-clone": ^1.2.0 ajv: ^6.12.4 chalk: ^4.0.0 cross-spawn: ^7.0.2 @@ -11835,7 +11974,7 @@ __metadata: text-table: ^0.2.0 bin: eslint: bin/eslint.js - checksum: 9ebfe5615dc84700000d218e32ddfdcfc227ca600f65f18e5541ec34f8902a00356a9a8804d9468fd6c8637a5ef6a3897291dad91ba6579d5b32ffeae5e31768 + checksum: 2da808655c7aa4b33f8970ba30d96b453c3071cc4d6cd60d367163430677e32ff186b65270816b662d29139283138bff81f28dddeb2e73265495245a316ed02c languageName: node linkType: hard @@ -12754,6 +12893,13 @@ __metadata: languageName: node linkType: hard +"function-bind@npm:^1.1.2": + version: 1.1.2 + resolution: "function-bind@npm:1.1.2" + checksum: 2b0ff4ce708d99715ad14a6d1f894e2a83242e4a52ccfcefaee5e40050562e5f6dafc1adbb4ce2d4ab47279a45dc736ab91ea5042d843c3c092820dfe032efb1 + languageName: node + linkType: hard + "function.prototype.name@npm:^1.1.5": version: 1.1.5 resolution: "function.prototype.name@npm:1.1.5" @@ -12766,6 +12912,18 @@ __metadata: languageName: node linkType: hard +"function.prototype.name@npm:^1.1.6": + version: 1.1.6 + resolution: "function.prototype.name@npm:1.1.6" + dependencies: + call-bind: ^1.0.2 + define-properties: ^1.2.0 + es-abstract: ^1.22.1 + functions-have-names: ^1.2.3 + checksum: 7a3f9bd98adab09a07f6e1f03da03d3f7c26abbdeaeee15223f6c04a9fb5674792bdf5e689dac19b97ac71de6aad2027ba3048a9b883aa1b3173eed6ab07f479 + languageName: node + linkType: hard + "functional-red-black-tree@npm:^1.0.1": version: 1.0.1 resolution: "functional-red-black-tree@npm:1.0.1" @@ -12854,6 +13012,18 @@ __metadata: languageName: node linkType: hard +"get-intrinsic@npm:^1.2.2": + version: 1.2.2 + resolution: "get-intrinsic@npm:1.2.2" + dependencies: + function-bind: ^1.1.2 + has-proto: ^1.0.1 + has-symbols: ^1.0.3 + hasown: ^2.0.0 + checksum: 447ff0724df26829908dc033b62732359596fcf66027bc131ab37984afb33842d9cd458fd6cecadfe7eac22fd8a54b349799ed334cf2726025c921c7250e7417 + languageName: node + linkType: hard + "get-package-type@npm:^0.1.0": version: 0.1.0 resolution: "get-package-type@npm:0.1.0" @@ -13109,6 +13279,21 @@ __metadata: languageName: node linkType: hard +"glob@npm:^10.3.7": + version: 10.3.10 + resolution: "glob@npm:10.3.10" + dependencies: + foreground-child: ^3.1.0 + jackspeak: ^2.3.5 + minimatch: ^9.0.1 + minipass: ^5.0.0 || ^6.0.2 || ^7.0.0 + path-scurry: ^1.10.1 + bin: + glob: dist/esm/bin.mjs + checksum: 4f2fe2511e157b5a3f525a54092169a5f92405f24d2aed3142f4411df328baca13059f4182f1db1bf933e2c69c0bd89e57ae87edd8950cba8c7ccbe84f721cf3 + languageName: node + linkType: hard + "glob@npm:^7.0.0, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6": version: 7.2.3 resolution: "glob@npm:7.2.3" @@ -13417,6 +13602,15 @@ __metadata: languageName: node linkType: hard +"hasown@npm:^2.0.0": + version: 2.0.0 + resolution: "hasown@npm:2.0.0" + dependencies: + function-bind: ^1.1.2 + checksum: 6151c75ca12554565098641c98a40f4cc86b85b0fd5b6fe92360967e4605a4f9610f7757260b4e8098dd1c2ce7f4b095f2006fe72a570e3b6d2d28de0298c176 + languageName: node + linkType: hard + "hdr-histogram-js@npm:^2.0.1": version: 2.0.3 resolution: "hdr-histogram-js@npm:2.0.3" @@ -13454,20 +13648,6 @@ __metadata: languageName: node linkType: hard -"hexer@npm:^1.5.0": - version: 1.5.0 - resolution: "hexer@npm:1.5.0" - dependencies: - ansi-color: ^0.2.1 - minimist: ^1.1.0 - process: ^0.10.0 - xtend: ^4.0.0 - bin: - hexer: ./cli.js - checksum: 2e7a919da953ae7bc8ee3d88b01615fd640a71f65cfaa8e7f0775f44ebbd06fe9d3b901a582c155a518537282dd231f5ca2f8523a5e7b84defc0b07f16854c22 - languageName: node - linkType: hard - "hexoid@npm:^1.0.0": version: 1.0.0 resolution: "hexoid@npm:1.0.0" @@ -14224,6 +14404,15 @@ __metadata: languageName: node linkType: hard +"is-core-module@npm:^2.13.1": + version: 2.13.1 + resolution: "is-core-module@npm:2.13.1" + dependencies: + hasown: ^2.0.0 + checksum: 256559ee8a9488af90e4bad16f5583c6d59e92f0742e9e8bb4331e758521ee86b810b93bae44f390766ffbc518a0488b18d9dab7da9a5ff997d499efc9403f7c + languageName: node + linkType: hard + "is-date-object@npm:^1.0.1, is-date-object@npm:^1.0.5": version: 1.0.5 resolution: "is-date-object@npm:1.0.5" @@ -14529,7 +14718,7 @@ __metadata: languageName: node linkType: hard -"is-typed-array@npm:^1.1.10, is-typed-array@npm:^1.1.9": +"is-typed-array@npm:^1.1.10, is-typed-array@npm:^1.1.12, is-typed-array@npm:^1.1.9": version: 1.1.12 resolution: "is-typed-array@npm:1.1.12" dependencies: @@ -14728,16 +14917,16 @@ __metadata: languageName: node linkType: hard -"jaeger-client@npm:^3.15.0": - version: 3.19.0 - resolution: "jaeger-client@npm:3.19.0" +"jackspeak@npm:^2.3.5": + version: 2.3.6 + resolution: "jackspeak@npm:2.3.6" dependencies: - node-int64: ^0.4.0 - opentracing: ^0.14.4 - thriftrw: ^3.5.0 - uuid: ^8.3.2 - xorshift: ^1.1.1 - checksum: fcdc0523b70299c0db1c07e6c209fa170cef75aa3ad00e6241c906423ba07dc6112a60e1b96de59c2a8eb9d335bf0a0c2a23cc13595ef24aededca2fdff65837 + "@isaacs/cliui": ^8.0.2 + "@pkgjs/parseargs": ^0.11.0 + dependenciesMeta: + "@pkgjs/parseargs": + optional: true + checksum: 57d43ad11eadc98cdfe7496612f6bbb5255ea69fe51ea431162db302c2a11011642f50cfad57288bd0aea78384a0612b16e131944ad8ecd09d619041c8531b54 languageName: node linkType: hard @@ -15019,9 +15208,9 @@ __metadata: languageName: node linkType: hard -"jest-preset-angular@npm:^13.1.2": - version: 13.1.2 - resolution: "jest-preset-angular@npm:13.1.2" +"jest-preset-angular@npm:^13.1.3": + version: 13.1.3 + resolution: "jest-preset-angular@npm:13.1.3" dependencies: bs-logger: ^0.2.6 esbuild: ">=0.13.8" @@ -15031,16 +15220,16 @@ __metadata: pretty-format: ^29.0.0 ts-jest: ^29.0.0 peerDependencies: - "@angular-devkit/build-angular": ">=13.0.0 <17.0.0" - "@angular/compiler-cli": ">=13.0.0 <17.0.0" - "@angular/core": ">=13.0.0 <17.0.0" - "@angular/platform-browser-dynamic": ">=13.0.0 <17.0.0" + "@angular-devkit/build-angular": ">=13.0.0 <18.0.0" + "@angular/compiler-cli": ">=13.0.0 <18.0.0" + "@angular/core": ">=13.0.0 <18.0.0" + "@angular/platform-browser-dynamic": ">=13.0.0 <18.0.0" jest: ^29.0.0 typescript: ">=4.4" dependenciesMeta: esbuild: optional: true - checksum: f6fd85b99b9fac58527723aa2ad5c4ccc3f0a3f6ed83bfb71af43f46e2cf0404516b3e7f0f4b41ab76763a774682b30b4416a60754de1b82e68134b4d5dc45e8 + checksum: a30563042d850a4ade10dbde61681e973dd21a6c5aa3f493688375fa6fb2bd0047cdc3178205ad5599db71186bbf3d13eec7ae6160d4f3d43931d3bdf5005df2 languageName: node linkType: hard @@ -16294,13 +16483,6 @@ __metadata: languageName: node linkType: hard -"long@npm:^2.4.0": - version: 2.4.0 - resolution: "long@npm:2.4.0" - checksum: e24fd5e14be90ba6ec3faa43b3b0f1c4ac88bfdc52471d90f63e173572f6db27c45873e847f8af58283ca3140eb42d7ba11708102f3cc0956793b03305c737e0 - languageName: node - linkType: hard - "long@npm:^4.0.0": version: 4.0.0 resolution: "long@npm:4.0.0" @@ -16837,7 +17019,7 @@ __metadata: languageName: node linkType: hard -"minimist@npm:^1.1.0, minimist@npm:^1.2.0, minimist@npm:^1.2.3, minimist@npm:^1.2.5, minimist@npm:^1.2.6, minimist@npm:^1.2.8": +"minimist@npm:^1.2.0, minimist@npm:^1.2.3, minimist@npm:^1.2.5, minimist@npm:^1.2.6, minimist@npm:^1.2.8": version: 1.2.8 resolution: "minimist@npm:1.2.8" checksum: 75a6d645fb122dad29c06a7597bddea977258957ed88d7a6df59b5cd3fe4a527e253e9bbf2e783e4b73657f9098b96a5fe96ab8a113655d4109108577ecf85b0 @@ -18075,6 +18257,13 @@ __metadata: languageName: node linkType: hard +"object-inspect@npm:^1.13.1": + version: 1.13.1 + resolution: "object-inspect@npm:1.13.1" + checksum: 7d9fa9221de3311dcb5c7c307ee5dc011cdd31dc43624b7c184b3840514e118e05ef0002be5388304c416c0eb592feb46e983db12577fc47e47d5752fbbfb61f + languageName: node + linkType: hard + "object-is@npm:^1.1.5": version: 1.1.5 resolution: "object-is@npm:1.1.5" @@ -18104,30 +18293,30 @@ __metadata: languageName: node linkType: hard -"object.fromentries@npm:^2.0.6": - version: 2.0.6 - resolution: "object.fromentries@npm:2.0.6" +"object.fromentries@npm:^2.0.7": + version: 2.0.7 + resolution: "object.fromentries@npm:2.0.7" dependencies: call-bind: ^1.0.2 - define-properties: ^1.1.4 - es-abstract: ^1.20.4 - checksum: 453c6d694180c0c30df451b60eaf27a5b9bca3fb43c37908fd2b78af895803dc631242bcf05582173afa40d8d0e9c96e16e8874b39471aa53f3ac1f98a085d85 + define-properties: ^1.2.0 + es-abstract: ^1.22.1 + checksum: 7341ce246e248b39a431b87a9ddd331ff52a454deb79afebc95609f94b1f8238966cf21f52188f2a353f0fdf83294f32f1ebf1f7826aae915ebad21fd0678065 languageName: node linkType: hard -"object.groupby@npm:^1.0.0": - version: 1.0.0 - resolution: "object.groupby@npm:1.0.0" +"object.groupby@npm:^1.0.1": + version: 1.0.1 + resolution: "object.groupby@npm:1.0.1" dependencies: call-bind: ^1.0.2 define-properties: ^1.2.0 - es-abstract: ^1.21.2 + es-abstract: ^1.22.1 get-intrinsic: ^1.2.1 - checksum: 64b00b287d57580111c958e7ff375c9b61811fa356f2cf0d35372d43cab61965701f00fac66c19fd8f49c4dfa28744bee6822379c69a73648ad03e09fcdeae70 + checksum: d7959d6eaaba358b1608066fc67ac97f23ce6f573dc8fc661f68c52be165266fcb02937076aedb0e42722fdda0bdc0bbf74778196ac04868178888e9fd3b78b5 languageName: node linkType: hard -"object.values@npm:^1.1.5, object.values@npm:^1.1.6": +"object.values@npm:^1.1.5": version: 1.1.6 resolution: "object.values@npm:1.1.6" dependencies: @@ -18138,6 +18327,17 @@ __metadata: languageName: node linkType: hard +"object.values@npm:^1.1.7": + version: 1.1.7 + resolution: "object.values@npm:1.1.7" + dependencies: + call-bind: ^1.0.2 + define-properties: ^1.2.0 + es-abstract: ^1.22.1 + checksum: f3e4ae4f21eb1cc7cebb6ce036d4c67b36e1c750428d7b7623c56a0db90edced63d08af8a316d81dfb7c41a3a5fa81b05b7cc9426e98d7da986b1682460f0777 + languageName: node + linkType: hard + "obuf@npm:^1.0.0, obuf@npm:^1.1.2, obuf@npm:~1.1.2": version: 1.1.2 resolution: "obuf@npm:1.1.2" @@ -18236,13 +18436,6 @@ __metadata: languageName: node linkType: hard -"opentracing@npm:^0.14.4": - version: 0.14.7 - resolution: "opentracing@npm:0.14.7" - checksum: 5f7e44439062d056a2a72ac89eff463c9cf5659a2aea230ff7f5a226c5e960c195ce04ec2e2cc590140bbb9c5d2be11a5a50a23484cbe2d0e132af4309d4c904 - languageName: node - linkType: hard - "option@npm:~0.2.1": version: 0.2.4 resolution: "option@npm:0.2.4" @@ -18785,7 +18978,7 @@ __metadata: languageName: node linkType: hard -"passport-jwt@npm:^4.0.0": +"passport-jwt@npm:^4.0.1": version: 4.0.1 resolution: "passport-jwt@npm:4.0.1" dependencies: @@ -18862,7 +19055,7 @@ __metadata: languageName: node linkType: hard -"path-scurry@npm:^1.6.1, path-scurry@npm:^1.7.0": +"path-scurry@npm:^1.10.1, path-scurry@npm:^1.6.1, path-scurry@npm:^1.7.0": version: 1.10.1 resolution: "path-scurry@npm:1.10.1" dependencies: @@ -19489,13 +19682,6 @@ __metadata: languageName: node linkType: hard -"process@npm:^0.10.0": - version: 0.10.1 - resolution: "process@npm:0.10.1" - checksum: bdaaa28a8edf96d5daa0f5c1faf4adfedce512ebca829a82e846d991492780c34eb934decf4fa5b311c698881d07a8d4592b4d7ea53ec03d51580a2f364d3e30 - languageName: node - linkType: hard - "process@npm:^0.11.10": version: 0.11.10 resolution: "process@npm:0.11.10" @@ -20255,6 +20441,17 @@ __metadata: languageName: node linkType: hard +"regexp.prototype.flags@npm:^1.5.1": + version: 1.5.1 + resolution: "regexp.prototype.flags@npm:1.5.1" + dependencies: + call-bind: ^1.0.2 + define-properties: ^1.2.0 + set-function-name: ^2.0.0 + checksum: 869edff00288442f8d7fa4c9327f91d85f3b3acf8cbbef9ea7a220345cf23e9241b6def9263d2c1ebcf3a316b0aa52ad26a43a84aa02baca3381717b3e307f47 + languageName: node + linkType: hard + "regexpp@npm:^3.1.0": version: 3.2.0 resolution: "regexpp@npm:3.2.0" @@ -20541,7 +20738,7 @@ __metadata: languageName: node linkType: hard -"rimraf@npm:*, rimraf@npm:^5.0.0": +"rimraf@npm:*": version: 5.0.1 resolution: "rimraf@npm:5.0.1" dependencies: @@ -20585,6 +20782,17 @@ __metadata: languageName: node linkType: hard +"rimraf@npm:^5.0.5": + version: 5.0.5 + resolution: "rimraf@npm:5.0.5" + dependencies: + glob: ^10.3.7 + bin: + rimraf: dist/esm/bin.mjs + checksum: d66eef829b2e23b16445f34e73d75c7b7cf4cbc8834b04720def1c8f298eb0753c3d76df77325fad79d0a2c60470525d95f89c2475283ad985fd7441c32732d1 + languageName: node + linkType: hard + "rimraf@npm:~2.6.2": version: 2.6.3 resolution: "rimraf@npm:2.6.3" @@ -20660,6 +20868,18 @@ __metadata: languageName: node linkType: hard +"safe-array-concat@npm:^1.0.1": + version: 1.0.1 + resolution: "safe-array-concat@npm:1.0.1" + dependencies: + call-bind: ^1.0.2 + get-intrinsic: ^1.2.1 + has-symbols: ^1.0.3 + isarray: ^2.0.5 + checksum: 001ecf1d8af398251cbfabaf30ed66e3855127fbceee178179524b24160b49d15442f94ed6c0db0b2e796da76bb05b73bf3cc241490ec9c2b741b41d33058581 + languageName: node + linkType: hard + "safe-buffer@npm:5.1.2, safe-buffer@npm:~5.1.0, safe-buffer@npm:~5.1.1": version: 5.1.2 resolution: "safe-buffer@npm:5.1.2" @@ -20991,6 +21211,29 @@ __metadata: languageName: node linkType: hard +"set-function-length@npm:^1.1.1": + version: 1.1.1 + resolution: "set-function-length@npm:1.1.1" + dependencies: + define-data-property: ^1.1.1 + get-intrinsic: ^1.2.1 + gopd: ^1.0.1 + has-property-descriptors: ^1.0.0 + checksum: c131d7569cd7e110cafdfbfbb0557249b538477624dfac4fc18c376d879672fa52563b74029ca01f8f4583a8acb35bb1e873d573a24edb80d978a7ee607c6e06 + languageName: node + linkType: hard + +"set-function-name@npm:^2.0.0": + version: 2.0.1 + resolution: "set-function-name@npm:2.0.1" + dependencies: + define-data-property: ^1.0.1 + functions-have-names: ^1.2.3 + has-property-descriptors: ^1.0.0 + checksum: 4975d17d90c40168eee2c7c9c59d023429f0a1690a89d75656306481ece0c3c1fb1ebcc0150ea546d1913e35fbd037bace91372c69e543e51fc5d1f31a9fa126 + languageName: node + linkType: hard + "set-value@npm:^2.0.1": version: 2.0.1 resolution: "set-value@npm:2.0.1" @@ -21663,13 +21906,6 @@ __metadata: languageName: node linkType: hard -"string-template@npm:~0.2.1": - version: 0.2.1 - resolution: "string-template@npm:0.2.1" - checksum: 042cdcf4d4832378f12fbf45b42f479990f330cc409e6dc184838801efbc8352ccf9428fe169f8f8cfff2b864879d4ba1ef8b5f41d63d1d71844c48005a1683f - languageName: node - linkType: hard - "string-width-cjs@npm:string-width@^4.2.0, string-width@npm:^1.0.2 || 2 || 3 || 4, string-width@npm:^4.0.0, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.2, string-width@npm:^4.2.3": version: 4.2.3 resolution: "string-width@npm:4.2.3" @@ -21736,6 +21972,17 @@ __metadata: languageName: node linkType: hard +"string.prototype.trim@npm:^1.2.8": + version: 1.2.8 + resolution: "string.prototype.trim@npm:1.2.8" + dependencies: + call-bind: ^1.0.2 + define-properties: ^1.2.0 + es-abstract: ^1.22.1 + checksum: 49eb1a862a53aba73c3fb6c2a53f5463173cb1f4512374b623bcd6b43ad49dd559a06fb5789bdec771a40fc4d2a564411c0a75d35fb27e76bbe738c211ecff07 + languageName: node + linkType: hard + "string.prototype.trimend@npm:^1.0.6": version: 1.0.6 resolution: "string.prototype.trimend@npm:1.0.6" @@ -21747,6 +21994,17 @@ __metadata: languageName: node linkType: hard +"string.prototype.trimend@npm:^1.0.7": + version: 1.0.7 + resolution: "string.prototype.trimend@npm:1.0.7" + dependencies: + call-bind: ^1.0.2 + define-properties: ^1.2.0 + es-abstract: ^1.22.1 + checksum: 2375516272fd1ba75992f4c4aa88a7b5f3c7a9ca308d963bcd5645adf689eba6f8a04ebab80c33e30ec0aefc6554181a3a8416015c38da0aa118e60ec896310c + languageName: node + linkType: hard + "string.prototype.trimstart@npm:^1.0.6": version: 1.0.6 resolution: "string.prototype.trimstart@npm:1.0.6" @@ -21758,6 +22016,17 @@ __metadata: languageName: node linkType: hard +"string.prototype.trimstart@npm:^1.0.7": + version: 1.0.7 + resolution: "string.prototype.trimstart@npm:1.0.7" + dependencies: + call-bind: ^1.0.2 + define-properties: ^1.2.0 + es-abstract: ^1.22.1 + checksum: 13d0c2cb0d5ff9e926fa0bec559158b062eed2b68cd5be777ffba782c96b2b492944e47057274e064549b94dd27cf81f48b27a31fee8af5b574cff253e7eb613 + languageName: node + linkType: hard + "string_decoder@npm:^1.1.1, string_decoder@npm:^1.3.0": version: 1.3.0 resolution: "string_decoder@npm:1.3.0" @@ -22251,19 +22520,6 @@ __metadata: languageName: node linkType: hard -"thriftrw@npm:^3.5.0": - version: 3.11.4 - resolution: "thriftrw@npm:3.11.4" - dependencies: - bufrw: ^1.2.1 - error: 7.0.2 - long: ^2.4.0 - bin: - thrift2json: thrift2json.js - checksum: 8ed1be215d09cc9463cc8988f80556f8f4ea9f5c23e554fa443424e7acbf767600499d4460cc3a6f6f716ee98c5f3442476b69574630c5e41f7caf050894ca26 - languageName: node - linkType: hard - "through2@npm:^2.0.0": version: 2.0.5 resolution: "through2@npm:2.0.5" @@ -22614,7 +22870,7 @@ __metadata: languageName: node linkType: hard -"tsconfig-paths@npm:4.2.0, tsconfig-paths@npm:^4.0.0, tsconfig-paths@npm:^4.1.2": +"tsconfig-paths@npm:4.2.0, tsconfig-paths@npm:^4.1.2, tsconfig-paths@npm:^4.2.0": version: 4.2.0 resolution: "tsconfig-paths@npm:4.2.0" dependencies: @@ -23387,7 +23643,7 @@ __metadata: languageName: node linkType: hard -"validator@npm:^13.7.0, validator@npm:^13.9.0": +"validator@npm:^13.11.0, validator@npm:^13.7.0": version: 13.11.0 resolution: "validator@npm:13.11.0" checksum: d1e0c27022681420756da25bc03eb08d5f0c66fb008f8ff02ebc95812b77c6be6e03d3bd05cf80ca702e23eeb73dadd66b4b3683173ea2a0bc7cc72820bee131 @@ -23820,6 +24076,19 @@ __metadata: languageName: node linkType: hard +"which-typed-array@npm:^1.1.13": + version: 1.1.13 + resolution: "which-typed-array@npm:1.1.13" + dependencies: + available-typed-arrays: ^1.0.5 + call-bind: ^1.0.4 + for-each: ^0.3.3 + gopd: ^1.0.1 + has-tostringtag: ^1.0.0 + checksum: 3828a0d5d72c800e369d447e54c7620742a4cc0c9baf1b5e8c17e9b6ff90d8d861a3a6dd4800f1953dbf80e5e5cec954a289e5b4a223e3bee4aeb1f8c5f33309 + languageName: node + linkType: hard + "which@npm:^1.2.9": version: 1.3.1 resolution: "which@npm:1.3.1" @@ -24116,14 +24385,7 @@ __metadata: languageName: node linkType: hard -"xorshift@npm:^1.1.1": - version: 1.2.0 - resolution: "xorshift@npm:1.2.0" - checksum: bb5575707d20a806e71fa3e80bc3dc083a4bcf3c82965bd27b797a355cf87583273fe7676cfc9c7ffaa4c17d5a171903462045e2154e51fe1f07b90a4dc6b9d2 - languageName: node - linkType: hard - -"xtend@npm:^4.0.0, xtend@npm:~4.0.0, xtend@npm:~4.0.1": +"xtend@npm:^4.0.0, xtend@npm:~4.0.1": version: 4.0.2 resolution: "xtend@npm:4.0.2" checksum: ac5dfa738b21f6e7f0dd6e65e1b3155036d68104e67e5d5d1bde74892e327d7e5636a076f625599dc394330a731861e87343ff184b0047fef1360a7ec0a5a36a