Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/sovity/edc-ui into 406-use-…
Browse files Browse the repository at this point in the history
…new-negotiate-contract-endpoint-in-ui-1

# Conflicts:
#	src/app/core/services/api/edc-api.service.ts
#	src/app/core/services/asset-service-mapped.ts
  • Loading branch information
SaadEGI committed Sep 22, 2023
2 parents 8cad198 + cc84938 commit dca1e82
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
4 changes: 0 additions & 4 deletions src/app/core/services/api/edc-api.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ import {
PolicyDefinitionCreateRequest,
PolicyDefinitionPage,
TransferHistoryPage,
UiAsset,
UiAssetCreateRequest,
UiContractNegotiation,
UiDataOffer,
buildEdcClient,
} from '@sovity.de/edc-client';
import {APP_CONFIG, AppConfig} from '../../config/app-config';
Expand Down
2 changes: 1 addition & 1 deletion src/app/core/services/asset-service-mapped.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export class AssetServiceMapped {
assetPage.assets.map((uiAsset) =>
this.assetPropertyMapper.buildAsset({
connectorEndpoint: this.config.connectorEndpoint,
uiAsset: uiAsset,
uiAsset,
}),
),
),
Expand Down

0 comments on commit dca1e82

Please sign in to comment.