From 71561a2eeefb24b47b0fe143b7fc379e88619fe7 Mon Sep 17 00:00:00 2001 From: DarKylX Date: Tue, 13 Oct 2026 14:37:58 +0300 Subject: [PATCH] fix(analytics): show platform visits and participants without a visit --- .../program-analytics-drilldown.service.ts | 15 +++----- ...program-manager-attention.use-case.spec.ts | 10 +++--- ...er-participants-without-visit.use-case.ts} | 6 ++-- .../program/ports/program.repository.port.ts | 2 +- .../domain/program/program-analytics.model.ts | 8 ++--- .../adapters/program/program-http.adapter.ts | 4 +-- .../repository/program/program.repository.ts | 4 +-- .../detail/analytics/analytics.component.html | 6 ++-- .../analytics/analytics.component.spec.ts | 36 ++++++++++--------- .../detail/analytics/analytics.component.ts | 26 +++++++------- .../analytics-attention-route.spec.ts | 8 ++--- .../analytics-attention.component.spec.ts | 36 +++++++++---------- .../analytics-drilldown.component.ts | 8 ++--- 13 files changed, 84 insertions(+), 85 deletions(-) rename projects/social_platform/src/app/api/program/use-cases/{get-program-manager-participants-without-onboarding.use-case.ts => get-program-manager-participants-without-visit.use-case.ts} (82%) diff --git a/projects/social_platform/src/app/api/program/facades/detail/program-analytics-drilldown.service.ts b/projects/social_platform/src/app/api/program/facades/detail/program-analytics-drilldown.service.ts index 3489257a4..74db7de95 100644 --- a/projects/social_platform/src/app/api/program/facades/detail/program-analytics-drilldown.service.ts +++ b/projects/social_platform/src/app/api/program/facades/detail/program-analytics-drilldown.service.ts @@ -8,7 +8,7 @@ import { ProgramAnalyticsCaseMetrics } from "@domain/program/program-analytics.m import { GetProgramManagerAssignmentsUseCase } from "@api/program/use-cases/get-program-manager-assignments.use-case"; import { GetProgramManagerAssignmentScoresUseCase } from "@api/program/use-cases/get-program-manager-assignment-scores.use-case"; import { GetProgramManagerParticipantsWithoutTeamUseCase } from "@api/program/use-cases/get-program-manager-participants-without-team.use-case"; -import { GetProgramManagerParticipantsWithoutOnboardingUseCase } from "@api/program/use-cases/get-program-manager-participants-without-onboarding.use-case"; +import { GetProgramManagerParticipantsWithoutVisitUseCase } from "@api/program/use-cases/get-program-manager-participants-without-visit.use-case"; import { GetProgramManagerProjectsAwaitingEvaluationUseCase } from "@api/program/use-cases/get-program-manager-projects-awaiting-evaluation.use-case"; import { GetProgramManagerProjectsNotSubmittedUseCase } from "@api/program/use-cases/get-program-manager-projects-not-submitted.use-case"; import { @@ -28,7 +28,7 @@ import { /** Root-списки внимания используют тот же modal context, не вложенную модалку. */ export type AnalyticsAttentionView = - | "participants-without-onboarding" + | "participants-without-visit" | "participants-without-team" | "projects-awaiting-evaluation" | "projects-not-submitted"; @@ -60,9 +60,7 @@ export class ProgramAnalyticsDrilldownService { private readonly getAssignments = inject(GetProgramManagerAssignmentsUseCase); private readonly getScores = inject(GetProgramManagerAssignmentScoresUseCase); private readonly getParticipants = inject(GetProgramManagerParticipantsWithoutTeamUseCase); - private readonly getWithoutOnboarding = inject( - GetProgramManagerParticipantsWithoutOnboardingUseCase, - ); + private readonly getWithoutVisit = inject(GetProgramManagerParticipantsWithoutVisitUseCase); private readonly getProjects = inject(GetProgramManagerProjectsAwaitingEvaluationUseCase); private readonly getNotSubmitted = inject(GetProgramManagerProjectsNotSubmittedUseCase); private readonly destroyRef = inject(DestroyRef); @@ -96,8 +94,7 @@ export class ProgramAnalyticsDrilldownService { readonly attentionError = signal(null); readonly isParticipantView = computed( () => - this.view() === "participants-without-team" || - this.view() === "participants-without-onboarding", + this.view() === "participants-without-team" || this.view() === "participants-without-visit", ); readonly isAttentionView = computed( () => @@ -179,9 +176,7 @@ export class ProgramAnalyticsDrilldownService { }; if (this.isParticipantView()) { const useCase = - this.view() === "participants-without-onboarding" - ? this.getWithoutOnboarding - : this.getParticipants; + this.view() === "participants-without-visit" ? this.getWithoutVisit : this.getParticipants; useCase .execute(this.programId, query) .pipe(takeUntil(this.cancelAttention), takeUntilDestroyed(this.destroyRef)) diff --git a/projects/social_platform/src/app/api/program/use-cases/get-program-manager-attention.use-case.spec.ts b/projects/social_platform/src/app/api/program/use-cases/get-program-manager-attention.use-case.spec.ts index 58d4ecece..1050102a6 100644 --- a/projects/social_platform/src/app/api/program/use-cases/get-program-manager-attention.use-case.spec.ts +++ b/projects/social_platform/src/app/api/program/use-cases/get-program-manager-attention.use-case.spec.ts @@ -12,7 +12,7 @@ import { notSubmittedPage, } from "@domain/program/program-analytics-attention.fixture"; import { GetProgramManagerParticipantsWithoutTeamUseCase } from "./get-program-manager-participants-without-team.use-case"; -import { GetProgramManagerParticipantsWithoutOnboardingUseCase } from "./get-program-manager-participants-without-onboarding.use-case"; +import { GetProgramManagerParticipantsWithoutVisitUseCase } from "./get-program-manager-participants-without-visit.use-case"; import { GetProgramManagerProjectsAwaitingEvaluationUseCase } from "./get-program-manager-projects-awaiting-evaluation.use-case"; import { GetProgramManagerProjectsNotSubmittedUseCase } from "./get-program-manager-projects-not-submitted.use-case"; @@ -30,9 +30,9 @@ describe("Attention: adapter → repository → use cases", () => { for (const [method, endpoint, useCase, page] of [ [ - "getManagerParticipantsWithoutOnboarding", - "participants-without-onboarding", - GetProgramManagerParticipantsWithoutOnboardingUseCase, + "getManagerParticipantsWithoutVisit", + "participants-without-visit", + GetProgramManagerParticipantsWithoutVisitUseCase, participantsPage(), ], [ @@ -57,7 +57,7 @@ describe("Attention: adapter → repository → use cases", () => { const injectUseCase = () => TestBed.inject< | GetProgramManagerParticipantsWithoutTeamUseCase - | GetProgramManagerParticipantsWithoutOnboardingUseCase + | GetProgramManagerParticipantsWithoutVisitUseCase | GetProgramManagerProjectsAwaitingEvaluationUseCase | GetProgramManagerProjectsNotSubmittedUseCase >(useCase); diff --git a/projects/social_platform/src/app/api/program/use-cases/get-program-manager-participants-without-onboarding.use-case.ts b/projects/social_platform/src/app/api/program/use-cases/get-program-manager-participants-without-visit.use-case.ts similarity index 82% rename from projects/social_platform/src/app/api/program/use-cases/get-program-manager-participants-without-onboarding.use-case.ts rename to projects/social_platform/src/app/api/program/use-cases/get-program-manager-participants-without-visit.use-case.ts index 8d197cce4..e401fe8a2 100644 --- a/projects/social_platform/src/app/api/program/use-cases/get-program-manager-participants-without-onboarding.use-case.ts +++ b/projects/social_platform/src/app/api/program/use-cases/get-program-manager-participants-without-visit.use-case.ts @@ -11,9 +11,9 @@ import { ProgramAnalyticsError } from "@domain/program/program-analytics.model"; import { fail, ok, Result } from "@domain/shared/result.type"; import { catchError, map, Observable, of } from "rxjs"; -/** Уникальные участники программы с незавершённым онбордингом платформы. */ +/** Уникальные участники программы без зафиксированного посещения платформы. */ @Injectable({ providedIn: "root" }) -export class GetProgramManagerParticipantsWithoutOnboardingUseCase { +export class GetProgramManagerParticipantsWithoutVisitUseCase { private readonly repository = inject(ProgramRepositoryPort); execute( @@ -25,7 +25,7 @@ export class GetProgramManagerParticipantsWithoutOnboardingUseCase { ProgramAnalyticsError > > { - return this.repository.getManagerParticipantsWithoutOnboarding(programId, query).pipe( + return this.repository.getManagerParticipantsWithoutVisit(programId, query).pipe( map(value => ok(value)), catchError((error: unknown) => { const status = error instanceof HttpErrorResponse ? error.status : 0; diff --git a/projects/social_platform/src/app/domain/program/ports/program.repository.port.ts b/projects/social_platform/src/app/domain/program/ports/program.repository.port.ts index daeafeb69..ca5a5d813 100644 --- a/projects/social_platform/src/app/domain/program/ports/program.repository.port.ts +++ b/projects/social_platform/src/app/domain/program/ports/program.repository.port.ts @@ -46,7 +46,7 @@ export abstract class ProgramRepositoryPort { abstract getManagerOverview(programId: number): Observable; - abstract getManagerParticipantsWithoutOnboarding( + abstract getManagerParticipantsWithoutVisit( programId: number, query: ProgramAnalyticsAttentionQuery, ): Observable>; diff --git a/projects/social_platform/src/app/domain/program/program-analytics.model.ts b/projects/social_platform/src/app/domain/program/program-analytics.model.ts index ec6311306..b2629be65 100644 --- a/projects/social_platform/src/app/domain/program/program-analytics.model.ts +++ b/projects/social_platform/src/app/domain/program/program-analytics.model.ts @@ -13,8 +13,8 @@ export interface ProgramAnalyticsOverview { participantFunnel: { registrations: number; uniqueParticipants: number; - /** Completed platform onboarding; absent during a staggered API rollout. */ - onboardedParticipants?: number; + /** Recorded platform activity or login; absent during a staggered API rollout. */ + visitedParticipants?: number; withTeam: number; projectCreators: number; submittedProjectCreators: number; @@ -41,8 +41,8 @@ export interface ProgramAnalyticsOverview { }; }; attention: { - /** Absent until the API deployment provides the onboarding attention list. */ - participantsWithoutOnboarding?: number; + /** Registered users with neither recorded activity nor login; optional during rollout. */ + participantsWithoutVisit?: number; participantsWithoutTeam: number; projectsAwaitingEvaluation: number; /** Несданные связи: требование сдачи применимо только к конкурсной программе. */ diff --git a/projects/social_platform/src/app/infrastructure/adapters/program/program-http.adapter.ts b/projects/social_platform/src/app/infrastructure/adapters/program/program-http.adapter.ts index e61dd1bc1..4f56bff18 100644 --- a/projects/social_platform/src/app/infrastructure/adapters/program/program-http.adapter.ts +++ b/projects/social_platform/src/app/infrastructure/adapters/program/program-http.adapter.ts @@ -88,12 +88,12 @@ export class ProgramHttpAdapter { } /** Без автозагрузки остальных страниц; camelcase преобразует общий interceptor. */ - getManagerParticipantsWithoutOnboarding( + getManagerParticipantsWithoutVisit( programId: number, query: ProgramAnalyticsAttentionQuery, ): Observable> { return this.apiService.get( - `${this.PROGRAMS_URL}/${programId}/manager-overview/participants-without-onboarding/`, + `${this.PROGRAMS_URL}/${programId}/manager-overview/participants-without-visit/`, this.attentionParams(query), ); } diff --git a/projects/social_platform/src/app/infrastructure/repository/program/program.repository.ts b/projects/social_platform/src/app/infrastructure/repository/program/program.repository.ts index 77965b4fa..aae0d1e63 100644 --- a/projects/social_platform/src/app/infrastructure/repository/program/program.repository.ts +++ b/projects/social_platform/src/app/infrastructure/repository/program/program.repository.ts @@ -82,11 +82,11 @@ export class ProgramRepository implements ProgramRepositoryPort { } /** Свежий manager-список при каждом открытии/поиске, без EntityCache. */ - getManagerParticipantsWithoutOnboarding( + getManagerParticipantsWithoutVisit( programId: number, query: ProgramAnalyticsAttentionQuery, ): Observable> { - return this.programAdapter.getManagerParticipantsWithoutOnboarding(programId, query); + return this.programAdapter.getManagerParticipantsWithoutVisit(programId, query); } /** Свежий manager-список при каждом открытии/поиске, без EntityCache. */ diff --git a/projects/social_platform/src/app/ui/pages/program/detail/analytics/analytics.component.html b/projects/social_platform/src/app/ui/pages/program/detail/analytics/analytics.component.html index 22e7c4de2..86f93e9ad 100644 --- a/projects/social_platform/src/app/ui/pages/program/detail/analytics/analytics.component.html +++ b/projects/social_platform/src/app/ui/pages/program/detail/analytics/analytics.component.html @@ -170,8 +170,8 @@

Требует внимания

[disabled]="item.value === 0" (click)=" drilldown.openAttention( - item.key === 'without-onboarding' - ? 'participants-without-onboarding' + item.key === 'without-visit' + ? 'participants-without-visit' : item.key === 'without-team' ? 'participants-without-team' : 'projects-awaiting-evaluation', @@ -315,7 +315,7 @@

Назначения эксперто

Воронка участников

= {}): ProgramAna participantFunnel: { registrations: 20, uniqueParticipants: 18, - onboardedParticipants: 16, + visitedParticipants: 16, withTeam: 12, projectCreators: 7, submittedProjectCreators: 2, @@ -549,11 +549,11 @@ describe("ProgramAnalyticsComponent", () => { expect(open).toHaveBeenCalledTimes(1); }); - it("onboarding attention uses the API count, opens its list, and disables zero", () => { + it("visit attention uses the API count, opens its list, and disables zero", () => { const base = overview(); data.set({ ...base, - attention: { ...base.attention, participantsWithoutOnboarding: 7 }, + attention: { ...base.attention, participantsWithoutVisit: 7 }, }); const fixture = TestBed.createComponent(ProgramAnalyticsComponent); fixture.detectChanges(); @@ -562,32 +562,35 @@ describe("ProgramAnalyticsComponent", () => { const open = vi.spyOn(drilldown, "openAttention").mockImplementation(() => {}); const trigger = Array.from( fixture.nativeElement.querySelectorAll(".attention__action") as NodeListOf, - ).find(button => button.textContent?.includes("Участники не завершили онбординг"))!; + ).find(button => button.textContent?.includes("Участники ещё не заходили на платформу"))!; expect(trigger.querySelector("strong")?.textContent).toBe("7"); expect(trigger.disabled).toBe(false); trigger.click(); - expect(open).toHaveBeenCalledExactlyOnceWith("participants-without-onboarding", trigger); - data.set({ ...base, attention: { ...base.attention, participantsWithoutOnboarding: 0 } }); + expect(open).toHaveBeenCalledExactlyOnceWith("participants-without-visit", trigger); + data.set({ ...base, attention: { ...base.attention, participantsWithoutVisit: 0 } }); fixture.detectChanges(); expect(trigger.disabled).toBe(true); trigger.click(); expect(open).toHaveBeenCalledTimes(1); }); - it("does not invent an onboarding attention count when the API field is absent", () => { + it("does not invent a visit attention count when the API field is absent", () => { + const model = overview(); + Object.assign(model.attention, { participantsWithoutOnboarding: 7 }); + data.set(model); const fixture = TestBed.createComponent(ProgramAnalyticsComponent); fixture.detectChanges(); expect( fixture.nativeElement.querySelector('[data-testid="attention-block"]').textContent, - ).not.toContain("Участники не завершили онбординг"); + ).not.toContain("Участники ещё не заходили на платформу"); }); - it("unfinished onboarding alone prevents the all-clear attention state", () => { + it("participants without a visit alone prevent the all-clear attention state", () => { const base = overview(); data.set({ ...base, attention: { - participantsWithoutOnboarding: 1, + participantsWithoutVisit: 1, participantsWithoutTeam: 0, projectsAwaitingEvaluation: 0, projectsNotSubmitted: { applicable: false, total: 0 }, @@ -599,7 +602,7 @@ describe("ProgramAnalyticsComponent", () => { expect(fixture.nativeElement.querySelector(".attention__empty")).toBeNull(); data.update(current => ({ ...current!, - attention: { ...current!.attention, participantsWithoutOnboarding: 0 }, + attention: { ...current!.attention, participantsWithoutVisit: 0 }, })); fixture.detectChanges(); expect(fixture.nativeElement.querySelector(".attention__empty")?.textContent).toContain( @@ -739,7 +742,7 @@ describe("ProgramAnalyticsComponent", () => { ...model.participantFunnel, registrations: 11, uniqueParticipants: 7, - onboardedParticipants: 6, + visitedParticipants: 6, withTeam: 4, projectCreators: 3, }; @@ -755,7 +758,7 @@ describe("ProgramAnalyticsComponent", () => { const rows = Array.from(root.querySelectorAll('[data-testid="participant-funnel"] tbody tr')); expect(rows.map(row => row.querySelector("th")?.firstChild?.textContent?.trim())).toEqual([ "Зарегистрировались", - "Завершили онбординг", + "Заходили на платформу", "Вступили в команду", ]); expect(rows.map(row => row.querySelector("td")?.textContent?.trim())).toEqual(["7", "6", "4"]); @@ -764,7 +767,7 @@ describe("ProgramAnalyticsComponent", () => { .queryAll(By.directive(TooltipComponent)) .map(element => (element.componentInstance as TooltipComponent).text()); expect(participants).toContain("Уникальные зарегистрированные участники программы."); - expect(tooltips.some(text => text.includes("завершение онбординга платформы"))).toBe(true); + expect(tooltips.some(text => text.includes("зафиксированное посещение платформы"))).toBe(true); expect(tooltips.some(text => text.includes("регистрационные записи"))).toBe(false); expect(root.querySelector('[data-testid="attention-block"]')?.textContent).toContain( "Участники без команды", @@ -788,9 +791,10 @@ describe("ProgramAnalyticsComponent", () => { expect(root.querySelectorAll("app-analytics-funnel-chart canvas")).toHaveLength(2); }); - it("не выдаёт отсутствие новой метрики онбординга за ноль", () => { + it("не выдаёт отсутствие новой метрики посещения за ноль", () => { const model = overview(); - delete model.participantFunnel.onboardedParticipants; + delete model.participantFunnel.visitedParticipants; + Object.assign(model.participantFunnel, { onboardedParticipants: 6 }); data.set(model); const fixture = TestBed.createComponent(ProgramAnalyticsComponent); fixture.detectChanges(); diff --git a/projects/social_platform/src/app/ui/pages/program/detail/analytics/analytics.component.ts b/projects/social_platform/src/app/ui/pages/program/detail/analytics/analytics.component.ts index 5e3d377bc..4b7a7d607 100644 --- a/projects/social_platform/src/app/ui/pages/program/detail/analytics/analytics.component.ts +++ b/projects/social_platform/src/app/ui/pages/program/detail/analytics/analytics.component.ts @@ -213,19 +213,19 @@ export class ProgramAnalyticsComponent implements OnInit { axisLabel: ["Регистрация"], }, { - key: "onboarded", - label: "Завершили онбординг", - value: funnel.onboardedParticipants ?? null, + key: "visited", + label: "Заходили на платформу", + value: funnel.visitedParticipants ?? null, tooltip: - "Зарегистрированные участники, завершившие стартовый сценарий платформы. Шаги можно пропустить; это не показатель заполненности профиля или регулярного использования.", - axisLabel: ["Завершили", "онбординг"], + "Зарегистрированные участники программы, для которых зафиксирован вход или активность на платформе. Учитываются и посещения до регистрации в этой программе.", + axisLabel: ["Заходили на", "платформу"], }, { ...this.metric( "with-team", "Вступили в команду", funnel.withTeam, - "Зарегистрированные участники, которые сейчас являются руководителями или участниками команды проекта программы. Учитываются и те, кто ещё не завершил онбординг.", + "Зарегистрированные участники, которые сейчас являются руководителями или участниками команды проекта программы.", ), axisLabel: ["Вступили", "в команду"], }, @@ -318,20 +318,20 @@ export class ProgramAnalyticsComponent implements OnInit { protected readonly attention = computed(() => { const overview = this.data(); if (!overview) return []; - const onboarding: AnalyticsMetric[] = - overview.attention.participantsWithoutOnboarding == null + const visit: AnalyticsMetric[] = + overview.attention.participantsWithoutVisit == null ? [] : [ { - key: "without-onboarding", - label: "Участники не завершили онбординг", - value: overview.attention.participantsWithoutOnboarding, + key: "without-visit", + label: "Участники ещё не заходили на платформу", + value: overview.attention.participantsWithoutVisit, tooltip: - "Зарегистрированные участники программы, которые ещё не завершили стартовый онбординг платформы. Участие в команде и подтверждение почты не заменяют онбординг.", + "Зарегистрированные участники программы, у которых ещё не зафиксированы ни вход, ни активность на платформе. Участник исчезает из списка после первого зафиксированного посещения.", }, ]; return [ - ...onboarding, + ...visit, { key: "without-team", label: "Участники без команды", diff --git a/projects/social_platform/src/app/ui/pages/program/detail/analytics/drilldown/analytics-attention-route.spec.ts b/projects/social_platform/src/app/ui/pages/program/detail/analytics/drilldown/analytics-attention-route.spec.ts index fd26886b6..b2aafa3b6 100644 --- a/projects/social_platform/src/app/ui/pages/program/detail/analytics/drilldown/analytics-attention-route.spec.ts +++ b/projects/social_platform/src/app/ui/pages/program/detail/analytics/drilldown/analytics-attention-route.spec.ts @@ -11,7 +11,7 @@ import { GetProgramManagerOverviewUseCase } from "@api/program/use-cases/get-pro import { GetProgramManagerAssignmentsUseCase } from "@api/program/use-cases/get-program-manager-assignments.use-case"; import { GetProgramManagerAssignmentScoresUseCase } from "@api/program/use-cases/get-program-manager-assignment-scores.use-case"; import { GetProgramManagerParticipantsWithoutTeamUseCase } from "@api/program/use-cases/get-program-manager-participants-without-team.use-case"; -import { GetProgramManagerParticipantsWithoutOnboardingUseCase } from "@api/program/use-cases/get-program-manager-participants-without-onboarding.use-case"; +import { GetProgramManagerParticipantsWithoutVisitUseCase } from "@api/program/use-cases/get-program-manager-participants-without-visit.use-case"; import { GetProgramManagerProjectsAwaitingEvaluationUseCase } from "@api/program/use-cases/get-program-manager-projects-awaiting-evaluation.use-case"; import { GetProgramManagerProjectsNotSubmittedUseCase } from "@api/program/use-cases/get-program-manager-projects-not-submitted.use-case"; import { ProgramAnalyticsInfoService } from "@api/program/facades/detail/program-analytics-info.service"; @@ -57,7 +57,7 @@ class RouteHost { describe("Attention SPA: observable route → resolver → overview", () => { it.each([ - "participants-without-onboarding", + "participants-without-visit", "participants-without-team", "projects-awaiting-evaluation", "projects-not-submitted", @@ -78,7 +78,7 @@ describe("Attention SPA: observable route → resolver → overview", () => { { provide: ActivatedRoute, useValue: { parent: { paramMap: params.asObservable() } } }, { provide: GetProgramManagerOverviewUseCase, useValue: overview }, { provide: GetProgramManagerParticipantsWithoutTeamUseCase, useValue: attention }, - { provide: GetProgramManagerParticipantsWithoutOnboardingUseCase, useValue: attention }, + { provide: GetProgramManagerParticipantsWithoutVisitUseCase, useValue: attention }, { provide: GetProgramManagerProjectsAwaitingEvaluationUseCase, useValue: attention }, { provide: GetProgramManagerProjectsNotSubmittedUseCase, useValue: attention }, { provide: GetProgramManagerAssignmentsUseCase, useValue: { execute: vi.fn() } }, @@ -101,7 +101,7 @@ describe("Attention SPA: observable route → resolver → overview", () => { await fixture.whenStable(); old.next( ok( - view === "participants-without-team" || view === "participants-without-onboarding" + view === "participants-without-team" || view === "participants-without-visit" ? participantsPage() : view === "projects-not-submitted" ? notSubmittedPage() diff --git a/projects/social_platform/src/app/ui/pages/program/detail/analytics/drilldown/analytics-attention.component.spec.ts b/projects/social_platform/src/app/ui/pages/program/detail/analytics/drilldown/analytics-attention.component.spec.ts index bdbb57cda..f6319cde2 100644 --- a/projects/social_platform/src/app/ui/pages/program/detail/analytics/drilldown/analytics-attention.component.spec.ts +++ b/projects/social_platform/src/app/ui/pages/program/detail/analytics/drilldown/analytics-attention.component.spec.ts @@ -11,7 +11,7 @@ import { firstValueFrom, of, Subject } from "rxjs"; import { GetProgramManagerAssignmentsUseCase } from "@api/program/use-cases/get-program-manager-assignments.use-case"; import { GetProgramManagerAssignmentScoresUseCase } from "@api/program/use-cases/get-program-manager-assignment-scores.use-case"; import { GetProgramManagerParticipantsWithoutTeamUseCase } from "@api/program/use-cases/get-program-manager-participants-without-team.use-case"; -import { GetProgramManagerParticipantsWithoutOnboardingUseCase } from "@api/program/use-cases/get-program-manager-participants-without-onboarding.use-case"; +import { GetProgramManagerParticipantsWithoutVisitUseCase } from "@api/program/use-cases/get-program-manager-participants-without-visit.use-case"; import { GetProgramManagerProjectsAwaitingEvaluationUseCase } from "@api/program/use-cases/get-program-manager-projects-awaiting-evaluation.use-case"; import { GetProgramManagerProjectsNotSubmittedUseCase } from "@api/program/use-cases/get-program-manager-projects-not-submitted.use-case"; import { @@ -37,7 +37,7 @@ describe("Attention views: real overlay", () => { let modal: ModalComponent; let trigger: HTMLButtonElement; const participants = { execute: vi.fn() }; - const onboarding = { execute: vi.fn() }; + const visit = { execute: vi.fn() }; const projects = { execute: vi.fn() }; const notSubmitted = { execute: vi.fn() }; const dialog = () => document.querySelector('[role="dialog"]')!; @@ -48,7 +48,7 @@ describe("Attention views: real overlay", () => { beforeEach(async () => { participants.execute.mockReset().mockReturnValue(of(ok(participantsPage()))); - onboarding.execute.mockReset().mockReturnValue(of(ok(participantsPage()))); + visit.execute.mockReset().mockReturnValue(of(ok(participantsPage()))); projects.execute.mockReset().mockReturnValue(of(ok(projectsPage()))); notSubmitted.execute.mockReset().mockReturnValue(of(ok(notSubmittedPage()))); await TestBed.configureTestingModule({ @@ -61,7 +61,7 @@ describe("Attention views: real overlay", () => { provideRouter([]), { provide: DATE_PIPE_DEFAULT_OPTIONS, useValue: { timezone: "UTC" } }, { provide: GetProgramManagerParticipantsWithoutTeamUseCase, useValue: participants }, - { provide: GetProgramManagerParticipantsWithoutOnboardingUseCase, useValue: onboarding }, + { provide: GetProgramManagerParticipantsWithoutVisitUseCase, useValue: visit }, { provide: GetProgramManagerProjectsAwaitingEvaluationUseCase, useValue: projects }, { provide: GetProgramManagerProjectsNotSubmittedUseCase, useValue: notSubmitted }, { @@ -134,21 +134,21 @@ describe("Attention views: real overlay", () => { expect(dialog().textContent).not.toMatch(/Ищет команду|Вуз|email|Напомнить/); }); - it("onboarding opens the participant list with server search and pagination", async () => { - onboarding.execute.mockReturnValue(of(ok(participantsPage({ count: 30 })))); - await open("participants-without-onboarding"); - expect(dialog().textContent).toContain("Участники не завершили онбординг"); + it("visit opens the participant list with server search and pagination", async () => { + visit.execute.mockReturnValue(of(ok(participantsPage({ count: 30 })))); + await open("participants-without-visit"); + expect(dialog().textContent).toContain("Участники ещё не заходили на платформу"); expect(dialog().textContent).toContain("Анна Петрова"); expect(dialog().querySelector("input")?.placeholder).toBe("Поиск по имени"); expect(dialog().querySelector("a")?.getAttribute("href")).toBe("/office/profile/123"); expect(participants.execute).not.toHaveBeenCalled(); button("Далее").click(); await fixture.whenStable(); - expect(onboarding.execute).toHaveBeenLastCalledWith(12, { search: "", limit: 25, offset: 25 }); + expect(visit.execute).toHaveBeenLastCalledWith(12, { search: "", limit: 25, offset: 25 }); state.searchDraft.set(" Анна "); state.applyAttentionSearch(); await fixture.whenStable(); - expect(onboarding.execute).toHaveBeenLastCalledWith(12, { + expect(visit.execute).toHaveBeenLastCalledWith(12, { search: "Анна", limit: 25, offset: 0, @@ -387,21 +387,21 @@ describe("Attention views: real overlay", () => { }); it.each([ - "participants-without-onboarding", + "participants-without-visit", "participants-without-team", "projects-awaiting-evaluation", "projects-not-submitted", ] as const)("%s: loading, empty, search_empty, error и retry отдельно", async view => { const api = - view === "participants-without-onboarding" - ? onboarding + view === "participants-without-visit" + ? visit : view === "participants-without-team" ? participants : view === "projects-not-submitted" ? notSubmitted : projects; const page = - view === "participants-without-team" || view === "participants-without-onboarding" + view === "participants-without-team" || view === "participants-without-visit" ? participantsPage() : view === "projects-not-submitted" ? notSubmittedPage() @@ -413,8 +413,8 @@ describe("Attention views: real overlay", () => { loading.next(ok({ ...page, count: 0, results: [] })); await fixture.whenStable(); expect(dialog().textContent).toContain( - view === "participants-without-onboarding" - ? "Все зарегистрированные участники завершили онбординг." + view === "participants-without-visit" + ? "Все зарегистрированные участники уже заходили на платформу." : view === "participants-without-team" ? "Все зарегистрированные участники уже состоят в командах." : view === "projects-not-submitted" @@ -445,7 +445,7 @@ describe("Attention views: real overlay", () => { }); it.each([ - "participants-without-onboarding", + "participants-without-visit", "participants-without-team", "projects-awaiting-evaluation", "projects-not-submitted", @@ -481,7 +481,7 @@ describe("Attention views: real overlay", () => { }); it.each([ - "participants-without-onboarding", + "participants-without-visit", "participants-without-team", "projects-awaiting-evaluation", "projects-not-submitted", diff --git a/projects/social_platform/src/app/ui/pages/program/detail/analytics/drilldown/analytics-drilldown.component.ts b/projects/social_platform/src/app/ui/pages/program/detail/analytics/drilldown/analytics-drilldown.component.ts index f9dbc2f89..a09ee281e 100644 --- a/projects/social_platform/src/app/ui/pages/program/detail/analytics/drilldown/analytics-drilldown.component.ts +++ b/projects/social_platform/src/app/ui/pages/program/detail/analytics/drilldown/analytics-drilldown.component.ts @@ -114,8 +114,8 @@ export class AnalyticsDrilldownComponent implements AfterViewInit { } case "participants-without-team": return "Участники без команды"; - case "participants-without-onboarding": - return "Участники не завершили онбординг"; + case "participants-without-visit": + return "Участники ещё не заходили на платформу"; case "projects-awaiting-evaluation": return "Работы ожидают оценивания"; case "projects-not-submitted": @@ -150,8 +150,8 @@ export class AnalyticsDrilldownComponent implements AfterViewInit { return "Для этой программы сдача решения не требуется."; if (this.state.appliedSearch()) return "По вашему запросу ничего не найдено."; if (this.state.view() === "projects-not-submitted") return "Все проекты программы уже сданы."; - if (this.state.view() === "participants-without-onboarding") - return "Все зарегистрированные участники завершили онбординг."; + if (this.state.view() === "participants-without-visit") + return "Все зарегистрированные участники уже заходили на платформу."; return this.state.view() === "participants-without-team" ? "Все зарегистрированные участники уже состоят в командах." : "Нет работ, ожидающих оценивания.";