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
b5fa12d7
Commit
b5fa12d7
authored
Mar 26, 2020
by
Tom Quirk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename design item isLoading prop
Rename isLoading => isUploading
parent
f3d1915e
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
8 deletions
+8
-8
ee/app/assets/javascripts/design_management/components/list/item.vue
...ts/javascripts/design_management/components/list/item.vue
+2
-2
ee/app/assets/javascripts/design_management/pages/index.vue
ee/app/assets/javascripts/design_management/pages/index.vue
+1
-1
ee/spec/frontend/design_management/components/list/__snapshots__/item_spec.js.snap
...anagement/components/list/__snapshots__/item_spec.js.snap
+1
-1
ee/spec/frontend/design_management/components/list/item_spec.js
...c/frontend/design_management/components/list/item_spec.js
+4
-4
No files found.
ee/app/assets/javascripts/design_management/components/list/item.vue
View file @
b5fa12d7
...
...
@@ -37,10 +37,10 @@ export default {
required
:
false
,
default
:
null
,
},
is
L
oading
:
{
is
Upl
oading
:
{
type
:
Boolean
,
required
:
false
,
default
:
fals
e
,
default
:
tru
e
,
},
},
data
()
{
...
...
ee/app/assets/javascripts/design_management/pages/index.vue
View file @
b5fa12d7
...
...
@@ -269,7 +269,7 @@ export default {
</li>
<li
v-for=
"design in designs"
:key=
"design.id"
class=
"col-md-6 col-lg-4 mb-3"
>
<design-dropzone
@
change=
"onExistingDesignDropzoneChange($event, design.filename)"
><design
v-bind=
"design"
:is-loading=
"isDesignToBeSaved(design.filename)"
><design
v-bind=
"design"
:is-
up
loading=
"isDesignToBeSaved(design.filename)"
/></design-dropzone>
<input
...
...
ee/spec/frontend/design_management/components/list/__snapshots__/item_spec.js.snap
View file @
b5fa12d7
...
...
@@ -263,7 +263,7 @@ exports[`Design management list item component with no notes renders item with n
</router-link-stub>
`;
exports[`Design management list item component with no notes renders loading spinner when is
L
oading is true 1`] = `
exports[`Design management list item component with no notes renders loading spinner when is
Upl
oading is true 1`] = `
<router-link-stub
class="card cursor-pointer text-plain js-design-list-item design-list-item"
to="[object Object]"
...
...
ee/spec/frontend/design_management/components/list/item_spec.js
View file @
b5fa12d7
...
...
@@ -19,7 +19,7 @@ describe('Design management list item component', () => {
function
createComponent
({
notesCount
=
0
,
event
=
DESIGN_VERSION_EVENT
.
NO_CHANGE
,
is
L
oading
=
false
,
is
Upl
oading
=
false
,
imageLoading
=
false
,
}
=
{})
{
wrapper
=
shallowMount
(
Item
,
{
...
...
@@ -29,7 +29,7 @@ describe('Design management list item component', () => {
id
:
1
,
filename
:
'
test
'
,
image
:
'
http://via.placeholder.com/300
'
,
is
L
oading
,
is
Upl
oading
,
event
,
notesCount
,
updatedAt
:
'
01-01-2019
'
,
...
...
@@ -86,8 +86,8 @@ describe('Design management list item component', () => {
expect
(
wrapper
.
element
).
toMatchSnapshot
();
});
it
(
'
renders loading spinner when is
L
oading is true
'
,
()
=>
{
createComponent
({
is
L
oading
:
true
});
it
(
'
renders loading spinner when is
Upl
oading is true
'
,
()
=>
{
createComponent
({
is
Upl
oading
:
true
});
expect
(
wrapper
.
element
).
toMatchSnapshot
();
});
...
...
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