From 06de7440f3425160bfbbe2b428c83678231c6273 Mon Sep 17 00:00:00 2001
From: dominik-zeglen <flesz3@o2.pl>
Date: Tue, 12 Nov 2019 14:08:00 +0100
Subject: [PATCH] Fix minor bugs

---
 .../PluginSecretFieldDialog.tsx               |  5 ++--
 .../PluginsDetailsPage/PluginsDetailsPage.tsx | 23 +++++++++++--------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/plugins/components/PluginSecretFieldDialog/PluginSecretFieldDialog.tsx b/src/plugins/components/PluginSecretFieldDialog/PluginSecretFieldDialog.tsx
index b79e8d46d..82bea2488 100644
--- a/src/plugins/components/PluginSecretFieldDialog/PluginSecretFieldDialog.tsx
+++ b/src/plugins/components/PluginSecretFieldDialog/PluginSecretFieldDialog.tsx
@@ -13,6 +13,7 @@ import ConfirmButton, {
 import Form from "@saleor/components/Form";
 import Skeleton from "@saleor/components/Skeleton";
 import { buttonMessages } from "@saleor/intl";
+import { maybe } from "@saleor/misc";
 import { Plugin_plugin_configuration } from "@saleor/plugins/types/Plugin";
 import { DialogProps } from "@saleor/types";
 import { ConfigurationTypeFieldEnum } from "@saleor/types/globalTypes";
@@ -67,8 +68,8 @@ const PluginSecretFieldDialog: React.FC<PluginSecretFieldDialogProps> = ({
                 label={field && field.label}
                 name="value"
                 type={
-                  field.type === ConfigurationTypeFieldEnum.PASSWORD &&
-                  "password"
+                  maybe(() => field.type) ===
+                    ConfigurationTypeFieldEnum.PASSWORD && "password"
                 }
                 value={data.value || ""}
                 onChange={change}
diff --git a/src/plugins/components/PluginsDetailsPage/PluginsDetailsPage.tsx b/src/plugins/components/PluginsDetailsPage/PluginsDetailsPage.tsx
index 383a110ab..7258b19e7 100644
--- a/src/plugins/components/PluginsDetailsPage/PluginsDetailsPage.tsx
+++ b/src/plugins/components/PluginsDetailsPage/PluginsDetailsPage.tsx
@@ -67,9 +67,12 @@ const PluginsDetailsPage: React.FC<PluginsDetailsPageProps> = props => {
   const initialForm: FormData = {
     active: maybe(() => plugin.active, false),
     configuration: maybe(() =>
-      plugin.configuration.filter(
-        field => !isSecretField(plugin.configuration, field.name)
-      )
+      plugin.configuration
+        .filter(field => !isSecretField(plugin.configuration, field.name))
+        .map(field => ({
+          ...field,
+          value: field.value || ""
+        }))
     )
   };
 
@@ -157,17 +160,19 @@ const PluginsDetailsPage: React.FC<PluginsDetailsPageProps> = props => {
                       disabled={disabled}
                       onChange={onChange}
                     />
-                    <CardSpacer />
                     {maybe(() =>
                       plugin.configuration.some(field =>
                         isSecretField(plugin.configuration, field.name)
                       )
                     ) && (
-                      <PluginAuthorization
-                        fields={plugin.configuration}
-                        onClear={onClear}
-                        onEdit={onEdit}
-                      />
+                      <>
+                        <CardSpacer />
+                        <PluginAuthorization
+                          fields={plugin.configuration}
+                          onClear={onClear}
+                          onEdit={onEdit}
+                        />
+                      </>
                     )}
                   </div>
                 </>