yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-10-30 10:05:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: supported entityName in arguments of extraManageItems in entityClass (#20741)

Browse Source 
* supported entityName in arguments of extraManageItems in entityClass

* supported the entityDetails in the method for future useCase

* minor fixes
This commit is contained in:
Ashish Gupta 2025-04-10 15:46:59 +05:30 committed by GitHub
parent ec336bc026
commit eceb5c3385
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 40 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openmetadata-ui/src/main/resources/ui/src/pages/APICollectionPage/APICollectionPage.tsx
View File

@ -107,9 +107,9 @@ const APICollectionPage: FunctionComponent = () => {
EntityType.API_COLLECTION, EntityType.API_COLLECTION,
decodedAPICollectionFQN, decodedAPICollectionFQN,
apiCollectionPermission, apiCollectionPermission,
apiCollection?.deleted ?? false apiCollection
), ),
[apiCollectionPermission, decodedAPICollectionFQN, apiCollection?.deleted] [apiCollectionPermission, decodedAPICollectionFQN, apiCollection]
); );
const { currentVersion, apiCollectionId } = useMemo( const { currentVersion, apiCollectionId } = useMemo(

4
openmetadata-ui/src/main/resources/ui/src/pages/DatabaseDetailsPage/DatabaseDetailsPage.tsx
View File

@ -127,9 +127,9 @@ const DatabaseDetails: FunctionComponent = () => {
EntityType.DATABASE, EntityType.DATABASE,
decodedDatabaseFQN, decodedDatabaseFQN,
databasePermission, databasePermission,
database?.deleted ?? false database
), ),
[decodedDatabaseFQN, databasePermission, database?.deleted] [decodedDatabaseFQN, databasePermission, database]
); );
const fetchDatabasePermission = async () => { const fetchDatabasePermission = async () => {
setIsLoading(true); setIsLoading(true);

2
openmetadata-ui/src/main/resources/ui/src/pages/DatabaseSchemaPage/DatabaseSchemaPage.component.tsx
View File

@ -117,7 +117,7 @@ const DatabaseSchemaPage: FunctionComponent = () => {
EntityType.DATABASE_SCHEMA, EntityType.DATABASE_SCHEMA,
decodedDatabaseSchemaFQN, decodedDatabaseSchemaFQN,
databaseSchemaPermission, databaseSchemaPermission,
databaseSchema?.deleted ?? false databaseSchema
), ),
[ [
databaseSchemaPermission, databaseSchemaPermission,

9
openmetadata-ui/src/main/resources/ui/src/pages/ServiceDetailsPage/ServiceDetailsPage.tsx
View File

@ -293,14 +293,9 @@ const ServiceDetailsPage: FunctionComponent = () => {
getEntityTypeFromServiceCategory(serviceCategory), getEntityTypeFromServiceCategory(serviceCategory),
decodedServiceFQN, decodedServiceFQN,
servicePermission, servicePermission,
serviceDetails?.deleted ?? false serviceDetails
), ),
[ [servicePermission, decodedServiceFQN, serviceCategory, serviceDetails]
servicePermission,
decodedServiceFQN,
serviceCategory,
serviceDetails?.deleted,
]
); );
const handleShowDeleted = useCallback( const handleShowDeleted = useCallback(

16
openmetadata-ui/src/main/resources/ui/src/pages/TableDetailsPageV1/TableDetailsPageV1.tsx
View File

@ -156,13 +156,15 @@ const TableDetailsPageV1: React.FC = () => {
const extraDropdownContent = useMemo( const extraDropdownContent = useMemo(
() => () =>
entityUtilClassBase.getManageExtraOptions( tableDetails
EntityType.TABLE, ? entityUtilClassBase.getManageExtraOptions(
tableFqn, EntityType.TABLE,
tablePermissions, tableFqn,
tableDetails?.deleted ?? false tablePermissions,
), tableDetails
[tablePermissions, tableFqn, tableDetails?.deleted] )
: [],
[tablePermissions, tableFqn, tableDetails]
); );
const { viewUsagePermission, viewTestCasePermission } = useMemo( const { viewUsagePermission, viewTestCasePermission } = useMemo(

29
openmetadata-ui/src/main/resources/ui/src/utils/EntityUtilClassBase.ts
View File

@ -22,6 +22,10 @@ import {
} from '../context/PermissionProvider/PermissionProvider.interface'; } from '../context/PermissionProvider/PermissionProvider.interface';
import { EntityType } from '../enums/entity.enum'; import { EntityType } from '../enums/entity.enum';
import { SearchIndex } from '../enums/search.enum'; import { SearchIndex } from '../enums/search.enum';
import { APICollection } from '../generated/entity/data/apiCollection';
import { Database } from '../generated/entity/data/database';
import { DatabaseSchema } from '../generated/entity/data/databaseSchema';
import { ServicesType } from '../interface/service.interface';
import APICollectionPage from '../pages/APICollectionPage/APICollectionPage'; import APICollectionPage from '../pages/APICollectionPage/APICollectionPage';
import APIEndpointPage from '../pages/APIEndpointPage/APIEndpointPage'; import APIEndpointPage from '../pages/APIEndpointPage/APIEndpointPage';
import ContainerPage from '../pages/ContainerPage/ContainerPage'; import ContainerPage from '../pages/ContainerPage/ContainerPage';
@ -29,6 +33,7 @@ import DashboardDetailsPage from '../pages/DashboardDetailsPage/DashboardDetails
import DatabaseDetailsPage from '../pages/DatabaseDetailsPage/DatabaseDetailsPage'; import DatabaseDetailsPage from '../pages/DatabaseDetailsPage/DatabaseDetailsPage';
import DatabaseSchemaPageComponent from '../pages/DatabaseSchemaPage/DatabaseSchemaPage.component'; import DatabaseSchemaPageComponent from '../pages/DatabaseSchemaPage/DatabaseSchemaPage.component';
import DataModelsPage from '../pages/DataModelPage/DataModelPage.component'; import DataModelsPage from '../pages/DataModelPage/DataModelPage.component';
import { VersionData } from '../pages/EntityVersionPage/EntityVersionPage.component';
import MetricDetailsPage from '../pages/MetricsPage/MetricDetailsPage/MetricDetailsPage'; import MetricDetailsPage from '../pages/MetricsPage/MetricDetailsPage/MetricDetailsPage';
import MlModelPage from '../pages/MlModelPage/MlModelPage.component'; import MlModelPage from '../pages/MlModelPage/MlModelPage.component';
import PipelineDetailsPage from '../pages/PipelineDetails/PipelineDetailsPage.component'; import PipelineDetailsPage from '../pages/PipelineDetails/PipelineDetailsPage.component';
@ -395,25 +400,39 @@ class EntityUtilClassBase {
_entityType: EntityType, _entityType: EntityType,
_fqn: string, _fqn: string,
_permission: OperationPermission, _permission: OperationPermission,
_deleted: boolean _entityDetails:
| VersionData
| ServicesType
| Database
| DatabaseSchema
| APICollection
): ItemType[] { ): ItemType[] {
const isEntityDeleted = _entityDetails?.deleted ?? false;
// We are encoding here since we are getting the decoded fqn from the OSS code // We are encoding here since we are getting the decoded fqn from the OSS code
const encodedFqn = getEncodedFqn(_fqn); const encodedFqn = getEncodedFqn(_fqn);
switch (_entityType) { switch (_entityType) {
case EntityType.TABLE: case EntityType.TABLE:
return [ return [
...ExtraTableDropdownOptions(encodedFqn, _permission, _deleted), ...ExtraTableDropdownOptions(
encodedFqn,
_permission,
isEntityDeleted
),
]; ];
case EntityType.DATABASE: case EntityType.DATABASE:
return [ return [
...ExtraDatabaseDropdownOptions(encodedFqn, _permission, _deleted), ...ExtraDatabaseDropdownOptions(
encodedFqn,
_permission,
isEntityDeleted
),
]; ];
case EntityType.DATABASE_SCHEMA: case EntityType.DATABASE_SCHEMA:
return [ return [
...ExtraDatabaseSchemaDropdownOptions( ...ExtraDatabaseSchemaDropdownOptions(
encodedFqn, encodedFqn,
_permission, _permission,
_deleted isEntityDeleted
), ),
]; ];
case EntityType.DATABASE_SERVICE: case EntityType.DATABASE_SERVICE:
@ -421,7 +440,7 @@ class EntityUtilClassBase {
...ExtraDatabaseServiceDropdownOptions( ...ExtraDatabaseServiceDropdownOptions(
encodedFqn, encodedFqn,
_permission, _permission,
_deleted isEntityDeleted
), ),
]; ];
default: default: