Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
scratch-www
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
xpstem
scratch-www
Commits
b0a9bab7
Commit
b0a9bab7
authored
Jun 08, 2021
by
Eric Rosenbaum
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
hide validation on click outside for thumnbail image
parent
935ec7ac
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
5 deletions
+18
-5
src/redux/studio-mutations.js
src/redux/studio-mutations.js
+3
-2
src/views/studio/studio-image.jsx
src/views/studio/studio-image.jsx
+15
-3
No files found.
src/redux/studio-mutations.js
View file @
b0a9bab7
...
...
@@ -173,13 +173,14 @@ const mutateFollowingStudio = shouldFollow => ((dispatch, getState) => {
});
const
mutateStudioImage
=
input
=>
((
dispatch
,
getState
)
=>
{
if
(
!
input
.
files
||
!
input
.
files
[
0
])
return
;
if
(
!
input
.
files
||
!
input
.
files
[
0
])
return
Promise
.
reject
(
new
Error
(
'
no file
'
))
;
const
state
=
getState
();
const
studioId
=
selectStudioId
(
state
);
const
currentImage
=
selectStudioImage
(
state
);
dispatch
(
startMutation
(
'
image
'
));
if
(
input
.
files
[
0
].
size
&&
input
.
files
[
0
].
size
>
MAX_IMAGE_BYTES
)
{
return
dispatch
(
completeMutation
(
'
image
'
,
currentImage
,
Errors
.
THUMBNAIL_TOO_LARGE
));
dispatch
(
completeMutation
(
'
image
'
,
currentImage
,
Errors
.
THUMBNAIL_TOO_LARGE
));
return
Promise
.
reject
(
new
Error
(
'
thumbnail too large
'
));
}
const
formData
=
new
FormData
();
formData
.
append
(
'
file
'
,
input
.
files
[
0
]);
...
...
src/views/studio/studio-image.jsx
View file @
b0a9bab7
...
...
@@ -4,6 +4,7 @@ import PropTypes from 'prop-types';
import
{
connect
}
from
'
react-redux
'
;
import
classNames
from
'
classnames
'
;
import
{
FormattedMessage
}
from
'
react-intl
'
;
import
onClickOutside
from
'
react-onclickoutside
'
;
import
{
selectStudioImage
,
selectIsFetchingInfo
}
from
'
../../redux/studio
'
;
import
{
selectCanEditInfo
,
selectShowEditMuteError
}
from
'
../../redux/studio-permissions
'
;
...
...
@@ -14,7 +15,6 @@ import {
import
ValidationMessage
from
'
../../components/forms/validation-message.jsx
'
;
import
StudioMuteEditMessage
from
'
./studio-mute-edit-message.jsx
'
;
import
editIcon
from
'
./icons/edit-icon.svg
'
;
const
errorToMessageId
=
error
=>
{
...
...
@@ -43,6 +43,11 @@ const StudioImage = ({
});
const
[
showMuteMessage
,
setShowMuteMessage
]
=
useState
(
false
);
const
[
hideValidationMessage
,
setHideValidationMessage
]
=
useState
(
false
);
StudioImage
.
handleClickOutside
=
()
=>
{
setHideValidationMessage
(
true
);
};
return
(
<
div
className=
{
fieldClassName
}
...
...
@@ -78,9 +83,10 @@ const StudioImage = ({
handleUpdate
(
e
.
target
)
.
then
(
dataUrl
=>
setUploadPreview
(
dataUrl
));
e
.
target
.
value
=
''
;
setHideValidationMessage
(
false
);
}
}
/>
{
imageError
&&
<
ValidationMessage
{
imageError
&&
!
hideValidationMessage
&&
<
ValidationMessage
mode=
"error"
message=
{
<
FormattedMessage
id=
{
errorToMessageId
(
imageError
)
}
/>
}
/>
}
...
...
@@ -91,6 +97,10 @@ const StudioImage = ({
);
};
const
clickOutsideConfig
=
{
handleClickOutside
:
()
=>
StudioImage
.
handleClickOutside
};
StudioImage
.
propTypes
=
{
imageError
:
PropTypes
.
string
,
canEditInfo
:
PropTypes
.
bool
,
...
...
@@ -101,7 +111,7 @@ StudioImage.propTypes = {
handleUpdate
:
PropTypes
.
func
};
export
default
connect
(
const
connectedStudioImage
=
connect
(
state
=>
({
image
:
selectStudioImage
(
state
),
canEditInfo
:
selectCanEditInfo
(
state
),
...
...
@@ -114,3 +124,5 @@ export default connect(
handleUpdate
:
mutateStudioImage
}
)(
StudioImage
);
export
default
onClickOutside
(
connectedStudioImage
,
clickOutsideConfig
);
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