fix(deposit): avoid form blocked by dua with old metadata

src/app/features/deposit/components/presentationals/deposit-form/deposit-form.presentational.html

@@ -684,36 +684,73 @@
                                         [dataSensitivityEnumValues]="listSensitivityOptions"
     ></dlcm-shared-data-sensitivity-input>
 
-    <ng-template [ngIf]="displayDua">
-      <div class="data-use-policy-wrapper">
-        <dlcm-shared-data-use-policy [dataUsePolicy]="getFormControl(formDefinition.dataUsePolicy)?.value"
-                                     [withTooltip]="true"
-                                     class="icon"
+    <div class="data-use-policy-wrapper">
+      <dlcm-shared-data-use-policy [dataUsePolicy]="getFormControl(formDefinition.dataUsePolicy)?.value"
+                                   [withTooltip]="true"
+                                   class="icon"
+      >
+      </dlcm-shared-data-use-policy>
+      <mat-form-field *ngIf="getFormControl(formDefinition.dataUsePolicy) as fd"
+                      [appearance]="appearanceInputMaterial"
+                      [class.mat-form-field-invalid]="formValidationHelper.displayInvalidWhenRequired(fd, displayEmptyRequiredFieldInError)"
+                      [matTooltipPosition]="'left'"
+                      [solidifyTooltip]="'deposit.tooltips.dataUsePolicy' | translate"
+                      class="data-use-policy-input"
+                      solidifyTooltipOnEllipsis
+      >
+        <mat-label>{{labelTranslateEnum.dataUsePolicy | translate}}</mat-label>
+        <mat-select [disabled]="readonly || fd.disabled"
+                    [formControl]="fd"
+                    [required]="formValidationHelper.hasRequiredField(fd)"
+                    [solidifyValidation]="errors"
+        >
+          <mat-option *ngFor="let dataUsePolicy of listDuaPolicyOptions"
+                      [value]="dataUsePolicy.key"
+                      [disabled]="(dataUsePolicy.enabled | isFalse)"
+                      [matTooltip]="((dataUsePolicy.enabled | isFalse) ? labelTranslateEnum.dataUsePolicyIsIncompatibleWithTheSelectedAccessLevelAndDataTag :
+                  dataUsePolicy.infoToTranslate) | translate"
+                      [matTooltipPosition]="'left'"
+                      solidifyTooltipOnEllipsis
+          >
+            {{dataUsePolicy.value | translate}}
+          </mat-option>
+        </mat-select>
+        <mat-error #errors
+                   solidifyTooltipOnEllipsis
+        ></mat-error>
+      </mat-form-field>
+    </div>
+
+    <ng-template [ngIf]="getFormControl(formDefinition.dataUsePolicy)?.value === dataUsePolicyShowEnum.DUA">
+      <div class="dua-wrapper">
+        <dlcm-shared-dua-type [duaType]="getFormControl(formDefinition.duaType)?.value"
+                              [withTooltip]="true"
+                              class="dua-icon"
         >
-        </dlcm-shared-data-use-policy>
-        <mat-form-field *ngIf="getFormControl(formDefinition.dataUsePolicy) as fd"
+        </dlcm-shared-dua-type>
+        <mat-form-field *ngIf="getFormControl(formDefinition.duaType) as fd"
                         [appearance]="appearanceInputMaterial"
                         [class.mat-form-field-invalid]="formValidationHelper.displayInvalidWhenRequired(fd, displayEmptyRequiredFieldInError)"
                         [matTooltipPosition]="'left'"
-                        [solidifyTooltip]="'deposit.tooltips.dataUsePolicy' | translate"
-                        class="data-use-policy-input"
+                        [solidifyTooltip]="'deposit.tooltips.duaType' | translate"
+                        class="dua-type-input"
                         solidifyTooltipOnEllipsis
         >
-          <mat-label>{{labelTranslateEnum.dataUsePolicy | translate}}</mat-label>
+          <mat-label>{{labelTranslateEnum.duaType | translate}}</mat-label>
           <mat-select [disabled]="readonly || fd.disabled"
                       [formControl]="fd"
                       [required]="formValidationHelper.hasRequiredField(fd)"
                       [solidifyValidation]="errors"
           >
-            <mat-option *ngFor="let dataUsePolicy of listDuaPolicyOptions"
-                        [value]="dataUsePolicy.key"
-                        [disabled]="(dataUsePolicy.enabled | isFalse)"
-                        [matTooltip]="((dataUsePolicy.enabled | isFalse) ? labelTranslateEnum.dataUsePolicyIsIncompatibleWithTheSelectedAccessLevelAndDataTag :
-                  dataUsePolicy.infoToTranslate) | translate"
+            <mat-option *ngFor="let duaType of listDuaTypeOptions"
+                        [value]="duaType.key"
+                        [disabled]="(duaType.enabled | isFalse)"
+                        [matTooltip]="((duaType.enabled | isFalse) ? labelTranslateEnum.duaTypeIsIncompatibleWithTheSelectedAccessLevelAndDataTag :
+                  duaType.infoToTranslate) | translate"
                         [matTooltipPosition]="'left'"
                         solidifyTooltipOnEllipsis
             >
-              {{dataUsePolicy.value | translate}}
+              {{duaType.value | translate}}
             </mat-option>
           </mat-select>
           <mat-error #errors
@@ -721,62 +758,23 @@
           ></mat-error>
         </mat-form-field>
       </div>
-
-      <ng-template [ngIf]="getFormControl(formDefinition.dataUsePolicy)?.value === dataUsePolicyShowEnum.DUA">
-        <div class="dua-wrapper">
-          <dlcm-shared-dua-type [duaType]="getFormControl(formDefinition.duaType)?.value"
-                                [withTooltip]="true"
-                                class="dua-icon"
-          >
-          </dlcm-shared-dua-type>
-          <mat-form-field *ngIf="getFormControl(formDefinition.duaType) as fd"
-                          [appearance]="appearanceInputMaterial"
-                          [class.mat-form-field-invalid]="formValidationHelper.displayInvalidWhenRequired(fd, displayEmptyRequiredFieldInError)"
-                          [matTooltipPosition]="'left'"
-                          [solidifyTooltip]="'deposit.tooltips.duaType' | translate"
-                          class="dua-type-input"
-                          solidifyTooltipOnEllipsis
-          >
-            <mat-label>{{labelTranslateEnum.duaType | translate}}</mat-label>
-            <mat-select [disabled]="readonly || fd.disabled"
-                        [formControl]="fd"
-                        [required]="formValidationHelper.hasRequiredField(fd)"
-                        [solidifyValidation]="errors"
-            >
-              <mat-option *ngFor="let duaType of listDuaTypeOptions"
-                          [value]="duaType.key"
-                          [disabled]="(duaType.enabled | isFalse)"
-                          [matTooltip]="((duaType.enabled | isFalse) ? labelTranslateEnum.duaTypeIsIncompatibleWithTheSelectedAccessLevelAndDataTag :
-                  duaType.infoToTranslate) | translate"
-                          [matTooltipPosition]="'left'"
-                          solidifyTooltipOnEllipsis
-              >
-                {{duaType.value | translate}}
-              </mat-option>
-            </mat-select>
-            <mat-error #errors
-                       solidifyTooltipOnEllipsis
-            ></mat-error>
-          </mat-form-field>
-        </div>
-      </ng-template>
-
-      <ng-container *ngIf="getFormControl(formDefinition.duaFileChange) as fd">
-        <solidify-file-upload-input-container [backendFileAdapter]="dataFileAdapter"
-                                              [readonly]="readonly"
-                                              [uploadButtonLabelToTranslate]="labelTranslateEnum.duaFile"
-                                              [titleToTranslate]="labelTranslateEnum.duaFile"
-                                              [backendFile]="dataFileDua"
-                                              [blobProvidedMode]="'RETRIEVE_BY_URL'"
-                                              [downloadUrl]="duaDownloadUrl"
-                                              [formControl]="fd"
-                                              class="dua-file-upload"
-                                              [class.hide]="!isRequiredDuaFile"
-        ></solidify-file-upload-input-container>
-      </ng-container>
     </ng-template>
 
-    <ng-template [ngIf]="displayLicenseSelect()">
+    <ng-container *ngIf="getFormControl(formDefinition.duaFileChange) as fd">
+      <solidify-file-upload-input-container [backendFileAdapter]="dataFileAdapter"
+                                            [readonly]="readonly"
+                                            [uploadButtonLabelToTranslate]="labelTranslateEnum.duaFile"
+                                            [titleToTranslate]="labelTranslateEnum.duaFile"
+                                            [backendFile]="dataFileDua"
+                                            [blobProvidedMode]="'RETRIEVE_BY_URL'"
+                                            [downloadUrl]="duaDownloadUrl"
+                                            [formControl]="fd"
+                                            class="dua-file-upload"
+                                            [class.hide]="!isRequiredDuaFile"
+      ></solidify-file-upload-input-container>
+    </ng-container>
+
+    <ng-template [ngIf]="displayLicenseSelect">
       <solidify-searchable-single-select *ngIf="getFormControl(formDefinition.licenseId) as fd"
                                          [solidifyDataTest]="dataTestEnum.depositLicenseId"
                                          [formControl]="fd"