Skip to content

Commit 275a6fe

Browse files
committed
feat: more complete display of originator and resource
1 parent d37bc26 commit 275a6fe

File tree

3 files changed

+43
-12
lines changed

3 files changed

+43
-12
lines changed

api/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"#types/*": "./types/*"
1515
},
1616
"dependencies": {
17-
"@data-fair/lib-common-types": "^1.8.2",
17+
"@data-fair/lib-common-types": "^1.8.3",
1818
"@data-fair/lib-express": "^1.16.1",
1919
"@data-fair/lib-node": "^2.5.1",
2020
"ajv-formats": "^3.0.1",

package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ui/src/pages/embed/events.vue

Lines changed: 38 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,18 @@
5151
>
5252
<v-expansion-panel-title>
5353
<span class="mr-4">
54+
<v-avatar
55+
v-if="event.originator?.internalProcess"
56+
v-tooltip="'Processus interne'"
57+
:icon="mdiCogRefresh"
58+
/>
59+
<v-avatar
60+
v-else-if="event.originator?.apiKey"
61+
v-tooltip="'Clé d\'API'"
62+
:icon="mdiApi"
63+
/>
5464
<owner-avatar
55-
v-if="event.originator?.organization && (event.sender.type !== 'organization' || event.originator.organization.id !== event.sender.id)"
65+
v-else-if="event.originator?.organization && (event.sender.type !== 'organization' || event.originator.organization.id !== event.sender.id)"
5666
:owner="{type: 'organization', ...event.originator.organization}"
5767
/>
5868
<owner-avatar
@@ -66,7 +76,18 @@
6676
</v-expansion-panel-title>
6777
<v-expansion-panel-text>
6878
<span class="mr-4">{{ dayjs(event.date).format('LLL') }}</span>
79+
<br>
6980
<template v-if="event.originator">
81+
<span
82+
v-if="event.originator.internalProcess"
83+
class="mr-4"
84+
>{{ event.originator.internalProcess.title || 'processus interne' }} <template v-if="event.originator.internalProcess.id">({{ event.originator.internalProcess.id }})</template>
85+
</span>
86+
<span
87+
v-if="event.originator.apiKey"
88+
class="mr-4"
89+
>{{ event.originator.apiKey.title || 'clé d\'API' }} <template v-if="event.originator.apiKey.id">({{ event.originator.apiKey.id }})</template>
90+
</span>
7091
<span
7192
v-if="event.originator.user"
7293
class="mr-4"
@@ -76,11 +97,21 @@
7697
class="mr-4"
7798
>{{ event.originator.organization.name }} ({{ event.originator.organization.id }})</span>
7899
</template>
79-
<v-row v-if="event.body">
80-
<v-col cols="12">
81-
{{ event.body }}
82-
</v-col>
83-
</v-row>
100+
<br>
101+
<span v-if="event.body">{{ event.body }}</span>
102+
<br>
103+
<template v-if="event.resource">
104+
<a
105+
v-if="event.resource.type === 'dataset'"
106+
:href="`/data-fair/datasets/${event.resource.id}`"
107+
>{{ event.resource.title }}</a>
108+
<a
109+
v-if="event.resource.type === 'processing'"
110+
:href="`/data-fair/extra/processings?p=.%2F${event.resource.id}`"
111+
>{{ event.resource.title }}</a>
112+
<span v-else-if="event.resource.title">{{ event.resource.type }} / {{ event.resource.title }} ({{ event.resource.id }})</span>
113+
<span v-else>{{ event.resource.type }} / {{ event.resource.id }}</span>
114+
</template>
84115
</v-expansion-panel-text>
85116
</v-expansion-panel>
86117
</v-expansion-panels>
@@ -108,7 +139,7 @@
108139

109140
<script lang="ts" setup>
110141
import type { LocalizedEvent } from '#api/types'
111-
import { mdiDotsVertical } from '@mdi/js'
142+
import { mdiDotsVertical, mdiApi, mdiCogRefresh } from '@mdi/js'
112143
import OwnerAvatar from '@data-fair/lib-vuetify/owner-avatar.vue'
113144
114145
type EventsRes = { results: LocalizedEvent[], next?: string }

0 commit comments

Comments
 (0)