paulononato/backstage
1
0
Fork 0
Code Issues Pull Requests Actions 41 Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:backstage/backstage

Browse Source
This commit is contained in:
Martin Morales
2023-04-12 09:21:44 -05:00
parent 28fecdb978 f1c2ff2cdb
commit c79a9c892f
10 changed files with 70 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.changeset/pre.json
+1 -1
View File
@@ -1,5 +1,5 @@
{
"mode": "pre",
"mode": "exit",
"tag": "next",
"initialVersions": {
"example-app": "0.2.81",
.changeset/shy-carpets-own.md
+7
View File
@@ -0,0 +1,7 @@
---
'@backstage/plugin-org': patch
---
Added `entityLimit` to change the limit of entities displayed in the ownership boxes.
[StoryBook Example for Ownership Card](https://backstage.io/storybook/?path=/story/plugins-org-ownership-card--default)
ADOPTERS.md
+1
View File
@@ -240,3 +240,4 @@ _You can do this by using the [Adopter form](https://info.backstage.spotify.com/
| [B3](https://www.b3.com.br/) | [Marcos Rodrigues](https://www.linkedin.com/in/marcos-rodrigues-cloud/) | B3 (Brazilian Stock Exchange) will implement a self-service platform focused on software development based on Backstage. The tool will primarily focus on product development and software engineering teams, as well as professionals from other areas who are also involved in software delivery. The new platform will function as a portal where teams can access tools, codes, and templates that have already been tested and are available, serving as building blocks for the development of new solutions. |
| [Porto](https://www.portoseguro.com.br/) | [Camilo Alessandro](https://www.linkedin.com/in/camilo-alessandro/) | Porto (Brazilian insurance company) Centralized developer portal with software catalog, application templates, maturity radar, component taxonomy standardization, and automation in the integration with DevSecOps processes. |
| [Einride](https://github.com/einride) | [@odsod](https://github.com/odsod/) | We use Backstage to create a great developer experience across Einride's entire software stack - from autonomous and electric vehicles to cloud systems - and we've developed a [Backstage Go SDK](https://github.com/einride/backstage-go) for interfacing with Backstage from our Go tooling.
| [Chartboost](https://www.chartboost.com)| [@brucearctor](https://github.com/brucearctor), [@ArtemChekunov](https://github.com/ArtemChekunov) | We are building our internal develper portal on top of Backstage.|
OWNERS.md
+1
View File
@@ -96,6 +96,7 @@ Scope: The TechDocs plugin and related tooling
| Carlos Esteban Lopez Jaramillo | VMWare | [luchillo17](https://github.com/luchillo17) | `luchillo17#8777` |
| David Tuite | Roadie | [dtuite](https://github.com/dtuite) | `David Tuite (roadie.io)#1010` |
| Himanshu Mishra | Harness.io | [OrkoHunter](https://github.com/OrkoHunter) | `OrkoHunter#1520` |
| Irma Solakovic | Roadie | [Irma12](https://github.com/Irma12) | `Irma#7629` |
| Jamie Klassen | VMware | [jamieklassen](https://github.com/jamieklassen) | `jamieklassen#3047` |
| Jussi Hallila | Roadie | [Xantier](https://github.com/Xantier) | `Xantier#0086` |
| Mark Avery | Cvent | [webark](https://github.com/webark) | `webark#8471` |
plugins/org/api-report.md
+2
View File
@@ -28,6 +28,7 @@ export const EntityOwnershipCard: (props: {
entityFilterKind?: string[] | undefined;
hideRelationsToggle?: boolean | undefined;
relationsType?: string | undefined;
entityLimit?: number | undefined;
}) => JSX.Element;
// @public (undocumented)
@@ -73,6 +74,7 @@ export const OwnershipCard: (props: {
entityFilterKind?: string[];
hideRelationsToggle?: boolean;
relationsType?: string;
entityLimit?: number;
}) => JSX.Element;
// @public (undocumented)
plugins/org/src/components/Cards/OwnershipCard/ComponentsGrid.tsx
+3
View File
@@ -110,11 +110,13 @@ export const ComponentsGrid = ({
relationsType,
isGroup,
entityFilterKind,
entityLimit = 6,
}: {
entity: Entity;
relationsType: string;
isGroup: boolean;
entityFilterKind?: string[];
entityLimit?: number;
}) => {
const catalogLink = useRouteRef(catalogIndexRouteRef);
const { componentsWithCounters, loading, error } = useGetEntities(
@@ -122,6 +124,7 @@ export const ComponentsGrid = ({
relationsType,
isGroup,
entityFilterKind,
entityLimit,
);
if (loading) {
plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.stories.tsx
+37 -4
View File
@@ -79,12 +79,22 @@ const makeComponent = ({ type, name }: { type: string; name: string }) => ({
],
});
const serviceA = makeComponent({ type: 'service', name: 'service-a' });
const serviceB = makeComponent({ type: 'service', name: 'service-a' });
const websiteA = makeComponent({ type: 'website', name: 'website-a' });
const types = [
'service',
'website',
'api',
'playlist',
'grpc',
'trpc',
'library',
];
const components = types.map((type, index) =>
makeComponent({ type, name: `${type}-${index}` }),
);
const catalogApi: Partial<CatalogApi> = {
getEntities: () => Promise.resolve({ items: [serviceA, serviceB, websiteA] }),
getEntities: () => Promise.resolve({ items: components }),
};
const apis = TestApiRegistry.from([catalogApiRef, catalogApi]);
@@ -138,3 +148,26 @@ export const Themed = () =>
mountedRoutes: { '/catalog': catalogIndexRouteRef },
},
);
export const WithVariableEntityList = {
argTypes: {
entityLimit: {
control: { type: 'number' },
},
},
render: ({ entityLimit }: { entityLimit: number }) =>
wrapInTestApp(
<ApiProvider apis={apis}>
<EntityProvider entity={defaultEntity}>
<Grid container spacing={4}>
<Grid item xs={12} md={6}>
<OwnershipCard entityLimit={entityLimit} />
</Grid>
</Grid>
</EntityProvider>
</ApiProvider>,
{
mountedRoutes: { '/catalog': catalogIndexRouteRef },
},
),
};
plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.tsx
+9 -2
View File
@@ -57,9 +57,15 @@ export const OwnershipCard = (props: {
entityFilterKind?: string[];
hideRelationsToggle?: boolean;
relationsType?: string;
entityLimit?: number;
}) => {
const { variant, entityFilterKind, hideRelationsToggle, relationsType } =
props;
const {
variant,
entityFilterKind,
hideRelationsToggle,
relationsType,
entityLimit = 6,
} = props;
const relationsToggle =
hideRelationsToggle === undefined ? false : hideRelationsToggle;
const classes = useStyles();
@@ -106,6 +112,7 @@ export const OwnershipCard = (props: {
)}
<ComponentsGrid
entity={entity}
entityLimit={entityLimit}
relationsType={getRelationsType}
isGroup={isGroup}
entityFilterKind={entityFilterKind}
plugins/org/src/components/Cards/OwnershipCard/useGetEntities.ts
+3 -2
View File
@@ -130,6 +130,7 @@ export function useGetEntities(
relationsType: string,
isGroup: boolean,
entityFilterKind?: string[],
entityLimit = 6,
): {
componentsWithCounters:
| {
@@ -189,8 +190,8 @@ export function useGetEntities(
[],
);
// Return top N (six) entities to be displayed in ownership boxes
const topN = counts.sort((a, b) => b.count - a.count).slice(0, 6);
// Return top N (entityLimit) entities to be displayed in ownership boxes
const topN = counts.sort((a, b) => b.count - a.count).slice(0, entityLimit);
return topN.map(topOwnedEntity => ({
counter: topOwnedEntity.count,
yarn.lock
+6 -6
View File
@@ -38910,12 +38910,12 @@ __metadata:
linkType: hard
"typescript@npm:~5.0.0":
version: 5.0.3
resolution: "typescript@npm:5.0.3"
version: 5.0.4
resolution: "typescript@npm:5.0.4"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: 3cce0576d218cb4277ff8b6adfef1a706e9114a98b4261a38ad658a7642f1b274a8396394f6cbff8c0ba852996d7ed2e233e9b8431d5d55ac7c2f6fea645af02
checksum: 82b94da3f4604a8946da585f7d6c3025fff8410779e5bde2855ab130d05e4fd08938b9e593b6ebed165bda6ad9292b230984f10952cf82f0a0ca07bbeaa08172
languageName: node
linkType: hard
@@ -38930,12 +38930,12 @@ __metadata:
linkType: hard
"typescript@patch:typescript@~5.0.0#~builtin<compat/typescript>":
version: 5.0.3
resolution: "typescript@patch:typescript@npm%3A5.0.3#~builtin<compat/typescript>::version=5.0.3&hash=a1c5e5"
version: 5.0.4
resolution: "typescript@patch:typescript@npm%3A5.0.4#~builtin<compat/typescript>::version=5.0.4&hash=a1c5e5"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: 9ec0a8eed38d46cc2c8794555b7674e413604c56c159f71b8ff21ce7f17334a44127a68724cb2ef8221ff3b19369f8f05654e8a5266621d7d962aeed889bd630
checksum: 6a1fe9a77bb9c5176ead919cc4a1499ee63e46b4e05bf667079f11bf3a8f7887f135aa72460a4c3b016e6e6bb65a822cb8689a6d86cbfe92d22cc9f501f09213
languageName: node
linkType: hard