Merge branch 'main' into small-i18n-fixes

sovity · Oct 1, 2024 · 957f6c7 · 957f6c7
2 parents b5ff049 + 34278d4
commit 957f6c7
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,6 +20,10 @@ the detailed section referring to by linking pull requests or issues.
 
 #### Patch
 
+- Fixed wrong button label stating "Method Parameterization" instead of "Path Parameterization" ([#857](https://github.com/sovity/edc-ui/issues/857))
+- Made Custom Http Method mandatory if the corresponding option is chosen ([#739](https://github.com/sovity/edc-ui/issues/739))
+
+
 ### Deployment Migration Notes
 
 _No special deployment migration steps required_

diff --git a/...eement-page/contract-agreement-transfer-dialog/contract-agreement-transfer-dialog-form.ts b/...eement-page/contract-agreement-transfer-dialog/contract-agreement-transfer-dialog-form.ts
@@ -58,7 +58,7 @@ export class ContractAgreementTransferDialogForm {
         showAllHttpParameterizationFields: [false],
 
         httpProxiedPath: [''],
-        httpProxiedMethod: [''],
+        httpProxiedMethod: ['', Validators.required],
         httpProxiedQueryParams: this.formBuilder.array(
           new Array<FormGroup<HttpDatasourceQueryParamFormModel>>(),
         ),
@@ -80,6 +80,8 @@ export class ContractAgreementTransferDialogForm {
         const httpAuthByValue = value.httpAuthHeaderType === 'Value';
         const httpAuthByVault = value.httpAuthHeaderType === 'Vault-Secret';
 
+        const httpProxiedMethod = !!value.showAllHttpParameterizationFields;
+
         return {
           dataAddressType: true,
 
@@ -101,7 +103,7 @@ export class ContractAgreementTransferDialogForm {
           showAllHttpParameterizationFields: !customTransferProcessRequest,
 
           httpProxiedPath: !customTransferProcessRequest,
-          httpProxiedMethod: !customTransferProcessRequest,
+          httpProxiedMethod: !customTransferProcessRequest && httpProxiedMethod,
           httpProxiedQueryParams: !customTransferProcessRequest,
           httpProxiedBody: !customTransferProcessRequest,
           httpProxiedBodyContentType: !customTransferProcessRequest,

diff --git a/...page/contract-agreement-transfer-dialog/contract-agreement-transfer-dialog.component.html b/...page/contract-agreement-transfer-dialog/contract-agreement-transfer-dialog.component.html
@@ -45,7 +45,7 @@ <h1 mat-dialog-title>
         "
         color="accent">
         <mat-label>{{
-          'contract_agreement_page.cus_tranfer' | translate
+          'contract_agreement_page.cus_transfer' | translate
         }}</mat-label>
         <textarea matInput [formControl]="ctrl" [placeholder]="'{}'"></textarea>
         <mat-error *ngIf="ctrl.invalid && ctrl.errors?.jsonInvalid">

diff --git a/src/app/shared/business/edit-asset-form/edit-asset-form.component.html b/src/app/shared/business/edit-asset-form/edit-asset-form.component.html
@@ -160,7 +160,7 @@
                     : ('general.enable' | translate)
                 }}
                 {{
-                  'create_data_offer_page.method_parameterization' | translate
+                  'create_data_offer_page.path_parameterization' | translate
                 }}
               </button>
             </div>