Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Migrate Catalog Page to UI API Wrapper #494

Merged
merged 8 commits into from
Sep 26, 2023
Merged

Migrate Catalog Page to UI API Wrapper #494

merged 8 commits into from
Sep 26, 2023

Conversation

richardtreier
Copy link
Collaborator

@richardtreier richardtreier commented Sep 26, 2023 •
edited
Loading

  • TODO: currently the catalog only supports the first contract offer of data offers
  • migrate catalog page to UI API Wrapper
  • migrate negotiation to UI API Wrapper
  • remove legacy Management API Client
  • remove dead code

@richardtreier
Squashed commit of the following:
e6c71b4 
commit a5ea128
Author: SaadBendou <bendousaad@gmail.com>
Date:   Mon Sep 25 14:15:54 2023 +0200

    fix: Use ContractNegotiation & Catalog in UI

commit 64e6f6d
Merge: 70498d4 9a177cb
Author: SaadBendou <bendousaad@gmail.com>
Date:   Mon Sep 25 11:44:11 2023 +0200

    Merge branch 'main' of https://github.com/sovity/edc-ui into 406-use-new-negotiate-contract-endpoint-in-ui-1

commit 70498d4
Author: SaadBendou <bendousaad@gmail.com>
Date:   Fri Sep 22 17:06:26 2023 +0200

    fix: Use ContractNegotiation & Catalog in UI

commit 2a35abf
Author: SaadBendou <bendousaad@gmail.com>
Date:   Fri Sep 22 11:37:30 2023 +0200

    fix: Use ContractNegotiation & Catalog in UI

commit dca1e82
Merge: 8cad198 cc84938
Author: SaadBendou <bendousaad@gmail.com>
Date:   Fri Sep 22 11:36:35 2023 +0200

    Merge branch 'main' of https://github.com/sovity/edc-ui into 406-use-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

commit 8cad198
Author: SaadBendou <bendousaad@gmail.com>
Date:   Thu Sep 21 17:32:32 2023 +0200

    fix: Use ContractNegotiation & Catalog in UI

commit 51b7f94
Author: SaadBendou <bendousaad@gmail.com>
Date:   Thu Sep 21 16:21:03 2023 +0200

    fix:buildAsset & remove Dead Code

commit 90ed2e4
Author: SaadBendou <bendousaad@gmail.com>
Date:   Thu Sep 21 15:27:18 2023 +0200

    fix: use buildAsset function

commit 445bf9f
Author: SaadBendou <bendousaad@gmail.com>
Date:   Thu Sep 21 15:19:47 2023 +0200

    fix: remove dead Code

commit b5d8e9c
Author: SaadBendou <bendousaad@gmail.com>
Date:   Thu Sep 21 15:14:49 2023 +0200

    chore: use UI-safe Criterion && update UiCriterion

commit d015c9d
Author: SaadBendou <bendousaad@gmail.com>
Date:   Wed Sep 20 16:52:31 2023 +0200

    chore: use UI-safe Criterion && update UiCriterion

commit c8f0868
Merge: 4793366 a026525
Author: SaadBendou <bendousaad@gmail.com>
Date:   Wed Sep 20 14:34:10 2023 +0200

    Merge branch '472-use-new-type-safe-asset-in-ui' of https://github.com/sovity/edc-ui into 394-use-new-create-contract-definition-endpoint-in-ui

    # Conflicts:
    #	src/app/core/services/api/edc-api.service.ts
    #	src/app/core/services/api/fake-backend/asset-fake-service.ts
    #	src/app/core/services/api/fake-backend/data/test-assets.ts

commit 4793366
Author: SaadBendou <bendousaad@gmail.com>
Date:   Wed Sep 20 14:31:45 2023 +0200

    chore: use UI-safe Criterion

commit a026525
Author: SaadBendou <bendousaad@gmail.com>
Date:   Wed Sep 20 12:02:00 2023 +0200

    chore: use UI-safe Asset
@richardtreier
reverted some files
d1f1ba3
@richardtreier
feat: migrate catalog + contract negotiation to API Wrapper (initial,…
83f31c6 
… no multiple contract offers per asset)
@richardtreier
minor code quality improvements
56e6547
@richardtreier richardtreier force-pushed the 406-use-new-negotiate-contract-endpoint-in-ui branch from 37d14c4 to 56e6547 Compare September 26, 2023 11:00
@richardtreier richardtreier force-pushed the 406-use-new-negotiate-contract-endpoint-in-ui branch from 9ba4d42 to 7ea648f Compare September 26, 2023 11:57
@richardtreier richardtreier enabled auto-merge (squash) September 26, 2023 12:02
SaadEGI
SaadEGI suggested changes Sep 26, 2023
View reviewed changes
Copy link

@SaadEGI SaadEGI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed

@richardtreier richardtreier merged commit 68b6105 into main Sep 26, 2023
12 checks passed
@richardtreier richardtreier deleted the 406-use-new-negotiate-contract-endpoint-in-ui branch September 26, 2023 12:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SaadEGI SaadEGI SaadEGI approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@richardtreier @SaadEGI