Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
2fae4773
Commit
2fae4773
authored
Dec 16, 2021
by
Anna Vovchenko
Committed by
Simon Knox
Dec 16, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improved agent activity page
- Added tooltip to the empty state - Removed 'strong' element
parent
71811fd3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
9 deletions
+26
-9
app/assets/javascripts/clusters/agents/components/activity_events_list.vue
...ripts/clusters/agents/components/activity_events_list.vue
+21
-7
app/assets/javascripts/clusters/agents/components/activity_history_item.vue
...ipts/clusters/agents/components/activity_history_item.vue
+2
-2
locale/gitlab.pot
locale/gitlab.pot
+3
-0
No files found.
app/assets/javascripts/clusters/agents/components/activity_events_list.vue
View file @
2fae4773
<
script
>
<
script
>
import
{
GlLoadingIcon
,
GlEmptyState
,
GlLink
,
GlIcon
,
GlAlert
}
from
'
@gitlab/ui
'
;
import
{
GlLoadingIcon
,
GlEmptyState
,
GlLink
,
GlIcon
,
GlAlert
,
GlTooltipDirective
,
}
from
'
@gitlab/ui
'
;
import
{
helpPagePath
}
from
'
~/helpers/help_page_helper
'
;
import
{
helpPagePath
}
from
'
~/helpers/help_page_helper
'
;
import
{
n__
,
s__
,
__
}
from
'
~/locale
'
;
import
{
n__
,
s__
,
__
}
from
'
~/locale
'
;
import
{
formatDate
,
getDayDifference
,
isToday
}
from
'
~/lib/utils/datetime_utility
'
;
import
{
formatDate
,
getDayDifference
,
isToday
}
from
'
~/lib/utils/datetime_utility
'
;
...
@@ -16,10 +23,14 @@ export default {
...
@@ -16,10 +23,14 @@ export default {
GlIcon
,
GlIcon
,
ActivityHistoryItem
,
ActivityHistoryItem
,
},
},
directives
:
{
GlTooltip
:
GlTooltipDirective
,
},
i18n
:
{
i18n
:
{
emptyText
:
s__
(
emptyText
:
s__
(
'
ClusterAgents|See Agent activity updates such as tokens created or revoked and clusters connected or not connected.
'
,
'
ClusterAgents|See Agent activity updates such as tokens created or revoked and clusters connected or not connected.
'
,
),
),
emptyTooltip
:
s__
(
'
ClusterAgents|What is GitLab Agent activity?
'
),
error
:
s__
(
error
:
s__
(
'
ClusterAgents|An error occurred while retrieving GitLab Agent activity. Reload the page to try again.
'
,
'
ClusterAgents|An error occurred while retrieving GitLab Agent activity. Reload the page to try again.
'
,
),
),
...
@@ -150,12 +161,15 @@ export default {
...
@@ -150,12 +161,15 @@ export default {
:svg-path=
"activityEmptyStateImage"
:svg-path=
"activityEmptyStateImage"
:svg-height=
"150"
:svg-height=
"150"
>
>
<template
#description
>
<template
#description
<div>
>
{{
$options
.
i18n
.
emptyText
}}
<span>
{{
$options
.
i18n
.
emptyText
}}
</span>
<gl-link
v-gl-tooltip
<gl-link
:href=
"$options.emptyHelpLink"
><gl-icon
name=
"question"
:size=
"14"
/></gl-link>
:href=
"$options.emptyHelpLink"
</div>
:title=
"$options.i18n.emptyTooltip"
:aria-label=
"$options.i18n.emptyTooltip"
><gl-icon
name=
"question"
:size=
"14"
/></gl-link>
</
template
>
</
template
>
</gl-empty-state>
</gl-empty-state>
</div>
</div>
...
...
app/assets/javascripts/clusters/agents/components/activity_history_item.vue
View file @
2fae4773
...
@@ -64,12 +64,12 @@ export default {
...
@@ -64,12 +64,12 @@ export default {
<p
class=
"gl-mt-2 gl-mb-0 gl-pb-2"
:class=
"bodyClass"
>
<p
class=
"gl-mt-2 gl-mb-0 gl-pb-2"
:class=
"bodyClass"
>
<gl-sprintf
:message=
"eventDetails.body"
>
<gl-sprintf
:message=
"eventDetails.body"
>
<template
#userName
>
<template
#userName
>
<s
trong>
{{
eventDetails
.
user
.
name
}}
</strong
>
<s
pan
class=
"gl-font-weight-bold"
>
{{
eventDetails
.
user
.
name
}}
</span
>
<gl-link
:href=
"eventDetails.user.webUrl"
>
@
{{
eventDetails
.
user
.
username
}}
</gl-link>
<gl-link
:href=
"eventDetails.user.webUrl"
>
@
{{
eventDetails
.
user
.
username
}}
</gl-link>
</
template
>
</
template
>
<
template
#strong=
"{ content }"
>
<
template
#strong=
"{ content }"
>
<s
trong>
{{
content
}}
</strong
>
<s
pan
class=
"gl-font-weight-bold"
>
{{
content
}}
</span
>
</
template
>
</
template
>
</gl-sprintf>
</gl-sprintf>
<time-ago-tooltip
:time=
"eventDetails.recordedAt"
/>
<time-ago-tooltip
:time=
"eventDetails.recordedAt"
/>
...
...
locale/gitlab.pot
View file @
2fae4773
...
@@ -7676,6 +7676,9 @@ msgstr ""
...
@@ -7676,6 +7676,9 @@ msgstr ""
msgid "ClusterAgents|View all %{number} clusters"
msgid "ClusterAgents|View all %{number} clusters"
msgstr ""
msgstr ""
msgid "ClusterAgents|What is GitLab Agent activity?"
msgstr ""
msgid "ClusterAgents|You cannot see this token again after you close this window."
msgid "ClusterAgents|You cannot see this token again after you close this window."
msgstr ""
msgstr ""
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment