yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-10-15 02:38:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI : Fix the breaking issue on Datalake service (#10626)

Browse Source 
* Fix the breaking issue on Datalake service

* changes as per comments
This commit is contained in:
Ashish Gupta 2023-03-16 22:37:01 +05:30 committed by GitHub
parent 9d858ede3a
commit f4ec07b04c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
openmetadata-ui/src/main/resources/ui/src/components/ServiceConnectionDetails/ServiceConnectionDetails.component.tsx
View File

@ -18,7 +18,7 @@
import { InfoCircleOutlined } from '@ant-design/icons'; import { InfoCircleOutlined } from '@ant-design/icons';
import { Card, Tooltip } from 'antd'; import { Card, Tooltip } from 'antd';
import { ObjectStoreServiceType } from 'generated/entity/services/objectstoreService'; 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 React, { ReactNode, useEffect, useState } from 'react';
import { getObjectStoreConfig } from 'utils/ObjectStoreServiceUtils'; import { getObjectStoreConfig } from 'utils/ObjectStoreServiceUtils';
import { DEF_UI_SCHEMA, JWT_CONFIG } from '../../constants/Services.constant'; import { DEF_UI_SCHEMA, JWT_CONFIG } from '../../constants/Services.constant';
@ -92,13 +92,13 @@ const ServiceConnectionDetails = ({
value.securityConfig?.awsAccessKeyId || value.securityConfig?.awsAccessKeyId ||
value.securityConfig?.awsSecretAccessKey value.securityConfig?.awsSecretAccessKey
) { ) {
const newSchemaPropertyObject =
schema.definitions.S3Config.properties.securityConfig
.properties;
return getKeyValues( return getKeyValues(
value.securityConfig, value.securityConfig,
newSchemaPropertyObject get(
schema,
'definitions.S3Config.properties.securityConfig.properties',
{}
)
); );
} }
} else if ( } else if (
@ -115,21 +115,25 @@ const ServiceConnectionDetails = ({
} else { } else {
if (isObject(value.securityConfig.gcsConfig)) { if (isObject(value.securityConfig.gcsConfig)) {
// Condition for GCS Credentials value // Condition for GCS Credentials value
const newGcsSchemaPropertyObject =
schema.definitions.GCSConfig.properties.securityConfig
.definitions.GCSValues.properties;
return getKeyValues( return getKeyValues(
value.securityConfig.gcsConfig, value.securityConfig.gcsConfig,
newGcsSchemaPropertyObject get(
schema,
'definitions.GCSConfig.properties.securityConfig.definitions.GCSValues.properties',
{}
)
); );
} else { } else {
// Condition for GCS Credentials path // 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',
{}
)
);
} }
} }
} }