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
e8028727
Commit
e8028727
authored
Feb 06, 2021
by
Kev
Committed by
Paul Slaughter
Feb 06, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix "Stay on Page" alert showing in empty snippet
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50400
parent
baa1e3d0
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
48 additions
and
4 deletions
+48
-4
app/assets/javascripts/snippets/components/edit.vue
app/assets/javascripts/snippets/components/edit.vue
+10
-1
changelogs/unreleased/262102-fix-stay-on-page-alert-showing-in-empty-snippet.yml
...62102-fix-stay-on-page-alert-showing-in-empty-snippet.yml
+5
-0
spec/frontend/snippets/components/edit_spec.js
spec/frontend/snippets/components/edit_spec.js
+24
-3
spec/frontend/snippets/test_utils.js
spec/frontend/snippets/test_utils.js
+9
-0
No files found.
app/assets/javascripts/snippets/components/edit.vue
View file @
e8028727
...
@@ -72,6 +72,15 @@ export default {
...
@@ -72,6 +72,15 @@ export default {
hasBlobChanges
()
{
hasBlobChanges
()
{
return
this
.
actions
.
length
>
0
;
return
this
.
actions
.
length
>
0
;
},
},
hasNoChanges
()
{
return
(
this
.
actions
.
every
(
(
action
)
=>
!
action
.
content
&&
!
action
.
filePath
&&
!
action
.
previousPath
,
)
&&
!
this
.
snippet
.
title
&&
!
this
.
snippet
.
description
);
},
hasValidBlobs
()
{
hasValidBlobs
()
{
return
this
.
actions
.
every
((
x
)
=>
x
.
content
);
return
this
.
actions
.
every
((
x
)
=>
x
.
content
);
},
},
...
@@ -116,7 +125,7 @@ export default {
...
@@ -116,7 +125,7 @@ export default {
onBeforeUnload
(
e
=
{})
{
onBeforeUnload
(
e
=
{})
{
const
returnValue
=
__
(
'
Are you sure you want to lose unsaved changes?
'
);
const
returnValue
=
__
(
'
Are you sure you want to lose unsaved changes?
'
);
if
(
!
this
.
hasBlobChanges
||
this
.
isUpdating
)
return
undefined
;
if
(
!
this
.
hasBlobChanges
||
this
.
hasNoChanges
||
this
.
isUpdating
)
return
undefined
;
Object
.
assign
(
e
,
{
returnValue
});
Object
.
assign
(
e
,
{
returnValue
});
return
returnValue
;
return
returnValue
;
...
...
changelogs/unreleased/262102-fix-stay-on-page-alert-showing-in-empty-snippet.yml
0 → 100644
View file @
e8028727
---
title
:
Fix "Stay on Page" alert showing in empty snippet
merge_request
:
50400
author
:
Kev @KevSlashNull
type
:
fixed
spec/frontend/snippets/components/edit_spec.js
View file @
e8028727
...
@@ -167,6 +167,8 @@ describe('Snippet Edit app', () => {
...
@@ -167,6 +167,8 @@ describe('Snippet Edit app', () => {
visibilityLevel
,
visibilityLevel
,
blobActions
:
[],
blobActions
:
[],
});
});
const
setTitle
=
(
val
)
=>
wrapper
.
find
(
TitleField
).
vm
.
$emit
(
'
input
'
,
val
);
const
setDescription
=
(
val
)
=>
wrapper
.
find
(
SnippetDescriptionEdit
).
vm
.
$emit
(
'
input
'
,
val
);
// Ideally we wouldn't call this method directly, but we don't have a way to trigger
// Ideally we wouldn't call this method directly, but we don't have a way to trigger
// apollo responses yet.
// apollo responses yet.
...
@@ -341,11 +343,30 @@ describe('Snippet Edit app', () => {
...
@@ -341,11 +343,30 @@ describe('Snippet Edit app', () => {
});
});
describe
(
'
on before unload
'
,
()
=>
{
describe
(
'
on before unload
'
,
()
=>
{
const
caseNoActions
=
()
=>
triggerBlobActions
([]);
const
caseEmptyAction
=
()
=>
triggerBlobActions
([
testEntries
.
empty
.
diff
]);
const
caseSomeActions
=
()
=>
triggerBlobActions
([
testEntries
.
updated
.
diff
]);
const
caseTitleIsSet
=
()
=>
{
caseEmptyAction
();
setTitle
(
'
test
'
);
};
const
caseDescriptionIsSet
=
()
=>
{
caseEmptyAction
();
setDescription
(
'
test
'
);
};
const
caseClickSubmitBtn
=
()
=>
{
caseSomeActions
();
clickSubmitBtn
();
};
it
.
each
`
it
.
each
`
condition | expectPrevented | action
condition | expectPrevented | action
${
'
there are no actions
'
}
|
${
false
}
|
${()
=>
triggerBlobActions
([])}
${
'
there are no actions
'
}
|
${
false
}
|
${
caseNoActions
}
${
'
there are actions
'
}
|
${
true
}
|
${()
=>
triggerBlobActions
([
testEntries
.
updated
.
diff
])}
${
'
there is an empty action
'
}
|
${
false
}
|
${
caseEmptyAction
}
${
'
the snippet is being saved
'
}
|
${
false
}
|
${()
=>
clickSubmitBtn
()}
${
'
there are actions
'
}
|
${
true
}
|
${
caseSomeActions
}
${
'
the title is set
'
}
|
${
true
}
|
${
caseTitleIsSet
}
${
'
the description is set
'
}
|
${
true
}
|
${
caseDescriptionIsSet
}
${
'
the snippet is being saved
'
}
|
${
false
}
|
${
caseClickSubmitBtn
}
`
(
`
(
'
handles before unload prevent when $condition (expectPrevented=$expectPrevented)
'
,
'
handles before unload prevent when $condition (expectPrevented=$expectPrevented)
'
,
({
expectPrevented
,
action
})
=>
{
({
expectPrevented
,
action
})
=>
{
...
...
spec/frontend/snippets/test_utils.js
View file @
e8028727
...
@@ -56,6 +56,15 @@ export const testEntries = {
...
@@ -56,6 +56,15 @@ export const testEntries = {
content
:
CONTENT_2
,
content
:
CONTENT_2
,
},
},
},
},
empty
:
{
id
:
'
empty
'
,
diff
:
{
action
:
SNIPPET_BLOB_ACTION_CREATE
,
filePath
:
''
,
previousPath
:
''
,
content
:
''
,
},
},
};
};
export
const
createBlobFromTestEntry
=
({
diff
,
origContent
},
isOrig
=
false
)
=>
({
export
const
createBlobFromTestEntry
=
({
diff
,
origContent
},
isOrig
=
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