Merge pull request #282 from gashcrumb/issue-279

syndesisio · May 15, 2019 · d2a5257 · d2a5257
2 parents e793bc4 + 5103709
commit d2a5257
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 33 deletions.
diff --git a/app/ui-react/packages/api/src/WithExtensionHelpers.tsx b/app/ui-react/packages/api/src/WithExtensionHelpers.tsx
@@ -37,7 +37,6 @@ export class WithExtensionHelpersWrapped extends React.Component<
     if (!response.ok) {
       throw new Error(response.statusText);
     }
-
     return Promise.resolve();
   }
 
@@ -69,24 +68,24 @@ export class WithExtensionHelpersWrapped extends React.Component<
   ): Promise<Extension> {
     const data = new FormData();
     data.append('file', file, file.name);
-
     const url = `${this.props.apiUri}/extensions`;
-
+    const {
+      Accept,
+      ['Content-Type']: contentType,
+      ...rest
+    } = this.props.headers;
     const response = await callFetch({
       body: data,
-      contentType: 'multipart/form-data',
-      headers: this.props.headers,
+      headers: { ...rest },
       includeAccept: false,
       includeContentType: false,
       includeReferrerPolicy: false,
       method: 'POST',
       url: extensionId ? `${url}?updatedId=${extensionId}` : url,
     });
-
     if (!response.ok) {
       throw new Error(response.statusText);
     }
-
     return (await response.json()) as Extension;
   }
 

diff --git a/app/ui-react/packages/api/src/callFetch.ts b/app/ui-react/packages/api/src/callFetch.ts
@@ -40,6 +40,10 @@ export interface IFetch {
   stringifyBody?: boolean;
 }
 
+const referrerPolicyId = 'referrerPolicy';
+const acceptId = 'Accept';
+const contentTypeId = 'Content-Type';
+
 export function callFetch({
   url,
   method,
@@ -52,26 +56,23 @@ export function callFetch({
   includeReferrerPolicy = true,
   stringifyBody = true,
 }: IFetch) {
-  if (includeAccept && !('Accept' in headers)) {
-    const acceptId = 'Accept';
+  if (includeAccept && !(acceptId in headers)) {
     headers[acceptId] = accept;
   }
-
-  if (includeContentType) {
-    const contentTypeId = 'Content-Type';
+  if (includeContentType && !(contentTypeId in headers)) {
     headers[contentTypeId] = contentType;
   }
-
-  if (includeReferrerPolicy) {
-    const referrerPolicyId = 'referrerPolicy';
+  if (includeReferrerPolicy && !(referrerPolicyId in headers)) {
     headers[referrerPolicyId] = 'no-referrer';
   }
-
+  const data =
+    headers[contentTypeId] &&
+    headers[contentTypeId].includes('application/json') &&
+    stringifyBody
+      ? JSON.stringify(body)
+      : body;
   return fetch(url, {
-    body:
-      contentType.includes('application/json') && stringifyBody
-        ? JSON.stringify(body)
-        : body,
+    body: data,
     cache: 'no-cache',
     credentials: 'include',
     headers: {

diff --git a/app/ui-react/syndesis/src/modules/extensions/pages/ExtensionDetailsPage.tsx b/app/ui-react/syndesis/src/modules/extensions/pages/ExtensionDetailsPage.tsx
@@ -39,18 +39,18 @@ export interface IExtensionDetailRouteState {
 export default class ExtensionDetailsPage extends React.Component {
   public getTypeMessage(type: string): string {
     if ('Steps' === type) {
-      return i18n.t('customizations:extension.StepExtension');
+      return i18n.t('extensions:extension.StepExtension');
     }
 
     if ('Connectors' === type) {
-      return i18n.t('customizations:extension.ConnectorExtension');
+      return i18n.t('extensions:extension.ConnectorExtension');
     }
 
     if ('Libraries' === type) {
-      return i18n.t('customizations:extension.LibraryExtension');
+      return i18n.t('extensions:extension.LibraryExtension');
     }
 
-    return i18n.t('customizations:extension.unknownExtensionType');
+    return i18n.t('extensions:extension.unknownExtensionType');
   }
 
   public render() {

diff --git a/app/ui-react/syndesis/src/modules/extensions/pages/ExtensionImportPage.tsx b/app/ui-react/syndesis/src/modules/extensions/pages/ExtensionImportPage.tsx
@@ -86,7 +86,7 @@ export default class ExtensionImportPage extends React.Component<
    * @param description the action description
    */
   public getActionText(name: string, description: string): string {
-    return i18n.t('customizations:action', {
+    return i18n.t('extensions:action', {
       actionDescription: description,
       actionName: name,
     });
@@ -98,7 +98,7 @@ export default class ExtensionImportPage extends React.Component<
         {({ pushNotification }) => {
           const onDndUploadRejectedHandler = (failedFileName: string) => {
             const text = i18n.t(
-              'customizations:extension.importUploadFailedAlertMessage',
+              'extensions:extension.importUploadFailedAlertMessage',
               {
                 fileName: failedFileName,
               }
@@ -139,7 +139,7 @@ export default class ExtensionImportPage extends React.Component<
                         this.setState({
                           ...this.state,
                           dndUploadSuccessMessage: i18n.t(
-                            'customizations:extension.importUploadSuccessMessage'
+                            'extensions:extension.importUploadSuccessMessage'
                           ),
                           extension: uploaded,
                           loading: false,
@@ -150,10 +150,10 @@ export default class ExtensionImportPage extends React.Component<
                           ...this.state,
                           disableDropzone: false,
                           dndUploadFailedMessage: i18n.t(
-                            'customizations:extension.importUploadFailedMessage'
+                            'extensions:extension.importUploadFailedMessage'
                           ),
                           i18nAlertMessage: i18n.t(
-                            'customizations:extension.importInvalidFileMessage'
+                            'extensions:extension.importInvalidFileMessage'
                           ),
                           loading: false,
                         });
@@ -250,11 +250,11 @@ export default class ExtensionImportPage extends React.Component<
                                   )}
                                   i18nIdLabel={i18n.t('shared:ID')}
                                   i18nImport={i18n.t(
-                                    'customizations:extension.ImportExtension'
+                                    'extensions:extension.ImportExtension'
                                   )}
                                   i18nNameLabel={i18n.t('shared:Name')}
                                   i18nTitle={i18n.t(
-                                    'customizations:extension.ImportReview'
+                                    'extensions:extension.ImportReview'
                                   )}
                                   i18nTypeLabel={i18n.t('shared:Type')}
                                   i18nActionText={this.getActionText}

diff --git a/app/ui-react/syndesis/src/modules/extensions/pages/ExtensionsPage.tsx b/app/ui-react/syndesis/src/modules/extensions/pages/ExtensionsPage.tsx
@@ -70,10 +70,10 @@ export default class ExtensionsPage extends React.Component {
     const numUsedBy = extension.uses as number;
 
     if (numUsedBy === 1) {
-      return i18n.t('customizations:usedByOne');
+      return i18n.t('extensions:usedByOne');
     }
 
-    return i18n.t('customizations:usedByMulti', { count: numUsedBy });
+    return i18n.t('extensions:usedByMulti', { count: numUsedBy });
   }
 
   public render() {