diff --git a/dbrepo-analyse-service/lib/dbrepo-1.8.2-py3-none-any.whl b/dbrepo-analyse-service/lib/dbrepo-1.8.2-py3-none-any.whl index efaf9736a83299d210adc4e4a9efe6417601282b..6a9e99b436161b8b1b6042b7700bdc2b4e2a0bc1 100644 Binary files a/dbrepo-analyse-service/lib/dbrepo-1.8.2-py3-none-any.whl and b/dbrepo-analyse-service/lib/dbrepo-1.8.2-py3-none-any.whl differ diff --git a/dbrepo-analyse-service/lib/dbrepo-1.8.2.tar.gz b/dbrepo-analyse-service/lib/dbrepo-1.8.2.tar.gz index f8e59f70c19fe9bd4c108e70256812539da225f4..37ee4cfb614c4842c7490e006d7656af3d2abe1c 100644 Binary files a/dbrepo-analyse-service/lib/dbrepo-1.8.2.tar.gz and b/dbrepo-analyse-service/lib/dbrepo-1.8.2.tar.gz differ diff --git a/dbrepo-dashboard-service/lib/dbrepo-1.8.2-py3-none-any.whl b/dbrepo-dashboard-service/lib/dbrepo-1.8.2-py3-none-any.whl index efaf9736a83299d210adc4e4a9efe6417601282b..6a9e99b436161b8b1b6042b7700bdc2b4e2a0bc1 100644 Binary files a/dbrepo-dashboard-service/lib/dbrepo-1.8.2-py3-none-any.whl and b/dbrepo-dashboard-service/lib/dbrepo-1.8.2-py3-none-any.whl differ diff --git a/dbrepo-dashboard-service/lib/dbrepo-1.8.2.tar.gz b/dbrepo-dashboard-service/lib/dbrepo-1.8.2.tar.gz index f8e59f70c19fe9bd4c108e70256812539da225f4..37ee4cfb614c4842c7490e006d7656af3d2abe1c 100644 Binary files a/dbrepo-dashboard-service/lib/dbrepo-1.8.2.tar.gz and b/dbrepo-dashboard-service/lib/dbrepo-1.8.2.tar.gz differ diff --git a/dbrepo-search-service/lib/dbrepo-1.8.2-py3-none-any.whl b/dbrepo-search-service/lib/dbrepo-1.8.2-py3-none-any.whl index efaf9736a83299d210adc4e4a9efe6417601282b..6a9e99b436161b8b1b6042b7700bdc2b4e2a0bc1 100644 Binary files a/dbrepo-search-service/lib/dbrepo-1.8.2-py3-none-any.whl and b/dbrepo-search-service/lib/dbrepo-1.8.2-py3-none-any.whl differ diff --git a/dbrepo-search-service/lib/dbrepo-1.8.2.tar.gz b/dbrepo-search-service/lib/dbrepo-1.8.2.tar.gz index f8e59f70c19fe9bd4c108e70256812539da225f4..37ee4cfb614c4842c7490e006d7656af3d2abe1c 100644 Binary files a/dbrepo-search-service/lib/dbrepo-1.8.2.tar.gz and b/dbrepo-search-service/lib/dbrepo-1.8.2.tar.gz differ diff --git a/dbrepo-ui/components/identifier/Select.vue b/dbrepo-ui/components/identifier/Select.vue index e5572866140858970c5141d40591af3dda5c389a..6ad3450a6ec29dc8225a45b4b8ed5ebbc4248c87 100644 --- a/dbrepo-ui/components/identifier/Select.vue +++ b/dbrepo-ui/components/identifier/Select.vue @@ -15,27 +15,21 @@ :identifier="identifier" /> </v-list-item-subtitle> <template v-slot:append> - <v-tooltip - v-if="identifier.status === 'published'" - :text="$t('pages.identifier.pid.title')" - left> - <template - v-slot:activator="{ props }"> - <v-icon - color="primary" - v-bind="props">mdi-identifier</v-icon> - </template> - </v-tooltip> - <v-tooltip - v-else - :text="$t('pages.identifier.draft.title')" - left> - <template - v-slot:activator="{ props }"> - <v-icon - v-bind="props">mdi-pencil-outline</v-icon> - </template> - </v-tooltip> + <v-list-item-action> + <v-tooltip + :text="identifier.status === 'published' ? $t('pages.identifier.pid.title') : $t('pages.identifier.draft.title')" + left> + <template + v-slot:activator="{ props }"> + {{ formatTimestampUTCLabel(identifier.created) }} + <v-icon + :color="identifier.status === 'published' ? 'primary' : null" + v-bind="props"> + {{ identifier.status === 'published' ? 'mdi-identifier' : 'mdi-pencil-outline' }} + </v-icon> + </template> + </v-tooltip> + </v-list-item-action> </template> </v-list-item> </div> @@ -43,6 +37,7 @@ <script> import Banner from '@/components/identifier/Banner.vue' +import { formatTimestampUTCLabel } from '@/utils' import { useCacheStore } from '@/stores/cache.js' export default { @@ -102,6 +97,7 @@ export default { this.init() }, methods: { + formatTimestampUTCLabel, href (identifier) { if (!identifier) { return null diff --git a/dbrepo-ui/pages/database/[database_id]/info.vue b/dbrepo-ui/pages/database/[database_id]/info.vue index 89583c5f4f450d6462a6f4aaa5343fee3d184b82..0af35a5d3bee8dc572488c39f6ac22d9b5c4a6f9 100644 --- a/dbrepo-ui/pages/database/[database_id]/info.vue +++ b/dbrepo-ui/pages/database/[database_id]/info.vue @@ -272,7 +272,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 diff --git a/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/core/api/identifier/IdentifierDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/core/api/identifier/IdentifierDto.java index 35293a6d9e456522c9c9f366ad8f37c7b1dbbf1e..e52c05617dfabbe6510097d6ad56724632c84990 100644 --- a/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/core/api/identifier/IdentifierDto.java +++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/core/api/identifier/IdentifierDto.java @@ -127,4 +127,7 @@ public class IdentifierDto { @Schema(example = "draft") private IdentifierStatusTypeDto status; + @NotNull + private Instant created; + } diff --git a/lib/python/dbrepo/api/dto.py b/lib/python/dbrepo/api/dto.py index 3c80f1174d4cee48c7c9608c6cac9eb7de8b8418..474e60790ef6ca92bd79bd610bd0ba653d0d5465 100644 --- a/lib/python/dbrepo/api/dto.py +++ b/lib/python/dbrepo/api/dto.py @@ -658,18 +658,18 @@ class Identifier(BaseModel): publisher: str creators: List[Creator] titles: List[IdentifierTitle] - descriptions: List[IdentifierDescription] - funders: Optional[List[IdentifierFunder]] = field(default_factory=list) + descriptions: Optional[List[IdentifierDescription]] = None + funders: Optional[List[IdentifierFunder]] = None doi: Optional[str] = None language: Optional[str] = None - licenses: Optional[List[License]] = field(default_factory=list) + licenses: Optional[List[License]] = None query_id: Optional[str] = None table_id: Optional[str] = None view_id: Optional[str] = None query: Optional[str] = None query_normalized: Optional[str] = None execution: Optional[str] = None - related_identifiers: Optional[List[RelatedIdentifier]] = field(default_factory=list) + related_identifiers: Optional[List[RelatedIdentifier]] = None result_hash: Optional[str] = None result_number: Optional[int] = None publication_day: Optional[int] = None