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
17b2450f
Commit
17b2450f
authored
Nov 15, 2019
by
Natalia Tepluhina
Committed by
Phil Hughes
Nov 15, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "Hide "Delete selected" in designs when viewing an old version"
parent
997a786e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
1 deletion
+15
-1
changelogs/unreleased/34149-hide-delete-selected-in-designs-when-viewing-an-old-version.yml
...elete-selected-in-designs-when-viewing-an-old-version.yml
+5
-0
ee/app/assets/javascripts/design_management/pages/index.vue
ee/app/assets/javascripts/design_management/pages/index.vue
+1
-0
ee/spec/frontend/design_management/pages/index_spec.js
ee/spec/frontend/design_management/pages/index_spec.js
+9
-1
No files found.
changelogs/unreleased/34149-hide-delete-selected-in-designs-when-viewing-an-old-version.yml
0 → 100644
View file @
17b2450f
---
title
:
Resolve Hide Delete selected in designs when viewing an old version
merge_request
:
19889
author
:
type
:
fixed
ee/app/assets/javascripts/design_management/pages/index.vue
View file @
17b2450f
...
@@ -267,6 +267,7 @@ export default {
...
@@ -267,6 +267,7 @@ export default {
@done="onDesignDelete"
@done="onDesignDelete"
>
>
<delete-button
<delete-button
v-if=
"isLatestVersion"
:is-deleting=
"loading"
:is-deleting=
"loading"
button-class=
"btn-danger btn-inverted mr-2"
button-class=
"btn-danger btn-inverted mr-2"
:has-selected-designs=
"hasSelectedDesigns"
:has-selected-designs=
"hasSelectedDesigns"
...
...
ee/spec/frontend/design_management/pages/index_spec.js
View file @
17b2450f
...
@@ -233,7 +233,7 @@ describe('Design management index page', () => {
...
@@ -233,7 +233,7 @@ describe('Design management index page', () => {
createFlash
.
mockReset
();
createFlash
.
mockReset
();
});
});
it
(
'
does
n
not warn when the max files are uploaded
'
,
()
=>
{
it
(
'
does not warn when the max files are uploaded
'
,
()
=>
{
createComponent
();
createComponent
();
wrapper
.
vm
.
onUploadDesign
(
new
Array
(
MAXIMUM_FILE_UPLOAD_LIMIT
).
fill
(
mockDesigns
[
0
]));
wrapper
.
vm
.
onUploadDesign
(
new
Array
(
MAXIMUM_FILE_UPLOAD_LIMIT
).
fill
(
mockDesigns
[
0
]));
...
@@ -260,6 +260,10 @@ describe('Design management index page', () => {
...
@@ -260,6 +260,10 @@ describe('Design management index page', () => {
expect
(
findDesignCheckboxes
().
length
).
toBe
(
mockDesigns
.
length
);
expect
(
findDesignCheckboxes
().
length
).
toBe
(
mockDesigns
.
length
);
});
});
it
(
'
renders Delete selected button
'
,
()
=>
{
expect
(
findDeleteButton
().
exists
()).
toBe
(
true
);
});
it
(
'
renders a button with Select all text
'
,
()
=>
{
it
(
'
renders a button with Select all text
'
,
()
=>
{
expect
(
findSelectAllButton
().
exists
()).
toBe
(
true
);
expect
(
findSelectAllButton
().
exists
()).
toBe
(
true
);
expect
(
findSelectAllButton
().
text
()).
toBe
(
'
Select all
'
);
expect
(
findSelectAllButton
().
text
()).
toBe
(
'
Select all
'
);
...
@@ -325,6 +329,10 @@ describe('Design management index page', () => {
...
@@ -325,6 +329,10 @@ describe('Design management index page', () => {
expect
(
findDesignCheckboxes
().
length
).
toBe
(
0
);
expect
(
findDesignCheckboxes
().
length
).
toBe
(
0
);
});
});
it
(
'
does not render Delete selected button
'
,
()
=>
{
expect
(
findDeleteButton
().
exists
()).
toBe
(
false
);
});
it
(
'
does not render Select All button
'
,
()
=>
{
it
(
'
does not render Select All button
'
,
()
=>
{
expect
(
findSelectAllButton
().
exists
()).
toBe
(
false
);
expect
(
findSelectAllButton
().
exists
()).
toBe
(
false
);
});
});
...
...
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