diff --git a/packages/backend/src/_common/model/index.ts b/packages/backend/src/_common/model/index.ts index c743fdefad..7bd9cfb909 100644 --- a/packages/backend/src/_common/model/index.ts +++ b/packages/backend/src/_common/model/index.ts @@ -7,7 +7,6 @@ export * from "./contact-support"; export * from "./interaction"; export * from "./jwt"; export * from "./message-sms"; -export * from "./stats"; export * from "./structure"; export * from "./structure-doc"; export * from "./structure-stats"; diff --git a/packages/backend/src/_common/model/stats/AdminStructureStatsData.type.ts b/packages/backend/src/_common/model/stats/AdminStructureStatsData.type.ts deleted file mode 100644 index e93df7ba3e..0000000000 --- a/packages/backend/src/_common/model/stats/AdminStructureStatsData.type.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { InteractionType } from "@domifa/common"; - -export type AdminStructureStatsData = { - usersCount: number; - structuresCount: number; - usagersDocumentsCount: number; - // structures: StructureAdminForList[]; - structuresCountByRegion: { - region: string; - count: number; - }[]; - structuresCountByTypeMap: { - [type: string]: number; - }; - structuresCountBySmsEnabled: number; - interactionsCountByTypeMap: { - [statut in InteractionType]: number; - }; - usagersCountByStatutMap: { - [statut: string]: number; - }; - usagersValidCountByStructureMap: { - [structureId: string]: number; - }; - usagersAllCountByStructureMap: { - [structureId: string]: number; - }; - usagersAyantsDroitsCountByStructureMap: { - [structureId: string]: number; - }; -}; diff --git a/packages/backend/src/_common/model/stats/StatsPeriod.type.ts b/packages/backend/src/_common/model/stats/StatsPeriod.type.ts deleted file mode 100644 index af0ba0e197..0000000000 --- a/packages/backend/src/_common/model/stats/StatsPeriod.type.ts +++ /dev/null @@ -1 +0,0 @@ -export type StatsPeriod = "days" | "months"; diff --git a/packages/backend/src/_common/model/stats/index.ts b/packages/backend/src/_common/model/stats/index.ts deleted file mode 100644 index 64cdbbbc36..0000000000 --- a/packages/backend/src/_common/model/stats/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -//@index('./*', f => `export * from '${f.path}'`) -export * from "./AdminStructureStatsData.type"; -export * from "./StatsPeriod.type"; diff --git a/packages/backend/src/_common/model/structure-stats/index.ts b/packages/backend/src/_common/model/structure-stats/index.ts index b14e660758..7ac364075c 100644 --- a/packages/backend/src/_common/model/structure-stats/index.ts +++ b/packages/backend/src/_common/model/structure-stats/index.ts @@ -1,3 +1,4 @@ +// @index('./*', f => `export * from '${f.path}'`) export * from "./StructureStats.type"; export * from "./StructureStatsFull.type"; export * from "./StructureStatsQuestionsAtDateValidUsagers.type"; diff --git a/packages/backend/src/_migrations/1703676787763-fix-last-interaction-migration.ts b/packages/backend/src/_migrations/1703676787763-fix-last-interaction-migration.ts index 7576f2ba90..4cc53682f7 100644 --- a/packages/backend/src/_migrations/1703676787763-fix-last-interaction-migration.ts +++ b/packages/backend/src/_migrations/1703676787763-fix-last-interaction-migration.ts @@ -72,6 +72,7 @@ export class FixLastInteractionMigration1703676787763 ) > 0 ) { const log = { + ref: usager.ref, structureId: usager.structureId, before: usager.lastInteraction.dateInteraction, after: dateInteractionOut, diff --git a/packages/backend/src/_portail-admin/admin-structures/controllers/admin-structures.controller.ts b/packages/backend/src/_portail-admin/admin-structures/controllers/admin-structures.controller.ts index 465cd29be0..dd2e7f907f 100644 --- a/packages/backend/src/_portail-admin/admin-structures/controllers/admin-structures.controller.ts +++ b/packages/backend/src/_portail-admin/admin-structures/controllers/admin-structures.controller.ts @@ -35,7 +35,6 @@ import { dataCompare } from "../../../util/dataCompare.service"; import { ExpressResponse } from "../../../util/express"; import { AdminStructureListData, - AdminStructureStatsData, Structure, StructureAdmin, UserStructureAuthenticated, @@ -47,6 +46,7 @@ import { UsersController } from "../../../users/users.controller"; import { RegisterUserAdminDto } from "../../../users/dto"; import { format } from "date-fns"; import { structureCreatorService } from "../../../structures/services"; +import { AdminStructureStatsData } from "@domifa/common"; @UseGuards(AuthGuard("jwt"), AppUserGuard) @Controller("admin/structures") diff --git a/packages/backend/src/_portail-admin/admin-structures/services/admin-structures.service.ts b/packages/backend/src/_portail-admin/admin-structures/services/admin-structures.service.ts index 3153b1a7c4..2b338c6a0f 100644 --- a/packages/backend/src/_portail-admin/admin-structures/services/admin-structures.service.ts +++ b/packages/backend/src/_portail-admin/admin-structures/services/admin-structures.service.ts @@ -16,17 +16,14 @@ import { usagerDocsRepository } from "../../../database/services/usager/usagerDo import { StatsDeploiementExportModel } from "../../../excel/export-stats-deploiement"; import { StatsDeploiementStructureExportModel } from "../../../excel/export-stats-deploiement/StatsDeploiementStructureExportModel.type"; import { FranceRegion } from "../../../util/territoires"; -import { - AdminStructureListData, - AdminStructureStatsData, - StructureAdmin, -} from "../../../_common/model"; +import { AdminStructureListData, StructureAdmin } from "../../../_common/model"; import { StatsByLocality, StatsByMonth, StructureType, InteractionType, UsagerDecisionStatut, + AdminStructureStatsData, } from "@domifa/common"; @Injectable() @@ -55,8 +52,10 @@ export class AdminStructuresService { const structuresCountBySmsEnabled = await this.getStructuresWithSms(); const structuresCount = await structureRepository.count(); + const usagersActifs = await usagerRepository.countTotalActifs(); const stats: AdminStructureStatsData = { + usagersActifs, structuresCount, usagersValidCountByStructureMap, usagersAyantsDroitsCountByStructureMap, @@ -345,10 +344,12 @@ export class AdminStructuresService { const interactionsCountByStatut = await this.getInteractionsCountByTypeMap(); + const usagersActifs = await usagerRepository.countTotalActifs(); const stats: StatsDeploiementExportModel = { exportDate: new Date(), structures: structuresModels, + usagersActifs, usagersAllCountByStructureId: usagersAllCountByStructureMap, usagersValideCountByStructureId: usagersValidCountByStructureMap, usagersAyantsDroitsByStructureId: usagersAyantsDroitsCountByStructureMap, diff --git a/packages/backend/src/database/services/usager/usagerRepository.service.ts b/packages/backend/src/database/services/usager/usagerRepository.service.ts index e74fb5c442..a4077a5eb4 100644 --- a/packages/backend/src/database/services/usager/usagerRepository.service.ts +++ b/packages/backend/src/database/services/usager/usagerRepository.service.ts @@ -127,9 +127,19 @@ async function countTotalUsagers(structuresId?: number[]): Promise { return usagers + ayantsDroits; } -async function countTotalActifs(): Promise { - const usagers: [{ actifs: string }] = await usagerRepository.query(` +async function countTotalActifs(): Promise<{ + domicilies: number; + ayantsDroits: number; + actifs: number; +}> { + const usagers: { + domicilies: string; + ayantsDroits: string; + actifs: string; + }[] = await usagerRepository.query(` SELECT + COUNT(DISTINCT uh."usagerUUID") as "domicilies", + COALESCE(SUM(jsonb_array_length(state->'ayantsDroits')), 0) as "ayantsDroits", COUNT(DISTINCT uh."usagerUUID") + COALESCE(SUM(jsonb_array_length(state->'ayantsDroits')), 0) AS "actifs" FROM "usager_history" uh JOIN usager u ON uh."usagerUUID" = u.uuid JOIN jsonb_array_elements(uh.states) AS state ON true WHERE @@ -137,8 +147,11 @@ async function countTotalActifs(): Promise { AND (state->>'historyBeginDate')::timestamptz < CURRENT_DATE + INTERVAL '1 day' AND (state->>'historyEndDate' is null OR (state->>'historyEndDate')::timestamptz >= CURRENT_DATE + INTERVAL '1 day' ) `); - - return parseInt(usagers[0].actifs, 10); + return { + domicilies: parseInt(usagers[0].domicilies, 10), + ayantsDroits: parseInt(usagers[0].ayantsDroits, 10), + actifs: parseInt(usagers[0].actifs, 10), + }; } async function countMigratedUsagers(): Promise { diff --git a/packages/backend/src/excel/_templates/export-stats-deploiement.xlsx b/packages/backend/src/excel/_templates/export-stats-deploiement.xlsx index 5678753a0c..aa06c7830f 100644 Binary files a/packages/backend/src/excel/_templates/export-stats-deploiement.xlsx and b/packages/backend/src/excel/_templates/export-stats-deploiement.xlsx differ diff --git a/packages/backend/src/excel/export-stats-deploiement/StatsDeploiementExportModel.type.ts b/packages/backend/src/excel/export-stats-deploiement/StatsDeploiementExportModel.type.ts index b2535352a8..4c6c9b61c0 100644 --- a/packages/backend/src/excel/export-stats-deploiement/StatsDeploiementExportModel.type.ts +++ b/packages/backend/src/excel/export-stats-deploiement/StatsDeploiementExportModel.type.ts @@ -12,6 +12,11 @@ export type StatsDeploiementExportModel = { region: string; count: number; }[]; + usagersActifs: { + domicilies: number; + ayantsDroits: number; + actifs: number; + }; usersCount: number; docsCount: number; interactionsCountByStatut: { diff --git a/packages/backend/src/excel/export-stats-deploiement/worksheet-renderer/exportStatsGlobalesWorksheetRenderer.ts b/packages/backend/src/excel/export-stats-deploiement/worksheet-renderer/exportStatsGlobalesWorksheetRenderer.ts index 1c6ab3d56a..bcce486d1c 100644 --- a/packages/backend/src/excel/export-stats-deploiement/worksheet-renderer/exportStatsGlobalesWorksheetRenderer.ts +++ b/packages/backend/src/excel/export-stats-deploiement/worksheet-renderer/exportStatsGlobalesWorksheetRenderer.ts @@ -35,6 +35,7 @@ function renderWorksheet({ renderExportDate(); renderUsagersCountByStatus(); renderStructuresCountByRegion(); + renderTotalActifs(); renderStructuresCountByType(); renderUsersDocsCount(); renderInteractionsCountByType(); @@ -63,9 +64,21 @@ function renderWorksheet({ value: stats.usagersCountByStatut.AYANTS_DROITS, }); } + function renderTotalActifs() { + let i = 13; + worksheetRendered.renderCell(i++, "b", { + value: stats.usagersActifs.actifs, + }); + worksheetRendered.renderCell(i++, "b", { + value: stats.usagersActifs.domicilies, + }); + worksheetRendered.renderCell(i++, "b", { + value: stats.usagersActifs.ayantsDroits, + }); + } function renderStructuresCountByType() { - let i = 13; + let i = 18; worksheetRendered.renderCell(i++, "b", { value: stats.structures.length, }); @@ -82,8 +95,9 @@ function renderWorksheet({ value: stats.structuresCountByType["mairie"], }); } + function renderInteractionsCountByType() { - let i = 23; + let i = 28; worksheetRendered.renderCell(i++, "b", { value: stats.interactionsCountByStatut["appel" as InteractionType], }); @@ -127,10 +141,10 @@ function renderWorksheet({ } function renderUsersDocsCount() { - worksheetRendered.renderCell(19, "b", { + worksheetRendered.renderCell(24, "b", { value: stats.usersCount, }); - worksheetRendered.renderCell(20, "b", { + worksheetRendered.renderCell(25, "b", { value: stats.docsCount, }); } diff --git a/packages/backend/src/stats/services/publicStats.service.ts b/packages/backend/src/stats/services/publicStats.service.ts index c92b9db7b2..be403bec3a 100644 --- a/packages/backend/src/stats/services/publicStats.service.ts +++ b/packages/backend/src/stats/services/publicStats.service.ts @@ -71,7 +71,7 @@ export class PublicStatsService implements OnModuleInit { "courrierIn" ), usagers: await usagerRepository.countTotalUsagers(), - actifs: await usagerRepository.countTotalActifs(), + actifs: (await usagerRepository.countTotalActifs()).actifs, }; await this.cacheManager.set("home-stats", homeStats); diff --git a/packages/common/src/stats/interfaces/AdminStructureStatsData.interface.ts b/packages/common/src/stats/interfaces/AdminStructureStatsData.interface.ts new file mode 100644 index 0000000000..76a17c5e1b --- /dev/null +++ b/packages/common/src/stats/interfaces/AdminStructureStatsData.interface.ts @@ -0,0 +1,25 @@ +import { type InteractionType } from "../../interactions"; + +export interface AdminStructureStatsData { + usersCount: number; + structuresCount: number; + usagersDocumentsCount: number; + usagersActifs: { + domicilies: number; + ayantsDroits: number; + actifs: number; + }; + structuresCountByRegion: Array<{ + region: string; + count: number; + }>; + structuresCountByTypeMap: Record; + structuresCountBySmsEnabled: number; + interactionsCountByTypeMap: { + [statut in InteractionType]: number; + }; + usagersCountByStatutMap: Record; + usagersValidCountByStructureMap: Record; + usagersAllCountByStructureMap: Record; + usagersAyantsDroitsCountByStructureMap: Record; +} diff --git a/packages/common/src/stats/interfaces/index.ts b/packages/common/src/stats/interfaces/index.ts index f31e834d58..1f5171f06d 100644 --- a/packages/common/src/stats/interfaces/index.ts +++ b/packages/common/src/stats/interfaces/index.ts @@ -1,2 +1,3 @@ // @index('./*', f => `export * from '${f.path}'`) +export * from "./AdminStructureStatsData.interface"; export * from "./HomeStats.interface"; diff --git a/packages/frontend/src/app/modules/general/components/home/home.component.html b/packages/frontend/src/app/modules/general/components/home/home.component.html index 6ef4371386..3cf82e792c 100644 --- a/packages/frontend/src/app/modules/general/components/home/home.component.html +++ b/packages/frontend/src/app/modules/general/components/home/home.component.html @@ -262,7 +262,7 @@

[options]="countOptions" class="display-4 fw-bold text-primary" > -
domiciliés
+
dossiers enregistrés
diff --git a/packages/frontend/src/app/modules/usager-dossier/components/step-footer/step-footer.component.html b/packages/frontend/src/app/modules/usager-dossier/components/step-footer/step-footer.component.html index 43b177ee99..be8c86ace6 100644 --- a/packages/frontend/src/app/modules/usager-dossier/components/step-footer/step-footer.component.html +++ b/packages/frontend/src/app/modules/usager-dossier/components/step-footer/step-footer.component.html @@ -6,7 +6,7 @@

Commentaires privés

Historique des décisions

{{ histo.userName }} diff --git a/packages/frontend/src/app/modules/usager-shared/components/delete-usager-menu/delete-usager-menu.component.html b/packages/frontend/src/app/modules/usager-shared/components/delete-usager-menu/delete-usager-menu.component.html index b1d4a88222..3efec5f567 100644 --- a/packages/frontend/src/app/modules/usager-shared/components/delete-usager-menu/delete-usager-menu.component.html +++ b/packages/frontend/src/app/modules/usager-shared/components/delete-usager-menu/delete-usager-menu.component.html @@ -1,108 +1,110 @@ -
-
- -
- +
- +
+ +
- - Supprimer cette demande - + +
- - + - - - + - - + Annuler + + + - - - + + + + diff --git a/packages/frontend/src/app/modules/usager-shared/components/delete-usager-menu/delete-usager-menu.component.ts b/packages/frontend/src/app/modules/usager-shared/components/delete-usager-menu/delete-usager-menu.component.ts index 100ebda91b..79d844962c 100644 --- a/packages/frontend/src/app/modules/usager-shared/components/delete-usager-menu/delete-usager-menu.component.ts +++ b/packages/frontend/src/app/modules/usager-shared/components/delete-usager-menu/delete-usager-menu.component.ts @@ -12,6 +12,7 @@ import { NgbModal, NgbModalRef } from "@ng-bootstrap/ng-bootstrap"; import { DEFAULT_MODAL_OPTIONS, UsagerLight, + UserStructure, } from "../../../../../_common/model"; import { CustomToastService } from "../../../shared/services/custom-toast.service"; @@ -39,6 +40,7 @@ export class DeleteUsagerMenuComponent implements OnInit, OnDestroy { public previousStatus: string; public loading: boolean; public isAdmin: boolean; + public me!: UserStructure | null; public readonly DECISION_LABELS: { [key in UsagerDecisionStatut]: string; @@ -61,6 +63,7 @@ export class DeleteUsagerMenuComponent implements OnInit, OnDestroy { this.loading = false; this.previousStatus = ""; + this.me = this.authService.currentUserValue; } public ngOnInit(): void { diff --git a/packages/portail-admins/src/_common/stats/AdminStructureStatsData.type.ts b/packages/portail-admins/src/_common/stats/AdminStructureStatsData.type.ts deleted file mode 100644 index 6b0e81599f..0000000000 --- a/packages/portail-admins/src/_common/stats/AdminStructureStatsData.type.ts +++ /dev/null @@ -1,36 +0,0 @@ -import { - InteractionType, - StructureType, - UsagerDecisionStatut, -} from "@domifa/common"; -import { StructureAdmin } from "../structure/StructureAdmin.type"; -import { StatsByRegion } from "./StatsByRegion.type"; - -export type AdminStructureStatsData = { - usersCount: number; - structuresCount: number; - usagersDocumentsCount: number; - structures: (StructureAdmin & { - usersCount?: number; // dashboard only - })[]; - structuresCountByRegion: StatsByRegion; - structuresCountByTypeMap: { - [type in StructureType | "total"]: number; - }; - structuresCountBySmsEnabled: number; - interactionsCountByTypeMap: { - [type in InteractionType]: number; - }; - usagersCountByStatutMap: { - [statut in UsagerDecisionStatut | "TOUS"]: number; - }; - usagersAyantsDroitsCountByStructureMap: { - [structureId: string]: number; - }; - usagersValidCountByStructureMap: { - [structureId: string]: number; - }; - usagersAllCountByStructureMap: { - [structureId: string]: number; - }; -}; diff --git a/packages/portail-admins/src/_common/stats/StatsTerritory.type.ts b/packages/portail-admins/src/_common/stats/StatsTerritory.type.ts deleted file mode 100644 index b1dee9e1d5..0000000000 --- a/packages/portail-admins/src/_common/stats/StatsTerritory.type.ts +++ /dev/null @@ -1,7 +0,0 @@ -export type StatsTerritory = { - [regionCode: string]: { - x: number; - y: number; - path: string; - }; -}; diff --git a/packages/portail-admins/src/_common/stats/index.ts b/packages/portail-admins/src/_common/stats/index.ts index 7b2d2cf3ac..405c12a2c0 100644 --- a/packages/portail-admins/src/_common/stats/index.ts +++ b/packages/portail-admins/src/_common/stats/index.ts @@ -1,4 +1,2 @@ // @index('./*', f => `export * from '${f.path}'`) -export * from "./AdminStructureStatsData.type"; export * from "./StatsByRegion.type"; -export * from "./StatsTerritory.type"; diff --git a/packages/portail-admins/src/app/modules/admin-structures/components/admin-structures-stats/admin-structures-stats.component.html b/packages/portail-admins/src/app/modules/admin-structures/components/admin-structures-stats/admin-structures-stats.component.html index 811e2cb832..1af3dcbdab 100644 --- a/packages/portail-admins/src/app/modules/admin-structures/components/admin-structures-stats/admin-structures-stats.component.html +++ b/packages/portail-admins/src/app/modules/admin-structures/components/admin-structures-stats/admin-structures-stats.component.html @@ -50,7 +50,31 @@

Statistiques de déploiement

- +
+
+
+ Domiciliés actifs +
+
+
+ + {{ stats.usagersActifs.actifs | formatBigNumber }} + + Total actifs +
+
+ + {{ stats.usagersActifs.domicilies | formatBigNumber }} + + Domiciliés +
+
+ + {{ stats.usagersActifs.ayantsDroits | formatBigNumber }} + + Ayants-droits +
+


diff --git a/packages/portail-admins/src/app/modules/admin-structures/components/admin-structures-stats/admin-structures-stats.component.ts b/packages/portail-admins/src/app/modules/admin-structures/components/admin-structures-stats/admin-structures-stats.component.ts index f2dfbc7455..bb9153bd61 100644 --- a/packages/portail-admins/src/app/modules/admin-structures/components/admin-structures-stats/admin-structures-stats.component.ts +++ b/packages/portail-admins/src/app/modules/admin-structures/components/admin-structures-stats/admin-structures-stats.component.ts @@ -1,10 +1,7 @@ import { Component, OnDestroy, OnInit } from "@angular/core"; import { Subscription } from "rxjs"; -import { - AdminStructureStatsData, - PortailAdminProfile, -} from "../../../../../_common"; +import { PortailAdminProfile } from "../../../../../_common"; import { DASHBOARD_STATUS_LABELS } from "../../../../../_common/usager/constants"; import { AdminAuthService } from "../../../admin-auth/services/admin-auth.service"; @@ -15,6 +12,7 @@ import { AdminStructuresStatsVM, adminStructuresStatsVmBuilder } from "./vm"; import { STRUCTURE_TYPE_LABELS, INTERACTIONS_LABELS_PLURIEL, + AdminStructureStatsData, } from "@domifa/common"; @Component({ @@ -57,6 +55,7 @@ export class AdminStructuresStatsComponent implements OnInit, OnDestroy { .subscribe((data: AdminStructureStatsData) => { this.data = data; this.stats = adminStructuresStatsVmBuilder.buildViewModel(data); + console.log(this.stats.usagersActifs); }) ); } diff --git a/packages/portail-admins/src/app/modules/admin-structures/components/admin-structures-stats/vm/AdminStructuresStatsVM.type.ts b/packages/portail-admins/src/app/modules/admin-structures/components/admin-structures-stats/vm/AdminStructuresStatsVM.type.ts index bd9c2abac9..22c5ab06a4 100644 --- a/packages/portail-admins/src/app/modules/admin-structures/components/admin-structures-stats/vm/AdminStructuresStatsVM.type.ts +++ b/packages/portail-admins/src/app/modules/admin-structures/components/admin-structures-stats/vm/AdminStructuresStatsVM.type.ts @@ -5,10 +5,15 @@ import { } from "@domifa/common"; import { StatsByRegion } from "../../../../../../_common"; -export type AdminStructuresStatsVM = { +export interface AdminStructuresStatsVM { usersCount: number; structuresCount: number; usagersCount: number; + usagersActifs: { + domicilies: number; + ayantsDroits: number; + actifs: number; + }; usagersCountByStatut: { status: UsagerDecisionStatut; label: string; @@ -37,4 +42,4 @@ export type AdminStructuresStatsVM = { usagersAllCountByStructureMap: { [structureId: string]: number; }; -}; +} diff --git a/packages/portail-admins/src/app/modules/admin-structures/components/admin-structures-stats/vm/adminStructuresStatsVmBuilder.service.ts b/packages/portail-admins/src/app/modules/admin-structures/components/admin-structures-stats/vm/adminStructuresStatsVmBuilder.service.ts index b3ee693e28..b16d303dee 100644 --- a/packages/portail-admins/src/app/modules/admin-structures/components/admin-structures-stats/vm/adminStructuresStatsVmBuilder.service.ts +++ b/packages/portail-admins/src/app/modules/admin-structures/components/admin-structures-stats/vm/adminStructuresStatsVmBuilder.service.ts @@ -4,8 +4,8 @@ import { UsagerDecisionStatut, INTERACTIONS_LABELS_PLURIEL, STRUCTURE_TYPE_LABELS, + AdminStructureStatsData, } from "@domifa/common"; -import { AdminStructureStatsData } from "../../../../../../_common"; import { DASHBOARD_STATUS_LABELS } from "../../../../../../_common/usager/constants"; import { AdminStructuresStatsVM } from "./AdminStructuresStatsVM.type"; diff --git a/packages/portail-admins/src/app/modules/shared/services/api/admin-structures-api-client.service.ts b/packages/portail-admins/src/app/modules/shared/services/api/admin-structures-api-client.service.ts index a0aa1131e7..5616d07710 100644 --- a/packages/portail-admins/src/app/modules/shared/services/api/admin-structures-api-client.service.ts +++ b/packages/portail-admins/src/app/modules/shared/services/api/admin-structures-api-client.service.ts @@ -5,12 +5,11 @@ import { filter, Observable, startWith, tap } from "rxjs"; import { environment } from "src/environments/environment"; import { AdminStructureListData, - AdminStructureStatsData, StructureAdmin, UserNewAdmin, } from "../../../../../_common"; import { structuresCache } from "../../store/structuresCache.service"; -import { ApiMessage } from "@domifa/common"; +import { ApiMessage, AdminStructureStatsData } from "@domifa/common"; const BASE_URL = environment.apiUrl + "admin/structures"; @Injectable() diff --git a/packages/portail-admins/src/app/modules/shared/store/AppStoreAction.type.ts b/packages/portail-admins/src/app/modules/shared/store/AppStoreAction.type.ts index ef97319719..ff7b85957d 100644 --- a/packages/portail-admins/src/app/modules/shared/store/AppStoreAction.type.ts +++ b/packages/portail-admins/src/app/modules/shared/store/AppStoreAction.type.ts @@ -1,7 +1,5 @@ -import { - AdminStructureListData, - AdminStructureStatsData, -} from "../../../../_common"; +import { AdminStructureStatsData } from "@domifa/common"; +import { AdminStructureListData } from "../../../../_common"; export type AppStoreAction = | { diff --git a/packages/portail-admins/src/app/modules/shared/store/AppStoreModel.type.ts b/packages/portail-admins/src/app/modules/shared/store/AppStoreModel.type.ts index 0adb13709a..a1651b1528 100644 --- a/packages/portail-admins/src/app/modules/shared/store/AppStoreModel.type.ts +++ b/packages/portail-admins/src/app/modules/shared/store/AppStoreModel.type.ts @@ -1,7 +1,5 @@ -import { - AdminStructureListData, - AdminStructureStatsData, -} from "../../../../_common"; +import { AdminStructureStatsData } from "@domifa/common"; +import { AdminStructureListData } from "../../../../_common"; export type AppStoreModel = { structureListData?: AdminStructureListData; diff --git a/packages/portail-admins/src/app/modules/shared/store/structuresCache.service.ts b/packages/portail-admins/src/app/modules/shared/store/structuresCache.service.ts index 47cffd315e..b4d31eeaa3 100644 --- a/packages/portail-admins/src/app/modules/shared/store/structuresCache.service.ts +++ b/packages/portail-admins/src/app/modules/shared/store/structuresCache.service.ts @@ -1,7 +1,5 @@ -import { - AdminStructureListData, - AdminStructureStatsData, -} from "../../../../_common"; +import { AdminStructureStatsData } from "@domifa/common"; +import { AdminStructureListData } from "../../../../_common"; import { appStore } from "./appStore.service"; export const structuresCache = {