From 353bf90051f1f2576468e4c950e5a9904ce9329e Mon Sep 17 00:00:00 2001 From: Martin Weise <martin.weise@tuwien.ac.at> Date: Thu, 24 Apr 2025 09:02:59 +0200 Subject: [PATCH] Fixed the identifier list Signed-off-by: Martin Weise <martin.weise@tuwien.ac.at> --- .../main/java/at/tuwien/entities/identifier/Identifier.java | 1 + .../main/java/at/tuwien/repository/IdentifierRepository.java | 4 ++++ dbrepo-ui/pages/database/[database_id]/info.vue | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/Identifier.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/Identifier.java index 43dbb849e3..ced5456d1c 100644 --- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/Identifier.java +++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/Identifier.java @@ -35,6 +35,7 @@ import static jakarta.persistence.GenerationType.IDENTITY; @NamedQuery(name = "Identifier.findSubsetIdentifier", query = "select i from Identifier i where i.database.id = ?1 and i.queryId = ?2 and i.type = 'SUBSET' ORDER BY i.id DESC"), @NamedQuery(name = "Identifier.findViewIdentifier", query = "select i from Identifier i where i.database.id = ?1 and i.viewId = ?2 and i.type = 'VIEW' ORDER BY i.id DESC"), @NamedQuery(name = "Identifier.findEarliest", query = "select i from Identifier i ORDER BY i.created ASC limit 1"), + @NamedQuery(name = "Identifier.findAll", query = "select i from Identifier i ORDER BY i.created DESC"), }) public class Identifier implements Serializable { diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/IdentifierRepository.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/IdentifierRepository.java index 9e49f2aa1c..7f2415d6b7 100644 --- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/IdentifierRepository.java +++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/IdentifierRepository.java @@ -1,6 +1,7 @@ package at.tuwien.repository; import at.tuwien.entities.identifier.Identifier; +import org.jetbrains.annotations.NotNull; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; @@ -11,6 +12,9 @@ import java.util.UUID; @Repository public interface IdentifierRepository extends JpaRepository<Identifier, UUID> { + @NotNull + List<Identifier> findAll(); + /** * Finds identifiers by given database id. * diff --git a/dbrepo-ui/pages/database/[database_id]/info.vue b/dbrepo-ui/pages/database/[database_id]/info.vue index 9f2d426553..fc149bede3 100644 --- a/dbrepo-ui/pages/database/[database_id]/info.vue +++ b/dbrepo-ui/pages/database/[database_id]/info.vue @@ -253,7 +253,7 @@ export default { if (!this.database || !this.database.identifiers) { return [] } - return this.database.identifiers.filter(i => i.query_id === this.$route.params.subset_id) + return this.database.identifiers.filter(i => i.database_id === this.$route.params.database_id) }, pid () { return this.$route.query.pid -- GitLab