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

* 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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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