fix routing from program to create project & program registration date

Author: Awakich

projects/social_platform/src/app/app.config.ts

@@ -8,7 +8,7 @@ import { ReactiveFormsModule } from "@angular/forms";
 import { BrowserModule } from "@angular/platform-browser";
 import { GlobalErrorHandlerService } from "@error/services/global-error-handler.service";
 import { HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi } from "@angular/common/http";
-import { provideRouter } from "@angular/router";
+import { provideRouter, withRouterConfig } from "@angular/router";
 import { APP_ROUTES } from "./app.routes";
 import {
   API_URL,
@@ -56,7 +56,12 @@ export const APP_CONFIG: ApplicationConfig = {
       useClass: GlobalErrorHandlerService,
     },
     provideHttpClient(withInterceptorsFromDi()),
-    provideRouter(APP_ROUTES),
+    provideRouter(
+      APP_ROUTES,
+      withRouterConfig({
+        onSameUrlNavigation: "reload",
+      })
+    ),
     provideAnimations(),
   ],
 };

projects/social_platform/src/app/office/program/shared/program-card/program-card.component.html

@@ -21,7 +21,7 @@
         !registerDateExpired && (!program.isUserMember || !program.isUserManager)
           ? "Регистрация до:" + " " + (program.datetimeRegistrationEnds | date: "dd MMMM")
           : registerDateExpired
-          ? "программа завершена"
+          ? "регистрация завершена"
           : "ты уже участвуешь!"
       }}
     </p>

projects/social_platform/src/app/office/projects/edit/edit.component.html

@@ -93,6 +93,12 @@ <h3 class="text-bold-body-16">📢 внимание!</h3>
           <strong>подсвечены&nbsp;<span>красным</span></strong
           >). Если вы пока не знаете что написать, можно сохранить черновик проекта и заполнить поля
           позже :&#41;
+
+          {{
+            fromProgram || isProjectAssignToProgram
+              ? 'также проверь вкладку "данные для конкурсов"'
+              : ""
+          }}
         </p>
         <app-button
           size="medium"

projects/social_platform/src/app/office/projects/edit/edit.component.ts

@@ -212,6 +212,8 @@ export class ProjectEditComponent implements OnInit, AfterViewInit, OnDestroy {
   // Id Лидера проекта
   leaderId = 0;
 
+  fromProgram = "";
+
   // Маркер того является ли проект привязанный к конкурсной программе
   isCompetitive = false;
   isProjectAssignToProgram = false;
@@ -621,6 +623,7 @@ export class ProjectEditComponent implements OnInit, AfterViewInit, OnDestroy {
 
     const editingStepSub$ = this.route.queryParams.subscribe(params => {
       const step = params["editingStep"] as EditStep;
+      this.fromProgram = params["fromProgram"];
       if (step && step !== this.editingStep) {
         this.projectStepService.setStepFromRoute(step);
       }

projects/social_platform/src/app/office/projects/services/projects.service.ts

@@ -19,7 +19,9 @@ export class ProjectsService {
       });
 
       this.router
-        .navigateByUrl(`/office/projects/${project.id}/edit?editingStep=main`)
+        .navigate([`/office/projects/${project.id}/edit`], {
+          queryParams: { editingStep: "main", fromProgram: true },
+        })
         .then(() => console.debug("Route change from ProjectsComponent"));
     });
   }