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
405d8b45
Commit
405d8b45
authored
Jan 18, 2018
by
Jose Ivan Vargas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added pipeline status to the files view
parent
03f386c2
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
202 additions
and
17 deletions
+202
-17
app/assets/javascripts/pages/projects/tree/components/commit_pipeline_status_component.vue
...ects/tree/components/commit_pipeline_status_component.vue
+95
-0
app/assets/javascripts/pages/projects/tree/services/commit_pipeline_service.js
...s/pages/projects/tree/services/commit_pipeline_service.js
+11
-0
app/assets/javascripts/pages/projects/tree/show/index.js
app/assets/javascripts/pages/projects/tree/show/index.js
+18
-0
app/assets/stylesheets/pages/commits.scss
app/assets/stylesheets/pages/commits.scss
+9
-0
app/helpers/ci_status_helper.rb
app/helpers/ci_status_helper.rb
+0
-11
app/views/projects/commits/_commit.html.haml
app/views/projects/commits/_commit.html.haml
+1
-6
spec/javascripts/commit/commit_pipeline_status_component_spec.js
...vascripts/commit/commit_pipeline_status_component_spec.js
+68
-0
No files found.
app/assets/javascripts/pages/projects/tree/components/commit_pipeline_status_component.vue
0 → 100644
View file @
405d8b45
<
script
>
import
Visibility
from
'
visibilityjs
'
;
import
ciIcon
from
'
~/vue_shared/components/ci_icon.vue
'
;
import
Poll
from
'
~/lib/utils/poll
'
;
import
Flash
from
'
~/flash
'
;
import
tooltip
from
'
~/vue_shared/directives/tooltip
'
;
import
CommitPipelineService
from
'
../services/commit_pipeline_service
'
;
export
default
{
directives
:
{
tooltip
,
},
components
:
{
ciIcon
,
},
props
:
{
endpoint
:
{
type
:
String
,
required
:
true
,
},
},
data
()
{
return
{
ciStatus
:
{},
isLoading
:
true
,
service
:
{},
};
},
mounted
()
{
this
.
service
=
new
CommitPipelineService
(
this
.
endpoint
);
this
.
initPolling
();
},
methods
:
{
successCallback
(
res
)
{
if
(
res
.
data
.
pipelines
.
length
>
0
)
{
this
.
ciStatus
=
res
.
data
.
pipelines
[
0
].
details
.
status
;
this
.
isLoading
=
false
;
}
else
{
this
.
isLoading
=
true
;
}
},
errorCallback
(
err
)
{
Flash
(
err
);
},
initPolling
()
{
this
.
poll
=
new
Poll
({
resource
:
this
.
service
,
method
:
'
fetchData
'
,
successCallback
:
response
=>
this
.
successCallback
(
response
),
errorCallback
:
this
.
errorCallback
,
});
if
(
!
Visibility
.
hidden
())
{
this
.
isLoading
=
true
;
this
.
poll
.
makeRequest
();
}
else
{
this
.
fetchPipelineCommitData
();
}
Visibility
.
change
(()
=>
{
if
(
!
Visibility
.
hidden
())
{
this
.
poll
.
restart
();
}
else
{
this
.
poll
.
stop
();
}
});
},
fetchPipelineCommitData
()
{
this
.
service
.
fetchData
()
.
then
(
this
.
successCallback
)
.
catch
(
this
.
errorCallback
);
},
},
destroy
()
{
this
.
poll
.
stop
();
},
};
</
script
>
<
template
>
<div
v-if=
"isLoading"
>
</div>
<a
v-else
:href=
"ciStatus.details_path"
>
<ci-icon
v-tooltip
:title=
"ciStatus.text"
:aria-label=
"ciStatus.text"
data-container=
"body"
:status=
"ciStatus"
/>
</a>
</
template
>
app/assets/javascripts/pages/projects/tree/services/commit_pipeline_service.js
0 → 100644
View file @
405d8b45
import
axios
from
'
~/lib/utils/axios_utils
'
;
export
default
class
CommitPipelineService
{
constructor
(
endpoint
)
{
this
.
endpoint
=
endpoint
;
}
fetchData
()
{
return
axios
.
get
(
this
.
endpoint
);
}
}
app/assets/javascripts/pages/projects/tree/show/index.js
View file @
405d8b45
import
Vue
from
'
vue
'
;
import
TreeView
from
'
../../../../tree
'
;
import
TreeView
from
'
../../../../tree
'
;
import
ShortcutsNavigation
from
'
../../../../shortcuts_navigation
'
;
import
ShortcutsNavigation
from
'
../../../../shortcuts_navigation
'
;
import
BlobViewer
from
'
../../../../blob/viewer
'
;
import
BlobViewer
from
'
../../../../blob/viewer
'
;
import
NewCommitForm
from
'
../../../../new_commit_form
'
;
import
NewCommitForm
from
'
../../../../new_commit_form
'
;
import
{
ajaxGet
}
from
'
../../../../lib/utils/common_utils
'
;
import
{
ajaxGet
}
from
'
../../../../lib/utils/common_utils
'
;
import
commitPipelineStatus
from
'
../components/commit_pipeline_status_component.vue
'
;
export
default
()
=>
{
export
default
()
=>
{
new
ShortcutsNavigation
();
// eslint-disable-line no-new
new
ShortcutsNavigation
();
// eslint-disable-line no-new
...
@@ -11,5 +13,21 @@ export default () => {
...
@@ -11,5 +13,21 @@ export default () => {
new
NewCommitForm
(
$
(
'
.js-create-dir-form
'
));
// eslint-disable-line no-new
new
NewCommitForm
(
$
(
'
.js-create-dir-form
'
));
// eslint-disable-line no-new
$
(
'
#tree-slider
'
).
waitForImages
(()
=>
$
(
'
#tree-slider
'
).
waitForImages
(()
=>
ajaxGet
(
document
.
querySelector
(
'
.js-tree-content
'
).
dataset
.
logsPath
));
ajaxGet
(
document
.
querySelector
(
'
.js-tree-content
'
).
dataset
.
logsPath
));
const
commitPipelineStatusEl
=
document
.
getElementById
(
'
commit-pipeline-status
'
);
// eslint-disable-next-line no-new
new
Vue
({
el
:
'
#commit-pipeline-status
'
,
components
:
{
commitPipelineStatus
,
},
render
(
createElement
)
{
return
createElement
(
'
commit-pipeline-status
'
,
{
props
:
{
endpoint
:
commitPipelineStatusEl
.
dataset
.
endpoint
,
},
});
},
});
};
};
app/assets/stylesheets/pages/commits.scss
View file @
405d8b45
...
@@ -195,6 +195,10 @@
...
@@ -195,6 +195,10 @@
.commit-actions
{
.commit-actions
{
@media
(
min-width
:
$screen-sm-min
)
{
@media
(
min-width
:
$screen-sm-min
)
{
font-size
:
0
;
font-size
:
0
;
span
{
font-size
:
6px
;
}
}
}
.ci-status-link
{
.ci-status-link
{
...
@@ -219,6 +223,11 @@
...
@@ -219,6 +223,11 @@
font-size
:
14px
;
font-size
:
14px
;
font-weight
:
$gl-font-weight-bold
;
font-weight
:
$gl-font-weight-bold
;
}
}
.ci-status-icon
{
position
:
relative
;
top
:
3px
;
}
}
}
.commit
,
.commit
,
...
...
app/helpers/ci_status_helper.rb
View file @
405d8b45
...
@@ -103,17 +103,6 @@ module CiStatusHelper
...
@@ -103,17 +103,6 @@ module CiStatusHelper
tooltip_placement:
tooltip_placement
)
tooltip_placement:
tooltip_placement
)
end
end
def
render_commit_status
(
commit
,
ref:
nil
,
tooltip_placement:
'auto left'
)
project
=
commit
.
project
path
=
pipelines_project_commit_path
(
project
,
commit
)
render_status_with_link
(
'commit'
,
commit
.
status
(
ref
),
path
,
tooltip_placement:
tooltip_placement
)
end
def
render_pipeline_status
(
pipeline
,
tooltip_placement:
'auto left'
)
def
render_pipeline_status
(
pipeline
,
tooltip_placement:
'auto left'
)
project
=
pipeline
.
project
project
=
pipeline
.
project
path
=
project_pipeline_path
(
project
,
pipeline
)
path
=
project_pipeline_path
(
project
,
pipeline
)
...
...
app/views/projects/commits/_commit.html.haml
View file @
405d8b45
...
@@ -26,9 +26,6 @@
...
@@ -26,9 +26,6 @@
%span
.commit-row-message.visible-xs-inline
%span
.commit-row-message.visible-xs-inline
·
·
=
commit
.
short_id
=
commit
.
short_id
-
if
commit
.
status
(
ref
)
.visible-xs-inline
=
render_commit_status
(
commit
,
ref:
ref
)
-
if
commit
.
description?
-
if
commit
.
description?
%button
.text-expander.hidden-xs.js-toggle-button
{
type:
"button"
}
...
%button
.text-expander.hidden-xs.js-toggle-button
{
type:
"button"
}
...
...
@@ -48,9 +45,7 @@
...
@@ -48,9 +45,7 @@
-
else
-
else
=
render
partial:
'projects/commit/ajax_signature'
,
locals:
{
commit:
commit
}
=
render
partial:
'projects/commit/ajax_signature'
,
locals:
{
commit:
commit
}
-
if
commit
.
status
(
ref
)
#commit-pipeline-status
{
data:
{
endpoint:
pipelines_project_commit_path
(
project
,
commit
.
id
)
}
}
=
render_commit_status
(
commit
,
ref:
ref
)
=
link_to
commit
.
short_id
,
link
,
class:
"commit-sha btn btn-transparent btn-link"
=
link_to
commit
.
short_id
,
link
,
class:
"commit-sha btn btn-transparent btn-link"
=
clipboard_button
(
text:
commit
.
id
,
title:
_
(
"Copy commit SHA to clipboard"
))
=
clipboard_button
(
text:
commit
.
id
,
title:
_
(
"Copy commit SHA to clipboard"
))
=
link_to_browse_code
(
project
,
commit
)
=
link_to_browse_code
(
project
,
commit
)
...
...
spec/javascripts/commit/commit_pipeline_status_component_spec.js
0 → 100644
View file @
405d8b45
import
Vue
from
'
vue
'
;
import
MockAdapter
from
'
axios-mock-adapter
'
;
import
axios
from
'
~/lib/utils/axios_utils
'
;
import
commitPipelineStatus
from
'
~/pages/projects/tree/components/commit_pipeline_status_component.vue
'
;
import
mountComponent
from
'
../helpers/vue_mount_component_helper
'
;
describe
(
'
Commit pipeline status component
'
,
()
=>
{
let
vm
;
let
component
;
let
mock
;
const
mockCiStatus
=
{
details_path
:
'
/root/hello-world/pipelines/1
'
,
favicon
:
'
canceled.ico
'
,
group
:
'
canceled
'
,
has_details
:
true
,
icon
:
'
status_canceled
'
,
label
:
'
canceled
'
,
text
:
'
canceled
'
,
};
beforeEach
(()
=>
{
mock
=
new
MockAdapter
(
axios
);
mock
.
onGet
(
'
/dummy/endpoint
'
).
reply
(()
=>
{
const
res
=
Promise
.
resolve
([
200
,
{
pipelines
:
[
{
details
:
{
status
:
mockCiStatus
,
},
},
],
}]);
return
res
;
});
component
=
Vue
.
extend
(
commitPipelineStatus
);
});
afterEach
(()
=>
{
mock
.
reset
();
});
describe
(
'
While polling pipeline data
'
,
()
=>
{
beforeEach
(()
=>
{
vm
=
mountComponent
(
component
,
{
endpoint
:
'
/dummy/endpoint
'
,
});
});
afterEach
(()
=>
{
vm
.
poll
.
stop
();
vm
.
$destroy
();
});
it
(
'
contains a ciStatus when the polling is succesful
'
,
(
done
)
=>
{
setTimeout
(()
=>
{
expect
(
vm
.
ciStatus
).
toEqual
(
mockCiStatus
);
done
();
},
1000
);
});
it
(
'
contains a ci-status icon when polling is succesful
'
,
(
done
)
=>
{
setTimeout
(()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.ci-status-icon
'
)).
not
.
toBe
(
null
);
done
();
});
});
});
});
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