diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DashboardVersion/DashboardVersion.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DashboardVersion/DashboardVersion.component.tsx index 2ed65cac0aa..0c79208e8fd 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DashboardVersion/DashboardVersion.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DashboardVersion/DashboardVersion.component.tsx @@ -44,6 +44,7 @@ const DashboardVersion: FC = ({ tier, slashedDashboardName, versionList, + deleted = false, backHandler, versionHandler, }: DashboardVersionProp) => { @@ -219,6 +220,7 @@ const DashboardVersion: FC = ({
void; versionHandler: (v: string) => void; } diff --git a/openmetadata-ui/src/main/resources/ui/src/components/PipelineVersion/PipelineVersion.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/PipelineVersion/PipelineVersion.component.tsx index 6ff0dcf810f..67b8518604b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/PipelineVersion/PipelineVersion.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/PipelineVersion/PipelineVersion.component.tsx @@ -44,6 +44,7 @@ const PipelineVersion: FC = ({ tier, slashedPipelineName, versionList, + deleted = false, backHandler, versionHandler, }: PipelineVersionProp) => { @@ -219,6 +220,7 @@ const PipelineVersion: FC = ({
void; versionHandler: (v: string) => void; } diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TopicVersion/TopicVersion.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TopicVersion/TopicVersion.component.tsx index e65656d236f..c6c790dc665 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TopicVersion/TopicVersion.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TopicVersion/TopicVersion.component.tsx @@ -42,6 +42,7 @@ const TopicVersion: FC = ({ tier, slashedTopicName, versionList, + deleted = false, backHandler, versionHandler, }: TopicVersionProp) => { @@ -264,6 +265,7 @@ const TopicVersion: FC = ({
void; versionHandler: (v: string) => void; } diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/entityPageInfo/EntityPageInfo.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/entityPageInfo/EntityPageInfo.tsx index cf4dfe2a6ef..acd135568af 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/entityPageInfo/EntityPageInfo.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/entityPageInfo/EntityPageInfo.tsx @@ -142,9 +142,7 @@ const EntityPageInfo = ({ const getVersionButton = (version: string) => { return ( -
!deleted && versionHandler?.()}> +
{parseFloat(version).toFixed(1)} diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/EntityVersionPage/EntityVersionPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/EntityVersionPage/EntityVersionPage.component.tsx index 99dcb194e38..faf2e3bb8d2 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/EntityVersionPage/EntityVersionPage.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/EntityVersionPage/EntityVersionPage.component.tsx @@ -598,6 +598,7 @@ const EntityVersionPage: FunctionComponent = () => { { { { const fieldsAdded = [...(changeDescription?.fieldsAdded || [])]; const fieldsDeleted = [...(changeDescription?.fieldsDeleted || [])]; - const fieldsUpdated = [...(changeDescription?.fieldsUpdated || [])]; + const fieldsUpdated = [ + ...(changeDescription?.fieldsUpdated?.filter( + (field) => field.name !== 'deleted' + ) || []), + ]; + const isDeleteUpdated = [ + ...(changeDescription?.fieldsUpdated?.filter( + (field) => field.name === 'deleted' + ) || []), + ]; return ( + {isDeleteUpdated?.length > 0 ? ( +

+ {isDeleteUpdated + .map((field) => { + return field.newValue + ? 'Entity has been deleted' + : 'Entity has been restored'; + }) + .join(', ')} +

+ ) : null} {fieldsAdded?.length > 0 ? (

{`${isPrefix ? '+ Added' : ''} ${fieldsAdded - ?.map(summaryFormatter) + .map(summaryFormatter) .join(', ')} ${!isPrefix ? `has been added` : ''}`}{' '}

) : null} {fieldsUpdated?.length ? (

{`${isPrefix ? 'Edited' : ''} ${fieldsUpdated - ?.map(summaryFormatter) + .map(summaryFormatter) .join(', ')} ${!isPrefix ? `has been updated` : ''}`}{' '}

) : null} {fieldsDeleted?.length ? (

{`${isPrefix ? '- Removed' : ''} ${fieldsDeleted - ?.map(summaryFormatter) + .map(summaryFormatter) .join(', ')} ${!isPrefix ? `has been Deleted` : ''}`}{' '}

) : null}