From abdeb93bb3a2abf77939e8266bc5daee48c4d611 Mon Sep 17 00:00:00 2001 From: illfixit <66363651+illfixit@users.noreply.github.com> Date: Fri, 20 Sep 2024 08:49:42 +0200 Subject: [PATCH 1/5] feat: replace hints with info boxes --- .../edit-asset-form.component.html | 17 +++++------ .../asset-edit-dialog.component.html | 28 +++++++++++-------- 2 files changed, 26 insertions(+), 19 deletions(-) diff --git a/src/app/component-library/edit-asset-form/edit-asset-form/edit-asset-form.component.html b/src/app/component-library/edit-asset-form/edit-asset-form/edit-asset-form.component.html index c0c1d594..a68e0f62 100644 --- a/src/app/component-library/edit-asset-form/edit-asset-form/edit-asset-form.component.html +++ b/src/app/component-library/edit-asset-form/edit-asset-form/edit-asset-form.component.html @@ -38,11 +38,12 @@ fieldId="create-asset-form-contact-email" label="Contact E-Mail" placeholder="contact@my-org.com" - [ctrl]="form.datasource.controls.contactEmail" - >This email address will be offered to potential consumers for + tooltip="This email address will be offered to potential consumers for contacting you. This is done in place of having an actual data source - connected. + connected." + [ctrl]=" + form.datasource.controls.contactEmail + "> When potential customers reach out to you via email, you’ll receive - messages with this subject line. + tooltip="When potential customers reach out to you via email, you’ll receive + messages with this subject line." + [ctrl]="form.datasource.controls.contactPreferredEmailSubject"> +
Contact E-Mail
-
- This email address will be offered to potential consumers for - contacting you. This is done in place of having an actual data - source connected. -
- @@ -561,6 +555,15 @@

matInput [formControl]="ctrl" [placeholder]="'contact@my-org.com'" /> + {{ validationMessages.invalidEmailMessage }} @@ -569,11 +572,6 @@

Preferred E-Mail Subject
-
- When potential customers reach out to you via email, you’ll - receive messages with this subject line. -
- + From 51509fb6b58fff5771fdc45fde5f707660be1947 Mon Sep 17 00:00:00 2001 From: illfixit <66363651+illfixit@users.noreply.github.com> Date: Fri, 20 Sep 2024 09:16:37 +0200 Subject: [PATCH 2/5] docs: append CL --- CHANGELOG.md | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 83e82f0f..f66e52b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,9 @@ the detailed section referring to by linking pull requests or issues. #### Patch +- Replaced hints with info boxes in On Request data source + ([#820](https://github.com/sovity/edc-ui/issues/820)) + ### Deployment Migration Notes _No special deployment migration steps required_ @@ -36,10 +39,14 @@ Various bugfixes. #### Patch -- Changed wording on the data offer creation page ([#817](https://github.com/sovity/edc-ui/issues/795)) -- Data Offer details now display the contract ID for each contract offer ([#795](https://github.com/sovity/edc-ui/issues/795)) -- Warn the user when using an invalid Policy Id ([#746](https://github.com/sovity/edc-ui/issues/746)) -- Warn the user when using an invalid Data Offer Id ([#745](https://github.com/sovity/edc-ui/issues/745)) +- Changed wording on the data offer creation page + ([#817](https://github.com/sovity/edc-ui/issues/795)) +- Data Offer details now display the contract ID for each contract offer + ([#795](https://github.com/sovity/edc-ui/issues/795)) +- Warn the user when using an invalid Policy Id + ([#746](https://github.com/sovity/edc-ui/issues/746)) +- Warn the user when using an invalid Data Offer Id + ([#745](https://github.com/sovity/edc-ui/issues/745)) - Fixed time restriction upper bound "local day to datetime" conversion issues ([#815](https://github.com/sovity/edc-ui/issues/815)) From 3e9db329a4dd3a9d311a5bea74a8a40409b5bea1 Mon Sep 17 00:00:00 2001 From: illfixit <66363651+illfixit@users.noreply.github.com> Date: Fri, 20 Sep 2024 15:43:57 +0200 Subject: [PATCH 3/5] chore: add translations --- .../data-offer-fake-service.ts | 2 +- .../asset-edit-page.component.ts | 6 +++++- src/assets/i18n/en.json | 19 +++++++++++++++++-- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/src/app/core/services/api/fake-backend/connector-fake-impl/data-offer-fake-service.ts b/src/app/core/services/api/fake-backend/connector-fake-impl/data-offer-fake-service.ts index 471a2a2c..f0a0c71c 100644 --- a/src/app/core/services/api/fake-backend/connector-fake-impl/data-offer-fake-service.ts +++ b/src/app/core/services/api/fake-backend/connector-fake-impl/data-offer-fake-service.ts @@ -4,7 +4,7 @@ import { IdResponseDto, UiCriterionLiteralType, } from '@sovity.de/edc-client'; -import {ALWAYS_TRUE_POLICY_ID} from 'src/app/component-library/edit-asset-form/edit-asset-form/form/model/always-true-policy-id'; +import {ALWAYS_TRUE_POLICY_ID} from '../../../../../shared/business/edit-asset-form/form/model/always-true-policy-id'; import {assetIdAvailable, createAsset} from './asset-fake-service'; import { contractDefinitionIdAvailable, diff --git a/src/app/routes/connector-ui/asset-edit-page/asset-edit-page/asset-edit-page.component.ts b/src/app/routes/connector-ui/asset-edit-page/asset-edit-page/asset-edit-page.component.ts index 796ddf69..a8a944d0 100644 --- a/src/app/routes/connector-ui/asset-edit-page/asset-edit-page/asset-edit-page.component.ts +++ b/src/app/routes/connector-ui/asset-edit-page/asset-edit-page/asset-edit-page.component.ts @@ -1,7 +1,11 @@ import {Component, OnInit} from '@angular/core'; import {ActivatedRoute, Router} from '@angular/router'; import {EMPTY, Observable, catchError, finalize, tap} from 'rxjs'; -import {IdResponseDto, UiAssetEditRequest} from '@sovity.de/edc-client'; +import { + DataOfferCreationRequestPolicyEnum, + IdResponseDto, + UiAssetEditRequest, +} from '@sovity.de/edc-client'; import {EdcApiService} from 'src/app/core/services/api/edc-api.service'; import {AssetRequestBuilder} from 'src/app/core/services/asset-request-builder'; import {AssetService} from 'src/app/core/services/asset.service'; diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index c420e050..a182a81c 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -84,7 +84,15 @@ "header_name": "Header Name", "header_value": "Header Value", "add_add_header": "Add Additional Header", - "page": "Page" + "page": "Page", + "show_adv_fields": "Show Advanced Fields", + "publishing": "Publishing", + "pub_desc": "Publish data offer to other data space participants", + "pub_unrestr": "Publish unrestricted", + "pub_restr": "Publish restricted", + "pub_asset_only": "Create asset only (without data offer)", + "pub_mode": "Publishing Mode", + "doc": "Documentation" }, "tooltip": { "negotiate": "Cannot negotiate contracts with your own connector.", @@ -228,6 +236,12 @@ "title": "Data Offers", "page": "Data Offer Page" }, + "create_data_offer": { + "def_datasrc": "Define the datasource of the asset", + "data_type": "Datasource Type", + "contact_email_placeholder": "contact@my-org.com", + "contact_email": "Contact E-Mail" + }, "create_data_offer_page": { "title": "Create Data Offer" }, @@ -300,7 +314,8 @@ "date_range": "Date Range", "search_pol": "Search policies", "create_policy": "Create Policy", - "no_pol": "No policy found with given filter." + "no_pol": "No policy found with given filter.", + "expression": "Policy Expression" }, "create_policy_page": { "title": "Create Policy" From 197c194cb182992e143819e4899d51311188005c Mon Sep 17 00:00:00 2001 From: illfixit <66363651+illfixit@users.noreply.github.com> Date: Fri, 20 Sep 2024 15:48:48 +0200 Subject: [PATCH 4/5] fix tooltip --- .../business/edit-asset-form/edit-asset-form.component.html | 4 +--- src/assets/i18n/en.json | 3 ++- 2 files changed, 3 insertions(+), 4 deletions(-) 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 db24412d..137e0dd4 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 @@ -39,9 +39,7 @@ placeholder="{{ 'create_data_offer.contact_email_placeholder' | translate }}" - tooltip="This email address will be offered to potential consumers for - contacting you. This is done in place of having an actual data source - connected." + tooltip="'contact_email_tooltip' | translate" [label]="'create_data_offer.contact_email' | translate" [ctrl]=" form.datasource.controls.contactEmail diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index a182a81c..0e7a9563 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -240,7 +240,8 @@ "def_datasrc": "Define the datasource of the asset", "data_type": "Datasource Type", "contact_email_placeholder": "contact@my-org.com", - "contact_email": "Contact E-Mail" + "contact_email": "Contact E-Mail", + "contact_email_tooltip": "When potential customers reach out to you via email, you’ll receive messages with this subject line." }, "create_data_offer_page": { "title": "Create Data Offer" From de52e99cf1a377f9b224ccc547557459444b8cce Mon Sep 17 00:00:00 2001 From: illfixit <66363651+illfixit@users.noreply.github.com> Date: Fri, 20 Sep 2024 15:52:57 +0200 Subject: [PATCH 5/5] Merge branch '820-no-info-box-for-contact-mail-and-subject-for-datasource-on-request' of https://www.github.com/sovity/edc-ui into 820-no-info-box-for-contact-mail-and-subject-for-datasource-on-request --- .../business/edit-asset-form/edit-asset-form.component.html | 5 ++--- src/assets/i18n/en.json | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) 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 137e0dd4..8b6ab9cc 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 @@ -39,7 +39,7 @@ placeholder="{{ 'create_data_offer.contact_email_placeholder' | translate }}" - tooltip="'contact_email_tooltip' | translate" + tooltip="'contact_form.contact_email_tooltip' | translate" [label]="'create_data_offer.contact_email' | translate" [ctrl]=" form.datasource.controls.contactEmail @@ -51,8 +51,7 @@ fieldId="create-asset-form-contact-subject" label="Preferred E-Mail Subject" placeholder="Data Offer 'xyz'" - tooltip="When potential customers reach out to you via email, you’ll receive - messages with this subject line." + tooltip="'contact_form.contact_subject_tooltip' | translate" [ctrl]="form.datasource.controls.contactPreferredEmailSubject"> diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 0e7a9563..78006e8d 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -241,7 +241,8 @@ "data_type": "Datasource Type", "contact_email_placeholder": "contact@my-org.com", "contact_email": "Contact E-Mail", - "contact_email_tooltip": "When potential customers reach out to you via email, you’ll receive messages with this subject line." + "contact_email_tooltip": "This email address will be offered to potential consumers for contacting you. This is done in place of having an actual data source connected.", + "contact_subject_tooltip": "When potential customers reach out to you via email, you’ll receive messages with this subject line." }, "create_data_offer_page": { "title": "Create Data Offer"