From fb5c0f38d3f0de5b1937e2211349d999d0f8bc8f Mon Sep 17 00:00:00 2001
From: Stan Lewis <gashcrumb@gmail.com>
Date: Tue, 9 Jun 2020 12:05:46 -0400
Subject: [PATCH] feat: don't show successful validation for unknown
 connectors; fixes #8608

---
 .../src/Connection/ConnectionDetailsForm.tsx  |  2 +-
 .../Connection/ConnectorConfigurationForm.tsx | 18 +++++------
 .../locales/connections-translations.en.json  |  2 ++
 .../syndesis/src/modules/connections/utils.ts | 31 +++++++++++++++----
 4 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/app/ui-react/packages/ui/src/Connection/ConnectionDetailsForm.tsx b/app/ui-react/packages/ui/src/Connection/ConnectionDetailsForm.tsx
index c1e875573a1..9fc71e62678 100644
--- a/app/ui-react/packages/ui/src/Connection/ConnectionDetailsForm.tsx
+++ b/app/ui-react/packages/ui/src/Connection/ConnectionDetailsForm.tsx
@@ -15,7 +15,7 @@ import './ConnectionDetailsForm.css';
 
 export interface IConnectionDetailsValidationResult {
   message: string;
-  type: 'error' | 'success';
+  type: 'error' | 'success' | 'info';
 }
 
 export interface IConnectionDetailsFormProps {
diff --git a/app/ui-react/packages/ui/src/Connection/ConnectorConfigurationForm.tsx b/app/ui-react/packages/ui/src/Connection/ConnectorConfigurationForm.tsx
index 1ffa1c579fd..42faf035d8c 100644
--- a/app/ui-react/packages/ui/src/Connection/ConnectorConfigurationForm.tsx
+++ b/app/ui-react/packages/ui/src/Connection/ConnectorConfigurationForm.tsx
@@ -5,7 +5,7 @@ import { ERROR, WARNING } from '../Shared';
 
 export interface IConnectorConfigurationFormValidationResult {
   message: string;
-  type: 'error' | 'success';
+  type: 'error' | 'success' | 'info';
 }
 
 export interface IConnectorConfigurationFormProps {
@@ -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
diff --git a/app/ui-react/syndesis/src/modules/connections/locales/connections-translations.en.json b/app/ui-react/syndesis/src/modules/connections/locales/connections-translations.en.json
index eba07b063ca..4e180ffa7ae 100644
--- a/app/ui-react/syndesis/src/modules/connections/locales/connections-translations.en.json
+++ b/app/ui-react/syndesis/src/modules/connections/locales/connections-translations.en.json
@@ -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?",
diff --git a/app/ui-react/syndesis/src/modules/connections/utils.ts b/app/ui-react/syndesis/src/modules/connections/utils.ts
index 635651a91ff..d4c275b5561 100644
--- a/app/ui-react/syndesis/src/modules/connections/utils.ts
+++ b/app/ui-react/syndesis/src/modules/connections/utils.ts
@@ -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(
@@ -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;
 }