IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

uri is validated

Browse Source
This commit is contained in:
Vladimir Khvan 2023-05-17 14:07:05 +05:00
parent 46c80fc2b4
commit f13cc530cd
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/sub-components/LabledInput.js
View File

@ -26,6 +26,7 @@ export const LabledInput = ({
onChange,
name,
mask,
hasError,
required = false,
}) => {
return (
@ -38,6 +39,7 @@ export const LabledInput = ({
value={value}
onChange={onChange}
required={required}
hasError={hasError}
{...(mask ? { mask: mask } : {})}
/>
</Label>

18
packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/sub-components/WebhookDialog.js
View File

@ -19,10 +19,20 @@ const Footer = styled.div`
}
`;
function validateUrl(url) {
try {
new URL(url);
} catch (error) {
return false;
}
return true;
}
const WebhookDialog = (props) => {
const { visible, onClose, header, isSettingsModal, onSubmit, webhook } = props;
const [isResetVisible, setIsResetVisible] = useState(isSettingsModal);
const [isUrlValid, setIsUrlValid] = useState(false);
const [isPasswordValid, setIsPasswordValid] = useState(false);
const [webhookInfo, setWebhookInfo] = useState({
@ -50,7 +60,7 @@ const WebhookDialog = (props) => {
};
const handleSubmitClick = () => {
if (isPasswordValid || isResetVisible) {
if (isUrlValid && (isPasswordValid || isResetVisible)) {
submitButtonRef.current.click();
}
};
@ -84,6 +94,11 @@ const WebhookDialog = (props) => {
});
}, [webhook]);
useEffect(() => {
const isValid = validateUrl(webhookInfo.uri);
isValid !== isUrlValid && setIsUrlValid(isValid);
}, [webhookInfo.uri]);
const onKeyPress = (e) => (e.key === "Esc" || e.key === "Escape") && onModalClose();
return (
@ -106,6 +121,7 @@ const WebhookDialog = (props) => {
name="uri"
value={webhookInfo.uri}
onChange={onInputChange}
hasError={!isUrlValid}
required
/>
<SSLVerification value={webhookInfo.ssl} onChange={onInputChange} />