diff --git a/.changeset/mighty-suns-drop.md b/.changeset/mighty-suns-drop.md index 80f7b88e2b..f8bb686aaf 100644 --- a/.changeset/mighty-suns-drop.md +++ b/.changeset/mighty-suns-drop.md @@ -2,4 +2,4 @@ '@backstage/plugin-org': patch --- -add transitive ownership type for kind group in OwnershipCard +add aggregated ownership type for kind group in OwnershipCard diff --git a/plugins/org/src/components/Cards/OwnershipCard/TransitiveRelationsGrid.tsx b/plugins/org/src/components/Cards/OwnershipCard/AggregatedRelationsGrid.tsx similarity index 94% rename from plugins/org/src/components/Cards/OwnershipCard/TransitiveRelationsGrid.tsx rename to plugins/org/src/components/Cards/OwnershipCard/AggregatedRelationsGrid.tsx index 8ed4d1c413..4839e4db56 100644 --- a/plugins/org/src/components/Cards/OwnershipCard/TransitiveRelationsGrid.tsx +++ b/plugins/org/src/components/Cards/OwnershipCard/AggregatedRelationsGrid.tsx @@ -28,7 +28,7 @@ import { import React from 'react'; import pluralize from 'pluralize'; import { catalogIndexRouteRef } from '../../../routes'; -import { useTransitiveEntities } from './useTransitiveEntities'; +import { useAggregatedEntities } from './useAggregatedEntities'; const useStyles = makeStyles((theme: BackstageTheme) => createStyles({ @@ -86,7 +86,7 @@ const EntityCountTile = ({ }; // can only be used for group entity -export const TransitiveRelationsGrid = ({ +export const AggregatedRelationsGrid = ({ entity, entityFilterKind, }: { @@ -94,7 +94,7 @@ export const TransitiveRelationsGrid = ({ entityFilterKind?: string[]; }) => { const catalogLink = useRouteRef(catalogIndexRouteRef); - const { componentsWithCounters, loading, error } = useTransitiveEntities( + const { componentsWithCounters, loading, error } = useAggregatedEntities( entity, entityFilterKind, ); diff --git a/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.tsx b/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.tsx index 18dd57cc1d..4612fce931 100644 --- a/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.tsx +++ b/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.tsx @@ -28,7 +28,7 @@ import { } from '@material-ui/core'; import React, { useState } from 'react'; import { DirectRelationsGrid } from './DirectRelationsGrid'; -import { TransitiveRelationsGrid } from './TransitiveRelationsGrid'; +import { AggregatedRelationsGrid } from './AggregatedRelationsGrid'; const useStyles = makeStyles(theme => ({ list: { @@ -59,12 +59,12 @@ const directRelationsGrid = (entity: Entity, entityFilterKind?: string[]) => { ); }; -const transitiveRelationsGrid = ( +const aggregatedRelationsGrid = ( entity: Entity, entityFilterKind?: string[], ) => { return ( - @@ -84,7 +84,7 @@ export const OwnershipCard = ({ const [relationsType, setRelationsType] = useState('direct'); const renderedGrid = relationsType !== 'direct' && isGroup - ? transitiveRelationsGrid(entity, entityFilterKind) + ? aggregatedRelationsGrid(entity, entityFilterKind) : directRelationsGrid(entity, entityFilterKind); return ( @@ -97,7 +97,7 @@ export const OwnershipCard = ({ relationsType === 'direct' - ? setRelationsType('transitive') + ? setRelationsType('aggregated') : setRelationsType('direct') } name="pin" @@ -113,7 +113,7 @@ export const OwnershipCard = ({ disabled={!isGroup} /> - Transitive Relations + Aggregated Relations diff --git a/plugins/org/src/components/Cards/OwnershipCard/useTransitiveEntities.ts b/plugins/org/src/components/Cards/OwnershipCard/useAggregatedEntities.ts similarity index 99% rename from plugins/org/src/components/Cards/OwnershipCard/useTransitiveEntities.ts rename to plugins/org/src/components/Cards/OwnershipCard/useAggregatedEntities.ts index de03b4b617..2707ba70e7 100644 --- a/plugins/org/src/components/Cards/OwnershipCard/useTransitiveEntities.ts +++ b/plugins/org/src/components/Cards/OwnershipCard/useAggregatedEntities.ts @@ -50,7 +50,7 @@ const getQueryParams = ( return queryParams; }; -export function useTransitiveEntities( +export function useAggregatedEntities( entity: Entity, entityFilterKind?: string[], ): {