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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
782c31a4
Commit
782c31a4
authored
May 29, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added empty state & YAML error state
parent
b4ef2aad
Changes
10
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
88 additions
and
18 deletions
+88
-18
app/assets/javascripts/ide/components/pipelines/list.vue
app/assets/javascripts/ide/components/pipelines/list.vue
+49
-3
app/assets/javascripts/ide/index.js
app/assets/javascripts/ide/index.js
+1
-0
app/assets/javascripts/ide/stores/modules/pipelines/actions.js
...ssets/javascripts/ide/stores/modules/pipelines/actions.js
+5
-3
app/assets/javascripts/ide/stores/modules/pipelines/mutations.js
...ets/javascripts/ide/stores/modules/pipelines/mutations.js
+3
-0
app/assets/javascripts/ide/stores/modules/pipelines/state.js
app/assets/javascripts/ide/stores/modules/pipelines/state.js
+1
-1
app/assets/javascripts/ide/stores/mutations.js
app/assets/javascripts/ide/stores/mutations.js
+2
-1
app/views/ide/index.html.haml
app/views/ide/index.html.haml
+2
-1
spec/javascripts/ide/mock_data.js
spec/javascripts/ide/mock_data.js
+2
-0
spec/javascripts/ide/stores/modules/pipelines/actions_spec.js
.../javascripts/ide/stores/modules/pipelines/actions_spec.js
+21
-8
spec/javascripts/ide/stores/modules/pipelines/mutations_spec.js
...avascripts/ide/stores/modules/pipelines/mutations_spec.js
+2
-1
No files found.
app/assets/javascripts/ide/components/pipelines/list.vue
View file @
782c31a4
<
script
>
<
script
>
import
{
mapActions
,
mapGetters
,
mapState
}
from
'
vuex
'
;
import
{
mapActions
,
mapGetters
,
mapState
}
from
'
vuex
'
;
import
{
sprintf
,
__
}
from
'
../../../locale
'
;
import
LoadingIcon
from
'
../../../vue_shared/components/loading_icon.vue
'
;
import
LoadingIcon
from
'
../../../vue_shared/components/loading_icon.vue
'
;
import
Icon
from
'
../../../vue_shared/components/icon.vue
'
;
import
Icon
from
'
../../../vue_shared/components/icon.vue
'
;
import
CiIcon
from
'
../../../vue_shared/components/ci_icon.vue
'
;
import
CiIcon
from
'
../../../vue_shared/components/ci_icon.vue
'
;
import
Tabs
from
'
../../../vue_shared/components/tabs/tabs
'
;
import
Tabs
from
'
../../../vue_shared/components/tabs/tabs
'
;
import
Tab
from
'
../../../vue_shared/components/tabs/tab.vue
'
;
import
Tab
from
'
../../../vue_shared/components/tabs/tab.vue
'
;
import
EmptyState
from
'
../../../pipelines/components/empty_state.vue
'
;
import
JobsList
from
'
../jobs/list.vue
'
;
import
JobsList
from
'
../jobs/list.vue
'
;
export
default
{
export
default
{
...
@@ -15,10 +17,23 @@ export default {
...
@@ -15,10 +17,23 @@ export default {
Tabs
,
Tabs
,
Tab
,
Tab
,
JobsList
,
JobsList
,
EmptyState
,
},
},
computed
:
{
computed
:
{
...
mapState
([
'
pipelinesEmptyStateSvgPath
'
]),
...
mapGetters
([
'
currentProject
'
]),
...
mapGetters
(
'
pipelines
'
,
[
'
jobsCount
'
,
'
failedJobsCount
'
,
'
failedStages
'
,
'
pipelineFailed
'
]),
...
mapGetters
(
'
pipelines
'
,
[
'
jobsCount
'
,
'
failedJobsCount
'
,
'
failedStages
'
,
'
pipelineFailed
'
]),
...
mapState
(
'
pipelines
'
,
[
'
isLoadingPipeline
'
,
'
latestPipeline
'
,
'
stages
'
,
'
isLoadingJobs
'
]),
...
mapState
(
'
pipelines
'
,
[
'
isLoadingPipeline
'
,
'
latestPipeline
'
,
'
stages
'
,
'
isLoadingJobs
'
]),
ciLintText
()
{
return
sprintf
(
__
(
'
You can also test your .gitlab-ci.yml in the %{linkStart}Lint%{linkEnd}
'
),
{
linkStart
:
`<a href="
${
this
.
currentProject
.
web_url
}
/-/ci/lint">`
,
linkEnd
:
'
</a>
'
,
},
false
,
);
},
},
},
created
()
{
created
()
{
this
.
fetchLatestPipeline
();
this
.
fetchLatestPipeline
();
...
@@ -32,12 +47,13 @@ export default {
...
@@ -32,12 +47,13 @@ export default {
<
template
>
<
template
>
<div
class=
"ide-pipeline"
>
<div
class=
"ide-pipeline"
>
<loading-icon
<loading-icon
v-if=
"isLoadingPipeline &&
!latestPipeline
"
v-if=
"isLoadingPipeline &&
latestPipeline === null
"
class=
"prepend-top-default"
class=
"prepend-top-default"
size=
"2"
size=
"2"
/>
/>
<template
v-else-if=
"latestPipeline"
>
<template
v-else-if=
"latestPipeline
!== null
"
>
<header
<header
v-if=
"latestPipeline"
class=
"ide-tree-header ide-pipeline-header"
class=
"ide-tree-header ide-pipeline-header"
>
>
<ci-icon
<ci-icon
...
@@ -61,7 +77,31 @@ export default {
...
@@ -61,7 +77,31 @@ export default {
</a>
</a>
</span>
</span>
</header>
</header>
<tabs
class=
"ide-pipeline-list"
>
<empty-state
v-if=
"latestPipeline === false"
help-page-path=
"a"
:empty-state-svg-path=
"pipelinesEmptyStateSvgPath"
:can-set-ci=
"true"
/>
<div
v-else-if=
"latestPipeline.yamlError"
class=
"bs-callout bs-callout-danger"
>
<p
class=
"append-bottom-0"
>
Found errors in your .gitlab-ci.yml:
</p>
<p
class=
"append-bottom-0"
>
{{
latestPipeline
.
yamlError
}}
</p>
<p
class=
"append-bottom-0"
v-html=
"ciLintText"
></p>
</div>
<tabs
v-else
class=
"ide-pipeline-list"
>
<tab
<tab
:active=
"!pipelineFailed"
:active=
"!pipelineFailed"
>
>
...
@@ -105,6 +145,7 @@ export default {
...
@@ -105,6 +145,7 @@ export default {
.ide-pipeline
{
.ide-pipeline
{
display
:
flex
;
display
:
flex
;
flex-direction
:
column
;
flex-direction
:
column
;
height
:
100%
;
}
}
.ide-pipeline-list
{
.ide-pipeline-list
{
...
@@ -121,4 +162,9 @@ export default {
...
@@ -121,4 +162,9 @@ export default {
.ide-pipeline-header
.ci-status-icon
{
.ide-pipeline-header
.ci-status-icon
{
display
:
flex
;
display
:
flex
;
}
}
.ide-pipeline
.empty-state
{
margin-top
:
auto
;
margin-bottom
:
auto
;
}
</
style
>
</
style
>
app/assets/javascripts/ide/index.js
View file @
782c31a4
...
@@ -21,6 +21,7 @@ export function initIde(el) {
...
@@ -21,6 +21,7 @@ export function initIde(el) {
emptyStateSvgPath
:
el
.
dataset
.
emptyStateSvgPath
,
emptyStateSvgPath
:
el
.
dataset
.
emptyStateSvgPath
,
noChangesStateSvgPath
:
el
.
dataset
.
noChangesStateSvgPath
,
noChangesStateSvgPath
:
el
.
dataset
.
noChangesStateSvgPath
,
committedStateSvgPath
:
el
.
dataset
.
committedStateSvgPath
,
committedStateSvgPath
:
el
.
dataset
.
committedStateSvgPath
,
pipelinesEmptyStateSvgPath
:
el
.
dataset
.
pipelinesEmptyStateSvgPath
,
});
});
},
},
render
(
createElement
)
{
render
(
createElement
)
{
...
...
app/assets/javascripts/ide/stores/modules/pipelines/actions.js
View file @
782c31a4
...
@@ -19,12 +19,14 @@ export const receiveLatestPipelineError = ({ commit, dispatch }) => {
...
@@ -19,12 +19,14 @@ export const receiveLatestPipelineError = ({ commit, dispatch }) => {
dispatch
(
'
stopPipelinePolling
'
);
dispatch
(
'
stopPipelinePolling
'
);
};
};
export
const
receiveLatestPipelineSuccess
=
({
rootGetters
,
commit
},
{
pipelines
})
=>
{
export
const
receiveLatestPipelineSuccess
=
({
rootGetters
,
commit
},
{
pipelines
})
=>
{
let
lastCommitPipeline
=
false
;
if
(
pipelines
&&
pipelines
.
length
)
{
if
(
pipelines
&&
pipelines
.
length
)
{
const
lastCommitHash
=
rootGetters
.
lastCommit
&&
rootGetters
.
lastCommit
.
id
;
const
lastCommitHash
=
rootGetters
.
lastCommit
&&
rootGetters
.
lastCommit
.
id
;
const
lastCommitPipeline
=
pipelines
.
find
(
pipeline
=>
pipeline
.
commit
.
id
===
lastCommitHash
);
lastCommitPipeline
=
pipelines
.
find
(
pipeline
=>
pipeline
.
commit
.
id
===
lastCommitHash
);
}
commit
(
types
.
RECEIVE_LASTEST_PIPELINE_SUCCESS
,
lastCommitPipeline
);
commit
(
types
.
RECEIVE_LASTEST_PIPELINE_SUCCESS
,
lastCommitPipeline
);
}
};
};
export
const
fetchLatestPipeline
=
({
dispatch
,
rootGetters
})
=>
{
export
const
fetchLatestPipeline
=
({
dispatch
,
rootGetters
})
=>
{
...
...
app/assets/javascripts/ide/stores/modules/pipelines/mutations.js
View file @
782c31a4
...
@@ -19,6 +19,7 @@ export default {
...
@@ -19,6 +19,7 @@ export default {
details
:
{
details
:
{
status
:
pipeline
.
details
.
status
,
status
:
pipeline
.
details
.
status
,
},
},
yamlError
:
pipeline
.
yaml_errors
,
};
};
state
.
stages
=
pipeline
.
details
.
stages
.
map
((
stage
,
i
)
=>
{
state
.
stages
=
pipeline
.
details
.
stages
.
map
((
stage
,
i
)
=>
{
const
foundStage
=
state
.
stages
.
find
(
s
=>
s
.
id
===
i
);
const
foundStage
=
state
.
stages
.
find
(
s
=>
s
.
id
===
i
);
...
@@ -32,6 +33,8 @@ export default {
...
@@ -32,6 +33,8 @@ export default {
jobs
:
foundStage
?
foundStage
.
jobs
:
[],
jobs
:
foundStage
?
foundStage
.
jobs
:
[],
};
};
});
});
}
else
{
state
.
latestPipeline
=
false
;
}
}
},
},
[
types
.
REQUEST_JOBS
](
state
,
id
)
{
[
types
.
REQUEST_JOBS
](
state
,
id
)
{
...
...
app/assets/javascripts/ide/stores/modules/pipelines/state.js
View file @
782c31a4
export
default
()
=>
({
export
default
()
=>
({
isLoadingPipeline
:
fals
e
,
isLoadingPipeline
:
tru
e
,
isLoadingJobs
:
false
,
isLoadingJobs
:
false
,
latestPipeline
:
null
,
latestPipeline
:
null
,
stages
:
[],
stages
:
[],
...
...
app/assets/javascripts/ide/stores/mutations.js
View file @
782c31a4
...
@@ -114,12 +114,13 @@ export default {
...
@@ -114,12 +114,13 @@ export default {
},
},
[
types
.
SET_EMPTY_STATE_SVGS
](
[
types
.
SET_EMPTY_STATE_SVGS
](
state
,
state
,
{
emptyStateSvgPath
,
noChangesStateSvgPath
,
committedStateSvgPath
},
{
emptyStateSvgPath
,
noChangesStateSvgPath
,
committedStateSvgPath
,
pipelinesEmptyStateSvgPath
},
)
{
)
{
Object
.
assign
(
state
,
{
Object
.
assign
(
state
,
{
emptyStateSvgPath
,
emptyStateSvgPath
,
noChangesStateSvgPath
,
noChangesStateSvgPath
,
committedStateSvgPath
,
committedStateSvgPath
,
pipelinesEmptyStateSvgPath
,
});
});
},
},
[
types
.
TOGGLE_FILE_FINDER
](
state
,
fileFindVisible
)
{
[
types
.
TOGGLE_FILE_FINDER
](
state
,
fileFindVisible
)
{
...
...
app/views/ide/index.html.haml
View file @
782c31a4
...
@@ -3,7 +3,8 @@
...
@@ -3,7 +3,8 @@
#ide
.ide-loading
{
data:
{
"empty-state-svg-path"
=>
image_path
(
'illustrations/multi_file_editor_empty.svg'
),
#ide
.ide-loading
{
data:
{
"empty-state-svg-path"
=>
image_path
(
'illustrations/multi_file_editor_empty.svg'
),
"no-changes-state-svg-path"
=>
image_path
(
'illustrations/multi-editor_no_changes_empty.svg'
),
"no-changes-state-svg-path"
=>
image_path
(
'illustrations/multi-editor_no_changes_empty.svg'
),
"committed-state-svg-path"
=>
image_path
(
'illustrations/multi-editor_all_changes_committed_empty.svg'
)
}
}
"committed-state-svg-path"
=>
image_path
(
'illustrations/multi-editor_all_changes_committed_empty.svg'
),
"pipelines-empty-state-svg-path"
:
image_path
(
'illustrations/pipelines_empty.svg'
)
}
}
.text-center
.text-center
=
icon
(
'spinner spin 2x'
)
=
icon
(
'spinner spin 2x'
)
%h2
.clgray
=
_
(
'Loading the GitLab IDE...'
)
%h2
.clgray
=
_
(
'Loading the GitLab IDE...'
)
spec/javascripts/ide/mock_data.js
View file @
782c31a4
...
@@ -20,12 +20,14 @@ export const pipelines = [
...
@@ -20,12 +20,14 @@ export const pipelines = [
ref
:
'
master
'
,
ref
:
'
master
'
,
sha
:
'
123
'
,
sha
:
'
123
'
,
status
:
'
failed
'
,
status
:
'
failed
'
,
commit
:
{
id
:
'
123
'
},
},
},
{
{
id
:
2
,
id
:
2
,
ref
:
'
master
'
,
ref
:
'
master
'
,
sha
:
'
213
'
,
sha
:
'
213
'
,
status
:
'
success
'
,
status
:
'
success
'
,
commit
:
{
id
:
'
213
'
},
},
},
];
];
...
...
spec/javascripts/ide/stores/modules/pipelines/actions_spec.js
View file @
782c31a4
...
@@ -65,15 +65,28 @@ describe('IDE pipelines actions', () => {
...
@@ -65,15 +65,28 @@ describe('IDE pipelines actions', () => {
});
});
describe
(
'
receiveLatestPipelineSuccess
'
,
()
=>
{
describe
(
'
receiveLatestPipelineSuccess
'
,
()
=>
{
it
(
'
commits pipeline
'
,
done
=>
{
const
rootGetters
=
{
testAction
(
lastCommit
:
{
id
:
'
123
'
},
receiveLatestPipelineSuccess
,
};
let
commit
;
beforeEach
(()
=>
{
commit
=
jasmine
.
createSpy
(
'
commit
'
);
});
it
(
'
commits pipeline
'
,
()
=>
{
receiveLatestPipelineSuccess
({
rootGetters
,
commit
},
{
pipelines
});
expect
(
commit
.
calls
.
argsFor
(
0
)).
toEqual
([
types
.
RECEIVE_LASTEST_PIPELINE_SUCCESS
,
pipelines
[
0
],
pipelines
[
0
],
mockedState
,
]);
[{
type
:
types
.
RECEIVE_LASTEST_PIPELINE_SUCCESS
,
payload
:
pipelines
[
0
]
}],
});
[],
done
,
it
(
'
commits false when there are no pipelines
'
,
()
=>
{
);
receiveLatestPipelineSuccess
({
rootGetters
,
commit
},
{
pipelines
:
[]
});
expect
(
commit
.
calls
.
argsFor
(
0
)).
toEqual
([
types
.
RECEIVE_LASTEST_PIPELINE_SUCCESS
,
false
]);
});
});
});
});
...
...
spec/javascripts/ide/stores/modules/pipelines/mutations_spec.js
View file @
782c31a4
...
@@ -47,13 +47,14 @@ describe('IDE pipelines mutations', () => {
...
@@ -47,13 +47,14 @@ describe('IDE pipelines mutations', () => {
path
:
'
test
'
,
path
:
'
test
'
,
commit
:
{
id
:
'
123
'
},
commit
:
{
id
:
'
123
'
},
details
:
{
status
:
jasmine
.
any
(
Object
)
},
details
:
{
status
:
jasmine
.
any
(
Object
)
},
yamlError
:
undefined
,
});
});
});
});
it
(
'
does not set latest pipeline if pipeline is null
'
,
()
=>
{
it
(
'
does not set latest pipeline if pipeline is null
'
,
()
=>
{
mutations
[
types
.
RECEIVE_LASTEST_PIPELINE_SUCCESS
](
mockedState
,
null
);
mutations
[
types
.
RECEIVE_LASTEST_PIPELINE_SUCCESS
](
mockedState
,
null
);
expect
(
mockedState
.
latestPipeline
).
toEqual
(
null
);
expect
(
mockedState
.
latestPipeline
).
toEqual
(
false
);
});
});
it
(
'
sets stages
'
,
()
=>
{
it
(
'
sets stages
'
,
()
=>
{
...
...
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