diff --git a/openmetadata-ui/src/main/resources/ui/src/axiosAPIs/dashboardAPI.ts b/openmetadata-ui/src/main/resources/ui/src/axiosAPIs/dashboardAPI.ts index 080058b855e..a5d22f55e36 100644 --- a/openmetadata-ui/src/main/resources/ui/src/axiosAPIs/dashboardAPI.ts +++ b/openmetadata-ui/src/main/resources/ui/src/axiosAPIs/dashboardAPI.ts @@ -58,7 +58,11 @@ export const getDashboardByFqn: Function = ( fqn: string, arrQueryFields: string ): Promise => { - const url = getURLWithQueryFields(`/dashboards/name/${fqn}`, arrQueryFields); + const url = getURLWithQueryFields( + `/dashboards/name/${fqn}`, + arrQueryFields, + 'include=all' + ); return APIClient.get(url); }; diff --git a/openmetadata-ui/src/main/resources/ui/src/axiosAPIs/miscAPI.ts b/openmetadata-ui/src/main/resources/ui/src/axiosAPIs/miscAPI.ts index ae8803c8d96..d6be2226ec5 100644 --- a/openmetadata-ui/src/main/resources/ui/src/axiosAPIs/miscAPI.ts +++ b/openmetadata-ui/src/main/resources/ui/src/axiosAPIs/miscAPI.ts @@ -25,7 +25,8 @@ export const searchData: Function = ( filters: string, sortField: string, sortOrder: string, - searchIndex: string + searchIndex: string, + onlyDeleted = false ): Promise => { return APIClient.get( `/search/query?${getSearchAPIQuery( @@ -35,7 +36,8 @@ export const searchData: Function = ( filters, sortField, sortOrder, - searchIndex + searchIndex, + onlyDeleted )}` ); }; diff --git a/openmetadata-ui/src/main/resources/ui/src/axiosAPIs/pipelineAPI.ts b/openmetadata-ui/src/main/resources/ui/src/axiosAPIs/pipelineAPI.ts index 1474adf3443..00f106111e3 100644 --- a/openmetadata-ui/src/main/resources/ui/src/axiosAPIs/pipelineAPI.ts +++ b/openmetadata-ui/src/main/resources/ui/src/axiosAPIs/pipelineAPI.ts @@ -58,7 +58,11 @@ export const getPipelineByFqn: Function = ( fqn: string, arrQueryFields: string ): Promise => { - const url = getURLWithQueryFields(`/pipelines/name/${fqn}`, arrQueryFields); + const url = getURLWithQueryFields( + `/pipelines/name/${fqn}`, + arrQueryFields, + 'include=all' + ); return APIClient.get(url); }; diff --git a/openmetadata-ui/src/main/resources/ui/src/axiosAPIs/topicsAPI.ts b/openmetadata-ui/src/main/resources/ui/src/axiosAPIs/topicsAPI.ts index 19e098d37a2..ad148e62c3a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/axiosAPIs/topicsAPI.ts +++ b/openmetadata-ui/src/main/resources/ui/src/axiosAPIs/topicsAPI.ts @@ -58,7 +58,11 @@ export const getTopicByFqn: Function = ( fqn: string, arrQueryFields: string ): Promise => { - const url = getURLWithQueryFields(`/topics/name/${fqn}`, arrQueryFields); + const url = getURLWithQueryFields( + `/topics/name/${fqn}`, + arrQueryFields, + 'include=all' + ); return APIClient.get(url); }; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.component.tsx index 68ca8cd1c94..1a227653696 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.component.tsx @@ -71,6 +71,7 @@ const DashboardDetails = ({ loadNodeHandler, versionHandler, version, + deleted, addLineageHandler, removeLineageHandler, }: DashboardDetailsProps) => { @@ -131,6 +132,7 @@ const DashboardDetails = ({ selectedName: 'icon-managecolor', }, isProtected: true, + isHidden: deleted, protectedState: !owner || hasEditAccess(), position: 3, }, @@ -318,6 +320,7 @@ const DashboardDetails = ({
)}
- - - + {!deleted && ( + + + + )} @@ -442,44 +448,61 @@ const DashboardDetails = ({ handleEditChartTag(chart, index); } }}> - - { - handleChartTagSelection(); - }} - onSelectionChange={(tags) => { - handleChartTagSelection(tags); - }}> - {chart.tags?.length ? ( - - ) : ( - + {deleted ? ( +
+ {chart.tags?.map( + (tag: TagLabel, i: number) => ( - + ) )} - - +
+ ) : ( + + { + handleChartTagSelection(); + }} + onSelectionChange={(tags) => { + handleChartTagSelection(tags); + }}> + {chart.tags?.length ? ( + + ) : ( + + + + )} + + + )} ))} @@ -492,6 +515,7 @@ const DashboardDetails = ({
)} - {activeTab === 3 && ( + {activeTab === 3 && !deleted && (
; dashboardTags: Array; slashedDashboardName: TitleBreadcrumbProps['titleLinks']; + deleted?: boolean; setActiveTabHandler: (value: number) => void; followDashboardHandler: () => void; unfollowDashboardHandler: () => void; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DatasetDetails/DatasetDetails.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DatasetDetails/DatasetDetails.component.tsx index 54d0fe8c23c..bd66a5e3519 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DatasetDetails/DatasetDetails.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DatasetDetails/DatasetDetails.component.tsx @@ -483,6 +483,7 @@ const DatasetDetails: React.FC = ({ id="lineageDetails"> = ({ loadNodeHandler, lineageLeafNodes, isNodeLoading, + deleted, addLineageHandler, removeLineageHandler, }: EntityLineageProp) => { @@ -585,41 +586,43 @@ const Entitylineage: FunctionComponent = ({ - { - setEditMode((pre) => !pre); - setSelectedNode({} as SelectedNode); - setIsDrawerOpen(false); - setNewAddedNode({} as FlowElement); - }}> - {loading ? ( - - ) : status === 'success' ? ( -