+ );
+ }
+
+ if (hasKeys(endpointErrors)) {
+
+ const message =
+ endpointErrors.url
+ ? 'Please provide a valid REST endpoint to test the server connection.'
+ : (endpointErrors.token || endpointErrors.username || endpointErrors.password)
+ ? 'Please add the credentials to test the server connection'
+ : 'Please correct validation errors';
+
return (
- { hint }
+ { message }
);
}
- if (checkingConnection === false) {
+ if (connectionError) {
return (
-
+
+ );
+}
diff --git a/client/src/plugins/deployment-tool/components/FormControl.js b/client/src/plugins/deployment-tool/components/FormControl.js
deleted file mode 100644
index 4e110afa21..0000000000
--- a/client/src/plugins/deployment-tool/components/FormControl.js
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH
- * under one or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information regarding copyright
- * ownership.
- *
- * Camunda licenses this file to you under the MIT; you may not use this file
- * except in compliance with the MIT License.
- */
-
-import React from 'react';
-
-import classnames from 'classnames';
-
-
-export default function FormControl({
- field,
- hint,
- label,
- onFocusChange,
- validated,
- form: { touched, errors, isSubmitting },
- ...props
-}) {
- const { name } = field;
-
- const invalid = errors[name] && touched[name];
-
- return (
-
-
-
-
-
-
-
-
- { invalid ? (
-
{errors[name]}
- ) : null}
-
- { hint ? (
-
{ hint }
- ) : null }
-
-
- );
-}
-
-
-
-// helpers //////
-function compose(...handlers) {
- return function(...args) {
- handlers.forEach(handler => handler(...args));
- };
-}
diff --git a/client/src/plugins/deployment-tool/components/AuthBearer.js b/client/src/plugins/deployment-tool/components/FormFeedback.js
similarity index 58%
rename from client/src/plugins/deployment-tool/components/AuthBearer.js
rename to client/src/plugins/deployment-tool/components/FormFeedback.js
index 7fad395956..e555c34b18 100644
--- a/client/src/plugins/deployment-tool/components/AuthBearer.js
+++ b/client/src/plugins/deployment-tool/components/FormFeedback.js
@@ -9,20 +9,20 @@
*/
import React from 'react';
-import { Field } from 'formik';
-import FormControl from './FormControl';
+export default function FormFeedback(props) {
+
+ const {
+ error,
+ hint
+ } = props;
-export default function AuthBearer({ onFocusChange, ...props }) {
return (
-
+
+ { error &&
{ error }
}
+
+ { hint &&
{ hint }
}
+
);
}
diff --git a/client/src/plugins/deployment-tool/components/Select.js b/client/src/plugins/deployment-tool/components/Select.js
new file mode 100644
index 0000000000..08096ebaac
--- /dev/null
+++ b/client/src/plugins/deployment-tool/components/Select.js
@@ -0,0 +1,68 @@
+/**
+ * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH
+ * under one or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information regarding copyright
+ * ownership.
+ *
+ * Camunda licenses this file to you under the MIT; you may not use this file
+ * except in compliance with the MIT License.
+ */
+
+import React from 'react';
+
+import classNames from 'classnames';
+
+import FormFeedback from './FormFeedback';
+
+import {
+ fieldError as defaultFieldError
+} from './Util';
+
+
+export default function Select(props) {
+
+ const {
+ hint,
+ label,
+ field,
+ form,
+ fieldError,
+ children,
+ ...restProps
+ } = props;
+
+ const {
+ name: fieldName
+ } = field;
+
+ const meta = form.getFieldMeta(fieldName);
+
+ const error = (fieldError || defaultFieldError)(meta);
+
+ return (
+
+
+
+
+
+
+
+
+
+
+
+ );
+}
diff --git a/client/src/plugins/deployment-tool/components/TextInput.js b/client/src/plugins/deployment-tool/components/TextInput.js
new file mode 100644
index 0000000000..e1f12a7bfe
--- /dev/null
+++ b/client/src/plugins/deployment-tool/components/TextInput.js
@@ -0,0 +1,72 @@
+/**
+ * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH
+ * under one or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information regarding copyright
+ * ownership.
+ *
+ * Camunda licenses this file to you under the MIT; you may not use this file
+ * except in compliance with the MIT License.
+ */
+
+import React from 'react';
+
+import classNames from 'classnames';
+
+import FormFeedback from './FormFeedback';
+
+import {
+ fieldError as defaultFieldError
+} from './Util';
+
+
+export default function TextInput(props) {
+
+ const {
+ hint,
+ label,
+ field,
+ form,
+ fieldError,
+ children,
+ ...restProps
+ } = props;
+
+ const {
+ name: fieldName,
+ value: fieldValue
+ } = field;
+
+ const meta = form.getFieldMeta(fieldName);
+
+ const error = (fieldError || defaultFieldError)(meta);
+
+ const invalid = error;
+ const valid = !error && meta.touched;
+
+ return (
+
+
+
+
+
+
+
+
+
+
+
+ );
+}
diff --git a/client/src/plugins/deployment-tool/errors/index.js b/client/src/plugins/deployment-tool/components/Util.js
similarity index 64%
rename from client/src/plugins/deployment-tool/errors/index.js
rename to client/src/plugins/deployment-tool/components/Util.js
index d1ba7d0a0f..9fcb1b1d51 100644
--- a/client/src/plugins/deployment-tool/errors/index.js
+++ b/client/src/plugins/deployment-tool/components/Util.js
@@ -8,11 +8,6 @@
* except in compliance with the MIT License.
*/
-import ConnectionError, { ConnectionErrorMessages } from './ConnectionError';
-import DeploymentError from './DeploymentError';
-
-export {
- ConnectionError,
- ConnectionErrorMessages,
- DeploymentError
-};
+export function fieldError(meta) {
+ return meta.touched && meta.error;
+}
diff --git a/client/src/plugins/deployment-tool/components/index.js b/client/src/plugins/deployment-tool/components/index.js
index 4b840d4b47..33c3db3b62 100644
--- a/client/src/plugins/deployment-tool/components/index.js
+++ b/client/src/plugins/deployment-tool/components/index.js
@@ -8,6 +8,6 @@
* except in compliance with the MIT License.
*/
-export { default as FormControl } from './FormControl';
-export { default as AuthBasic } from './AuthBasic';
-export { default as AuthBearer } from './AuthBearer';
+export { default as TextInput } from './TextInput';
+export { default as CheckBox } from './CheckBox';
+export { default as Select } from './Select';
diff --git a/client/src/plugins/deployment-tool/errors/ConnectionError.js b/client/src/plugins/deployment-tool/errors/ConnectionError.js
deleted file mode 100644
index 623e581d41..0000000000
--- a/client/src/plugins/deployment-tool/errors/ConnectionError.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH
- * under one or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information regarding copyright
- * ownership.
- *
- * Camunda licenses this file to you under the MIT; you may not use this file
- * except in compliance with the MIT License.
- */
-
-export const ConnectionErrorMessages = {
- noInternetConnection: 'Could not establish a network connection. Most likely your machine is not online right now.',
- unableToConnect: 'Could not connect to the server. Did you run the engine?',
- unauthorized: 'Authentication failed. Please check your credentials.',
- forbidden: 'This user is not permitted to deploy. Please use different credentials or get this user enabled to deploy.',
- notFound: 'Could not find the Camunda endpoint. Please check the URL and make sure Camunda is running.',
- internalServerError: 'Camunda is reporting an error. Please check the server status.',
- unreachable: 'Camunda is reporting an error. Please check the server status.'
-};
-
-
-export default class ConnectionError extends Error {
- constructor(response) {
- super();
-
- this.message = (
- this.getStatusCodeErrorMessage(response) ||
- this.getNetworkErrorMessage(response)
- );
- }
-
- getStatusCodeErrorMessage(response) {
- switch (response.status) {
- case 401:
- return ConnectionErrorMessages.unauthorized;
- case 403:
- return ConnectionErrorMessages.forbidden;
- case 404:
- return ConnectionErrorMessages.notFound;
- case 500:
- return ConnectionErrorMessages.internalServerError;
- case 503:
- return ConnectionErrorMessages.unavailable;
- }
- }
-
- getNetworkErrorMessage(response) {
- if (!/^https?:\/\/localhost/.test(response.url) && !window.navigator.onLine) {
- return ConnectionErrorMessages.noInternetConnection;
- }
-
- return ConnectionErrorMessages.unableToConnect;
- }
-}
diff --git a/client/src/plugins/deployment-tool/errors/DeploymentError.js b/client/src/plugins/deployment-tool/errors/DeploymentError.js
deleted file mode 100644
index a4d22ed9c1..0000000000
--- a/client/src/plugins/deployment-tool/errors/DeploymentError.js
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH
- * under one or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information regarding copyright
- * ownership.
- *
- * Camunda licenses this file to you under the MIT; you may not use this file
- * except in compliance with the MIT License.
- */
-
-const DeploymentErrorMessages = {
- noInternetConnection: 'Could not establish a network connection. Most likely your machine is not online right now.',
- unableToConnect: 'Could not connect to the server. Did you run the engine?',
- bpmnParsingError: 'Server could not parse the diagram. Please check log for errors.',
- unauthorized: 'The deployment was unauthorized. Please use valid credentials.',
- forbidden: 'The deployment was not permitted for your credentials. Please check your credentials.',
- notFound: 'Could not connect to Camunda. Please check the endpoint URL.',
- internalServerError: 'Camunda reported an unknown error. Please check the server status.',
- serverUnavailable: 'Camunda is currently unavailable. Please try again later.'
-};
-
-const PARSE_ERROR = 'ENGINE-09005 Could not parse BPMN process. Errors:';
-
-
-export default class DeploymentError extends Error {
- constructor(response, body) {
- super();
-
- this.message = (
- this.getCamundaBpmErrorMessage(body) ||
- this.getStatusCodeErrorMessage(response) ||
- this.getNetworkErrorMessage(response)
- );
-
- this.problems = this.getProblems(body);
- }
-
- getCamundaBpmErrorMessage(body) {
- if (body && body.message && body.message.startsWith(PARSE_ERROR)) {
- return DeploymentErrorMessages.bpmnParsingError;
- }
- }
-
- getStatusCodeErrorMessage(response) {
- switch (response.status) {
- case 401:
- return DeploymentErrorMessages.unauthorized;
- case 403:
- return DeploymentErrorMessages.forbidden;
- case 404:
- return DeploymentErrorMessages.notFound;
- case 500:
- return DeploymentErrorMessages.internalServerError;
- case 503:
- return DeploymentErrorMessages.serverUnavailable;
- }
- }
-
- getNetworkErrorMessage(response) {
- if (!/^https?:\/\/localhost/.test(response.url) && !window.navigator.onLine) {
- return DeploymentErrorMessages.noInternetConnection;
- }
-
- return DeploymentErrorMessages.unableToConnect;
- }
-
- getProblems(body) {
- return body.message;
- }
-}
diff --git a/client/src/plugins/deployment-tool/getEditMenu.js b/client/src/plugins/deployment-tool/getEditMenu.js
deleted file mode 100644
index 2a20173be1..0000000000
--- a/client/src/plugins/deployment-tool/getEditMenu.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH
- * under one or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information regarding copyright
- * ownership.
- *
- * Camunda licenses this file to you under the MIT; you may not use this file
- * except in compliance with the MIT License.
- */
-
-export default function getEditMenu(enabled) {
- return [
- [
- {
- role: 'undo',
- enabled
- },
- {
- role: 'redo',
- enabled
- },
- ],
- [
- {
- role: 'copy',
- enabled
- },
- {
- role: 'cut',
- enabled
- },
- {
- role: 'paste',
- enabled
- },
- {
- role: 'selectAll',
- enabled
- }
- ]
- ];
-}
diff --git a/client/src/plugins/deployment-tool/validators.js b/client/src/plugins/deployment-tool/validators.js
deleted file mode 100644
index 92cd87abd3..0000000000
--- a/client/src/plugins/deployment-tool/validators.js
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH
- * under one or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information regarding copyright
- * ownership.
- *
- * Camunda licenses this file to you under the MIT; you may not use this file
- * except in compliance with the MIT License.
- */
-
-export default {
- bearer: validateBearer,
- deploymentName: validateDeploymentName,
- endpointUrl: validateEndpointUrl,
- password: validatePassword,
- username: validateUsername
-};
-
-function validateBearer(bearer) {
- if (!bearer) {
- return 'Token must not be empty.';
- }
-}
-
-function validateDeploymentName(name) {
- if (!name) {
- return 'Deployment name must not be empty.';
- }
-}
-
-function validateEndpointUrl(url) {
- if (!url) {
- return 'Endpoint URL must not be empty.';
- }
-
- if (!/^https?:\/\/.+/.test(url)) {
- return 'Endpoint URL must start with "http://" or "https://".';
- }
-}
-
-function validatePassword(password) {
- if (!password) {
- return 'Password must not be empty.';
- }
-}
-
-function validateUsername(username) {
- if (!username) {
- return 'Username must not be empty.';
- }
-}
\ No newline at end of file