Drive shortname limited to 45 characters. Conditional existing option…

… for personal dropbox in request forms.

src/app/components/request-storage/request-storage.component.html

@@ -27,6 +27,7 @@ <h3>Do you want to request new storage or update existing storage?</h3>
             <mat-radio-group fxLayout="column" fxLayoutGap="1em" formControlName="requestType">
               <mat-radio-button value="New">New</mat-radio-button>
               <mat-radio-button value="Existing">Existing</mat-radio-button>
+              <mat-radio-button *ngIf="requestTypeForm.controls.requestType.value === 'Existing' || requestTypeForm.controls.requestType.value === 'New - Dropbox'" value="New - Dropbox">Existing - Personal Dropbox</mat-radio-button>
               <mat-error *ngIf="requestTypeForm.controls.requestType.invalid && requestTypeClicked">* Please choose an
                 option</mat-error>
             </mat-radio-group>
@@ -109,7 +110,7 @@ <h3>Is there anything else you would like to tell us?</h3>
     </mat-step>
 
     <mat-step [editable]="isEditable" [stepControl]="projectForm"
-      *ngIf="requestTypeForm.controls.requestType.value === 'New'">
+      *ngIf="requestTypeForm.controls.requestType.value === 'New' || requestTypeForm.controls.requestType.value === 'New - Dropbox'">
       <form [formGroup]="projectForm" novalidate>
         <ng-template matStepLabel>General Information</ng-template>
 
@@ -185,7 +186,7 @@ <h3>Please choose at least one FOR code from the Australian and New Zealand Stan
     </mat-step>
 
     <mat-step [editable]="isEditable" [stepControl]="dataInfoForm"
-      *ngIf="requestTypeForm.controls.requestType.value === 'New'">
+      *ngIf="requestTypeForm.controls.requestType.value === 'New' || requestTypeForm.controls.requestType.value === 'New - Dropbox' ">
       <form [formGroup]="dataInfoForm" novalidate>
         <ng-template matStepLabel>Data Information</ng-template>
 
@@ -216,10 +217,10 @@ <h3>
               GDC-data)?
             </h3>
             <mat-form-field floatLabel="never" class="no-floating-label input-full-width">
-              <input matInput placeholder="Short name" formControlName="shortName" type="text" />
+              <input matInput placeholder="Short name" formControlName="shortName" type="text"/>
               <mat-hint align="start">Avoid generic names like <i>my-project</i> or
                 <i>my-data</i></mat-hint>
-              <mat-error *ngIf="dataInfoForm.controls.shortName.invalid">* Please enter a short name</mat-error>
+              <mat-error *ngIf="dataInfoForm.controls.shortName.invalid">* Please enter a short name containing less than 45 characters</mat-error>
             </mat-form-field>
           </div>
 
@@ -435,7 +436,7 @@ <h3>Please provide a list of University of Auckland people who require access</h
     </mat-step>
 
     <mat-step [editable]="isEditable" [stepControl]="dataSizeForm"
-      *ngIf="requestTypeForm.controls.requestType.value === 'New'">
+      *ngIf="requestTypeForm.controls.requestType.value === 'New' || requestTypeForm.controls.requestType.value === 'New - Dropbox' ">
       <form [formGroup]="dataSizeForm" novalidate>
         <ng-template matStepLabel>Data Size</ng-template>
 

src/app/components/request-storage/request-storage.component.ts

@@ -205,7 +205,7 @@ export class RequestStorageComponent implements OnInit, OnDestroy, CanComponentD
     this.dataInfoForm = this.formBuilder.group({
       dataRequirements: new FormControl(undefined),
       dataRequirementsOther: new FormControl(undefined),
-      shortName: new FormControl(undefined, [Validators.required]),
+      shortName: new FormControl(undefined, [Validators.required, Validators.maxLength(45)]),
       projectMembers: this.projectMembers
     });