diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/img/kpi-small.png b/openmetadata-ui/src/main/resources/ui/src/assets/img/kpi-small.png new file mode 100644 index 00000000000..a6bd5ce2a89 Binary files /dev/null and b/openmetadata-ui/src/main/resources/ui/src/assets/img/kpi-small.png differ diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/img/total-assets-medium.png b/openmetadata-ui/src/main/resources/ui/src/assets/img/total-assets-medium.png new file mode 100644 index 00000000000..b2a75278aa0 Binary files /dev/null and b/openmetadata-ui/src/main/resources/ui/src/assets/img/total-assets-medium.png differ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/CustomizeMyData/CustomizeMyData.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/CustomizeMyData/CustomizeMyData.interface.ts index e7c7fd1d7ce..6a1febb1f27 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/CustomizeMyData/CustomizeMyData.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/CustomizeMyData/CustomizeMyData.interface.ts @@ -17,4 +17,5 @@ export interface CustomizeMyDataProps { initialPageData: Document; onSaveLayout: () => Promise; handlePageDataChange: (newPageData: Document) => void; + handleSaveCurrentPageLayout: (value: boolean) => void; } diff --git a/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/CustomizeMyData/CustomizeMyData.tsx b/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/CustomizeMyData/CustomizeMyData.tsx index 01102f6152c..ee207ef4157 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/CustomizeMyData/CustomizeMyData.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/CustomizeMyData/CustomizeMyData.tsx @@ -61,6 +61,7 @@ function CustomizeMyData({ initialPageData, onSaveLayout, handlePageDataChange, + handleSaveCurrentPageLayout, }: Readonly) { const { t } = useTranslation(); const history = useHistory(); @@ -210,6 +211,7 @@ function CustomizeMyData({ followedData={followedData ?? []} followedDataCount={followedDataCount} handleResetLayout={handleResetRightPanelLayout} + handleSaveCurrentPageLayout={handleSaveCurrentPageLayout} isAnnouncementLoading={isAnnouncementLoading} isLoadingOwnedData={isLoadingOwnedData} layoutConfigData={widgetConfig.data} @@ -318,11 +320,6 @@ function CustomizeMyData({ ); }, []); - const handleSave = useCallback(async () => { - await onSaveLayout(); - handleCancel(); - }, [onSaveLayout]); - const handleReset = useCallback(() => { setLayout([ ...customizePageClassBase.landingPageDefaultLayout, @@ -377,7 +374,7 @@ function CustomizeMyData({ - diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MyData/RightSidebar/AnnouncementsWidget.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/RightSidebar/AnnouncementsWidget.tsx index 75b2a7ac17c..287e147b1ab 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/MyData/RightSidebar/AnnouncementsWidget.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/RightSidebar/AnnouncementsWidget.tsx @@ -38,7 +38,7 @@ function AnnouncementsWidget({ }, [widgetKey]); return ( -
+
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MyData/RightSidebar/RightSidebar.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/RightSidebar/RightSidebar.component.tsx index 26172bfeeb5..727288b5982 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/MyData/RightSidebar/RightSidebar.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/RightSidebar/RightSidebar.component.tsx @@ -42,6 +42,7 @@ const RightSidebar = ({ updateParentLayout, resetLayout = false, handleResetLayout, + handleSaveCurrentPageLayout, }: RightSidebarProps) => { const [layout, setLayout] = useState>([ ...(layoutConfigData?.page?.layout ?? []), @@ -205,7 +206,7 @@ const RightSidebar = ({ }, [layout]); useEffect(() => { - if (resetLayout && handleResetLayout) { + if (resetLayout && handleResetLayout && handleSaveCurrentPageLayout) { setLayout([ ...customizePageClassBase.rightPanelDefaultLayout, ...(isEditView @@ -222,6 +223,7 @@ const RightSidebar = ({ : []), ]); handleResetLayout(false); + handleSaveCurrentPageLayout(true); } }, [resetLayout]); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MyData/RightSidebar/RightSidebar.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/MyData/RightSidebar/RightSidebar.interface.ts index 738b2951783..b3173c77f9d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/MyData/RightSidebar/RightSidebar.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/RightSidebar/RightSidebar.interface.ts @@ -27,4 +27,5 @@ export interface RightSidebarProps { layoutConfigData?: WidgetConfig['data']; parentLayoutData?: Array; updateParentLayout?: (newLayout: Array) => void; + handleSaveCurrentPageLayout?: (value: boolean) => void; } diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/de-de.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/de-de.json index 4c2eecf1f71..a0011a6dd50 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/de-de.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/de-de.json @@ -195,6 +195,7 @@ "created-date": "Erstellungsdatum", "created-lowercase": "erstellt", "creating-account": "Konto erstellen", + "creating-lowercase": "creating", "credentials-type": "Anmeldeinformationstyp", "criteria": "Kriterien", "cron": "Cron", @@ -1070,6 +1071,7 @@ "updated-by": "Aktualisiert von", "updated-lowercase": "aktualisiert", "updated-on": "Aktualisiert am", + "updating-lowercase": "updating", "upload-csv-uppercase-file": "CSV-Datei hochladen", "upstream-depth": "Upstream-Tiefe", "url-lowercase": "URL", @@ -1615,6 +1617,8 @@ "no-query-available": "Keine Abfrage verfügbar.", "no-task-available": "Keine Aufgabendaten verfügbar.", "no-task-creation-without-assignee": "Es kann keine Aufgabe ohne Beauftragten erstellt werden.", + "page-layout-operation-error": "Error while {{operation}} the page layout.", + "page-layout-operation-success": "Page layout {{operation}} successfully.", "please-add-description": "Eine leere Beschreibung wird nicht akzeptiert. Bitte fügen Sie eine Beschreibung hinzu.", "please-add-tags": "Eine leere Tag-Liste wird nicht akzeptiert. Bitte fügen Sie einen Tag hinzu.", "re-indexing-error": "Fehler beim Re-Indexieren!", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json index bf1db9ab3bf..11d961ecdad 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json @@ -195,6 +195,7 @@ "created-date": "Created Date", "created-lowercase": "created", "creating-account": "Creating Account", + "creating-lowercase": "creating", "credentials-type": "Credentials Type", "criteria": "Criteria", "cron": "Cron", @@ -1070,6 +1071,7 @@ "updated-by": "Updated by", "updated-lowercase": "updated", "updated-on": "Updated on", + "updating-lowercase": "updating", "upload-csv-uppercase-file": "Upload CSV file", "upstream-depth": "Upstream Depth", "url-lowercase": "url", @@ -1615,6 +1617,8 @@ "no-query-available": "No query available.", "no-task-available": "No task data is available.", "no-task-creation-without-assignee": "Cannot create a task without assignee", + "page-layout-operation-error": "Error while {{operation}} the page layout.", + "page-layout-operation-success": "Page layout {{operation}} successfully.", "please-add-description": "Empty description is not accepted. Please add a description.", "please-add-tags": "An empty tag list is not accepted. Please add a tag.", "re-indexing-error": "Error while re indexing!", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/es-es.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/es-es.json index f1b385a48a4..3045dafa2e3 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/es-es.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/es-es.json @@ -195,6 +195,7 @@ "created-date": "Created Date", "created-lowercase": "creado", "creating-account": "Creando cuenta", + "creating-lowercase": "creating", "credentials-type": "Tipo de credenciales", "criteria": "Criterio", "cron": "Cron", @@ -1070,6 +1071,7 @@ "updated-by": "Actualizado por", "updated-lowercase": "actualizado", "updated-on": "Actualizado el", + "updating-lowercase": "updating", "upload-csv-uppercase-file": "Cargar archivo CSV", "upstream-depth": "Profundidad aguas arriba", "url-lowercase": "url", @@ -1615,6 +1617,8 @@ "no-query-available": "No hay consulta disponible.", "no-task-available": "No hay datos de tarea disponibles.", "no-task-creation-without-assignee": "No se puede crear una tarea sin destinatario", + "page-layout-operation-error": "Error while {{operation}} the page layout.", + "page-layout-operation-success": "Page layout {{operation}} successfully.", "please-add-description": "No se acepta una descripción vacía. Por favor agregue una descripción.", "please-add-tags": "No se acepta una lista de etiquetas vacía. Por favor agregue una etiqueta.", "re-indexing-error": "Error while re indexing!", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/fr-fr.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/fr-fr.json index 7bb8adad115..4d6b72b3bd5 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/fr-fr.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/fr-fr.json @@ -195,6 +195,7 @@ "created-date": "Date de Création", "created-lowercase": "créé", "creating-account": "Création du Compte", + "creating-lowercase": "creating", "credentials-type": "Type d'Identifiants", "criteria": "Critères", "cron": "Cron", @@ -1070,6 +1071,7 @@ "updated-by": "Mis à Jour par", "updated-lowercase": "mis à jour", "updated-on": "Mis à Jour le", + "updating-lowercase": "updating", "upload-csv-uppercase-file": "Télécharger le Fichier CSV", "upstream-depth": "Profondeur de l'Amont", "url-lowercase": "url", @@ -1615,6 +1617,8 @@ "no-query-available": "Aucune requête disponible", "no-task-available": "Aucune donnée n'est disponible pour les tâches", "no-task-creation-without-assignee": "Impossible de créer une tâche sans destinataire", + "page-layout-operation-error": "Error while {{operation}} the page layout.", + "page-layout-operation-success": "Page layout {{operation}} successfully.", "please-add-description": "La description vide n'est pas acceptée. Veuillez ajouter une description.", "please-add-tags": "Impossible d'accepter une liste de tags vide. Veuillez ajouter un tag.", "re-indexing-error": "Erreur lors du réindexage !", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/ja-jp.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/ja-jp.json index fc28166a701..a97cdda9496 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/ja-jp.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/ja-jp.json @@ -195,6 +195,7 @@ "created-date": "Created Date", "created-lowercase": "作成済", "creating-account": "アカウントの作成", + "creating-lowercase": "creating", "credentials-type": "Credentials Type", "criteria": "クライテリア", "cron": "Cron", @@ -1070,6 +1071,7 @@ "updated-by": "Updated by", "updated-lowercase": "updated", "updated-on": "Updated on", + "updating-lowercase": "updating", "upload-csv-uppercase-file": "CSVファイルをアップロード", "upstream-depth": "Upstream Depth", "url-lowercase": "url", @@ -1615,6 +1617,8 @@ "no-query-available": "利用可能なクエリはありません。", "no-task-available": "タスク情報はありません。", "no-task-creation-without-assignee": "担当者のいないタスクは作成できません", + "page-layout-operation-error": "Error while {{operation}} the page layout.", + "page-layout-operation-success": "Page layout {{operation}} successfully.", "please-add-description": "空の説明は受け付けられません。説明を追加してください。", "please-add-tags": "空のタグリストは受け付けられません。タグを追加してください。", "re-indexing-error": "Error while re indexing!", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-br.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-br.json index 50dacf33d7b..25a0ae13da6 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-br.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-br.json @@ -195,6 +195,7 @@ "created-date": "Created Date", "created-lowercase": "criado", "creating-account": "Criando conta", + "creating-lowercase": "creating", "credentials-type": "Tipo de credenciais", "criteria": "Critério", "cron": "Cron", @@ -1070,6 +1071,7 @@ "updated-by": "Atualizado por", "updated-lowercase": "atualizado", "updated-on": "Atualizado em", + "updating-lowercase": "updating", "upload-csv-uppercase-file": "Enviar arquivo CSV", "upstream-depth": "Profundidade a montante", "url-lowercase": "url", @@ -1615,6 +1617,8 @@ "no-query-available": "Nenhuma consulta disponível.", "no-task-available": "Não há dados de tarefa disponíveis.", "no-task-creation-without-assignee": "Não é possível criar uma tarefa sem destinatário", + "page-layout-operation-error": "Error while {{operation}} the page layout.", + "page-layout-operation-success": "Page layout {{operation}} successfully.", "please-add-description": "Descrição vazia não é aceita. Por favor, adicione uma descrição.", "please-add-tags": "Uma lista de tags vazia não é aceita. Por favor, adicione uma tag.", "re-indexing-error": "Error while re indexing!", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/ru-ru.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/ru-ru.json index 2117a9fa502..a9a23607025 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/ru-ru.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/ru-ru.json @@ -195,6 +195,7 @@ "created-date": "Дата создания", "created-lowercase": "создано", "creating-account": "Создание аккаунта", + "creating-lowercase": "creating", "credentials-type": "Тип учетных данных", "criteria": "Критерий", "cron": "Крон", @@ -1070,6 +1071,7 @@ "updated-by": "Обновлено", "updated-lowercase": "обновлено", "updated-on": "Обновление", + "updating-lowercase": "updating", "upload-csv-uppercase-file": "Загрузить CSV-файл", "upstream-depth": "Восходящая линия", "url-lowercase": "url", @@ -1615,6 +1617,8 @@ "no-query-available": "Нет доступных запросов.", "no-task-available": "Данных о задании нет.", "no-task-creation-without-assignee": "Невозможно создать задачу без исполнителя", + "page-layout-operation-error": "Error while {{operation}} the page layout.", + "page-layout-operation-success": "Page layout {{operation}} successfully.", "please-add-description": "Пустое описание не принимается. Пожалуйста, добавьте описание.", "please-add-tags": "Пустой список тегов не принимается. Пожалуйста, добавьте тег.", "re-indexing-error": "Ошибка при переиндексации!", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/zh-cn.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/zh-cn.json index 1a4a8a6f8a8..8604b3e8bd2 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/zh-cn.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/zh-cn.json @@ -195,6 +195,7 @@ "created-date": "创建日期", "created-lowercase": "创建", "creating-account": "注册帐号", + "creating-lowercase": "creating", "credentials-type": "凭证类型", "criteria": "标准", "cron": "Cron", @@ -1070,6 +1071,7 @@ "updated-by": "更新者", "updated-lowercase": "已更新", "updated-on": "更新于", + "updating-lowercase": "updating", "upload-csv-uppercase-file": "上传 CSV 文件", "upstream-depth": "上游深度", "url-lowercase": "url", @@ -1615,6 +1617,8 @@ "no-query-available": "没有可用的查询", "no-task-available": "没有任务数据可用", "no-task-creation-without-assignee": "无法创建没有受派人的任务", + "page-layout-operation-error": "Error while {{operation}} the page layout.", + "page-layout-operation-success": "Page layout {{operation}} successfully.", "please-add-description": "不接受空描述，请添加描述信息", "please-add-tags": "不接受空标签列表，请添加标签信息", "re-indexing-error": "在重新索引时发生错误！", diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/CustomizablePage/CustomizablePage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/CustomizablePage/CustomizablePage.tsx index f0d230d689a..66255d453d8 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/CustomizablePage/CustomizablePage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/CustomizablePage/CustomizablePage.tsx @@ -12,7 +12,8 @@ */ import { AxiosError } from 'axios'; import { compare } from 'fast-json-patch'; -import React, { useCallback, useEffect, useState } from 'react'; +import React, { useCallback, useEffect, useMemo, useState } from 'react'; +import { useTranslation } from 'react-i18next'; import { useParams } from 'react-router-dom'; import CustomizeMyData from '../../components/CustomizableComponents/CustomizeMyData/CustomizeMyData'; import Loader from '../../components/Loader/Loader'; @@ -27,22 +28,37 @@ import { } from '../../rest/DocStoreAPI'; import { getFinalLandingPage } from '../../utils/CustomizableLandingPageUtils'; import customizePageClassBase from '../../utils/CustomizePageClassBase'; +import { getDecodedFqn } from '../../utils/StringsUtils'; +import { showErrorToast, showSuccessToast } from '../../utils/ToastUtils'; export const CustomizablePage = () => { - const { fqn, pageFqn } = useParams<{ fqn: string; pageFqn: PageType }>(); + const { fqn: personaFQN, pageFqn } = + useParams<{ fqn: string; pageFqn: PageType }>(); + const { t } = useTranslation(); const [page, setPage] = useState({} as Document); const [editedPage, setEditedPage] = useState({} as Document); const [isLoading, setIsLoading] = useState(true); + const [saveCurrentPageLayout, setSaveCurrentPageLayout] = useState(false); + + const decodedPersonaFQN = useMemo( + () => getDecodedFqn(personaFQN), + [personaFQN] + ); + const decodedPageFQN = useMemo(() => getDecodedFqn(pageFqn), [pageFqn]); const handlePageDataChange = useCallback((newPageData: Document) => { setEditedPage(newPageData); }, []); + const handleSaveCurrentPageLayout = useCallback((value: boolean) => { + setSaveCurrentPageLayout(value); + }, []); + const fetchDocument = async () => { - const pageFQN = `${EntityType.PERSONA}.${fqn}.${EntityType.PAGE}.${pageFqn}`; + const pageLayoutFQN = `${EntityType.PERSONA}.${personaFQN}.${EntityType.PAGE}.${pageFqn}`; try { setIsLoading(true); - const pageData = await getDocumentByFQN(pageFQN); + const pageData = await getDocumentByFQN(pageLayoutFQN); const finalPageData = getFinalLandingPage(pageData, true); setPage(finalPageData); @@ -52,8 +68,8 @@ export const CustomizablePage = () => { setPage( getFinalLandingPage( { - name: `${fqn}${pageFqn}`, - fullyQualifiedName: pageFQN, + name: `${decodedPersonaFQN}${decodedPageFQN}`, + fullyQualifiedName: getDecodedFqn(pageLayoutFQN), entityType: EntityType.PAGE, data: { page: { @@ -73,22 +89,46 @@ export const CustomizablePage = () => { const handleSave = async () => { try { const finalPage = getFinalLandingPage(editedPage); + let response: Document; if (page.id) { const jsonPatch = compare(page, finalPage); - await updateDocument(page?.id ?? '', jsonPatch); + response = await updateDocument(page.id ?? '', jsonPatch); } else { - await createDocument(finalPage); + response = await createDocument(finalPage); } + setPage(response); + setEditedPage(response); + showSuccessToast( + t('server.page-layout-operation-success', { + operation: page.id + ? t('label.updated-lowercase') + : t('label.created-lowercase'), + }) + ); } catch { // Error + showErrorToast( + t('server.page-layout-operation-error', { + operation: page.id + ? t('label.updating-lowercase') + : t('label.creating-lowercase'), + }) + ); } }; + useEffect(() => { + if (saveCurrentPageLayout) { + handleSave(); + setSaveCurrentPageLayout(false); + } + }, [saveCurrentPageLayout]); + useEffect(() => { fetchDocument(); - }, [fqn, pageFqn]); + }, [personaFQN, pageFqn]); if (isLoading) { return ; @@ -98,6 +138,7 @@ export const CustomizablePage = () => { return ( diff --git a/openmetadata-ui/src/main/resources/ui/src/rest/DocStoreAPI.ts b/openmetadata-ui/src/main/resources/ui/src/rest/DocStoreAPI.ts index 3ba3797b00f..7c7b8843edc 100644 --- a/openmetadata-ui/src/main/resources/ui/src/rest/DocStoreAPI.ts +++ b/openmetadata-ui/src/main/resources/ui/src/rest/DocStoreAPI.ts @@ -49,11 +49,10 @@ export const updateDocument = async (id: string, data: Operation[]) => { const configOptions = { headers: { 'Content-type': 'application/json-patch+json' }, }; - const response = await axiosClient.patch( - `${BASE_URL}/${id}`, - data, - configOptions - ); + const response = await axiosClient.patch< + Operation[], + AxiosResponse + >(`${BASE_URL}/${id}`, data, configOptions); return response.data; }; diff --git a/openmetadata-ui/src/main/resources/ui/src/styles/app.less b/openmetadata-ui/src/main/resources/ui/src/styles/app.less index 8522b2765ae..ac50233f9ee 100644 --- a/openmetadata-ui/src/main/resources/ui/src/styles/app.less +++ b/openmetadata-ui/src/main/resources/ui/src/styles/app.less @@ -501,7 +501,7 @@ a[href].link-text-grey, .no-scrollbar { scrollbar-width: none; - ::-webkit-scrollbar { + &::-webkit-scrollbar { display: none; } } diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/CustomizableLandingPageUtils.ts b/openmetadata-ui/src/main/resources/ui/src/utils/CustomizableLandingPageUtils.ts index bcd127ae1b0..41692e84934 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/CustomizableLandingPageUtils.ts +++ b/openmetadata-ui/src/main/resources/ui/src/utils/CustomizableLandingPageUtils.ts @@ -51,7 +51,7 @@ export const getAddWidgetHandler = placeholderWidgetKey === LandingPageWidgetKeys.EMPTY_WIDGET_PLACEHOLDER ) { return [ - ...currentLayout, + ...moveEmptyWidgetToTheEnd(currentLayout), { w: widgetWidth, h: widgetHeight, @@ -95,6 +95,13 @@ const getEmptyWidgetHeight = ( } }; +export const moveEmptyWidgetToTheEnd = (layout: Array) => + layout.map((widget) => + widget.i === LandingPageWidgetKeys.EMPTY_WIDGET_PLACEHOLDER + ? { ...widget, y: 100 } + : widget + ); + export const getRemoveWidgetHandler = (widgetKey: string, minHeight: number, maxHeight: number) => (currentLayout: Array) => { diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/CustomizePageClassBase.ts b/openmetadata-ui/src/main/resources/ui/src/utils/CustomizePageClassBase.ts index 7c2f5076a20..c0f707411d3 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/CustomizePageClassBase.ts +++ b/openmetadata-ui/src/main/resources/ui/src/utils/CustomizePageClassBase.ts @@ -15,9 +15,11 @@ import { FC } from 'react'; import ActivityFeedImg from '../assets/img/activity-feed.png'; import AnnouncementImg from '../assets/img/announcement.png'; import FollowingImg from '../assets/img/following.png'; +import KPISmallImg from '../assets/img/kpi-small.png'; import KPIImg from '../assets/img/kpi.png'; import MyDataImg from '../assets/img/my-data.png'; import RecentViewsImg from '../assets/img/recent-views.png'; +import TotalAssetsMediumImg from '../assets/img/total-assets-medium.png'; import TotalAssetsImg from '../assets/img/total-assets.png'; import KPIWidget from '../components/KPIWidget/KPIWidget.component'; import { MyDataWidget } from '../components/MyData/MyDataWidget/MyDataWidget.component'; @@ -198,14 +200,14 @@ class CustomizePageClassBase { } case LandingPageWidgetKeys.KPI: { if (size === WidgetWidths.small) { - return ''; + return KPISmallImg; } return KPIImg; } case LandingPageWidgetKeys.TOTAL_DATA_ASSETS: { if (size === WidgetWidths.medium) { - return ''; + return TotalAssetsMediumImg; } return TotalAssetsImg;