Skip to content
This repository was archived by the owner on Jul 24, 2024. It is now read-only.

feat: don't show successful validation for unknown connectors #8678

Merged
merged 1 commit into from
Jun 10, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import './ConnectionDetailsForm.css';

export interface IConnectionDetailsValidationResult {
message: string;
type: 'error' | 'success';
type: 'error' | 'success' | 'info';
}

export interface IConnectionDetailsFormProps {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { ERROR, WARNING } from '../Shared';

export interface IConnectorConfigurationFormValidationResult {
message: string;
type: 'error' | 'success';
type: 'error' | 'success' | 'info';
}

export interface IConnectorConfigurationFormProps {
Expand Down Expand Up @@ -56,14 +56,14 @@ export const ConnectorConfigurationForm: React.FunctionComponent<IConnectorConfi
</StackItem>
<StackItem>
{validationResults &&
validationResults.map((e, idx) => (
<Alert
title={e.message}
key={idx}
isInline={true}
variant={e.type === ERROR ? WARNING : e.type}
/>
))}
validationResults.map((e, idx) => (
<Alert
title={e.message}
key={idx}
isInline={true}
variant={e.type === ERROR ? WARNING : e.type}
/>
))}
</StackItem>
<StackItem>
<Form
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
"namePlaceholder": "Must enter a connection name...",
"usedByOne": "Used by 1 integration",
"usedByMulti": "Used by integrations {{count}} times",
"validationSuccessful": "{{name}} has been successfully validated",
"validationUnsupported": "{{name}} does not support validation",
"create": {
"unsavedChangesTitle": "Do you really want to cancel?",
"unsavedChangesMessage": "You have not finished creating the connection. If you cancel now you will lose data you already entered. Do you still want to cancel?",
Expand Down
31 changes: 25 additions & 6 deletions app/ui-react/syndesis/src/modules/connections/utils.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
import { Result } from '@syndesis/models';
import { IConnectorConfigurationFormValidationResult } from '@syndesis/ui';
import i18n from '../../i18n';

export function parseValidationResult(
results: Result[],
connectorName: string
) {
export function parseValidationResult(results: Result[], name: string) {
const badValidationResults = results
.filter(s => s.status === 'ERROR')
.map(
Expand All @@ -16,12 +14,33 @@ export function parseValidationResult(
);
const goodValidationResults = [
{
message: `${connectorName} has been successfully validated`,
message: i18n.t('connections:validationSuccessful', { name }),
type: 'success',
} as IConnectorConfigurationFormValidationResult,
];

const unsupportedValidationResults = results
.filter(s => s.status === 'UNSUPPORTED')
.map(s => {
if (
s.errors &&
s.errors.filter(e => e.code === 'unknown-connector').length > 0
) {
return {
message: i18n.t('connections:validationUnsupported', {
name,
}),
type: 'info',
} as IConnectorConfigurationFormValidationResult;
} else {
return {
message: s.errors!.map(e => e.description).join(', \n'),
type: 'info',
} as IConnectorConfigurationFormValidationResult;
}
});
return badValidationResults.length > 0
? badValidationResults
: unsupportedValidationResults.length > 0
? unsupportedValidationResults
: goodValidationResults;
}