From 986824cf097542119f9376a329a12cb8a0e66afb Mon Sep 17 00:00:00 2001 From: Ilia Orlov <66363651+illfixit@users.noreply.github.com> Date: Mon, 30 Sep 2024 08:50:34 +0200 Subject: [PATCH 1/4] chore: mandatory custom method, fix i18n (#856) --- .../contract-agreement-transfer-dialog-form.ts | 2 +- .../contract-agreement-transfer-dialog.component.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-transfer-dialog/contract-agreement-transfer-dialog-form.ts b/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-transfer-dialog/contract-agreement-transfer-dialog-form.ts index 81de2b6c..360136c9 100644 --- a/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-transfer-dialog/contract-agreement-transfer-dialog-form.ts +++ b/src/app/routes/connector-ui/contract-agreement-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>(), ), diff --git a/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-transfer-dialog/contract-agreement-transfer-dialog.component.html b/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-transfer-dialog/contract-agreement-transfer-dialog.component.html index 6b44e8f5..1414fa2c 100644 --- a/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-transfer-dialog/contract-agreement-transfer-dialog.component.html +++ b/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-transfer-dialog/contract-agreement-transfer-dialog.component.html @@ -45,7 +45,7 @@

" color="accent"> {{ - 'contract_agreement_page.cus_tranfer' | translate + 'contract_agreement_page.cus_transfer' | translate }} From dbeb64f789ed61c020de11e89f470a5150176da6 Mon Sep 17 00:00:00 2001 From: Sebastian Opriel <22075788+SebastianOpriel@users.noreply.github.com> Date: Tue, 1 Oct 2024 08:38:07 +0200 Subject: [PATCH 2/4] Fixed label for button (#858) --- CHANGELOG.md | 3 +++ .../business/edit-asset-form/edit-asset-form.component.html | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fe7c7e2f..0dd6a762 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,9 @@ 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) + + ### Deployment Migration Notes _No special deployment migration steps required_ 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 index 550f0291..305f8b24 100644 --- 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 }} From 25445c901673a2745d29552035435ccfca5e4341 Mon Sep 17 00:00:00 2001 From: Ilia Orlov <66363651+illfixit@users.noreply.github.com> Date: Tue, 1 Oct 2024 11:32:42 +0200 Subject: [PATCH 3/4] Mandatory custom method (#859) --- .../contract-agreement-transfer-dialog-form.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-transfer-dialog/contract-agreement-transfer-dialog-form.ts b/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-transfer-dialog/contract-agreement-transfer-dialog-form.ts index 360136c9..288b3475 100644 --- a/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-transfer-dialog/contract-agreement-transfer-dialog-form.ts +++ b/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-transfer-dialog/contract-agreement-transfer-dialog-form.ts @@ -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, From 34278d4aa119b578246ae8a4287ead1afbec2e84 Mon Sep 17 00:00:00 2001 From: Ilia Orlov <66363651+illfixit@users.noreply.github.com> Date: Tue, 1 Oct 2024 11:38:23 +0200 Subject: [PATCH 4/4] Update CHANGELOG.md (#860) --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0dd6a762..e83c9fab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,7 +20,8 @@ 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) +- 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