@backstage/plugin-catalog-import 0.10.11-next.2 → 0.11.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,24 @@
|
|
|
1
1
|
# @backstage/plugin-catalog-import
|
|
2
2
|
|
|
3
|
+
## 0.11.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- e1174b0: `EntityListComponent` uses `entityPresentationApi` instead of `humanizeEntityRef` to display Entity
|
|
8
|
+
|
|
9
|
+
### Patch Changes
|
|
10
|
+
|
|
11
|
+
- Updated dependencies
|
|
12
|
+
- @backstage/core-compat-api@0.2.5
|
|
13
|
+
- @backstage/core-components@0.14.7
|
|
14
|
+
- @backstage/catalog-model@1.5.0
|
|
15
|
+
- @backstage/plugin-catalog-react@1.12.0
|
|
16
|
+
- @backstage/integration@1.11.0
|
|
17
|
+
- @backstage/catalog-client@1.6.5
|
|
18
|
+
- @backstage/frontend-plugin-api@0.6.5
|
|
19
|
+
- @backstage/integration-react@1.1.27
|
|
20
|
+
- @backstage/plugin-catalog-common@1.0.23
|
|
21
|
+
|
|
3
22
|
## 0.10.11-next.2
|
|
4
23
|
|
|
5
24
|
### Patch Changes
|
package/alpha/package.json
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
1
|
+
import { stringifyEntityRef } from '@backstage/catalog-model';
|
|
2
|
+
import { useApi } from '@backstage/core-plugin-api';
|
|
3
|
+
import { entityPresentationApiRef, EntityRefLink, EntityDisplayName } from '@backstage/plugin-catalog-react';
|
|
3
4
|
import Collapse from '@material-ui/core/Collapse';
|
|
4
5
|
import IconButton from '@material-ui/core/IconButton';
|
|
5
6
|
import List from '@material-ui/core/List';
|
|
@@ -17,11 +18,6 @@ const useStyles = makeStyles((theme) => ({
|
|
|
17
18
|
paddingLeft: theme.spacing(4)
|
|
18
19
|
}
|
|
19
20
|
}));
|
|
20
|
-
function sortEntities(entities) {
|
|
21
|
-
return entities.sort(
|
|
22
|
-
(a, b) => humanizeEntityRef(a).localeCompare(humanizeEntityRef(b))
|
|
23
|
-
);
|
|
24
|
-
}
|
|
25
21
|
const EntityListComponent = (props) => {
|
|
26
22
|
const {
|
|
27
23
|
locations,
|
|
@@ -31,14 +27,21 @@ const EntityListComponent = (props) => {
|
|
|
31
27
|
firstListItem,
|
|
32
28
|
withLinks = false
|
|
33
29
|
} = props;
|
|
34
|
-
const app = useApp();
|
|
35
30
|
const classes = useStyles();
|
|
31
|
+
const entityPresentationApi = useApi(entityPresentationApiRef);
|
|
36
32
|
const [expandedUrls, setExpandedUrls] = useState([]);
|
|
37
33
|
const handleClick = (url) => {
|
|
38
34
|
setExpandedUrls(
|
|
39
35
|
(urls) => urls.includes(url) ? urls.filter((u) => u !== url) : urls.concat(url)
|
|
40
36
|
);
|
|
41
37
|
};
|
|
38
|
+
function sortEntities(entities) {
|
|
39
|
+
return entities.sort(
|
|
40
|
+
(a, b) => entityPresentationApi.forEntity(stringifyEntityRef(a)).snapshot.entityRef.localeCompare(
|
|
41
|
+
entityPresentationApi.forEntity(stringifyEntityRef(b)).snapshot.entityRef
|
|
42
|
+
)
|
|
43
|
+
);
|
|
44
|
+
}
|
|
42
45
|
return /* @__PURE__ */ React.createElement(List, null, firstListItem, locations.map((r) => /* @__PURE__ */ React.createElement(React.Fragment, { key: r.target }, /* @__PURE__ */ React.createElement(
|
|
43
46
|
ListItem,
|
|
44
47
|
{
|
|
@@ -63,13 +66,10 @@ const EntityListComponent = (props) => {
|
|
|
63
66
|
unmountOnExit: true
|
|
64
67
|
},
|
|
65
68
|
/* @__PURE__ */ React.createElement(List, { component: "div", disablePadding: true, dense: true }, sortEntities(r.entities).map((entity) => {
|
|
66
|
-
const Icon = app.getSystemIcon(
|
|
67
|
-
`kind:${entity.kind.toLocaleLowerCase("en-US")}`
|
|
68
|
-
);
|
|
69
69
|
return /* @__PURE__ */ React.createElement(
|
|
70
70
|
ListItem,
|
|
71
71
|
{
|
|
72
|
-
key:
|
|
72
|
+
key: stringifyEntityRef(entity),
|
|
73
73
|
className: classes.nested,
|
|
74
74
|
...withLinks ? {
|
|
75
75
|
component: EntityRefLink,
|
|
@@ -77,8 +77,12 @@ const EntityListComponent = (props) => {
|
|
|
77
77
|
button: withLinks
|
|
78
78
|
} : {}
|
|
79
79
|
},
|
|
80
|
-
/* @__PURE__ */ React.createElement(
|
|
81
|
-
|
|
80
|
+
/* @__PURE__ */ React.createElement(
|
|
81
|
+
ListItemText,
|
|
82
|
+
{
|
|
83
|
+
primary: /* @__PURE__ */ React.createElement(EntityDisplayName, { entityRef: entity })
|
|
84
|
+
}
|
|
85
|
+
)
|
|
82
86
|
);
|
|
83
87
|
}))
|
|
84
88
|
))));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EntityListComponent.esm.js","sources":["../../../src/components/EntityListComponent/EntityListComponent.tsx"],"sourcesContent":["/*\n * Copyright 2021 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport {
|
|
1
|
+
{"version":3,"file":"EntityListComponent.esm.js","sources":["../../../src/components/EntityListComponent/EntityListComponent.tsx"],"sourcesContent":["/*\n * Copyright 2021 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport {\n Entity,\n CompoundEntityRef,\n stringifyEntityRef,\n} from '@backstage/catalog-model';\nimport { useApi } from '@backstage/core-plugin-api';\nimport {\n EntityDisplayName,\n EntityRefLink,\n entityPresentationApiRef,\n} from '@backstage/plugin-catalog-react';\nimport Collapse from '@material-ui/core/Collapse';\nimport IconButton from '@material-ui/core/IconButton';\nimport List from '@material-ui/core/List';\nimport ListItem from '@material-ui/core/ListItem';\nimport ListItemIcon from '@material-ui/core/ListItemIcon';\nimport ListItemSecondaryAction from '@material-ui/core/ListItemSecondaryAction';\nimport ListItemText from '@material-ui/core/ListItemText';\nimport { makeStyles } from '@material-ui/core/styles';\nimport ExpandLessIcon from '@material-ui/icons/ExpandLess';\nimport ExpandMoreIcon from '@material-ui/icons/ExpandMore';\nimport React, { useState } from 'react';\n\nconst useStyles = makeStyles(theme => ({\n nested: {\n paddingLeft: theme.spacing(4),\n },\n}));\n\n/**\n * Props for {@link EntityListComponent}.\n *\n * @public\n */\nexport interface EntityListComponentProps {\n locations: Array<{\n target: string;\n entities: (Entity | CompoundEntityRef)[];\n }>;\n locationListItemIcon: (target: string) => React.ReactElement;\n collapsed?: boolean;\n firstListItem?: React.ReactElement;\n onItemClick?: (target: string) => void;\n withLinks?: boolean;\n}\n\n/**\n * Shows a result list of entities.\n *\n * @public\n */\nexport const EntityListComponent = (props: EntityListComponentProps) => {\n const {\n locations,\n collapsed = false,\n locationListItemIcon,\n onItemClick,\n firstListItem,\n withLinks = false,\n } = props;\n\n const classes = useStyles();\n const entityPresentationApi = useApi(entityPresentationApiRef);\n const [expandedUrls, setExpandedUrls] = useState<string[]>([]);\n\n const handleClick = (url: string) => {\n setExpandedUrls(urls =>\n urls.includes(url) ? urls.filter(u => u !== url) : urls.concat(url),\n );\n };\n\n function sortEntities(entities: Array<CompoundEntityRef | Entity>) {\n return entities.sort((a, b) =>\n entityPresentationApi\n .forEntity(stringifyEntityRef(a))\n .snapshot.entityRef.localeCompare(\n entityPresentationApi.forEntity(stringifyEntityRef(b)).snapshot\n .entityRef,\n ),\n );\n }\n\n return (\n <List>\n {firstListItem}\n {locations.map(r => (\n <React.Fragment key={r.target}>\n <ListItem\n dense\n button={Boolean(onItemClick) as any}\n onClick={() => onItemClick?.(r.target)}\n >\n <ListItemIcon>{locationListItemIcon(r.target)}</ListItemIcon>\n\n <ListItemText\n primary={r.target}\n secondary={`Entities: ${r.entities.length}`}\n />\n\n {collapsed && (\n <ListItemSecondaryAction>\n <IconButton edge=\"end\" onClick={() => handleClick(r.target)}>\n {expandedUrls.includes(r.target) ? (\n <ExpandLessIcon />\n ) : (\n <ExpandMoreIcon />\n )}\n </IconButton>\n </ListItemSecondaryAction>\n )}\n </ListItem>\n\n <Collapse\n in={!collapsed || expandedUrls.includes(r.target)}\n timeout=\"auto\"\n unmountOnExit\n >\n <List component=\"div\" disablePadding dense>\n {sortEntities(r.entities).map(entity => {\n return (\n <ListItem\n key={stringifyEntityRef(entity)}\n className={classes.nested}\n {...(withLinks\n ? {\n component: EntityRefLink,\n entityRef: entity,\n button: withLinks as any,\n }\n : {})}\n >\n <ListItemText\n primary={<EntityDisplayName entityRef={entity} />}\n />\n </ListItem>\n );\n })}\n </List>\n </Collapse>\n </React.Fragment>\n ))}\n </List>\n );\n};\n"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@backstage/plugin-catalog-import",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.11.0",
|
|
4
4
|
"description": "A Backstage plugin the helps you import entities into your catalog",
|
|
5
5
|
"backstage": {
|
|
6
6
|
"role": "frontend-plugin"
|
|
@@ -49,18 +49,18 @@
|
|
|
49
49
|
"test": "backstage-cli package test"
|
|
50
50
|
},
|
|
51
51
|
"dependencies": {
|
|
52
|
-
"@backstage/catalog-client": "^1.6.5
|
|
53
|
-
"@backstage/catalog-model": "^1.5.0
|
|
52
|
+
"@backstage/catalog-client": "^1.6.5",
|
|
53
|
+
"@backstage/catalog-model": "^1.5.0",
|
|
54
54
|
"@backstage/config": "^1.2.0",
|
|
55
|
-
"@backstage/core-compat-api": "^0.2.5
|
|
56
|
-
"@backstage/core-components": "^0.14.7
|
|
55
|
+
"@backstage/core-compat-api": "^0.2.5",
|
|
56
|
+
"@backstage/core-components": "^0.14.7",
|
|
57
57
|
"@backstage/core-plugin-api": "^1.9.2",
|
|
58
58
|
"@backstage/errors": "^1.2.4",
|
|
59
|
-
"@backstage/frontend-plugin-api": "^0.6.5
|
|
60
|
-
"@backstage/integration": "^1.11.0
|
|
61
|
-
"@backstage/integration-react": "^1.1.27
|
|
62
|
-
"@backstage/plugin-catalog-common": "^1.0.23
|
|
63
|
-
"@backstage/plugin-catalog-react": "^1.12.0
|
|
59
|
+
"@backstage/frontend-plugin-api": "^0.6.5",
|
|
60
|
+
"@backstage/integration": "^1.11.0",
|
|
61
|
+
"@backstage/integration-react": "^1.1.27",
|
|
62
|
+
"@backstage/plugin-catalog-common": "^1.0.23",
|
|
63
|
+
"@backstage/plugin-catalog-react": "^1.12.0",
|
|
64
64
|
"@material-ui/core": "^4.12.2",
|
|
65
65
|
"@material-ui/icons": "^4.9.1",
|
|
66
66
|
"@material-ui/lab": "4.0.0-alpha.61",
|
|
@@ -74,10 +74,11 @@
|
|
|
74
74
|
"yaml": "^2.0.0"
|
|
75
75
|
},
|
|
76
76
|
"devDependencies": {
|
|
77
|
-
"@backstage/cli": "^0.26.5
|
|
78
|
-
"@backstage/core-app-api": "^1.12.
|
|
79
|
-
"@backstage/dev-utils": "^1.0.32
|
|
80
|
-
"@backstage/
|
|
77
|
+
"@backstage/cli": "^0.26.5",
|
|
78
|
+
"@backstage/core-app-api": "^1.12.5",
|
|
79
|
+
"@backstage/dev-utils": "^1.0.32",
|
|
80
|
+
"@backstage/plugin-catalog": "^1.20.0",
|
|
81
|
+
"@backstage/test-utils": "^1.5.5",
|
|
81
82
|
"@testing-library/dom": "^10.0.0",
|
|
82
83
|
"@testing-library/jest-dom": "^6.0.0",
|
|
83
84
|
"@testing-library/react": "^15.0.0",
|