fix skip registration func issues

Author: Awakich

projects/skills/src/app/trajectories/track-career/detail/info/info.component.scss

@@ -287,7 +287,8 @@
     gap: 20px;
     margin-top: 10px;
 
-    &__future-container, &__personal-container {
+    &__future-container,
+    &__personal-container {
       display: none;
     }
 

projects/social_platform/src/app/office/onboarding/stage-one/stage-one.component.ts

@@ -1,7 +1,7 @@
 /** @format */
 
 import { ChangeDetectorRef, Component, OnDestroy, OnInit, signal } from "@angular/core";
-import { NonNullableFormBuilder, ReactiveFormsModule, Validators } from "@angular/forms";
+import { NonNullableFormBuilder, ReactiveFormsModule } from "@angular/forms";
 import { concatMap, map, Observable, Subscription, take } from "rxjs";
 import { AuthService } from "@auth/services";
 import { ControlErrorPipe, ValidationService } from "@corelib";
@@ -132,11 +132,9 @@ export class OnboardingStageOneComponent implements OnInit, OnDestroy {
   private completeRegistration(stage: number): void {
     this.skipSubmitting.set(true);
     this.onboardingService.setFormValue(this.stageForm.value);
-    this.authService.setOnboardingStage(stage).subscribe(() => {
-      this.router.navigateByUrl(
-        stage !== 3 ? "/office/onboarding/stage-2" : "/office/onboarding/stage-3"
-      );
-    });
+    this.router.navigateByUrl(
+      stage === 2 ? "/office/onboarding/stage-2" : "/office/onboarding/stage-3"
+    );
     this.skipSubmitting.set(false);
   }
 }

projects/social_platform/src/app/office/onboarding/stage-two/stage-two.component.html

@@ -57,4 +57,14 @@ <h4 class="text-heading-4 content__section-heading content__right-heading">Би
       >
     </div>
   </div>
+
+  <app-modal [open]="isChooseSkill()" (openChange)="isChooseSkill.set(!isChooseSkill())">
+    <div class="cancel">
+      <div class="cancel__top">
+        <i (click)="isChooseSkill.set(false)" appIcon icon="cross" class="cancel__cross"></i>
+        <p class="cancel__title text-bold-body-16">Произошла ошибка при заполнении данных!</p>
+      </div>
+      <p class="text-body-14 cancel__text">{{ isChooseSkillText() }}.</p>
+    </div>
+  </app-modal>
 </div>

projects/social_platform/src/app/office/onboarding/stage-two/stage-two.component.scss

@@ -112,3 +112,40 @@
     }
   }
 }
+
+.cancel {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  max-height: calc(100vh - 40px);
+  padding: 40px 0 80px;
+  overflow-y: auto;
+
+  @include responsive.apply-desktop {
+    width: 80%;
+  }
+
+  &__cross {
+    position: absolute;
+    top: 0;
+    right: 0;
+    width: 32px;
+    height: 32px;
+    cursor: pointer;
+
+    @include responsive.apply-desktop {
+      top: 8px;
+      right: 8px;
+    }
+  }
+
+  &__title {
+    margin-bottom: 12px;
+    text-align: center;
+  }
+
+  &__text {
+    text-align: center;
+  }
+}

projects/social_platform/src/app/office/onboarding/stage-two/stage-two.component.ts

@@ -1,6 +1,13 @@
 /** @format */
 
-import { ChangeDetectorRef, Component, OnDestroy, OnInit, signal } from "@angular/core";
+import {
+  ChangeDetectorRef,
+  Component,
+  ComponentFactoryResolver,
+  OnDestroy,
+  OnInit,
+  signal,
+} from "@angular/core";
 import { NonNullableFormBuilder, ReactiveFormsModule, Validators } from "@angular/forms";
 import { concatMap, map, Observable, Subscription, take } from "rxjs";
 import { AuthService } from "@auth/services";
@@ -15,6 +22,8 @@ import { SkillsService } from "@office/services/skills.service";
 import { SkillsGroup } from "@office/models/skills-group";
 import { SkillsGroupComponent } from "@office/shared/skills-group/skills-group.component";
 import { SkillsBasketComponent } from "@office/shared/skills-basket/skills-basket.component";
+import { HttpResponse } from "@angular/common/http";
+import { ModalComponent } from "@ui/components/modal/modal.component";
 
 @Component({
   selector: "app-stage-two",
@@ -26,6 +35,7 @@ import { SkillsBasketComponent } from "@office/shared/skills-basket/skills-baske
     ReactiveFormsModule,
     IconComponent,
     ButtonComponent,
+    ModalComponent,
     ControlErrorPipe,
     AutoCompleteInputComponent,
     SkillsGroupComponent,
@@ -55,6 +65,9 @@ export class OnboardingStageTwoComponent implements OnInit, OnDestroy {
   stageSubmitting = signal(false);
   skipSubmitting = signal(false);
 
+  isChooseSkill = signal(false);
+  isChooseSkillText = signal("");
+
   subscriptions$ = signal<Subscription[]>([]);
 
   ngOnInit(): void {
@@ -104,8 +117,14 @@ export class OnboardingStageTwoComponent implements OnInit, OnDestroy {
       .saveProfile({ skillsIds: skills.map(skill => skill.id) })
       .pipe(concatMap(() => this.authService.setOnboardingStage(2)))
       .subscribe({
-        next: () => this.authService.setOnboardingStage(3),
-        error: () => this.stageSubmitting.set(false),
+        next: () => this.completeRegistration(3),
+        error: err => {
+          this.stageSubmitting.set(false);
+          if (err.status === 400) {
+            this.isChooseSkill.set(true);
+            this.isChooseSkillText.set(err.error[0]);
+          }
+        },
       });
   }
 
@@ -146,9 +165,7 @@ export class OnboardingStageTwoComponent implements OnInit, OnDestroy {
   private completeRegistration(stage: number): void {
     this.skipSubmitting.set(true);
     this.onboardingService.setFormValue(this.stageForm.value);
-    this.authService.setOnboardingStage(stage).subscribe(() => {
-      this.router.navigateByUrl("/office/onboarding/stage-3");
-    });
+    stage === 3 && this.router.navigateByUrl("/office/onboarding/stage-3");
     this.skipSubmitting.set(false);
   }
 }

projects/social_platform/src/app/office/onboarding/stage-zero/stage-zero.component.html

@@ -167,7 +167,7 @@ <h3 class="auth__title">
           class="page__add-education"
           (click)="addEducation()"
         >
-          <span>Добавить новое образование</span>
+          <span>Добавить образование</span>
           <i appIcon icon="plus" appSquare="14"></i>
         </app-button>
 
@@ -380,7 +380,7 @@ <h3 class="auth__title">
         </ul>
       </ng-container>
       <app-button class="page__add-achievement" (click)="addAchievement()">
-        <span>Добавить новое достижение</span>
+        <span>Добавить достижение</span>
         <i appIcon icon="plus" appSquare="14"></i>
       </app-button>
     </div>
@@ -473,26 +473,23 @@ <h3 class="auth__title">
           editWorkClick ||
           editLanguageClick ||
           isEducationDirty ||
-          isWorkDirty ||
-          isLanguageDirty
+          isWorkDirty
         "
         [ngStyle]="{
           opacity:
             editEducationClick ||
             editWorkClick ||
             editLanguageClick ||
             isEducationDirty ||
-            isWorkDirty ||
-            isLanguageDirty
+            isWorkDirty
               ? '0.6'
               : '1',
           cursor:
             editEducationClick ||
             editWorkClick ||
             editLanguageClick ||
             isEducationDirty ||
-            isWorkDirty ||
-            isLanguageDirty
+            isWorkDirty
               ? 'not-allowed'
               : 'pointer'
         }"

projects/social_platform/src/app/office/onboarding/stage-zero/stage-zero.component.ts

@@ -236,7 +236,7 @@ export class OnboardingStageZeroComponent implements OnInit, OnDestroy {
   get isWorkDirty(): boolean {
     const f = this.stageForm;
     return [
-      "organization",
+      "organizationNameWork",
       "entryYearWork",
       "completionYearWork",
       "descriptionWork",
@@ -604,11 +604,9 @@ export class OnboardingStageZeroComponent implements OnInit, OnDestroy {
   private completeRegistration(stage: number): void {
     this.skipSubmitting.set(true);
     this.onboardingService.setFormValue(this.stageForm.value);
-    this.authService.setOnboardingStage(stage).subscribe(() => {
-      this.router.navigateByUrl(
-        stage !== 3 ? "/office/onboarding/stage-1" : "/office/onboarding/stage-3"
-      );
-    });
+    this.router.navigateByUrl(
+      stage === 1 ? "/office/onboarding/stage-1" : "/office/onboarding/stage-3"
+    );
     this.skipSubmitting.set(false);
   }
 }