Skip to content

Merge index into client image#140

Merged
dennisvang merged 3 commits intodevelopfrom
feature/merge-index
Mar 4, 2025
Merged

Merge index into client image#140
dennisvang merged 3 commits intodevelopfrom
feature/merge-index

Conversation

@janslifka
Copy link
Copy Markdown
Collaborator

@janslifka janslifka commented Sep 4, 2023

(description by dennisvang)

This PR introduces support for the "index gatekeeper", a.k.a. index permits.
Admin users can now decide whether or not to include an FDP into the index.
When a ping is received from an unknown FDP, it is not included in the list, but gets a pending status.
The admin can review, and then accept or reject the FDP.

In addition, this PR enables the client to deal with both normal fdps and fdp-indexes, without explicit (docker) configuration.
As a result, there is no longer the need for separate fdp-client and fdp-index-client docker images.
The client automatically recognizes that an fdp is an index, by checking the index member in the response from the fdp's /configs/bootstrap endpoint (see e.g. https://app.fairdatapoint.org/swagger-ui/index.html#/Client/getBootstrapConfig).

Changes as summarized by Copilot:

This pull request introduces several changes across multiple files in the FAIRDataPoint-client project:

  1. API Changes (src/api/fdpIndex/index.ts):

    • Added permit parameter to getEntries method.
    • Introduced a new putEntry method for updating entries.
  2. Component Changes (src/components/EntityView/index.vue):

    • Added navigation tabs for "Index" and "Metadata" views.
    • Introduced FairDataPoints component and dynamic content rendering based on viewIndex.
  3. Header Component (src/components/FdpHeader/index.vue):

    • Modified dropdown menu to include "Trigger ping" and "Index Settings" for admins when isIndex is true.
  4. Page Component (src/components/Page/index.vue):

    • Added a slot for pagenav.
  5. Entity Configuration (src/entity/EntityConfig.ts and src/entity/RepositoryConfig.ts):

    • Added isRepository getter to both classes.
  6. Main Configuration (src/main.ts):

    • Set configuration for index.
  7. Router Configuration (src/router/index.ts):

    • Modified routes to include index settings and adjusted route logic for isIndex.
  8. Index Detail View (src/views/IndexDetail/index.vue):

    • Added permit handling and UI elements for changing permit status.
  9. Index Settings View (src/views/IndexSettings/index.vue):

    • Added "Auto Permit" checkbox and handling in the form.
  10. Removed File (src/views/Index/index.vue):

    • Deleted the Index view file.

These changes enhance the functionality related to index management, including new API methods, UI components for viewing and managing entries, and updated configurations and routing.

@MarekSuchanek MarekSuchanek self-assigned this Feb 26, 2025
@dennisvang
Copy link
Copy Markdown
Contributor

related to

  • FAIRDataTeam/jira-backlog-migration#32

@dennisvang dennisvang added this to the release v2 milestone Feb 28, 2025
@dennisvang
Copy link
Copy Markdown
Contributor

@MarekSuchanek Do you know more about the status of this PR? Is it complete or still work in progress?

@MarekSuchanek
Copy link
Copy Markdown
Contributor

@dennisvang this can be merged once CI works well again... and then we can make PR + merge it for fix/fdp2 branch

@dennisvang
Copy link
Copy Markdown
Contributor

Thanks @MarekSuchanek . I'll merge the changes from develop and fix the conflicts.

- separate github workflows
- multi-stage dockerfile
@dennisvang dennisvang requested a review from MarekSuchanek March 3, 2025 08:06
@dennisvang dennisvang merged commit e5940b3 into develop Mar 4, 2025
2 checks passed
@dennisvang dennisvang deleted the feature/merge-index branch March 4, 2025 09:13
dennisvang added a commit that referenced this pull request Jul 7, 2025
* Merge index into client image

* Add index FDP permits

---------

Co-authored-by: dennisvang <[email protected]>
dennisvang added a commit that referenced this pull request Jul 16, 2025
* Merge index into client image

* Add index FDP permits

---------

Co-authored-by: Jan Slifka <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants