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
70cea8f1
Commit
70cea8f1
authored
Dec 04, 2019
by
Dhiraj Bodicherla
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Using newer gitlab ui components
parent
a289b99c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
19 deletions
+21
-19
ee/app/assets/javascripts/environments/components/deploy_board_component.vue
...cripts/environments/components/deploy_board_component.vue
+13
-12
ee/app/assets/javascripts/vue_shared/components/deployment_instance.vue
...javascripts/vue_shared/components/deployment_instance.vue
+8
-7
No files found.
ee/app/assets/javascripts/environments/components/deploy_board_component.vue
View file @
70cea8f1
...
...
@@ -10,10 +10,9 @@
* [Mockup](https://gitlab.com/gitlab-org/gitlab-foss/uploads/2f655655c0eadf655d0ae7467b53002a/environments__deploy-graphic.png)
*/
import
_
from
'
underscore
'
;
import
{
GlLoadingIcon
,
GlLink
}
from
'
@gitlab/ui
'
;
import
{
GlLoadingIcon
,
GlLink
,
GlTooltipDirective
}
from
'
@gitlab/ui
'
;
import
deployBoardSvg
from
'
ee_empty_states/icons/_deploy_board.svg
'
;
import
{
__
,
n__
,
s__
,
sprintf
}
from
'
~/locale
'
;
import
tooltip
from
'
~/vue_shared/directives/tooltip
'
;
import
STATUS_MAP
from
'
../constants
'
;
export
default
{
...
...
@@ -23,7 +22,7 @@ export default {
GlLink
,
},
directives
:
{
tooltip
,
GlTooltip
:
GlTooltipDirective
,
},
props
:
{
deployBoardData
:
{
...
...
@@ -94,7 +93,12 @@ export default {
deployBoardSvg
()
{
return
deployBoardSvg
;
},
deployBoardActions
()
{
return
this
.
deployBoardData
.
rollback_url
||
this
.
deployBoardData
.
abort_url
;
},
statuses
()
{
// Canary is not a pod status but it needs to be in the legend.
// Hence adding it here.
return
{
...
STATUS_MAP
,
canary
:
{
...
...
@@ -121,7 +125,7 @@ export default {
<div
v-if=
"canRenderDeployBoard"
class=
"deploy-board-information p-3"
>
<div
class=
"deploy-board-information"
>
<section
class=
"deploy-board-status"
>
<span
v-tooltip
:title=
"instanceIsCompletedText"
>
<span
v-
gl-
tooltip
:title=
"instanceIsCompletedText"
>
<span
ref=
"percentage"
class=
"text-center text-plain gl-font-size-large"
>
{{
deployBoardData
.
completion
}}
%
</span
>
...
...
@@ -158,25 +162,22 @@ export default {
</div>
</section>
<section
v-if=
"deployBoardData.rollback_url || deployBoardData.abort_url"
class=
"deploy-board-actions"
>
<a
<section
v-if=
"deployBoardActions"
class=
"deploy-board-actions"
>
<gl-link
v-if=
"deployBoardData.rollback_url"
:href=
"deployBoardData.rollback_url"
class=
"btn"
data-method=
"post"
rel=
"nofollow"
>
{{ __('Rollback') }}
</
a
>
{{ __('Rollback') }}
</
gl-link
>
<
a
<
gl-link
v-if=
"deployBoardData.abort_url"
:href=
"deployBoardData.abort_url"
class=
"btn btn-red btn-inverted"
data-method=
"post"
rel=
"nofollow"
>
{{ __('Abort') }}
</
a
>
{{ __('Abort') }}
</
gl-link
>
</section>
</div>
...
...
ee/app/assets/javascripts/vue_shared/components/deployment_instance.vue
View file @
70cea8f1
...
...
@@ -12,11 +12,14 @@
* this information in the tooltip and the colors.
* Mockup is https://gitlab.com/gitlab-org/gitlab/issues/35570
*/
import
tooltip
from
'
~/vue_shared/directives/tooltip
'
;
import
{
GlLink
,
GlTooltipDirective
}
from
'
@gitlab/ui
'
;
export
default
{
components
:
{
GlLink
,
},
directives
:
{
tooltip
,
GlTooltip
:
GlTooltipDirective
,
},
props
:
{
...
...
@@ -77,13 +80,11 @@ export default {
};
</
script
>
<
template
>
<
a
v-tooltip
<
gl-link
v-
gl-
tooltip
:class=
"cssClass"
:title=
"tooltipText"
:href=
"computedLogPath"
class=
"deployment-instance d-flex justify-content-center align-items-center"
data-placement=
"top"
>
</a>
/>
</
template
>
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