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
e7994dda
Commit
e7994dda
authored
Nov 12, 2021
by
Jannik Lehmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace GlTable with GlTablelite for pipelines table
parent
87358de5
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
9 deletions
+9
-9
app/assets/javascripts/pipelines/components/pipelines_list/pipelines_table.vue
...s/pipelines/components/pipelines_list/pipelines_table.vue
+4
-4
spec/frontend/commit/pipelines/pipelines_table_spec.js
spec/frontend/commit/pipelines/pipelines_table_spec.js
+2
-2
spec/frontend/pipelines/pipelines_table_spec.js
spec/frontend/pipelines/pipelines_table_spec.js
+3
-3
No files found.
app/assets/javascripts/pipelines/components/pipelines_list/pipelines_table.vue
View file @
e7994dda
<
script
>
import
{
GlTable
,
GlTooltipDirective
}
from
'
@gitlab/ui
'
;
import
{
GlTable
Lite
,
GlTooltipDirective
}
from
'
@gitlab/ui
'
;
import
{
s__
}
from
'
~/locale
'
;
import
eventHub
from
'
../../event_hub
'
;
import
PipelineMiniGraph
from
'
./pipeline_mini_graph.vue
'
;
...
...
@@ -18,7 +18,7 @@ const DEFAULT_TH_CLASSES =
export
default
{
components
:
{
GlTable
,
GlTable
Lite
,
LinkedPipelinesMiniList
:
()
=>
import
(
'
ee_component/vue_shared/components/linked_pipelines_mini_list.vue
'
),
PipelinesCommit
,
...
...
@@ -156,7 +156,7 @@ export default {
</
script
>
<
template
>
<div
class=
"ci-table"
>
<gl-table
<gl-table
-lite
:fields=
"tableFields"
:items=
"pipelines"
tbody-tr-class=
"commit"
...
...
@@ -225,7 +225,7 @@ export default {
<
template
#cell(actions)=
"{ item }"
>
<pipeline-operations
:pipeline=
"item"
:canceling-pipeline=
"cancelingPipeline"
/>
</
template
>
</gl-table>
</gl-table
-lite
>
<pipeline-stop-modal
:pipeline=
"pipeline"
@
submit=
"onSubmit"
/>
</div>
...
...
spec/frontend/commit/pipelines/pipelines_table_spec.js
View file @
e7994dda
import
{
GlEmptyState
,
GlLoadingIcon
,
GlModal
,
GlTable
}
from
'
@gitlab/ui
'
;
import
{
GlEmptyState
,
GlLoadingIcon
,
GlModal
,
GlTable
Lite
}
from
'
@gitlab/ui
'
;
import
{
mount
}
from
'
@vue/test-utils
'
;
import
MockAdapter
from
'
axios-mock-adapter
'
;
import
fixture
from
'
test_fixtures/pipelines/pipelines.json
'
;
...
...
@@ -22,7 +22,7 @@ describe('Pipelines table in Commits and Merge requests', () => {
const
findRunPipelineBtnMobile
=
()
=>
wrapper
.
findByTestId
(
'
run_pipeline_button_mobile
'
);
const
findLoadingState
=
()
=>
wrapper
.
findComponent
(
GlLoadingIcon
);
const
findEmptyState
=
()
=>
wrapper
.
findComponent
(
GlEmptyState
);
const
findTable
=
()
=>
wrapper
.
findComponent
(
GlTable
);
const
findTable
=
()
=>
wrapper
.
findComponent
(
GlTable
Lite
);
const
findTableRows
=
()
=>
wrapper
.
findAllByTestId
(
'
pipeline-table-row
'
);
const
findModal
=
()
=>
wrapper
.
findComponent
(
GlModal
);
...
...
spec/frontend/pipelines/pipelines_table_spec.js
View file @
e7994dda
import
'
~/commons
'
;
import
{
GlTable
}
from
'
@gitlab/ui
'
;
import
{
GlTable
Lite
}
from
'
@gitlab/ui
'
;
import
{
mount
}
from
'
@vue/test-utils
'
;
import
fixture
from
'
test_fixtures/pipelines/pipelines.json
'
;
import
{
extendedWrapper
}
from
'
helpers/vue_test_utils_helper
'
;
...
...
@@ -44,7 +44,7 @@ describe('Pipelines Table', () => {
);
};
const
findGlTable
=
()
=>
wrapper
.
findComponent
(
GlTabl
e
);
const
findGlTable
Lite
=
()
=>
wrapper
.
findComponent
(
GlTableLit
e
);
const
findStatusBadge
=
()
=>
wrapper
.
findComponent
(
CiBadge
);
const
findPipelineInfo
=
()
=>
wrapper
.
findComponent
(
PipelineUrl
);
const
findTriggerer
=
()
=>
wrapper
.
findComponent
(
PipelineTriggerer
);
...
...
@@ -77,7 +77,7 @@ describe('Pipelines Table', () => {
});
it
(
'
displays table
'
,
()
=>
{
expect
(
findGlTable
().
exists
()).
toBe
(
true
);
expect
(
findGlTable
Lite
().
exists
()).
toBe
(
true
);
});
it
(
'
should render table head with correct columns
'
,
()
=>
{
...
...
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