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
337a9a5b
Commit
337a9a5b
authored
Jul 17, 2020
by
Zack Cuddy
Committed by
Andrew Fontaine
Jul 17, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Geo - Clean up old node css
Replaces custom sass file with gitlab-ui utility classes
parent
654e6447
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
18 deletions
+16
-18
ee/app/assets/javascripts/geo_nodes/components/geo_node_actions.vue
...ets/javascripts/geo_nodes/components/geo_node_actions.vue
+14
-6
ee/app/assets/stylesheets/pages/geo.scss
ee/app/assets/stylesheets/pages/geo.scss
+0
-10
ee/spec/features/admin/geo/admin_geo_nodes_spec.rb
ee/spec/features/admin/geo/admin_geo_nodes_spec.rb
+1
-1
ee/spec/features/geo_node_spec.rb
ee/spec/features/geo_node_spec.rb
+1
-1
No files found.
ee/app/assets/javascripts/geo_nodes/components/geo_node_actions.vue
View file @
337a9a5b
...
@@ -88,12 +88,12 @@ export default {
...
@@ -88,12 +88,12 @@ export default {
<
template
>
<
template
>
<div
<div
data-testid=
"nodeActions"
data-testid=
"nodeActions"
class=
"g
eo-node-actions gl-display-flex gl-align-items-center gl-justify-content-end gl-flex-direction-column gl-sm-flex-direction-row
"
class=
"g
l-display-flex gl-align-items-center gl-justify-content-end gl-flex-direction-column gl-sm-flex-direction-row gl-mx-5 gl-sm-mx-0
"
>
>
<gl-button
<gl-button
v-if=
"isSecondaryNode"
v-if=
"isSecondaryNode"
:href=
"node.geoProjectsUrl"
:href=
"node.geoProjectsUrl"
class=
"gl-mx-2 gl-mt-5 gl-sm-mt-0"
class=
"gl-mx-2 gl-mt-5 gl-sm-mt-0
gl-w-full gl-sm-w-auto
"
target=
"_blank"
target=
"_blank"
>
>
<span
class=
"gl-display-flex gl-align-items-center"
>
<span
class=
"gl-display-flex gl-align-items-center"
>
...
@@ -102,17 +102,25 @@ export default {
...
@@ -102,17 +102,25 @@ export default {
</span>
</span>
</gl-button>
</gl-button>
<template
v-if=
"nodeActionsAllowed"
>
<template
v-if=
"nodeActionsAllowed"
>
<gl-button
v-if=
"nodeMissingOauth"
class=
"gl-mx-2 gl-mt-5 gl-sm-mt-0"
@
click=
"onRepairNode"
>
<gl-button
v-if=
"nodeMissingOauth"
class=
"gl-mx-2 gl-mt-5 gl-sm-mt-0 gl-w-full gl-sm-w-auto"
@
click=
"onRepairNode"
>
{{
s__
(
'
Repair authentication
'
)
}}
{{
s__
(
'
Repair authentication
'
)
}}
</gl-button>
</gl-button>
<gl-button
v-if=
"nodeEditAllowed"
:href=
"node.editPath"
class=
"gl-mx-2 gl-mt-5 gl-sm-mt-0"
>
<gl-button
v-if=
"nodeEditAllowed"
:href=
"node.editPath"
class=
"gl-mx-2 gl-mt-5 gl-sm-mt-0 gl-w-full gl-sm-w-auto"
>
{{
__
(
'
Edit
'
)
}}
{{
__
(
'
Edit
'
)
}}
</gl-button>
</gl-button>
<gl-button
<gl-button
v-if=
"isSecondaryNode"
v-if=
"isSecondaryNode"
data-testid=
"removeButton"
data-testid=
"removeButton"
variant=
"danger"
variant=
"danger"
class=
"gl-mx-2 gl-mt-5 gl-sm-mt-0"
class=
"gl-mx-2 gl-mt-5 gl-sm-mt-0
gl-w-full gl-sm-w-auto
"
:disabled=
"!nodeRemovalAllowed"
:disabled=
"!nodeRemovalAllowed"
@
click=
"onRemoveSecondaryNode"
@
click=
"onRemoveSecondaryNode"
>
>
...
@@ -121,7 +129,7 @@ export default {
...
@@ -121,7 +129,7 @@ export default {
<div
<div
v-gl-tooltip
.
hover
v-gl-tooltip
.
hover
name=
"disabledRemovalTooltip"
name=
"disabledRemovalTooltip"
class=
"gl-mx-2 gl-mt-5 gl-sm-mt-0"
class=
"gl-mx-2 gl-mt-5 gl-sm-mt-0
gl-w-full gl-sm-w-auto
"
:title=
"disabledRemovalTooltip"
:title=
"disabledRemovalTooltip"
>
>
<gl-button
<gl-button
...
...
ee/app/assets/stylesheets/pages/geo.scss
View file @
337a9a5b
@media
(
max-width
:
$breakpoint-sm
)
{
.geo-node-actions
{
margin
:
0
1rem
;
>
*
{
width
:
100%
;
}
}
}
.project-card-errors
{
.project-card-errors
{
.btn-card-header
{
.btn-card-header
{
&
.collapsed
{
&
.collapsed
{
...
...
ee/spec/features/admin/geo/admin_geo_nodes_spec.rb
View file @
337a9a5b
...
@@ -157,7 +157,7 @@ RSpec.describe 'admin Geo Nodes', :js, :geo do
...
@@ -157,7 +157,7 @@ RSpec.describe 'admin Geo Nodes', :js, :geo do
end
end
it
'removes an existing Geo Node'
do
it
'removes an existing Geo Node'
do
page
.
within
(
find
(
'
.geo-node-actions
'
,
match: :first
))
do
page
.
within
(
find
(
'
[data-testid="nodeActions"]
'
,
match: :first
))
do
page
.
click_button
(
'Remove'
)
page
.
click_button
(
'Remove'
)
end
end
page
.
within
(
'.modal'
)
do
page
.
within
(
'.modal'
)
do
...
...
ee/spec/features/geo_node_spec.rb
View file @
337a9a5b
...
@@ -51,7 +51,7 @@ RSpec.describe 'GEO Nodes', :geo do
...
@@ -51,7 +51,7 @@ RSpec.describe 'GEO Nodes', :geo do
wait_for_requests
wait_for_requests
geo_node_actions
=
all
(
'
div.geo-node-actions
'
)
geo_node_actions
=
all
(
'
[data-testid="nodeActions"]
'
)
expected_url
=
File
.
join
(
geo_secondary
.
url
,
'/admin/geo/projects'
)
expected_url
=
File
.
join
(
geo_secondary
.
url
,
'/admin/geo/projects'
)
expect
(
geo_node_actions
.
last
).
to
have_link
(
'Open projects'
,
href:
expected_url
)
expect
(
geo_node_actions
.
last
).
to
have_link
(
'Open projects'
,
href:
expected_url
)
...
...
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