- {getServiceLogo(type || '', 'h-9')}
+ {getServiceLogo(type || '', 'h-9', { serviceType: type })}
{type === selectServiceType && (
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/AddService/Steps/Steps.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/AddService/Steps/Steps.interface.ts
index b2346eb7f885..140a822ea3df 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/AddService/Steps/Steps.interface.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/AddService/Steps/Steps.interface.ts
@@ -27,5 +27,5 @@ export type SelectServiceTypeProps = {
export type ConfigureServiceProps = {
serviceName: string;
onBack: () => void;
- onNext: (data: Pick) => void;
+ onNext: (data: Pick) => void;
};
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Services.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Services.test.tsx
index c77eaf30dbaa..ca7fbd17cec1 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Services.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Services.test.tsx
@@ -1,5 +1,5 @@
/*
- * Copyright 2024 Collate.
+ * Copyright 2025 Collate
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -10,375 +10,391 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import { act, fireEvent, render, screen } from '@testing-library/react';
-import { ColumnsType } from 'antd/lib/table';
-import React, { ReactNode } from 'react';
-import { DISABLED } from '../../../constants/constants';
-import { PAGE_HEADERS } from '../../../constants/PageHeaders.constant';
-import { PIPELINE_SERVICE_PLATFORM } from '../../../constants/Services.constant';
-import { useAirflowStatus } from '../../../context/AirflowStatusProvider/AirflowStatusProvider';
-import { ServiceCategory } from '../../../enums/service.enum';
-import { PipelineServiceType } from '../../../generated/entity/data/pipeline';
-import LimitWrapper from '../../../hoc/LimitWrapper';
+
+import { render, screen, waitFor } from '@testing-library/react';
+import { MemoryRouter } from 'react-router-dom';
+import { act } from 'react-dom/test-utils';
import Services from './Services';
+import { ServiceCategory } from '../../../../enums/service.enum';
-let isDescription = true;
-
-const mockService = {
- name: ServiceCategory.PIPELINE_SERVICES,
- serviceType: PipelineServiceType.Airbyte,
-};
-
-const services = [
- {
- name: ServiceCategory.DATABASE_SERVICES,
- header: PAGE_HEADERS.DATABASES_SERVICES,
- },
- {
- name: ServiceCategory.DASHBOARD_SERVICES,
- header: PAGE_HEADERS.DASHBOARD_SERVICES,
- },
- {
- name: ServiceCategory.MESSAGING_SERVICES,
- header: PAGE_HEADERS.MESSAGING_SERVICES,
- },
- {
- name: ServiceCategory.METADATA_SERVICES,
- header: PAGE_HEADERS.METADATA_SERVICES,
- },
- {
- name: ServiceCategory.ML_MODEL_SERVICES,
- header: PAGE_HEADERS.ML_MODELS_SERVICES,
- },
- {
- name: ServiceCategory.PIPELINE_SERVICES,
- header: PAGE_HEADERS.PIPELINES_SERVICES,
- },
- {
- name: ServiceCategory.SEARCH_SERVICES,
- header: PAGE_HEADERS.SEARCH_SERVICES,
- },
- {
- name: ServiceCategory.STORAGE_SERVICES,
- header: PAGE_HEADERS.STORAGE_SERVICES,
- },
-];
-
-const mockGetServicesData = [
- {
- id: '518dea5f-28b7-4c3d-a4ef-4b1791e41d47',
- name: 'Glue',
- fullyQualifiedName: 'Glue',
- serviceType: 'Glue',
- connection: {
- config: {
- type: 'Glue',
- awsConfig: {
- awsAccessKeyId: 'aws accessKey id',
- awsSecretAccessKey: '*********',
- awsRegion: 'aws region',
- endPointURL: 'https://glue.region_name.amazonaws.com/',
- assumeRoleSessionName: 'OpenMetadataSession',
- },
- supportsMetadataExtraction: true,
- supportsDBTExtraction: true,
- },
+// Mock the dependencies
+jest.mock('../../../../rest/serviceAPI', () => ({
+ getServices: jest.fn(),
+ searchService: jest.fn(),
+}));
+
+jest.mock('../../../../context/PermissionProvider/PermissionProvider', () => ({
+ usePermissionProvider: () => ({
+ permissions: {
+ DatabaseService: { Create: true, Delete: true, ViewAll: true },
+ PipelineService: { Create: true, Delete: true, ViewAll: true },
+ DashboardService: { Create: true, Delete: true, ViewAll: true },
},
- version: 0.1,
- updatedAt: 1708326433711,
- updatedBy: 'admin',
- href: 'http://localhost:8585/api/v1/services/databaseServices/518dea5f-28b7-4c3d-a4ef-4b1791e41d47',
- deleted: false,
- },
-];
-
-jest.mock('../../../context/PermissionProvider/PermissionProvider', () => ({
- usePermissionProvider: jest.fn().mockReturnValue({
- permissions: jest.fn().mockReturnValue({
- Create: true,
- Delete: true,
- ViewAll: true,
- EditAll: true,
- EditDescription: true,
- EditDisplayName: true,
- EditCustomFields: true,
- }),
}),
}));
-jest.mock('../../../hooks/paging/usePaging', () => ({
- usePaging: jest.fn().mockReturnValue({
+jest.mock('../../../../context/AirflowStatusProvider/AirflowStatusProvider', () => ({
+ useAirflowStatus: () => ({
+ isFetchingStatus: false,
+ }),
+}));
+
+jest.mock('../../../../hooks/paging/usePaging', () => ({
+ usePaging: () => ({
+ paging: { total: 0, offset: 0, limit: 10 },
+ handlePagingChange: jest.fn(),
currentPage: 1,
- paging: {},
- pageSize: 10,
- showPagination: true,
handlePageChange: jest.fn(),
- handlePagingChange: jest.fn(),
+ pageSize: 10,
handlePageSizeChange: jest.fn(),
+ showPagination: false,
}),
}));
-jest.mock(
- '../../../context/AirflowStatusProvider/AirflowStatusProvider',
- () => ({
- useAirflowStatus: jest.fn().mockImplementation(() => ({
- isFetchingStatus: false,
- isAirflowAvailable: true,
- fetchAirflowStatus: jest.fn(),
- platform: PIPELINE_SERVICE_PLATFORM,
- })),
- })
-);
-
-jest.mock('../../../utils/CommonUtils', () => ({
- getServiceLogo: jest.fn().mockReturnValue('Pipeline Service'),
-}));
-
-const mockSearchService = jest.fn();
-jest.mock('../../../rest/serviceAPI', () => ({
- getServices: jest
- .fn()
- .mockImplementation(() => Promise.resolve(mockGetServicesData)),
- searchService: jest.fn().mockImplementation(() => mockSearchService()),
+jest.mock('react-router-dom', () => ({
+ ...jest.requireActual('react-router-dom'),
+ useNavigate: () => jest.fn(),
}));
-jest.mock('../../../utils/StringsUtils', () => ({
- ...jest.requireActual('../../../utils/StringsUtils'),
- stringToHTML: jest.fn((text) => text),
-}));
+import { getServices, searchService } from '../../../../rest/serviceAPI';
-jest.mock('../../../utils/EntityUtils', () => {
- const actual = jest.requireActual('../../../utils/EntityUtils');
+const mockGetServices = getServices as jest.MockedFunction;
+const mockSearchService = searchService as jest.MockedFunction;
- return {
- ...actual,
- getEntityName: jest.fn().mockReturnValue('Glue'),
- highlightSearchText: jest.fn((text) => text),
- };
-});
+describe('Services Component - Logo Display', () => {
+ beforeEach(() => {
+ jest.clearAllMocks();
+ });
-jest.mock('../../../utils/PermissionsUtils', () => ({
- checkPermission: jest.fn().mockReturnValue(true),
-}));
+ const mockServices = [
+ {
+ id: '1',
+ name: 'custom-db-1',
+ displayName: 'Custom Database 1',
+ serviceType: 'CustomDatabase',
+ fullyQualifiedName: 'custom-db-1',
+ description: 'Test custom database',
+ logoUrl: 'https://example.com/custom-db-logo.png',
+ deleted: false,
+ href: '/services/databaseServices/custom-db-1',
+ },
+ {
+ id: '2',
+ name: 'custom-pipeline-1',
+ displayName: 'Custom Pipeline 1',
+ serviceType: 'CustomPipeline',
+ fullyQualifiedName: 'custom-pipeline-1',
+ description: 'Test custom pipeline',
+ logoUrl: 'https://example.com/custom-pipeline-logo.svg',
+ deleted: false,
+ href: '/services/pipelineServices/custom-pipeline-1',
+ },
+ {
+ id: '3',
+ name: 'custom-dashboard-1',
+ displayName: 'Custom Dashboard 1',
+ serviceType: 'CustomDashboard',
+ fullyQualifiedName: 'custom-dashboard-1',
+ description: 'Test custom dashboard',
+ logoUrl: null, // No custom logo
+ deleted: false,
+ href: '/services/dashboardServices/custom-dashboard-1',
+ },
+ {
+ id: '4',
+ name: 'mysql-service',
+ displayName: 'MySQL Service',
+ serviceType: 'Mysql',
+ fullyQualifiedName: 'mysql-service',
+ description: 'Standard MySQL service',
+ logoUrl: undefined, // No custom logo
+ deleted: false,
+ href: '/services/databaseServices/mysql-service',
+ },
+ ];
-jest.mock('../../../utils/ServiceUtils', () => ({
- getOptionalFields: jest.fn(),
- getResourceEntityFromServiceCategory: jest.fn(),
- getServiceTypesFromServiceCategory: jest.fn(),
-}));
+ describe('Service List View', () => {
+ it('should display custom logos in service list', async () => {
+ mockGetServices.mockResolvedValue({
+ data: mockServices,
+ paging: { total: 4, offset: 0, limit: 10 },
+ });
-jest.mock('../../common/ErrorWithPlaceholder/ErrorPlaceHolder', () => {
- return () =>
+
+ );
+ });
-jest.mock('../../common/OwnerLabel/OwnerLabel.component', () => ({
- OwnerLabel: jest.fn().mockImplementation(() =>
+
+ );
+ });
-jest.mock('react-router-dom', () => ({
- useNavigate: jest.fn().mockImplementation(() => mockNavigate),
- Link: jest
- .fn()
- .mockImplementation(({ children }: { children: React.ReactNode }) => (
-
+
+ );
+ });
+
+ await waitFor(() => {
+ expect(screen.getByTestId('services-container')).toBeInTheDocument();
});
- expect(await screen.findByText('PageHeader')).toBeInTheDocument();
- expect(
- await screen.findByText(service.header.header)
- ).toBeInTheDocument();
- expect(
- await screen.findByText(service.header.subHeader)
- ).toBeInTheDocument();
+ // Find the custom logo image
+ const customLogo = screen.getByTestId('service-name-custom-db-1')
+ .closest('div')
+ ?.querySelector('img') as HTMLImageElement;
+
+ expect(customLogo).toHaveAttribute('src', 'https://example.com/custom-db-logo.png');
+
+ // Simulate image load error
+ const errorEvent = new Event('error');
+ customLogo.dispatchEvent(errorEvent);
+
+ // Should fallback to default logo
+ await waitFor(() => {
+ expect(customLogo.src).not.toBe('https://example.com/custom-db-logo.png');
+ });
});
});
- it('should render add service skeleton loader while airflow status is not fetching', async () => {
- await act(async () => {
- render(
+
+ );
+ });
- expect(LimitWrapper).toHaveBeenCalledWith(
- expect.objectContaining({ resource: 'dataAssets' }),
- {}
- );
- });
+ await waitFor(() => {
+ expect(screen.getByTestId('services-container')).toBeInTheDocument();
+ });
- it('should call mock push add service skeleton loader while airflow status is not fetching', async () => {
- await act(async () => {
- render(
+
+ );
+ });
- expect(
- await screen.findByTestId('card-renderer-container')
- ).toBeInTheDocument();
- expect(
- await screen.findByTestId('table-props-container')
- ).toBeInTheDocument();
- expect(await screen.findByText('label.name')).toBeInTheDocument();
- expect(
- await screen.findByTestId('service-name-pipelineServices')
- ).toHaveTextContent('Glue');
-
- expect(await screen.findByText('label.owner-plural')).toBeInTheDocument();
- expect(await screen.findByText('OwnerLabel')).toBeInTheDocument();
- });
+ await waitFor(() => {
+ expect(screen.getByTestId('services-container')).toBeInTheDocument();
+ });
- it('should render service card with description', async () => {
- render(
+
+ );
+ });
+
+ await waitFor(() => {
+ expect(screen.getByTestId('services-container')).toBeInTheDocument();
+ });
+
+ // Perform search
+ const searchInput = screen.getByPlaceholderText(/search/i);
+ await act(async () => {
+ fireEvent.change(searchInput, { target: { value: 'custom' } });
+ });
+
+ await waitFor(() => {
+ expect(mockSearchService).toHaveBeenCalled();
+ });
- expect(await screen.findByTestId('service-card')).toBeInTheDocument();
+ // Custom logo should still be displayed
+ const customLogo = screen.getByTestId('service-name-custom-db-1')
+ .closest('div')
+ ?.querySelector('img');
+ expect(customLogo).toHaveAttribute('src', 'https://example.com/custom-db-logo.png');
+ });
+ });
- expect(await screen.findByTestId('service-description')).toHaveTextContent(
- 'label.no-description'
- );
+ describe('Different Service Types', () => {
+ const serviceTypeTestCases = [
+ { category: ServiceCategory.DATABASE_SERVICES, serviceType: 'CustomDatabase' },
+ { category: ServiceCategory.PIPELINE_SERVICES, serviceType: 'CustomPipeline' },
+ { category: ServiceCategory.DASHBOARD_SERVICES, serviceType: 'CustomDashboard' },
+ { category: ServiceCategory.MESSAGING_SERVICES, serviceType: 'CustomMessaging' },
+ { category: ServiceCategory.MLMODEL_SERVICES, serviceType: 'CustomMlModel' },
+ { category: ServiceCategory.STORAGE_SERVICES, serviceType: 'CustomStorage' },
+ { category: ServiceCategory.SEARCH_SERVICES, serviceType: 'CustomSearch' },
+ { category: ServiceCategory.DRIVE_SERVICES, serviceType: 'CustomDrive' },
+ ];
+
+ serviceTypeTestCases.forEach(({ category, serviceType }) => {
+ it(`should handle custom logos for ${serviceType} services`, async () => {
+ const testService = {
+ id: '1',
+ name: `test-${serviceType.toLowerCase()}`,
+ displayName: `Test ${serviceType}`,
+ serviceType,
+ fullyQualifiedName: `test-${serviceType.toLowerCase()}`,
+ description: `Test ${serviceType} service`,
+ logoUrl: `https://example.com/${serviceType.toLowerCase()}-logo.png`,
+ deleted: false,
+ href: `/services/${category.toLowerCase()}/test-${serviceType.toLowerCase()}`,
+ };
+
+ mockGetServices.mockResolvedValue({
+ data: [testService],
+ paging: { total: 1, offset: 0, limit: 10 },
+ });
+
+ await act(async () => {
+ render(
+
+
+ );
+ });
+
+ await waitFor(() => {
+ expect(screen.getByTestId('services-container')).toBeInTheDocument();
+ });
+
+ const serviceIcon = screen.getByTestId('service-icon');
+ const logoImg = serviceIcon.querySelector('img');
+ expect(logoImg).toHaveAttribute('src', `https://example.com/${serviceType.toLowerCase()}-logo.png`);
+ });
+ });
});
- it('should show add service button even if platform is disabled', async () => {
- (useAirflowStatus as jest.Mock).mockImplementationOnce(() => ({
- platform: DISABLED,
- }));
- await act(async () => {
- render(
+
+ );
+ });
+
+ await waitFor(() => {
+ expect(screen.getByTestId('error-placeholder')).toBeInTheDocument();
+ });
});
- const addServiceButton = screen.getByTestId('add-service-button');
+ it('should handle empty service list', async () => {
+ mockGetServices.mockResolvedValue({
+ data: [],
+ paging: { total: 0, offset: 0, limit: 10 },
+ });
+
+ await act(async () => {
+ render(
+
+
+ );
+ });
+
+ await waitFor(() => {
+ expect(screen.getByTestId('services-container')).toBeInTheDocument();
+ });
- expect(addServiceButton).toBeInTheDocument();
+ expect(screen.getByText(/no services found/i)).toBeInTheDocument();
+ });
});
-});
+});
\ No newline at end of file
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Services.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Services.tsx
index 05d58776ef1c..ac69223ca747 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Services.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Services.tsx
@@ -342,7 +342,7 @@ const Services = ({ serviceName }: ServicesProps) => {
width: 200,
render: (name, record) => (
ErrorPlaceHolder
;
-});
+ await act(async () => {
+ render(
+ OwnerLabel
), -})); + await waitFor(() => { + expect(screen.getByTestId('services-container')).toBeInTheDocument(); + }); -jest.mock('../../../utils/TableColumn.util', () => ({ - ownerTableObject: jest.fn().mockReturnValue([ - { - title: 'label.owner-plural', - dataIndex: 'owners', - key: 'owners', - width: 180, - render: () =>OwnerLabel
,
- },
- ]),
-}));
+ // Check that custom logos are displayed
+ const customDbLogo = screen.getByTestId('service-name-custom-db-1')
+ .closest('div')
+ ?.querySelector('img');
+ expect(customDbLogo).toHaveAttribute('src', 'https://example.com/custom-db-logo.png');
-jest.mock('../../common/ListView/ListView.component', () => ({
- ListView: jest.fn().mockImplementation(({ cardRenderer, tableProps }) => (
-
-
- )),
-}));
+ const customPipelineLogo = screen.getByTestId('service-name-custom-pipeline-1')
+ .closest('div')
+ ?.querySelector('img');
+ expect(customPipelineLogo).toHaveAttribute('src', 'https://example.com/custom-pipeline-logo.svg');
+ });
-jest.mock('../../common/RichTextEditor/RichTextEditorPreviewerV1', () => {
- return jest
- .fn()
- .mockReturnValue(
-
- {cardRenderer({
- ...mockService,
- description: isDescription ? 'test description' : '',
- })}
-
-
- {tableProps.columns.map(
- (column: ColumnsType[0], key: string) =>
- column.render && (
- <>
-
- {column.title as string}
-
- {column.render(column.title, column, 1) as ReactNode}
-
-
- )
- )}
- RichTextPreviewer
- );
-});
-
-jest.mock(
- '../../common/Skeleton/CommonSkeletons/ControlElements/ControlElements.component',
- () =>
- jest
- .fn()
- .mockImplementation(() => (
- ButtonSkeleton
- ))
-);
-
-jest.mock('../../Database/ColumnFilter/ColumnFilter.component', () => ({
- __esModule: true,
-
- default: jest.fn().mockImplementation(() => ColumnFilter
), -})); + it('should fallback to default logos when no custom logo provided', async () => { + mockGetServices.mockResolvedValue({ + data: mockServices, + paging: { total: 4, offset: 0, limit: 10 }, + }); -jest.mock('../../PageHeader/PageHeader.component', () => - jest - .fn() - .mockImplementation(({ data = ServiceCategory.PIPELINE_SERVICES }) => ( -
- PageHeader
-
- ))
-);
-
-jest.mock('antd', () => ({
- ...jest.requireActual('antd'),
-
- Tooltip: jest
- .fn()
- .mockImplementation(({ children }) => {data.header}
-{data.subHeader}
-{children}
),
-}));
-const mockNavigate = jest.fn();
+ await act(async () => {
+ render(
+ {children}
- )), -})); + await waitFor(() => { + expect(screen.getByTestId('services-container')).toBeInTheDocument(); + }); -jest.mock('../../../hoc/LimitWrapper', () => { - return jest - .fn() - .mockImplementation(({ children }) => <>LimitWrapper{children}); -}); + // Check that default logos are used for services without custom logos + const defaultDashboardLogo = screen.getByTestId('service-name-custom-dashboard-1') + .closest('div') + ?.querySelector('img'); + expect(defaultDashboardLogo).toHaveAttribute('src', expect.stringContaining('dashboard')); -describe('Services', () => { - it('should render Services', async () => { - await act(async () => { - render(
- {getServiceLogo(record.serviceType || '', 'w-4')}
+ {getServiceLogo(record.serviceType || '', 'w-4', record)}
{
diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createApiService.ts b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createApiService.ts
index edefcb1d2d06..50e9982248cc 100644
--- a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createApiService.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createApiService.ts
@@ -36,6 +36,10 @@ export interface CreateAPIService {
* The ingestion agent responsible for executing the ingestion pipeline.
*/
ingestionRunner?: EntityReference;
+ /**
+ * URL to the logo image for this service. Primarily used for custom service types.
+ */
+ logoUrl?: string;
/**
* Name that identifies the this entity instance uniquely
*/
diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createDashboardService.ts b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createDashboardService.ts
index b9ca86cf88f0..e05dcd5a0b5e 100644
--- a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createDashboardService.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createDashboardService.ts
@@ -35,6 +35,10 @@ export interface CreateDashboardService {
* The ingestion agent responsible for executing the ingestion pipeline.
*/
ingestionRunner?: EntityReference;
+ /**
+ * URL to the logo image for this service. Primarily used for custom service types.
+ */
+ logoUrl?: string;
/**
* Name that identifies the this entity instance uniquely
*/
@@ -1107,7 +1111,7 @@ export interface GCPCredentialsConfiguration {
*
* Google Cloud Platform ADC ( Application Default Credentials )
*/
- type?: string;
+ type?: CredentialsType;
/**
* Path of the file containing the GCP credentials info
*/
@@ -1125,7 +1129,7 @@ export interface GCPCredentialsConfiguration {
/**
* Google Cloud Platform account type.
*/
- externalType?: string;
+ externalType?: GCPAccountType;
/**
* Google Security Token Service subject token type based on the OAuth 2.0 token exchange
* spec.
@@ -1138,6 +1142,17 @@ export interface GCPCredentialsConfiguration {
[property: string]: any;
}
+export enum GCPAccountType {
+ ExternalAccount = "external_account",
+}
+
+export enum CredentialsType {
+ ExternalAccount = "external_account",
+ GcpADC = "gcp_adc",
+ GcpCredentialPath = "gcp_credential_path",
+ ServiceAccount = "service_account",
+}
+
/**
* we enable the authenticated service account to impersonate another service account
*
diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createDatabaseService.ts b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createDatabaseService.ts
index a9dd343ce7a6..648908135161 100644
--- a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createDatabaseService.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createDatabaseService.ts
@@ -36,6 +36,10 @@ export interface CreateDatabaseService {
* at runtime based on the Ingestion Agent of the service.
*/
ingestionRunner?: EntityReference;
+ /**
+ * URL to the logo image for this service. Primarily used for custom service types.
+ */
+ logoUrl?: string;
/**
* Name that identifies the this entity instance uniquely
*/
@@ -1547,7 +1551,7 @@ export interface GCPCredentialsConfiguration {
*
* Google Cloud Platform ADC ( Application Default Credentials )
*/
- type?: string;
+ type?: CredentialsType;
/**
* Path of the file containing the GCP credentials info
*/
@@ -1565,7 +1569,7 @@ export interface GCPCredentialsConfiguration {
/**
* Google Cloud Platform account type.
*/
- externalType?: string;
+ externalType?: GCPAccountType;
/**
* Google Security Token Service subject token type based on the OAuth 2.0 token exchange
* spec.
@@ -1578,6 +1582,17 @@ export interface GCPCredentialsConfiguration {
[property: string]: any;
}
+export enum GCPAccountType {
+ ExternalAccount = "external_account",
+}
+
+export enum CredentialsType {
+ ExternalAccount = "external_account",
+ GcpADC = "gcp_adc",
+ GcpCredentialPath = "gcp_credential_path",
+ ServiceAccount = "service_account",
+}
+
/**
* we enable the authenticated service account to impersonate another service account
*
diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createDriveService.ts b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createDriveService.ts
index 41e7a2061bef..103798ae326d 100644
--- a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createDriveService.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createDriveService.ts
@@ -35,6 +35,10 @@ export interface CreateDriveService {
* The ingestion agent responsible for executing the ingestion pipeline.
*/
ingestionRunner?: EntityReference;
+ /**
+ * URL to the logo image for this service. Primarily used for custom service types.
+ */
+ logoUrl?: string;
/**
* Name that identifies this drive service.
*/
@@ -207,7 +211,7 @@ export interface GCPCredentialsConfiguration {
*
* Google Cloud Platform ADC ( Application Default Credentials )
*/
- type?: string;
+ type?: CredentialsType;
/**
* Path of the file containing the GCP credentials info
*/
@@ -225,7 +229,7 @@ export interface GCPCredentialsConfiguration {
/**
* Google Cloud Platform account type.
*/
- externalType?: string;
+ externalType?: GCPAccountType;
/**
* Google Security Token Service subject token type based on the OAuth 2.0 token exchange
* spec.
@@ -238,6 +242,17 @@ export interface GCPCredentialsConfiguration {
[property: string]: any;
}
+export enum GCPAccountType {
+ ExternalAccount = "external_account",
+}
+
+export enum CredentialsType {
+ ExternalAccount = "external_account",
+ GcpADC = "gcp_adc",
+ GcpCredentialPath = "gcp_credential_path",
+ ServiceAccount = "service_account",
+}
+
/**
* we enable the authenticated service account to impersonate another service account
*
diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createMessagingService.ts b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createMessagingService.ts
index e7a3c7758295..25030d23abbf 100644
--- a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createMessagingService.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createMessagingService.ts
@@ -36,6 +36,10 @@ export interface CreateMessagingService {
* The ingestion agent responsible for executing the ingestion pipeline.
*/
ingestionRunner?: EntityReference;
+ /**
+ * URL to the logo image for this service. Primarily used for custom service types.
+ */
+ logoUrl?: string;
/**
* Name that identifies the this entity instance uniquely
*/
diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createMetadataService.ts b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createMetadataService.ts
index 24357f39b9cb..51696cd7f4c0 100644
--- a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createMetadataService.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createMetadataService.ts
@@ -31,6 +31,10 @@ export interface CreateMetadataService {
* The ingestion agent responsible for executing the ingestion pipeline.
*/
ingestionRunner?: EntityReference;
+ /**
+ * URL to the logo image for this service. Primarily used for custom service types.
+ */
+ logoUrl?: string;
/**
* Name that identifies the this entity instance uniquely
*/
diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createMlModelService.ts b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createMlModelService.ts
index 8a4c92287098..07c318b8307c 100644
--- a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createMlModelService.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createMlModelService.ts
@@ -35,6 +35,10 @@ export interface CreateMlModelService {
* The ingestion agent responsible for executing the ingestion pipeline.
*/
ingestionRunner?: EntityReference;
+ /**
+ * URL to the logo image for this service. Primarily used for custom service types.
+ */
+ logoUrl?: string;
/**
* Name that identifies the this entity instance uniquely
*/
@@ -224,7 +228,7 @@ export interface GCPCredentialsConfiguration {
*
* Google Cloud Platform ADC ( Application Default Credentials )
*/
- type?: string;
+ type?: CredentialsType;
/**
* Path of the file containing the GCP credentials info
*/
@@ -242,7 +246,7 @@ export interface GCPCredentialsConfiguration {
/**
* Google Cloud Platform account type.
*/
- externalType?: string;
+ externalType?: GCPAccountType;
/**
* Google Security Token Service subject token type based on the OAuth 2.0 token exchange
* spec.
@@ -255,6 +259,17 @@ export interface GCPCredentialsConfiguration {
[property: string]: any;
}
+export enum GCPAccountType {
+ ExternalAccount = "external_account",
+}
+
+export enum CredentialsType {
+ ExternalAccount = "external_account",
+ GcpADC = "gcp_adc",
+ GcpCredentialPath = "gcp_credential_path",
+ ServiceAccount = "service_account",
+}
+
/**
* we enable the authenticated service account to impersonate another service account
*
diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createPipelineService.ts b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createPipelineService.ts
index d5c44176087b..214baa177809 100644
--- a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createPipelineService.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createPipelineService.ts
@@ -39,6 +39,10 @@ export interface CreatePipelineService {
* Life Cycle of the entity
*/
lifeCycle?: LifeCycle;
+ /**
+ * URL to the logo image for this service. Primarily used for custom service types.
+ */
+ logoUrl?: string;
/**
* Name that identifies the this entity instance uniquely
*/
diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createSearchService.ts b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createSearchService.ts
index 6a30016d7835..a99209b41a69 100644
--- a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createSearchService.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createSearchService.ts
@@ -36,6 +36,10 @@ export interface CreateSearchService {
* The ingestion agent responsible for executing the ingestion pipeline.
*/
ingestionRunner?: EntityReference;
+ /**
+ * URL to the logo image for this service. Primarily used for custom service types.
+ */
+ logoUrl?: string;
/**
* Name that identifies the this entity instance uniquely
*/
diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createSecurityService.ts b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createSecurityService.ts
index 4e624d6fbdd4..6c37d3e171df 100644
--- a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createSecurityService.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createSecurityService.ts
@@ -36,6 +36,10 @@ export interface CreateSecurityService {
* The ingestion agent responsible for executing the ingestion pipeline.
*/
ingestionRunner?: EntityReference;
+ /**
+ * URL to the logo image for this service. Primarily used for custom service types.
+ */
+ logoUrl?: string;
/**
* Name that identifies the this entity instance uniquely
*/
diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createStorageService.ts b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createStorageService.ts
index 0aff7fb05b34..98a24e5ffbda 100644
--- a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createStorageService.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createStorageService.ts
@@ -36,6 +36,10 @@ export interface CreateStorageService {
* The ingestion agent responsible for executing the ingestion pipeline.
*/
ingestionRunner?: EntityReference;
+ /**
+ * URL to the logo image for this service. Primarily used for custom service types.
+ */
+ logoUrl?: string;
/**
* Name that identifies the this entity instance uniquely
*/
@@ -261,7 +265,7 @@ export interface GCPCredentialsConfiguration {
*
* Google Cloud Platform ADC ( Application Default Credentials )
*/
- type?: string;
+ type?: CredentialsType;
/**
* Path of the file containing the GCP credentials info
*/
@@ -279,7 +283,7 @@ export interface GCPCredentialsConfiguration {
/**
* Google Cloud Platform account type.
*/
- externalType?: string;
+ externalType?: GCPAccountType;
/**
* Google Security Token Service subject token type based on the OAuth 2.0 token exchange
* spec.
@@ -292,6 +296,17 @@ export interface GCPCredentialsConfiguration {
[property: string]: any;
}
+export enum GCPAccountType {
+ ExternalAccount = "external_account",
+}
+
+export enum CredentialsType {
+ ExternalAccount = "external_account",
+ GcpADC = "gcp_adc",
+ GcpCredentialPath = "gcp_credential_path",
+ ServiceAccount = "service_account",
+}
+
/**
* we enable the authenticated service account to impersonate another service account
*
diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/apiService.ts b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/apiService.ts
index c1198cd1b0fe..0b17eb2986dc 100644
--- a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/apiService.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/apiService.ts
@@ -64,6 +64,11 @@ export interface APIService {
* The ingestion agent responsible for executing the ingestion pipeline.
*/
ingestionRunner?: EntityReference;
+ /**
+ * URL to the logo image for this service. Primarily used for custom service types to
+ * provide a visual identifier.
+ */
+ logoUrl?: string;
/**
* Name that identifies this API service.
*/
diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/dashboardService.ts b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/dashboardService.ts
index 516ae9c175be..c824f8c69745 100644
--- a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/dashboardService.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/dashboardService.ts
@@ -63,6 +63,11 @@ export interface DashboardService {
* The ingestion agent responsible for executing the ingestion pipeline.
*/
ingestionRunner?: EntityReference;
+ /**
+ * URL to the logo image for this service. Primarily used for custom service types to
+ * provide a visual identifier.
+ */
+ logoUrl?: string;
/**
* Name that identifies this dashboard service.
*/
@@ -1224,7 +1229,7 @@ export interface GCPCredentialsConfiguration {
*
* Google Cloud Platform ADC ( Application Default Credentials )
*/
- type?: string;
+ type?: CredentialsType;
/**
* Path of the file containing the GCP credentials info
*/
@@ -1242,7 +1247,7 @@ export interface GCPCredentialsConfiguration {
/**
* Google Cloud Platform account type.
*/
- externalType?: string;
+ externalType?: GCPAccountType;
/**
* Google Security Token Service subject token type based on the OAuth 2.0 token exchange
* spec.
@@ -1255,6 +1260,17 @@ export interface GCPCredentialsConfiguration {
[property: string]: any;
}
+export enum GCPAccountType {
+ ExternalAccount = "external_account",
+}
+
+export enum CredentialsType {
+ ExternalAccount = "external_account",
+ GcpADC = "gcp_adc",
+ GcpCredentialPath = "gcp_credential_path",
+ ServiceAccount = "service_account",
+}
+
/**
* we enable the authenticated service account to impersonate another service account
*
diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/databaseService.ts b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/databaseService.ts
index c892939532bb..bed267a862d9 100644
--- a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/databaseService.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/databaseService.ts
@@ -65,6 +65,11 @@ export interface DatabaseService {
* The ingestion agent responsible for executing the ingestion pipeline.
*/
ingestionRunner?: EntityReference;
+ /**
+ * URL to the logo image for this service. Primarily used for custom service types to
+ * provide a visual identifier.
+ */
+ logoUrl?: string;
/**
* Name that identifies this database service.
*/
@@ -1666,7 +1671,7 @@ export interface GCPCredentialsConfiguration {
*
* Google Cloud Platform ADC ( Application Default Credentials )
*/
- type?: string;
+ type?: CredentialsType;
/**
* Path of the file containing the GCP credentials info
*/
@@ -1684,7 +1689,7 @@ export interface GCPCredentialsConfiguration {
/**
* Google Cloud Platform account type.
*/
- externalType?: string;
+ externalType?: GCPAccountType;
/**
* Google Security Token Service subject token type based on the OAuth 2.0 token exchange
* spec.
@@ -1697,6 +1702,17 @@ export interface GCPCredentialsConfiguration {
[property: string]: any;
}
+export enum GCPAccountType {
+ ExternalAccount = "external_account",
+}
+
+export enum CredentialsType {
+ ExternalAccount = "external_account",
+ GcpADC = "gcp_adc",
+ GcpCredentialPath = "gcp_credential_path",
+ ServiceAccount = "service_account",
+}
+
/**
* we enable the authenticated service account to impersonate another service account
*
diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/driveService.ts b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/driveService.ts
index 0d1ac4afed16..9478d4f15e76 100644
--- a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/driveService.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/driveService.ts
@@ -63,6 +63,11 @@ export interface DriveService {
* The ingestion agent responsible for executing the ingestion pipeline.
*/
ingestionRunner?: EntityReference;
+ /**
+ * URL to the logo image for this service. Primarily used for custom service types to
+ * provide a visual identifier.
+ */
+ logoUrl?: string;
/**
* Name that identifies this drive service.
*/
@@ -322,7 +327,7 @@ export interface GCPCredentialsConfiguration {
*
* Google Cloud Platform ADC ( Application Default Credentials )
*/
- type?: string;
+ type?: CredentialsType;
/**
* Path of the file containing the GCP credentials info
*/
@@ -340,7 +345,7 @@ export interface GCPCredentialsConfiguration {
/**
* Google Cloud Platform account type.
*/
- externalType?: string;
+ externalType?: GCPAccountType;
/**
* Google Security Token Service subject token type based on the OAuth 2.0 token exchange
* spec.
@@ -353,6 +358,17 @@ export interface GCPCredentialsConfiguration {
[property: string]: any;
}
+export enum GCPAccountType {
+ ExternalAccount = "external_account",
+}
+
+export enum CredentialsType {
+ ExternalAccount = "external_account",
+ GcpADC = "gcp_adc",
+ GcpCredentialPath = "gcp_credential_path",
+ ServiceAccount = "service_account",
+}
+
/**
* we enable the authenticated service account to impersonate another service account
*
diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/ingestionPipelines/ingestionPipeline.ts b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/ingestionPipelines/ingestionPipeline.ts
index ad572a1fc2de..7b2d0876a7cd 100644
--- a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/ingestionPipelines/ingestionPipeline.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/ingestionPipelines/ingestionPipeline.ts
@@ -2511,7 +2511,7 @@ export interface GCPCredentialsConfiguration {
*
* Google Cloud Platform ADC ( Application Default Credentials )
*/
- type?: string;
+ type?: CredentialsType;
/**
* Path of the file containing the GCP credentials info
*/
@@ -2529,7 +2529,7 @@ export interface GCPCredentialsConfiguration {
/**
* Google Cloud Platform account type.
*/
- externalType?: string;
+ externalType?: GCPAccountType;
/**
* Google Security Token Service subject token type based on the OAuth 2.0 token exchange
* spec.
@@ -2542,6 +2542,17 @@ export interface GCPCredentialsConfiguration {
[property: string]: any;
}
+export enum GCPAccountType {
+ ExternalAccount = "external_account",
+}
+
+export enum CredentialsType {
+ ExternalAccount = "external_account",
+ GcpADC = "gcp_adc",
+ GcpCredentialPath = "gcp_credential_path",
+ ServiceAccount = "service_account",
+}
+
/**
* we enable the authenticated service account to impersonate another service account
*
diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/messagingService.ts b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/messagingService.ts
index 1d72276248ac..99085754afc9 100644
--- a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/messagingService.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/messagingService.ts
@@ -64,6 +64,11 @@ export interface MessagingService {
* The ingestion agent responsible for executing the ingestion pipeline.
*/
ingestionRunner?: EntityReference;
+ /**
+ * URL to the logo image for this service. Primarily used for custom service types to
+ * provide a visual identifier.
+ */
+ logoUrl?: string;
/**
* Name that identifies this messaging service.
*/
diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/metadataService.ts b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/metadataService.ts
index 902b9326607d..597c0e19e22f 100644
--- a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/metadataService.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/metadataService.ts
@@ -60,6 +60,11 @@ export interface MetadataService {
* The ingestion agent responsible for executing the ingestion pipeline.
*/
ingestionRunner?: EntityReference;
+ /**
+ * URL to the logo image for this service. Primarily used for custom service types to
+ * provide a visual identifier.
+ */
+ logoUrl?: string;
/**
* Name that identifies this database service.
*/
diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/mlmodelService.ts b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/mlmodelService.ts
index 9500a63279e5..4943bbfa67f7 100644
--- a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/mlmodelService.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/mlmodelService.ts
@@ -64,6 +64,11 @@ export interface MlmodelService {
* The ingestion agent responsible for executing the ingestion pipeline.
*/
ingestionRunner?: EntityReference;
+ /**
+ * URL to the logo image for this service. Primarily used for custom service types to
+ * provide a visual identifier.
+ */
+ logoUrl?: string;
/**
* Name that identifies this pipeline service.
*/
@@ -342,7 +347,7 @@ export interface GCPCredentialsConfiguration {
*
* Google Cloud Platform ADC ( Application Default Credentials )
*/
- type?: string;
+ type?: CredentialsType;
/**
* Path of the file containing the GCP credentials info
*/
@@ -360,7 +365,7 @@ export interface GCPCredentialsConfiguration {
/**
* Google Cloud Platform account type.
*/
- externalType?: string;
+ externalType?: GCPAccountType;
/**
* Google Security Token Service subject token type based on the OAuth 2.0 token exchange
* spec.
@@ -373,6 +378,17 @@ export interface GCPCredentialsConfiguration {
[property: string]: any;
}
+export enum GCPAccountType {
+ ExternalAccount = "external_account",
+}
+
+export enum CredentialsType {
+ ExternalAccount = "external_account",
+ GcpADC = "gcp_adc",
+ GcpCredentialPath = "gcp_credential_path",
+ ServiceAccount = "service_account",
+}
+
/**
* we enable the authenticated service account to impersonate another service account
*
diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/pipelineService.ts b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/pipelineService.ts
index 57b627426324..d6c8c0d829be 100644
--- a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/pipelineService.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/pipelineService.ts
@@ -64,6 +64,11 @@ export interface PipelineService {
* The ingestion agent responsible for executing the ingestion pipeline.
*/
ingestionRunner?: EntityReference;
+ /**
+ * URL to the logo image for this service. Primarily used for custom service types to
+ * provide a visual identifier.
+ */
+ logoUrl?: string;
/**
* Name that identifies this pipeline service.
*/
diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/searchService.ts b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/searchService.ts
index b5dcc71c14ae..db5959b0b0ea 100644
--- a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/searchService.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/searchService.ts
@@ -63,6 +63,11 @@ export interface SearchService {
* The ingestion agent responsible for executing the ingestion pipeline.
*/
ingestionRunner?: EntityReference;
+ /**
+ * URL to the logo image for this service. Primarily used for custom service types to
+ * provide a visual identifier.
+ */
+ logoUrl?: string;
/**
* Name that identifies this search service.
*/
diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/securityService.ts b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/securityService.ts
index 624c9fc5f247..e21fe47216c8 100644
--- a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/securityService.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/securityService.ts
@@ -64,6 +64,11 @@ export interface SecurityService {
* The ingestion agent responsible for executing the ingestion pipeline.
*/
ingestionRunner?: EntityReference;
+ /**
+ * URL to the logo image for this service. Primarily used for custom service types to
+ * provide a visual identifier.
+ */
+ logoUrl?: string;
/**
* Name that identifies this security service.
*/
diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/storageService.ts b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/storageService.ts
index 49c3837111db..e908fa2b5d27 100644
--- a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/storageService.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/storageService.ts
@@ -63,6 +63,11 @@ export interface StorageService {
* The ingestion agent responsible for executing the ingestion pipeline.
*/
ingestionRunner?: EntityReference;
+ /**
+ * URL to the logo image for this service. Primarily used for custom service types to
+ * provide a visual identifier.
+ */
+ logoUrl?: string;
/**
* Name that identifies this storage service.
*/
@@ -378,7 +383,7 @@ export interface GCPCredentialsConfiguration {
*
* Google Cloud Platform ADC ( Application Default Credentials )
*/
- type?: string;
+ type?: CredentialsType;
/**
* Path of the file containing the GCP credentials info
*/
@@ -396,7 +401,7 @@ export interface GCPCredentialsConfiguration {
/**
* Google Cloud Platform account type.
*/
- externalType?: string;
+ externalType?: GCPAccountType;
/**
* Google Security Token Service subject token type based on the OAuth 2.0 token exchange
* spec.
@@ -409,6 +414,17 @@ export interface GCPCredentialsConfiguration {
[property: string]: any;
}
+export enum GCPAccountType {
+ ExternalAccount = "external_account",
+}
+
+export enum CredentialsType {
+ ExternalAccount = "external_account",
+ GcpADC = "gcp_adc",
+ GcpCredentialPath = "gcp_credential_path",
+ ServiceAccount = "service_account",
+}
+
/**
* we enable the authenticated service account to impersonate another service account
*
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/AddServicePage/AddServicePage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/AddServicePage/AddServicePage.component.tsx
index e5054dabc242..6eba9c8e67b3 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/AddServicePage/AddServicePage.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/AddServicePage/AddServicePage.component.tsx
@@ -239,7 +239,7 @@ const AddServicePage = () => {
- {getServiceLogo(service.serviceType || '', 'h-7')}
+ {getServiceLogo(service.serviceType || '', 'h-7', service)}
{serviceConfig.serviceType ? (
- {getServiceLogo(serviceConfig.serviceType || '', 'h-6')}{' '}
+ {getServiceLogo(serviceConfig.serviceType || '', 'h-6', serviceConfig)}{' '}
{`${serviceConfig.serviceType} ${t('label.service')}`}
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/AddServicePage/AddServicePage.interface.ts b/openmetadata-ui/src/main/resources/ui/src/pages/AddServicePage/AddServicePage.interface.ts
index e69b42f56b17..b67c2ff976a0 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/AddServicePage/AddServicePage.interface.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/AddServicePage/AddServicePage.interface.ts
@@ -16,6 +16,7 @@ export interface ServiceConfig {
name: string;
description: string;
serviceType: string;
+ logoUrl?: string;
connection: {
config: ConfigData;
};
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/EditConnectionFormPage/EditConnectionFormPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/EditConnectionFormPage/EditConnectionFormPage.component.tsx
index 3e5575a6d449..54ed654e92d4 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/EditConnectionFormPage/EditConnectionFormPage.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/EditConnectionFormPage/EditConnectionFormPage.component.tsx
@@ -217,7 +217,7 @@ function EditConnectionFormPage() {
- {getServiceLogo(serviceDetails?.serviceType ?? '', 'h-6')}{' '}
+ {getServiceLogo(serviceDetails?.serviceType ?? '', 'h-6', serviceDetails)}{' '}
{t('message.edit-service-entity-connection', {
entity: serviceFQN,
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/CommonUtils.test.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/CommonUtils.test.tsx
new file mode 100644
index 000000000000..88ad6f45b6bb
--- /dev/null
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/CommonUtils.test.tsx
@@ -0,0 +1,353 @@
+/*
+ * Copyright 2025 Collate
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { render, screen, fireEvent, waitFor } from '@testing-library/react';
+import { getServiceLogo } from './CommonUtils';
+
+// Mock the ServiceUtilClassBase
+jest.mock('./ServiceUtilClassBase', () => ({
+ getServiceTypeLogo: jest.fn(),
+}));
+
+import serviceUtilClassBase from './ServiceUtilClassBase';
+
+const mockGetServiceTypeLogo = serviceUtilClassBase.getServiceTypeLogo as jest.MockedFunction<
+ typeof serviceUtilClassBase.getServiceTypeLogo
+>;
+
+describe('CommonUtils - getServiceLogo', () => {
+ beforeEach(() => {
+ jest.clearAllMocks();
+ mockGetServiceTypeLogo.mockReturnValue('default-logo.png');
+ });
+
+ describe('Custom logo URL handling', () => {
+ it('should render custom logo when logoUrl is provided', () => {
+ const serviceEntity = {
+ logoUrl: 'https://example.com/custom-logo.png',
+ serviceType: 'CustomDatabase',
+ };
+
+ const { container } = render(
+ getServiceLogo('CustomDatabase', 'test-class', serviceEntity)
+ );
+
+ const img = container.querySelector('img');
+ expect(img).toBeInTheDocument();
+ expect(img).toHaveAttribute('src', 'https://example.com/custom-logo.png');
+ expect(img).toHaveClass('test-class');
+ });
+
+ it('should render custom logo with default className when not provided', () => {
+ const serviceEntity = {
+ logoUrl: 'https://example.com/custom-logo.png',
+ serviceType: 'CustomDatabase',
+ };
+
+ const { container } = render(
+ getServiceLogo('CustomDatabase', '', serviceEntity)
+ );
+
+ const img = container.querySelector('img');
+ expect(img).toBeInTheDocument();
+ expect(img).toHaveAttribute('src', 'https://example.com/custom-logo.png');
+ expect(img).toHaveClass('');
+ });
+
+ it('should render custom logo with SVG format', () => {
+ const serviceEntity = {
+ logoUrl: 'https://example.com/custom-logo.svg',
+ serviceType: 'CustomPipeline',
+ };
+
+ const { container } = render(
+ getServiceLogo('CustomPipeline', 'w-4 h-4', serviceEntity)
+ );
+
+ const img = container.querySelector('img');
+ expect(img).toBeInTheDocument();
+ expect(img).toHaveAttribute('src', 'https://example.com/custom-logo.svg');
+ expect(img).toHaveClass('w-4 h-4');
+ });
+ });
+
+ describe('Fallback to default logo', () => {
+ it('should use default logo when no custom logoUrl provided', () => {
+ const serviceEntity = {
+ serviceType: 'CustomDatabase',
+ };
+
+ const { container } = render(
+ getServiceLogo('CustomDatabase', 'test-class', serviceEntity)
+ );
+
+ const img = container.querySelector('img');
+ expect(img).toBeInTheDocument();
+ expect(img).toHaveAttribute('src', 'default-logo.png');
+ expect(mockGetServiceTypeLogo).toHaveBeenCalledWith({
+ serviceType: 'CustomDatabase',
+ });
+ });
+
+ it('should use default logo when serviceEntity is not provided', () => {
+ const { container } = render(
+ getServiceLogo('CustomDatabase', 'test-class')
+ );
+
+ const img = container.querySelector('img');
+ expect(img).toBeInTheDocument();
+ expect(img).toHaveAttribute('src', 'default-logo.png');
+ expect(mockGetServiceTypeLogo).toHaveBeenCalledWith({
+ serviceType: 'CustomDatabase',
+ });
+ });
+
+ it('should use default logo when serviceEntity is empty', () => {
+ const serviceEntity = {};
+
+ const { container } = render(
+ getServiceLogo('CustomDatabase', 'test-class', serviceEntity)
+ );
+
+ const img = container.querySelector('img');
+ expect(img).toBeInTheDocument();
+ expect(img).toHaveAttribute('src', 'default-logo.png');
+ });
+ });
+
+ describe('Error handling and fallback', () => {
+ it('should fallback to default logo when custom logo fails to load', async () => {
+ const serviceEntity = {
+ logoUrl: 'https://example.com/broken-logo.png',
+ serviceType: 'CustomDatabase',
+ };
+
+ const { container } = render(
+ getServiceLogo('CustomDatabase', 'test-class', serviceEntity)
+ );
+
+ const img = container.querySelector('img') as HTMLImageElement;
+ expect(img).toBeInTheDocument();
+ expect(img).toHaveAttribute('src', 'https://example.com/broken-logo.png');
+
+ // Simulate image load error
+ fireEvent.error(img);
+
+ await waitFor(() => {
+ expect(img).toHaveAttribute('src', 'default-logo.png');
+ });
+
+ expect(mockGetServiceTypeLogo).toHaveBeenCalledWith({
+ serviceType: 'CustomDatabase',
+ });
+ });
+
+ it('should handle multiple error events gracefully', async () => {
+ const serviceEntity = {
+ logoUrl: 'https://example.com/broken-logo.png',
+ serviceType: 'CustomDatabase',
+ };
+
+ const { container } = render(
+ getServiceLogo('CustomDatabase', 'test-class', serviceEntity)
+ );
+
+ const img = container.querySelector('img') as HTMLImageElement;
+
+ // Simulate multiple error events
+ fireEvent.error(img);
+ fireEvent.error(img);
+ fireEvent.error(img);
+
+ await waitFor(() => {
+ expect(img).toHaveAttribute('src', 'default-logo.png');
+ });
+
+ // Should only call getServiceTypeLogo once per error event
+ expect(mockGetServiceTypeLogo).toHaveBeenCalledTimes(3);
+ });
+
+ it('should not fallback if custom logo loads successfully', async () => {
+ const serviceEntity = {
+ logoUrl: 'https://example.com/working-logo.png',
+ serviceType: 'CustomDatabase',
+ };
+
+ const { container } = render(
+ getServiceLogo('CustomDatabase', 'test-class', serviceEntity)
+ );
+
+ const img = container.querySelector('img') as HTMLImageElement;
+ expect(img).toHaveAttribute('src', 'https://example.com/working-logo.png');
+
+ // Simulate successful image load
+ fireEvent.load(img);
+
+ await waitFor(() => {
+ expect(img).toHaveAttribute('src', 'https://example.com/working-logo.png');
+ });
+
+ // Should not call getServiceTypeLogo for fallback
+ expect(mockGetServiceTypeLogo).not.toHaveBeenCalled();
+ });
+ });
+
+ describe('Edge cases', () => {
+ it('should handle null logoUrl', () => {
+ const serviceEntity = {
+ logoUrl: null,
+ serviceType: 'CustomDatabase',
+ };
+
+ const { container } = render(
+ getServiceLogo('CustomDatabase', 'test-class', serviceEntity)
+ );
+
+ const img = container.querySelector('img');
+ expect(img).toBeInTheDocument();
+ expect(img).toHaveAttribute('src', 'default-logo.png');
+ });
+
+ it('should handle undefined logoUrl', () => {
+ const serviceEntity = {
+ logoUrl: undefined,
+ serviceType: 'CustomDatabase',
+ };
+
+ const { container } = render(
+ getServiceLogo('CustomDatabase', 'test-class', serviceEntity)
+ );
+
+ const img = container.querySelector('img');
+ expect(img).toBeInTheDocument();
+ expect(img).toHaveAttribute('src', 'default-logo.png');
+ });
+
+ it('should handle empty string logoUrl', () => {
+ const serviceEntity = {
+ logoUrl: '',
+ serviceType: 'CustomDatabase',
+ };
+
+ const { container } = render(
+ getServiceLogo('CustomDatabase', 'test-class', serviceEntity)
+ );
+
+ const img = container.querySelector('img');
+ expect(img).toBeInTheDocument();
+ expect(img).toHaveAttribute('src', 'default-logo.png');
+ });
+
+ it('should handle whitespace-only logoUrl', () => {
+ const serviceEntity = {
+ logoUrl: ' ',
+ serviceType: 'CustomDatabase',
+ };
+
+ const { container } = render(
+ getServiceLogo('CustomDatabase', 'test-class', serviceEntity)
+ );
+
+ const img = container.querySelector('img');
+ expect(img).toBeInTheDocument();
+ expect(img).toHaveAttribute('src', 'default-logo.png');
+ });
+
+ it('should return null when no logo is available', () => {
+ mockGetServiceTypeLogo.mockReturnValue(null);
+
+ const result = getServiceLogo('UnknownService', 'test-class');
+
+ expect(result).toBeNull();
+ });
+
+ it('should return null when getServiceTypeLogo returns empty string', () => {
+ mockGetServiceTypeLogo.mockReturnValue('');
+
+ const result = getServiceLogo('UnknownService', 'test-class');
+
+ expect(result).toBeNull();
+ });
+ });
+
+ describe('Accessibility', () => {
+ it('should have proper alt attribute', () => {
+ const serviceEntity = {
+ logoUrl: 'https://example.com/custom-logo.png',
+ serviceType: 'CustomDatabase',
+ };
+
+ const { container } = render(
+ getServiceLogo('CustomDatabase', 'test-class', serviceEntity)
+ );
+
+ const img = container.querySelector('img');
+ expect(img).toHaveAttribute('alt', '');
+ });
+
+ it('should have proper alt attribute for default logo', () => {
+ const { container } = render(
+ getServiceLogo('CustomDatabase', 'test-class')
+ );
+
+ const img = container.querySelector('img');
+ expect(img).toHaveAttribute('alt', '');
+ });
+ });
+
+ describe('Different service types', () => {
+ const serviceTypeTestCases = [
+ 'CustomDatabase',
+ 'CustomPipeline',
+ 'CustomDashboard',
+ 'CustomMessaging',
+ 'CustomMlModel',
+ 'CustomStorage',
+ 'CustomSearch',
+ 'CustomDrive',
+ 'CustomApi',
+ 'CustomSecurity',
+ 'CustomMetadata',
+ ];
+
+ serviceTypeTestCases.forEach((serviceType) => {
+ it(`should handle ${serviceType} with custom logo`, () => {
+ const serviceEntity = {
+ logoUrl: `https://example.com/${serviceType.toLowerCase()}-logo.png`,
+ serviceType,
+ };
+
+ const { container } = render(
+ getServiceLogo(serviceType, 'test-class', serviceEntity)
+ );
+
+ const img = container.querySelector('img');
+ expect(img).toBeInTheDocument();
+ expect(img).toHaveAttribute('src', `https://example.com/${serviceType.toLowerCase()}-logo.png`);
+ });
+
+ it(`should handle ${serviceType} without custom logo`, () => {
+ const serviceEntity = { serviceType };
+
+ const { container } = render(
+ getServiceLogo(serviceType, 'test-class', serviceEntity)
+ );
+
+ const img = container.querySelector('img');
+ expect(img).toBeInTheDocument();
+ expect(img).toHaveAttribute('src', 'default-logo.png');
+ expect(mockGetServiceTypeLogo).toHaveBeenCalledWith({ serviceType });
+ });
+ });
+ });
+});
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/CommonUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/CommonUtils.tsx
index 13ff9b8ef00f..5fbce79d85d7 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/CommonUtils.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/CommonUtils.tsx
@@ -358,14 +358,30 @@ export const getImages = (imageUri: string) => {
export const getServiceLogo = (
serviceType: string,
- className = ''
+ className = '',
+ serviceEntity?: { logoUrl?: string; serviceType?: string }
): JSX.Element | null => {
- const logo = serviceUtilClassBase.getServiceTypeLogo({
- serviceType,
- } as SearchSourceAlias);
+ // Check for custom logoUrl first
+ const logo = serviceEntity?.logoUrl ||
+ serviceUtilClassBase.getServiceTypeLogo({
+ serviceType,
+ } as SearchSourceAlias);
if (!isNull(logo)) {
- return 
;
+ return (
+ {
+ // Fallback to default icon if custom logo fails to load
+ const target = e.target as HTMLImageElement;
+ target.src = serviceUtilClassBase.getServiceTypeLogo({
+ serviceType,
+ } as SearchSourceAlias);
+ }}
+ />
+ );
}
return null;
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/EntityLineageUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/EntityLineageUtils.tsx
index fdd83d99880c..3a190ab109a5 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/EntityLineageUtils.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/EntityLineageUtils.tsx
@@ -1911,7 +1911,7 @@ const buildLineageTableColumns = (headers: string[]): ColumnsType => {
})
)}
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/ServiceUtilClassBase.test.ts b/openmetadata-ui/src/main/resources/ui/src/utils/ServiceUtilClassBase.test.ts
new file mode 100644
index 000000000000..c100ef5e402a
--- /dev/null
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/ServiceUtilClassBase.test.ts
@@ -0,0 +1,317 @@
+/*
+ * Copyright 2025 Collate
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+ DATABASE_DEFAULT,
+ DASHBOARD_DEFAULT,
+ PIPELINE_DEFAULT,
+ TOPIC_DEFAULT,
+ ML_MODEL_DEFAULT,
+ CUSTOM_STORAGE_DEFAULT,
+ CUSTOM_SEARCH_DEFAULT,
+ CUSTOM_DRIVE_DEFAULT,
+ DEFAULT_SERVICE,
+} from '../../constants/Services.constant';
+import serviceUtilClassBase from './ServiceUtilClassBase';
+
+describe('ServiceUtilClassBase', () => {
+ describe('getServiceLogo', () => {
+ const validLogoUrl = 'https://example.com/logo.png';
+ const validSvgLogoUrl = 'https://example.com/logo.svg';
+
+ describe('Custom logo URL priority', () => {
+ it('should return custom logoUrl when provided', () => {
+ const serviceEntity = {
+ logoUrl: validLogoUrl,
+ serviceType: 'CustomDatabase',
+ };
+
+ const result = serviceUtilClassBase.getServiceLogo('CustomDatabase', serviceEntity);
+
+ expect(result).toBe(validLogoUrl);
+ });
+
+ it('should return custom logoUrl for SVG format', () => {
+ const serviceEntity = {
+ logoUrl: validSvgLogoUrl,
+ serviceType: 'CustomPipeline',
+ };
+
+ const result = serviceUtilClassBase.getServiceLogo('CustomPipeline', serviceEntity);
+
+ expect(result).toBe(validSvgLogoUrl);
+ });
+
+ it('should prioritize custom logoUrl over hardcoded mappings', () => {
+ const serviceEntity = {
+ logoUrl: validLogoUrl,
+ serviceType: 'CustomDatabase',
+ };
+
+ const result = serviceUtilClassBase.getServiceLogo('CustomDatabase', serviceEntity);
+
+ expect(result).toBe(validLogoUrl);
+ expect(result).not.toBe(DATABASE_DEFAULT);
+ });
+ });
+
+ describe('Hardcoded service type mappings', () => {
+ it('should return hardcoded logo for CustomDatabase when no custom logoUrl', () => {
+ const serviceEntity = {
+ serviceType: 'CustomDatabase',
+ };
+
+ const result = serviceUtilClassBase.getServiceLogo('CustomDatabase', serviceEntity);
+
+ expect(result).toBe(DATABASE_DEFAULT);
+ });
+
+ it('should return hardcoded logo for CustomPipeline when no custom logoUrl', () => {
+ const serviceEntity = {
+ serviceType: 'CustomPipeline',
+ };
+
+ const result = serviceUtilClassBase.getServiceLogo('CustomPipeline', serviceEntity);
+
+ expect(result).toBe(PIPELINE_DEFAULT);
+ });
+
+ it('should return hardcoded logo for CustomDashboard when no custom logoUrl', () => {
+ const serviceEntity = {
+ serviceType: 'CustomDashboard',
+ };
+
+ const result = serviceUtilClassBase.getServiceLogo('CustomDashboard', serviceEntity);
+
+ expect(result).toBe(DASHBOARD_DEFAULT);
+ });
+ });
+
+ describe('Generic service type fallback', () => {
+ it('should return messaging service default for unknown messaging service', () => {
+ const serviceEntity = {
+ serviceType: 'CustomKafka',
+ };
+
+ const result = serviceUtilClassBase.getServiceLogo('CustomKafka', serviceEntity);
+
+ expect(result).toBe(TOPIC_DEFAULT);
+ });
+
+ it('should return database service default for unknown database service', () => {
+ const serviceEntity = {
+ serviceType: 'CustomPostgres',
+ };
+
+ const result = serviceUtilClassBase.getServiceLogo('CustomPostgres', serviceEntity);
+
+ expect(result).toBe(DATABASE_DEFAULT);
+ });
+
+ it('should return pipeline service default for unknown pipeline service', () => {
+ const serviceEntity = {
+ serviceType: 'CustomAirflow',
+ };
+
+ const result = serviceUtilClassBase.getServiceLogo('CustomAirflow', serviceEntity);
+
+ expect(result).toBe(PIPELINE_DEFAULT);
+ });
+
+ it('should return dashboard service default for unknown dashboard service', () => {
+ const serviceEntity = {
+ serviceType: 'CustomGrafana',
+ };
+
+ const result = serviceUtilClassBase.getServiceLogo('CustomGrafana', serviceEntity);
+
+ expect(result).toBe(DASHBOARD_DEFAULT);
+ });
+
+ it('should return ML model service default for unknown ML model service', () => {
+ const serviceEntity = {
+ serviceType: 'CustomMLflow',
+ };
+
+ const result = serviceUtilClassBase.getServiceLogo('CustomMLflow', serviceEntity);
+
+ expect(result).toBe(ML_MODEL_DEFAULT);
+ });
+
+ it('should return storage service default for unknown storage service', () => {
+ const serviceEntity = {
+ serviceType: 'CustomS3',
+ };
+
+ const result = serviceUtilClassBase.getServiceLogo('CustomS3', serviceEntity);
+
+ expect(result).toBe(CUSTOM_STORAGE_DEFAULT);
+ });
+
+ it('should return search service default for unknown search service', () => {
+ const serviceEntity = {
+ serviceType: 'CustomElasticsearch',
+ };
+
+ const result = serviceUtilClassBase.getServiceLogo('CustomElasticsearch', serviceEntity);
+
+ expect(result).toBe(CUSTOM_SEARCH_DEFAULT);
+ });
+
+ it('should return drive service default for unknown drive service', () => {
+ const serviceEntity = {
+ serviceType: 'CustomDropbox',
+ };
+
+ const result = serviceUtilClassBase.getServiceLogo('CustomDropbox', serviceEntity);
+
+ expect(result).toBe(CUSTOM_DRIVE_DEFAULT);
+ });
+
+ it('should return default service for completely unknown service type', () => {
+ const serviceEntity = {
+ serviceType: 'UnknownService',
+ };
+
+ const result = serviceUtilClassBase.getServiceLogo('UnknownService', serviceEntity);
+
+ expect(result).toBe(DEFAULT_SERVICE);
+ });
+ });
+
+ describe('Backward compatibility', () => {
+ it('should work without serviceEntity parameter (legacy behavior)', () => {
+ const result = serviceUtilClassBase.getServiceLogo('CustomDatabase');
+
+ expect(result).toBe(DATABASE_DEFAULT);
+ });
+
+ it('should work with empty serviceEntity', () => {
+ const serviceEntity = {};
+
+ const result = serviceUtilClassBase.getServiceLogo('CustomDatabase', serviceEntity);
+
+ expect(result).toBe(DATABASE_DEFAULT);
+ });
+
+ it('should work with serviceEntity without logoUrl', () => {
+ const serviceEntity = {
+ serviceType: 'CustomDatabase',
+ name: 'test-service',
+ };
+
+ const result = serviceUtilClassBase.getServiceLogo('CustomDatabase', serviceEntity);
+
+ expect(result).toBe(DATABASE_DEFAULT);
+ });
+ });
+
+ describe('Edge cases', () => {
+ it('should handle null logoUrl', () => {
+ const serviceEntity = {
+ logoUrl: null,
+ serviceType: 'CustomDatabase',
+ };
+
+ const result = serviceUtilClassBase.getServiceLogo('CustomDatabase', serviceEntity);
+
+ expect(result).toBe(DATABASE_DEFAULT);
+ });
+
+ it('should handle undefined logoUrl', () => {
+ const serviceEntity = {
+ logoUrl: undefined,
+ serviceType: 'CustomDatabase',
+ };
+
+ const result = serviceUtilClassBase.getServiceLogo('CustomDatabase', serviceEntity);
+
+ expect(result).toBe(DATABASE_DEFAULT);
+ });
+
+ it('should handle empty string logoUrl', () => {
+ const serviceEntity = {
+ logoUrl: '',
+ serviceType: 'CustomDatabase',
+ };
+
+ const result = serviceUtilClassBase.getServiceLogo('CustomDatabase', serviceEntity);
+
+ expect(result).toBe(DATABASE_DEFAULT);
+ });
+
+ it('should handle whitespace-only logoUrl', () => {
+ const serviceEntity = {
+ logoUrl: ' ',
+ serviceType: 'CustomDatabase',
+ };
+
+ const result = serviceUtilClassBase.getServiceLogo('CustomDatabase', serviceEntity);
+
+ expect(result).toBe(DATABASE_DEFAULT);
+ });
+ });
+
+ describe('All service types coverage', () => {
+ const serviceTypeTestCases = [
+ // Database services
+ { type: 'CustomDatabase', expected: DATABASE_DEFAULT },
+ { type: 'CustomMysql', expected: DATABASE_DEFAULT },
+ { type: 'CustomPostgres', expected: DATABASE_DEFAULT },
+
+ // Pipeline services
+ { type: 'CustomPipeline', expected: PIPELINE_DEFAULT },
+ { type: 'CustomAirflow', expected: PIPELINE_DEFAULT },
+ { type: 'CustomPrefect', expected: PIPELINE_DEFAULT },
+
+ // Dashboard services
+ { type: 'CustomDashboard', expected: DASHBOARD_DEFAULT },
+ { type: 'CustomLooker', expected: DASHBOARD_DEFAULT },
+ { type: 'CustomGrafana', expected: DASHBOARD_DEFAULT },
+
+ // Messaging services
+ { type: 'CustomMessaging', expected: TOPIC_DEFAULT },
+ { type: 'CustomKafka', expected: TOPIC_DEFAULT },
+ { type: 'CustomPulsar', expected: TOPIC_DEFAULT },
+
+ // ML Model services
+ { type: 'CustomMlModel', expected: ML_MODEL_DEFAULT },
+ { type: 'CustomMLflow', expected: ML_MODEL_DEFAULT },
+ { type: 'CustomSageMaker', expected: ML_MODEL_DEFAULT },
+
+ // Storage services
+ { type: 'CustomStorage', expected: CUSTOM_STORAGE_DEFAULT },
+ { type: 'CustomS3', expected: CUSTOM_STORAGE_DEFAULT },
+ { type: 'CustomGCS', expected: CUSTOM_STORAGE_DEFAULT },
+
+ // Search services
+ { type: 'CustomSearch', expected: CUSTOM_SEARCH_DEFAULT },
+ { type: 'CustomElasticsearch', expected: CUSTOM_SEARCH_DEFAULT },
+ { type: 'CustomOpenSearch', expected: CUSTOM_SEARCH_DEFAULT },
+
+ // Drive services
+ { type: 'CustomDrive', expected: CUSTOM_DRIVE_DEFAULT },
+ { type: 'CustomGoogleDrive', expected: CUSTOM_DRIVE_DEFAULT },
+ { type: 'CustomDropbox', expected: CUSTOM_DRIVE_DEFAULT },
+ ];
+
+ serviceTypeTestCases.forEach(({ type, expected }) => {
+ it(`should return correct default for ${type}`, () => {
+ const serviceEntity = { serviceType: type };
+ const result = serviceUtilClassBase.getServiceLogo(type, serviceEntity);
+ expect(result).toBe(expected);
+ });
+ });
+ });
+ });
+});
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/ServiceUtilClassBase.ts b/openmetadata-ui/src/main/resources/ui/src/utils/ServiceUtilClassBase.ts
index 72157774a4a0..ff4c9b3e9bb2 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/ServiceUtilClassBase.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/ServiceUtilClassBase.ts
@@ -395,7 +395,16 @@ class ServiceUtilClassBase {
return EntityType.TABLE;
}
- public getServiceLogo(type: string): string {
+ public getServiceLogo(
+ type: string,
+ serviceEntity?: { logoUrl?: string; serviceType?: string }
+ ): string {
+ // Priority 1: If service entity has a custom logoUrl, use it
+ if (serviceEntity?.logoUrl) {
+ return serviceEntity.logoUrl;
+ }
+
+ // Priority 2: Use hardcoded logo mappings for known services
const serviceTypes = this.getSupportedServiceFromList();
switch (toLower(type)) {
case this.DatabaseServiceTypeSmallCase.CustomDatabase:
@@ -689,6 +698,7 @@ class ServiceUtilClassBase {
return TIMESCALE;
default: {
+ // Priority 3: Fallback to generic service type icon
let logo;
if (serviceTypes.messagingServices.includes(type)) {
logo = TOPIC_DEFAULT;