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
11898e1a
Commit
11898e1a
authored
Dec 25, 2017
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Simplify to .geo-node-mismatch
parent
3ebe67d5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
11 deletions
+6
-11
app/assets/javascripts/geo_nodes.js
app/assets/javascripts/geo_nodes.js
+5
-6
app/assets/stylesheets/pages/geo_nodes.scss
app/assets/stylesheets/pages/geo_nodes.scss
+1
-5
No files found.
app/assets/javascripts/geo_nodes.js
View file @
11898e1a
...
...
@@ -14,9 +14,8 @@ const unhealthyIcon = 'fa-times';
const
unknownIcon
=
'
fa-times
'
;
const
notAvailable
=
'
Not Available
'
;
const
versionMismatch
=
'
Does not match the primary node version
'
;
const
versionMismatchClass
=
'
geo-node-version
-mismatch
'
;
const
nodeMismatchClass
=
'
geo-node
-mismatch
'
;
const
storageMismatch
=
'
Does not match the primary storage configuration
'
;
const
storageMismatchClass
=
'
geo-node-storage-mismatch
'
;
class
GeoNodeStatus
{
constructor
(
el
)
{
...
...
@@ -207,20 +206,20 @@ class GeoNodeStatus {
if
(
!
this
.
primaryVersion
||
(
this
.
primaryVersion
===
status
.
version
&&
this
.
primaryRevision
===
status
.
revision
))
{
this
.
$secondaryVersion
.
removeClass
(
`
${
version
MismatchClass
}
`
);
this
.
$secondaryVersion
.
removeClass
(
`
${
node
MismatchClass
}
`
);
this
.
$secondaryVersion
.
text
(
`
${
status
.
version
}
(
${
status
.
revision
}
)`
);
}
else
{
this
.
$secondaryVersion
.
addClass
(
`
${
version
MismatchClass
}
`
);
this
.
$secondaryVersion
.
addClass
(
`
${
node
MismatchClass
}
`
);
this
.
$secondaryVersion
.
text
(
`
${
status
.
version
}
(
${
status
.
revision
}
) -
${
versionMismatch
}
`
);
}
if
(
status
.
storage_shards_match
==
null
)
{
this
.
$secondaryStorage
.
text
(
'
UNKNOWN
'
);
}
else
if
(
status
.
storage_shards_match
)
{
this
.
$secondaryStorage
.
removeClass
(
`
${
storag
eMismatchClass
}
`
);
this
.
$secondaryStorage
.
removeClass
(
`
${
nod
eMismatchClass
}
`
);
this
.
$secondaryStorage
.
text
(
'
OK
'
);
}
else
{
this
.
$secondaryStorage
.
addClass
(
`
${
storag
eMismatchClass
}
`
);
this
.
$secondaryStorage
.
addClass
(
`
${
nod
eMismatchClass
}
`
);
this
.
$secondaryStorage
.
text
(
storageMismatch
);
}
...
...
app/assets/stylesheets/pages/geo_nodes.scss
View file @
11898e1a
...
...
@@ -127,11 +127,7 @@
}
}
.geo-node-version-mismatch
{
color
:
$gl-danger
;
}
.geo-node-storage-mismatch
{
.geo-node-mismatch
{
color
:
$gl-danger
;
}
...
...
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