remove REGISTRATION_2_1

ORCID · Sep 2, 2024 · d0d3b9b · d0d3b9b
1 parent 82b21a2
commit d0d3b9b
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 64 deletions.
diff --git a/src/app/register2/components/step-a/step-a.component.html b/src/app/register2/components/step-a/step-a.component.html
@@ -21,20 +21,9 @@ <h1 class="orc-font-heading-small" i18n="@@register.create">
       </ng-container>
     </mat-card-title>
     <mat-card-subtitle role="heading" aria-level="2">
-      <h2
-        class="orc-font-body-small"
-        i18n="@@register.step1.3"
-        *ngIf="togglzregistration21"
-      >
+      <h2 class="orc-font-body-small" i18n="@@register.step1.3">
         Step 1 of 5 - Names and emails
       </h2>
-      <h2
-        class="orc-font-body-small"
-        i18n="@@register.step1.2"
-        *ngIf="!togglzregistration21"
-      >
-        Step 1 of 4 - Names and emails
-      </h2>
     </mat-card-subtitle>
   </mat-card-header>
 

diff --git a/src/app/register2/components/step-a/step-a.component.ts b/src/app/register2/components/step-a/step-a.component.ts
@@ -27,7 +27,6 @@ import { BaseStepDirective } from '../BaseStep'
 export class StepAComponent extends BaseStepDirective implements AfterViewInit {
   @ViewChild('firstInput') firstInput: ElementRef
 
-  @Input() togglzregistration21: boolean
   @Input() reactivation: ReactivationLocal
   nextButtonWasClicked: boolean
 

diff --git a/src/app/register2/components/step-b/step-b.component.html b/src/app/register2/components/step-b/step-b.component.html
@@ -21,20 +21,9 @@ <h1 class="orc-font-heading-small" i18n="@@register.create">
       </ng-container>
     </mat-card-title>
     <mat-card-subtitle role="heading" aria-level="2">
-      <h2
-        class="orc-font-body-small"
-        i18n="@@register.step2.3"
-        *ngIf="togglzregistration21"
-      >
+      <h2 class="orc-font-body-small" i18n="@@register.step2.3">
         Step 2 of 5 - Password
       </h2>
-      <h2
-        class="orc-font-body-small"
-        i18n="@@register.step2.2"
-        *ngIf="!togglzregistration21"
-      >
-        Step 2 of 4 - Password
-      </h2>
     </mat-card-subtitle>
   </mat-card-header>
 

diff --git a/src/app/register2/components/step-b/step-b.component.ts b/src/app/register2/components/step-b/step-b.component.ts
@@ -15,7 +15,6 @@ import { BaseStepDirective } from '../BaseStep'
 export class StepBComponent extends BaseStepDirective {
   @Input() personalData
   @Input() reactivation: ReactivationLocal
-  @Input() togglzregistration21: boolean
 
   nextButtonWasClicked = false
 

diff --git a/src/app/register2/components/step-c/step-c.component.html b/src/app/register2/components/step-c/step-c.component.html
@@ -27,20 +27,9 @@ <h1 class="orc-font-heading-small" i18n="@@register.create">
       </ng-container>
     </mat-card-title>
     <mat-card-subtitle role="heading" aria-level="2">
-      <h2
-        class="orc-font-body-small"
-        i18n="@@register.step4.3"
-        *ngIf="togglzregistration21"
-      >
+      <h2 class="orc-font-body-small" i18n="@@register.step4.3">
         Step 4 of 5 - Visibility
       </h2>
-      <h2
-        class="orc-font-body-small"
-        i18n="@@register.step3.2"
-        *ngIf="!togglzregistration21"
-      >
-        Step 3 of 4 - Visibility
-      </h2>
     </mat-card-subtitle>
   </mat-card-header>
 

diff --git a/src/app/register2/components/step-c/step-c.component.ts b/src/app/register2/components/step-c/step-c.component.ts
@@ -15,7 +15,6 @@ import { BaseStepDirective } from '../BaseStep'
 export class StepCComponent extends BaseStepDirective {
   @Input() loading
   @Input() reactivation: ReactivationLocal
-  @Input() togglzregistration21: boolean
 
   constructor() {
     super()

diff --git a/src/app/register2/components/step-d/step-d.component.html b/src/app/register2/components/step-d/step-d.component.html
@@ -27,20 +27,9 @@ <h1 class="orc-font-heading-small" i18n="@@register.create">
       </ng-container>
     </mat-card-title>
     <mat-card-subtitle role="heading" aria-level="2">
-      <h2
-        class="orc-font-body-small"
-        i18n="@@register.step5.3"
-        *ngIf="togglzregistration21"
-      >
+      <h2 class="orc-font-body-small" i18n="@@register.step5.3">
         Step 5 of 5 - Terms and conditions
       </h2>
-      <h2
-        class="orc-font-body-small"
-        i18n="@@register.step4.2"
-        *ngIf="!togglzregistration21"
-      >
-        Step 4 of 4 - Terms and conditions
-      </h2>
     </mat-card-subtitle>
   </mat-card-header>
 

diff --git a/src/app/register2/components/step-d/step-d.component.ts b/src/app/register2/components/step-d/step-d.component.ts
@@ -15,7 +15,6 @@ import { BaseStepDirective } from '../BaseStep'
 export class StepDComponent extends BaseStepDirective {
   @Input() loading
   @Input() reactivation: ReactivationLocal
-  @Input() togglzregistration21: boolean
 
   nextButtonWasClicked = false
 

diff --git a/src/app/register2/pages/register/register2.component.html b/src/app/register2/pages/register/register2.component.html
@@ -27,7 +27,6 @@
               [(formGroup)]="FormGroupStepA"
               [reactivation]="reactivation"
               #stepComponentA
-              [togglzregistration21]="registration21"
             ></app-step-a>
           </mat-step>
           <mat-step [stepControl]="FormGroupStepB">
@@ -39,11 +38,9 @@
               [(formGroup)]="FormGroupStepB"
               [personalData]="personalData"
               [reactivation]="reactivation"
-              [togglzregistration21]="registration21"
             ></app-step-b>
           </mat-step>
           <mat-step
-            *ngIf="registration21"
             [stepControl]="FormGroupStepC2"
             [optional]="formGroupStepC2Optional"
           >
@@ -64,15 +61,13 @@
               [(formGroup)]="FormGroupStepC"
               [loading]="loading"
               [reactivation]="reactivation"
-              [togglzregistration21]="registration21"
             ></app-step-c>
           </mat-step>
           <mat-step [stepControl]="FormGroupStepD" #lastStep>
             <ng-template matStepLabel i18n="@@register.visibilityAndTerm"
               >Visibility and terms</ng-template
             >
             <app-step-d
-              [togglzregistration21]="registration21"
               #stepComponentD
               [(formGroup)]="FormGroupStepD"
               (submit)="register()"

diff --git a/src/app/register2/pages/register/register2.component.ts b/src/app/register2/pages/register/register2.component.ts
@@ -32,7 +32,6 @@ import { ThirdPartyAuthData } from 'src/app/types/sign-in-data.endpoint'
 import { GoogleTagManagerService } from '../../../core/google-tag-manager/google-tag-manager.service'
 import { SearchService } from '../../../core/search/search.service'
 import { ReactivationLocal } from '../../../types/reactivation.local'
-import { TogglzService } from 'src/app/core/togglz/togglz.service'
 
 @Component({
   selector: 'app-register-2',
@@ -71,7 +70,6 @@ export class Register2Component implements OnInit, AfterViewInit {
   stepControlStepC2: UntypedFormGroup
   formGroupStepC2Optional = false
   @ViewChild('stepper') private myStepper: MatStepper
-  registration21: boolean
 
   constructor(
     private _cdref: ChangeDetectorRef,
@@ -85,8 +83,7 @@ export class Register2Component implements OnInit, AfterViewInit {
     private _router: Router,
     private _errorHandler: ErrorHandlerService,
     private _userInfo: UserService,
-    private _searchService: SearchService,
-    private _togglz: TogglzService
+    private _searchService: SearchService
   ) {
     _platformInfo.get().subscribe((platform) => {
       this.platform = platform
@@ -95,9 +92,6 @@ export class Register2Component implements OnInit, AfterViewInit {
     })
   }
   ngOnInit() {
-    this._togglz.getStateOf('REGISTRATION_2_1').subscribe((value) => {
-      this.registration21 = value
-    })
     this._register.getRegisterForm().subscribe()
 
     this.FormGroupStepA = this._formBuilder.group({