Skip to content

Commit 39c87a3

Browse files
committed
use courses array from API instead of query params for program-to-course navigation
1 parent 563ee4f commit 39c87a3

4 files changed

Lines changed: 5 additions & 15 deletions

File tree

projects/social_platform/src/app/office/courses/detail/course-detail.component.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,6 @@ export class CourseDetailComponent implements OnInit {
7777
}
7878

7979
redirectToProgram(): void {
80-
this.router.navigate([`/office/program/${this.course()?.partnerProgramId}`], {
81-
queryParams: { courseId: this.course()?.id },
82-
});
80+
this.router.navigateByUrl(`/office/program/${this.course()?.partnerProgramId}`);
8381
}
8482
}

projects/social_platform/src/app/office/features/detail/detail.component.html

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -181,11 +181,8 @@
181181
участники
182182
</app-button>
183183
</a>
184-
} @else { @if (info().courseId || queryCourseId()) {
185-
<a
186-
class="info__contacts"
187-
[routerLink]="'/office/courses/' + (info().courseId || queryCourseId())"
188-
>
184+
} @else { @if (info().courses?.length) {
185+
<a class="info__contacts" [routerLink]="'/office/courses/' + info().courses[0].id">
189186
<app-button appearance="outline" size="medium" customTypographyClass="text-body-12">
190187
перейти в курс
191188
</app-button>

projects/social_platform/src/app/office/features/detail/detail.component.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ export class DeatilComponent implements OnInit, OnDestroy {
8080
profile?: User;
8181
profileProjects = signal<User["projects"]>([]);
8282
listType: "project" | "program" | "profile" = "project";
83-
queryCourseId = signal<number | null>(null);
8483

8584
// Переменная для подсказок
8685
isTooltipVisible = false;
@@ -159,12 +158,6 @@ export class DeatilComponent implements OnInit, OnDestroy {
159158
this.listType = data["listType"];
160159
});
161160

162-
const queryParamsSub$ = this.route.queryParams.subscribe(params => {
163-
const courseId = params["courseId"];
164-
this.queryCourseId.set(courseId ? +courseId : null);
165-
});
166-
this.subscriptions.push(queryParamsSub$);
167-
168161
this.initializeBackPath();
169162

170163
this.updatePageStates();

projects/social_platform/src/app/office/program/models/program.model.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ export class Program {
5959
isUserMember!: boolean;
6060
publishProjectsAfterFinish!: boolean;
6161
courseId!: number | null;
62+
courses!: { id: number; title: string; isAvailable: boolean }[];
6263

6364
static default(): Program {
6465
return {
@@ -88,6 +89,7 @@ export class Program {
8889
isUserManager: false,
8990
publishProjectsAfterFinish: false,
9091
courseId: null,
92+
courses: [],
9193
};
9294
}
9395
}

0 commit comments

Comments
 (0)