Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
ce-deploy-ui
Manage
Activity
Members
Labels
Plan
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ccce
dev
ce-deploy-ui
Commits
90055b74
Commit
90055b74
authored
1 year ago
by
cjenkscybercom
Browse files
Options
Downloads
Patches
Plain Diff
CE-2223
: move job detail alerts to top of page, reword messages
parent
bcad7798
No related branches found
No related tags found
2 merge requests
!407
CE-2141: 3.0.0
,
!405
Qa release tasks
Pipeline
#164758
passed
1 year ago
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/api/DataTypes.js
+5
-5
5 additions, 5 deletions
src/api/DataTypes.js
src/components/Job/JobDetails.js
+21
-16
21 additions, 16 deletions
src/components/Job/JobDetails.js
with
26 additions
and
21 deletions
src/api/DataTypes.js
+
5
−
5
View file @
90055b74
const
jobMessages
=
{
queued
:
"
job is queued on
job
server
"
,
queued
:
"
job is queued on
the
server
"
,
running
:
"
job is running
"
,
failed
:
"
job failed
"
,
failed
:
"
job
has
failed
"
,
successful
:
"
job was successful
"
};
const
typeMap
=
{
DEPLOY
:
"
Deployment
"
,
UNDEPLOY
:
"
Undeployment
"
,
START
:
"
Start
c
ommand
"
,
STOP
:
"
Stop
c
ommand
"
START
:
"
Start
C
ommand
"
,
STOP
:
"
Stop
C
ommand
"
};
export
class
AWXJobDetails
{
constructor
(
operationType
,
job
)
{
...
...
@@ -31,7 +31,7 @@ export class AWXJobDetails {
return
this
.
job
?.
status
.
toLowerCase
();
}
message
()
{
const
stem
=
this
.
job
?
`
The
${
this
.
typeLabel
()}
: `
:
""
;
const
stem
=
this
.
job
?
`
${
this
.
typeLabel
()}
: `
:
""
;
const
info
=
this
.
job
?
jobMessages
[
this
.
job
.
status
.
toLowerCase
()]
:
"
Fetching data
"
;
...
...
This diff is collapsed.
Click to expand it.
src/components/Job/JobDetails.js
+
21
−
16
View file @
90055b74
...
...
@@ -102,19 +102,32 @@ export function JobDetails({ operation, job }) {
:
"
-
"
};
const
finishedJobAlerts
=
finishedJob
?
(
<
Grid
item
xs
=
{
12
}
>
<
AlertBannerList
alerts
=
{[
alert
].
concat
(
jobAlert
)}
/
>
<
/Grid
>
)
:
null
;
const
unFinishedJobsWithAlerts
=
!
finishedJob
&&
alert
?
(
<
Grid
item
xs
=
{
12
}
>
<
AlertBannerList
alerts
=
{[
alert
]}
/
>
<
/Grid
>
)
:
null
;
return
(
<
Grid
container
spacing
=
{
1
}
>
{
finishedJob
&&
(
<
Grid
item
xs
=
{
12
}
>
<
AlertBannerList
alerts
=
{[
alert
].
concat
(
jobAlert
)}
/
>
<
/Grid
>
)}
{
finishedJobAlerts
}
{
unFinishedJobsWithAlerts
}
<
Grid
item
xs
=
{
12
}
...
...
@@ -143,14 +156,6 @@ export function JobDetails({ operation, job }) {
<
/CardContent
>
<
/Card
>
<
/Grid
>
{
!
finishedJob
&&
alert
&&
(
<
Grid
item
xs
=
{
12
}
>
<
AlertBannerList
alerts
=
{[
alert
]}
/
>
<
/Grid
>
)}
<
AccessControl
allowedRoles
=
{[
"
DeploymentToolAdmin
"
,
"
DeploymentToolIntegrator
"
]}
renderNoAccess
=
{()
=>
<><
/>
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment