@backstage/plugin-catalog 1.24.0-next.0 → 1.24.0-next.2
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,52 @@
|
|
|
1
1
|
# @backstage/plugin-catalog
|
|
2
2
|
|
|
3
|
+
## 1.24.0-next.2
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- cec8e8c: Adding negation keyword for entity filtering
|
|
8
|
+
|
|
9
|
+
### Patch Changes
|
|
10
|
+
|
|
11
|
+
- Updated dependencies
|
|
12
|
+
- @backstage/plugin-catalog-react@1.14.0-next.2
|
|
13
|
+
- @backstage/catalog-client@1.7.1-next.0
|
|
14
|
+
- @backstage/catalog-model@1.7.0
|
|
15
|
+
- @backstage/core-compat-api@0.3.1-next.2
|
|
16
|
+
- @backstage/core-components@0.15.1-next.2
|
|
17
|
+
- @backstage/core-plugin-api@1.10.0-next.1
|
|
18
|
+
- @backstage/errors@1.2.4
|
|
19
|
+
- @backstage/frontend-plugin-api@0.9.0-next.2
|
|
20
|
+
- @backstage/integration-react@1.2.0-next.2
|
|
21
|
+
- @backstage/types@1.1.1
|
|
22
|
+
- @backstage/plugin-catalog-common@1.1.0
|
|
23
|
+
- @backstage/plugin-permission-react@0.4.27-next.1
|
|
24
|
+
- @backstage/plugin-scaffolder-common@1.5.6
|
|
25
|
+
- @backstage/plugin-search-common@1.2.14
|
|
26
|
+
- @backstage/plugin-search-react@1.8.1-next.2
|
|
27
|
+
|
|
28
|
+
## 1.24.0-next.1
|
|
29
|
+
|
|
30
|
+
### Patch Changes
|
|
31
|
+
|
|
32
|
+
- e969dc7: Move `@types/react` to a peer dependency.
|
|
33
|
+
- Updated dependencies
|
|
34
|
+
- @backstage/core-components@0.15.1-next.1
|
|
35
|
+
- @backstage/frontend-plugin-api@0.9.0-next.1
|
|
36
|
+
- @backstage/integration-react@1.2.0-next.1
|
|
37
|
+
- @backstage/core-compat-api@0.3.1-next.1
|
|
38
|
+
- @backstage/core-plugin-api@1.10.0-next.1
|
|
39
|
+
- @backstage/plugin-permission-react@0.4.27-next.1
|
|
40
|
+
- @backstage/plugin-catalog-react@1.14.0-next.1
|
|
41
|
+
- @backstage/plugin-search-react@1.8.1-next.1
|
|
42
|
+
- @backstage/catalog-client@1.7.0
|
|
43
|
+
- @backstage/catalog-model@1.7.0
|
|
44
|
+
- @backstage/errors@1.2.4
|
|
45
|
+
- @backstage/types@1.1.1
|
|
46
|
+
- @backstage/plugin-catalog-common@1.1.0
|
|
47
|
+
- @backstage/plugin-scaffolder-common@1.5.6
|
|
48
|
+
- @backstage/plugin-search-common@1.2.14
|
|
49
|
+
|
|
3
50
|
## 1.24.0-next.0
|
|
4
51
|
|
|
5
52
|
### Minor Changes
|
package/alpha/package.json
CHANGED
|
@@ -18,6 +18,7 @@ function parseFilterExpression(expression) {
|
|
|
18
18
|
);
|
|
19
19
|
const matchers = parts.flatMap((part) => {
|
|
20
20
|
const factory = rootMatcherFactories[part.key];
|
|
21
|
+
const negation = part.negation;
|
|
21
22
|
if (!factory) {
|
|
22
23
|
const known = Object.keys(rootMatcherFactories).map((m) => `'${m}'`);
|
|
23
24
|
expressionParseErrors.push(
|
|
@@ -31,7 +32,7 @@ function parseFilterExpression(expression) {
|
|
|
31
32
|
part.parameters,
|
|
32
33
|
(e) => expressionParseErrors.push(e)
|
|
33
34
|
);
|
|
34
|
-
return [matcher];
|
|
35
|
+
return [negation ? (entity) => !matcher(entity) : matcher];
|
|
35
36
|
});
|
|
36
37
|
const filterFn = (entity) => matchers.every((matcher) => {
|
|
37
38
|
try {
|
|
@@ -49,7 +50,7 @@ function splitFilterExpression(expression, onParseError) {
|
|
|
49
50
|
const words = expression.split(" ").map((w) => w.trim()).filter(Boolean);
|
|
50
51
|
const result = new Array();
|
|
51
52
|
for (const word of words) {
|
|
52
|
-
const match = word.match(/^([^:]+):(.+)$/);
|
|
53
|
+
const match = word.match(/^(not:)?([^:]+):(.+)$/);
|
|
53
54
|
if (!match) {
|
|
54
55
|
onParseError(
|
|
55
56
|
new InputError(
|
|
@@ -58,9 +59,10 @@ function splitFilterExpression(expression, onParseError) {
|
|
|
58
59
|
);
|
|
59
60
|
continue;
|
|
60
61
|
}
|
|
61
|
-
const key = match[
|
|
62
|
-
const parameters = match[
|
|
63
|
-
|
|
62
|
+
const key = match[2];
|
|
63
|
+
const parameters = match[3].split(",").filter(Boolean);
|
|
64
|
+
const negation = Boolean(match[1]);
|
|
65
|
+
result.push({ key, parameters, negation });
|
|
64
66
|
}
|
|
65
67
|
return result;
|
|
66
68
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseFilterExpression.esm.js","sources":["../../../src/alpha/filter/parseFilterExpression.ts"],"sourcesContent":["/*\n * Copyright 2023 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 { Entity } from '@backstage/catalog-model';\nimport { InputError } from '@backstage/errors';\nimport { EntityMatcherFn } from './matchers/types';\nimport { createKindMatcher } from './matchers/createKindMatcher';\nimport { createTypeMatcher } from './matchers/createTypeMatcher';\nimport { createIsMatcher } from './matchers/createIsMatcher';\nimport { createHasMatcher } from './matchers/createHasMatcher';\n\nconst rootMatcherFactories: Record<\n string,\n (\n parameters: string[],\n onParseError: (error: Error) => void,\n ) => EntityMatcherFn\n> = {\n kind: createKindMatcher,\n type: createTypeMatcher,\n is: createIsMatcher,\n has: createHasMatcher,\n};\n\n/**\n * Parses a filter expression that decides whether to render an entity component\n * or not. Returns a function that matches entities based on that expression.\n *\n * @remarks\n *\n * Filter strings are on the form `kind:user,group is:orphan`. There's\n * effectively an AND between the space separated parts, and an OR between comma\n * separated parameters. So the example filter string semantically means\n * \"entities that are of either User or Group kind, and also are orphans\".\n *\n * The `expressionParseErrors` array contains any errors that were encountered\n * during initial parsing of the expression. Note that the parts of the input\n * expression that had errors are ignored entirely and parsing continues as if\n * they didn't exist.\n */\nexport function parseFilterExpression(expression: string): {\n filterFn: (entity: Entity) => boolean;\n expressionParseErrors: Error[];\n} {\n const expressionParseErrors: Error[] = [];\n\n const parts = splitFilterExpression(expression, e =>\n expressionParseErrors.push(e),\n );\n
|
|
1
|
+
{"version":3,"file":"parseFilterExpression.esm.js","sources":["../../../src/alpha/filter/parseFilterExpression.ts"],"sourcesContent":["/*\n * Copyright 2023 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 { Entity } from '@backstage/catalog-model';\nimport { InputError } from '@backstage/errors';\nimport { EntityMatcherFn } from './matchers/types';\nimport { createKindMatcher } from './matchers/createKindMatcher';\nimport { createTypeMatcher } from './matchers/createTypeMatcher';\nimport { createIsMatcher } from './matchers/createIsMatcher';\nimport { createHasMatcher } from './matchers/createHasMatcher';\n\nconst rootMatcherFactories: Record<\n string,\n (\n parameters: string[],\n onParseError: (error: Error) => void,\n negation?: boolean,\n ) => EntityMatcherFn\n> = {\n kind: createKindMatcher,\n type: createTypeMatcher,\n is: createIsMatcher,\n has: createHasMatcher,\n};\n\n/**\n * Parses a filter expression that decides whether to render an entity component\n * or not. Returns a function that matches entities based on that expression.\n *\n * @remarks\n *\n * Filter strings are on the form `kind:user,group is:orphan`. There's\n * effectively an AND between the space separated parts, and an OR between comma\n * separated parameters. So the example filter string semantically means\n * \"entities that are of either User or Group kind, and also are orphans\".\n *\n * The `expressionParseErrors` array contains any errors that were encountered\n * during initial parsing of the expression. Note that the parts of the input\n * expression that had errors are ignored entirely and parsing continues as if\n * they didn't exist.\n */\nexport function parseFilterExpression(expression: string): {\n filterFn: (entity: Entity) => boolean;\n expressionParseErrors: Error[];\n} {\n const expressionParseErrors: Error[] = [];\n\n const parts = splitFilterExpression(expression, e =>\n expressionParseErrors.push(e),\n );\n const matchers = parts.flatMap(part => {\n const factory = rootMatcherFactories[part.key];\n const negation = part.negation;\n if (!factory) {\n const known = Object.keys(rootMatcherFactories).map(m => `'${m}'`);\n expressionParseErrors.push(\n new InputError(\n `'${part.key}' is not a valid filter expression key, expected one of ${known}`,\n ),\n );\n return [];\n }\n\n const matcher = factory(part.parameters, e =>\n expressionParseErrors.push(e),\n );\n\n return [negation ? (entity: Entity) => !matcher(entity) : matcher];\n });\n\n const filterFn = (entity: Entity) =>\n matchers.every(matcher => {\n try {\n return matcher(entity);\n } catch {\n return false;\n }\n });\n\n return {\n filterFn,\n expressionParseErrors,\n };\n}\n\nexport function splitFilterExpression(\n expression: string,\n onParseError: (error: Error) => void,\n): Array<{ key: string; parameters: string[]; negation: boolean }> {\n const words = expression\n .split(' ')\n .map(w => w.trim())\n .filter(Boolean);\n\n const result = new Array<{\n key: string;\n parameters: string[];\n negation: boolean;\n }>();\n\n for (const word of words) {\n const match = word.match(/^(not:)?([^:]+):(.+)$/);\n if (!match) {\n onParseError(\n new InputError(\n `'${word}' is not a valid filter expression, expected 'key:parameter' form`,\n ),\n );\n continue;\n }\n const key = match[2];\n const parameters = match[3].split(',').filter(Boolean); // silently ignore double commas\n const negation = Boolean(match[1]);\n result.push({ key, parameters, negation });\n }\n\n return result;\n}\n"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@backstage/plugin-catalog",
|
|
3
|
-
"version": "1.24.0-next.
|
|
3
|
+
"version": "1.24.0-next.2",
|
|
4
4
|
"description": "The Backstage plugin for browsing the Backstage catalog",
|
|
5
5
|
"backstage": {
|
|
6
6
|
"role": "frontend-plugin",
|
|
@@ -58,26 +58,25 @@
|
|
|
58
58
|
"test": "backstage-cli package test"
|
|
59
59
|
},
|
|
60
60
|
"dependencies": {
|
|
61
|
-
"@backstage/catalog-client": "
|
|
62
|
-
"@backstage/catalog-model": "
|
|
63
|
-
"@backstage/core-compat-api": "
|
|
64
|
-
"@backstage/core-components": "
|
|
65
|
-
"@backstage/core-plugin-api": "
|
|
66
|
-
"@backstage/errors": "
|
|
67
|
-
"@backstage/frontend-plugin-api": "
|
|
68
|
-
"@backstage/integration-react": "
|
|
69
|
-
"@backstage/plugin-catalog-common": "
|
|
70
|
-
"@backstage/plugin-catalog-react": "
|
|
71
|
-
"@backstage/plugin-permission-react": "
|
|
72
|
-
"@backstage/plugin-scaffolder-common": "
|
|
73
|
-
"@backstage/plugin-search-common": "
|
|
74
|
-
"@backstage/plugin-search-react": "
|
|
75
|
-
"@backstage/types": "
|
|
61
|
+
"@backstage/catalog-client": "1.7.1-next.0",
|
|
62
|
+
"@backstage/catalog-model": "1.7.0",
|
|
63
|
+
"@backstage/core-compat-api": "0.3.1-next.2",
|
|
64
|
+
"@backstage/core-components": "0.15.1-next.2",
|
|
65
|
+
"@backstage/core-plugin-api": "1.10.0-next.1",
|
|
66
|
+
"@backstage/errors": "1.2.4",
|
|
67
|
+
"@backstage/frontend-plugin-api": "0.9.0-next.2",
|
|
68
|
+
"@backstage/integration-react": "1.2.0-next.2",
|
|
69
|
+
"@backstage/plugin-catalog-common": "1.1.0",
|
|
70
|
+
"@backstage/plugin-catalog-react": "1.14.0-next.2",
|
|
71
|
+
"@backstage/plugin-permission-react": "0.4.27-next.1",
|
|
72
|
+
"@backstage/plugin-scaffolder-common": "1.5.6",
|
|
73
|
+
"@backstage/plugin-search-common": "1.2.14",
|
|
74
|
+
"@backstage/plugin-search-react": "1.8.1-next.2",
|
|
75
|
+
"@backstage/types": "1.1.1",
|
|
76
76
|
"@material-ui/core": "^4.12.2",
|
|
77
77
|
"@material-ui/icons": "^4.9.1",
|
|
78
78
|
"@material-ui/lab": "4.0.0-alpha.61",
|
|
79
79
|
"@mui/utils": "^5.14.15",
|
|
80
|
-
"@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0",
|
|
81
80
|
"dataloader": "^2.0.0",
|
|
82
81
|
"expiry-map": "^2.0.0",
|
|
83
82
|
"history": "^5.0.0",
|
|
@@ -87,24 +86,34 @@
|
|
|
87
86
|
"zen-observable": "^0.10.0"
|
|
88
87
|
},
|
|
89
88
|
"devDependencies": {
|
|
90
|
-
"@backstage/cli": "
|
|
91
|
-
"@backstage/core-app-api": "
|
|
92
|
-
"@backstage/dev-utils": "
|
|
93
|
-
"@backstage/frontend-test-utils": "
|
|
94
|
-
"@backstage/plugin-permission-common": "
|
|
95
|
-
"@backstage/test-utils": "
|
|
89
|
+
"@backstage/cli": "0.28.0-next.2",
|
|
90
|
+
"@backstage/core-app-api": "1.15.1-next.1",
|
|
91
|
+
"@backstage/dev-utils": "1.1.2-next.2",
|
|
92
|
+
"@backstage/frontend-test-utils": "0.2.1-next.2",
|
|
93
|
+
"@backstage/plugin-permission-common": "0.8.1",
|
|
94
|
+
"@backstage/test-utils": "1.6.1-next.2",
|
|
96
95
|
"@testing-library/dom": "^10.0.0",
|
|
97
96
|
"@testing-library/jest-dom": "^6.0.0",
|
|
98
97
|
"@testing-library/react": "^16.0.0",
|
|
99
98
|
"@testing-library/user-event": "^14.0.0",
|
|
100
99
|
"@types/pluralize": "^0.0.33",
|
|
100
|
+
"@types/react": "^18.0.0",
|
|
101
|
+
"react": "^18.0.2",
|
|
102
|
+
"react-dom": "^18.0.2",
|
|
103
|
+
"react-router-dom": "^6.3.0",
|
|
101
104
|
"swr": "^2.2.5"
|
|
102
105
|
},
|
|
103
106
|
"peerDependencies": {
|
|
107
|
+
"@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0",
|
|
104
108
|
"react": "^16.13.1 || ^17.0.0 || ^18.0.0",
|
|
105
109
|
"react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0",
|
|
106
110
|
"react-router-dom": "6.0.0-beta.0 || ^6.3.0"
|
|
107
111
|
},
|
|
112
|
+
"peerDependenciesMeta": {
|
|
113
|
+
"@types/react": {
|
|
114
|
+
"optional": true
|
|
115
|
+
}
|
|
116
|
+
},
|
|
108
117
|
"configSchema": "config.d.ts",
|
|
109
118
|
"module": "./dist/index.esm.js"
|
|
110
119
|
}
|