diff --git a/catalog-rest-service/src/main/resources/ui/src/assets/img/service-icon-redash.png b/catalog-rest-service/src/main/resources/ui/src/assets/img/service-icon-redash.png new file mode 100644 index 00000000000..7c8ea03ca83 Binary files /dev/null and b/catalog-rest-service/src/main/resources/ui/src/assets/img/service-icon-redash.png differ diff --git a/catalog-rest-service/src/main/resources/ui/src/assets/img/service-icon-tableau.png b/catalog-rest-service/src/main/resources/ui/src/assets/img/service-icon-tableau.png new file mode 100644 index 00000000000..c19d4d9a8fe Binary files /dev/null and b/catalog-rest-service/src/main/resources/ui/src/assets/img/service-icon-tableau.png differ diff --git a/catalog-rest-service/src/main/resources/ui/src/constants/services.const.ts b/catalog-rest-service/src/main/resources/ui/src/constants/services.const.ts index f95f2297ae0..e5a6af76327 100644 --- a/catalog-rest-service/src/main/resources/ui/src/constants/services.const.ts +++ b/catalog-rest-service/src/main/resources/ui/src/constants/services.const.ts @@ -28,10 +28,12 @@ import postgres from '../assets/img/service-icon-post.png'; import presto from '../assets/img/service-icon-presto.png'; import pulsar from '../assets/img/service-icon-pulsar.png'; import query from '../assets/img/service-icon-query.png'; +import redash from '../assets/img/service-icon-redash.png'; import redshift from '../assets/img/service-icon-redshift.png'; import snowflakes from '../assets/img/service-icon-snowflakes.png'; import mysql from '../assets/img/service-icon-sql.png'; import superset from '../assets/img/service-icon-superset.png'; +import tableau from '../assets/img/service-icon-tableau.png'; import plus from '../assets/svg/plus.svg'; import { ServiceCategory } from '../enums/service.enum'; @@ -49,6 +51,8 @@ export const KAFKA = kafka; export const PULSAR = pulsar; export const SUPERSET = superset; export const LOOKER = looker; +export const TABLEAU = tableau; +export const REDASH = redash; export const SERVICE_DEFAULT = serviceDefault; export const PLUS = plus; @@ -68,7 +72,7 @@ export const serviceTypes: Record> = { 'Presto', ], messagingServices: ['Kafka', 'Pulsar'], - dashboardServices: ['Superset', 'Looker'], + dashboardServices: ['Superset', 'Looker', 'Tableau', 'Redash'], }; export const arrServiceTypes: Array = [ diff --git a/catalog-rest-service/src/main/resources/ui/src/enums/service.enum.ts b/catalog-rest-service/src/main/resources/ui/src/enums/service.enum.ts index 8927538d1e6..1f6d6797b37 100644 --- a/catalog-rest-service/src/main/resources/ui/src/enums/service.enum.ts +++ b/catalog-rest-service/src/main/resources/ui/src/enums/service.enum.ts @@ -42,4 +42,6 @@ export enum MessagingServiceType { export enum DashboardServiceType { SUPERSET = 'Superset', LOOKER = 'Looker', + TABLEAU = 'Tableau', + REDASH = 'Redash', } diff --git a/catalog-rest-service/src/main/resources/ui/src/utils/ServiceUtils.ts b/catalog-rest-service/src/main/resources/ui/src/utils/ServiceUtils.ts index 3e21a332128..655802d154e 100644 --- a/catalog-rest-service/src/main/resources/ui/src/utils/ServiceUtils.ts +++ b/catalog-rest-service/src/main/resources/ui/src/utils/ServiceUtils.ts @@ -14,11 +14,13 @@ import { POSTGRES, PRESTO, PULSAR, + REDASH, REDSHIFT, serviceTypes, SERVICE_DEFAULT, SNOWFLAKE, SUPERSET, + TABLEAU, } from '../constants/services.const'; import { DashboardServiceType, @@ -71,6 +73,12 @@ export const serviceTypeLogo = (type: string) => { case DashboardServiceType.LOOKER: return LOOKER; + case DashboardServiceType.TABLEAU: + return TABLEAU; + + case DashboardServiceType.REDASH: + return REDASH; + default: return SERVICE_DEFAULT; } @@ -197,6 +205,8 @@ export const getEntityCountByService = (buckets: Array) => { break; case DashboardServiceType.SUPERSET: case DashboardServiceType.LOOKER: + case DashboardServiceType.TABLEAU: + case DashboardServiceType.REDASH: entityCounts.dashboardCount += bucket.doc_count; break;