From f4ec07b04cd99c2869dfec1a0bf257b01faf8b7d Mon Sep 17 00:00:00 2001
From: Ashish Gupta <ashish@getcollate.io>
Date: Thu, 16 Mar 2023 22:37:01 +0530
Subject: [PATCH] UI : Fix the breaking issue on Datalake service (#10626)

* Fix the breaking issue on Datalake service

* changes as per comments
---
 .../ServiceConnectionDetails.component.tsx    | 34 +++++++++++--------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ServiceConnectionDetails/ServiceConnectionDetails.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ServiceConnectionDetails/ServiceConnectionDetails.component.tsx
index f6e0212912b..cfeadf380ee 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/ServiceConnectionDetails/ServiceConnectionDetails.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/ServiceConnectionDetails/ServiceConnectionDetails.component.tsx
@@ -18,7 +18,7 @@
 import { InfoCircleOutlined } from '@ant-design/icons';
 import { Card, Tooltip } from 'antd';
 import { ObjectStoreServiceType } from 'generated/entity/services/objectstoreService';
-import { isEmpty, isNull, isObject } from 'lodash';
+import { get, isEmpty, isNull, isObject } from 'lodash';
 import React, { ReactNode, useEffect, useState } from 'react';
 import { getObjectStoreConfig } from 'utils/ObjectStoreServiceUtils';
 import { DEF_UI_SCHEMA, JWT_CONFIG } from '../../constants/Services.constant';
@@ -92,13 +92,13 @@ const ServiceConnectionDetails = ({
                   value.securityConfig?.awsAccessKeyId ||
                   value.securityConfig?.awsSecretAccessKey
                 ) {
-                  const newSchemaPropertyObject =
-                    schema.definitions.S3Config.properties.securityConfig
-                      .properties;
-
                   return getKeyValues(
                     value.securityConfig,
-                    newSchemaPropertyObject
+                    get(
+                      schema,
+                      'definitions.S3Config.properties.securityConfig.properties',
+                      {}
+                    )
                   );
                 }
               } else if (
@@ -115,21 +115,25 @@ const ServiceConnectionDetails = ({
             } else {
               if (isObject(value.securityConfig.gcsConfig)) {
                 // Condition for GCS Credentials value
-                const newGcsSchemaPropertyObject =
-                  schema.definitions.GCSConfig.properties.securityConfig
-                    .definitions.GCSValues.properties;
-
                 return getKeyValues(
                   value.securityConfig.gcsConfig,
-                  newGcsSchemaPropertyObject
+                  get(
+                    schema,
+                    'definitions.GCSConfig.properties.securityConfig.definitions.GCSValues.properties',
+                    {}
+                  )
                 );
               } else {
                 // Condition for GCS Credentials path
-                const newSchemaPropertyObject =
-                  schema.definitions.GCSConfig.properties.securityConfig
-                    .definitions.GCSCredentialsPath;
 
-                return getKeyValues(value, newSchemaPropertyObject);
+                return getKeyValues(
+                  value,
+                  get(
+                    schema,
+                    'definitions.GCSConfig.properties.securityConfig.definitions.GCSCredentialsPath',
+                    {}
+                  )
+                );
               }
             }
           }