From 4849068e4a68a2d71e0256494db9dee0e080a928 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 3 Sep 2023 00:33:30 +0000 Subject: [PATCH 1/2] fix(deps): update dependency json-rules-engine to v6.4.2 Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- yarn.lock | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/yarn.lock b/yarn.lock index 29953fc257..6a607ddb41 100644 --- a/yarn.lock +++ b/yarn.lock @@ -27855,10 +27855,10 @@ __metadata: languageName: node linkType: hard -"hash-it@npm:^5.0.0": - version: 5.0.2 - resolution: "hash-it@npm:5.0.2" - checksum: 18a8a934e90b123ed3cf61cd06cb22273552e03a287155a2276edb77843b18b039b7bfb0a892df215569d7b6c3cc2413453730e3913f56f9069490ad38b1dc28 +"hash-it@npm:^6.0.0": + version: 6.0.0 + resolution: "hash-it@npm:6.0.0" + checksum: 10ca948ff7902a752344c3975c1a5c76ba9e4aa0363032f347a7235cce98473dce60fe4399b05979596aedf649adaf5b3f792a55b9b64ad59ae686e43300c2d1 languageName: node linkType: hard @@ -30583,15 +30583,15 @@ __metadata: linkType: hard "json-rules-engine@npm:^6.1.2": - version: 6.1.2 - resolution: "json-rules-engine@npm:6.1.2" + version: 6.4.2 + resolution: "json-rules-engine@npm:6.4.2" dependencies: clone: ^2.1.2 eventemitter2: ^6.4.4 - hash-it: ^5.0.0 - jsonpath-plus: ^5.0.7 + hash-it: ^6.0.0 + jsonpath-plus: ^7.2.0 lodash.isobjectlike: ^4.0.0 - checksum: bb6af1e24318e7bbb098b809925918d8fc735a1887d0388a94c22f90dcf8cff8c9db5d891f8915d6c48447d31c0d505eae2a5bccbbb58e25f0e2746dee6cdec9 + checksum: c3dcddc71db42e2e29ced8883adc7e38a99a3fa7111fd1539cd38e375a422225956e61c53346e341a8b0432507225cb1d634acc2d02faccb24b73b559a574e44 languageName: node linkType: hard @@ -30808,13 +30808,6 @@ __metadata: languageName: node linkType: hard -"jsonpath-plus@npm:^5.0.7": - version: 5.1.0 - resolution: "jsonpath-plus@npm:5.1.0" - checksum: 0ebb56b4b079e5aae574df1feff043de0fe3d00a9eafb9a258cdff7df29f2d3b4dea9c6095c2d9176ec3417a3847e3aba8268a05e5f0a90c78cf0d7297b7a3bc - languageName: node - linkType: hard - "jsonpath-plus@npm:^6.0.1": version: 6.0.1 resolution: "jsonpath-plus@npm:6.0.1" From 51b801f743b2b7626f5a09ac25b515d2f9461b19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= Date: Mon, 4 Sep 2023 11:59:35 +0200 Subject: [PATCH 2/2] fixup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fredrik Adelöw --- .changeset/stupid-ants-change.md | 5 +++++ .../src/service/JsonRulesEngineFactChecker.ts | 6 ++++++ 2 files changed, 11 insertions(+) create mode 100644 .changeset/stupid-ants-change.md diff --git a/.changeset/stupid-ants-change.md b/.changeset/stupid-ants-change.md new file mode 100644 index 0000000000..c78c5e4250 --- /dev/null +++ b/.changeset/stupid-ants-change.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-tech-insights-backend-module-jsonfc': patch +--- + +Handle extracting facts from 'not' conditions too diff --git a/plugins/tech-insights-backend-module-jsonfc/src/service/JsonRulesEngineFactChecker.ts b/plugins/tech-insights-backend-module-jsonfc/src/service/JsonRulesEngineFactChecker.ts index 721c9b3c62..6c1c559fc4 100644 --- a/plugins/tech-insights-backend-module-jsonfc/src/service/JsonRulesEngineFactChecker.ts +++ b/plugins/tech-insights-backend-module-jsonfc/src/service/JsonRulesEngineFactChecker.ts @@ -222,6 +222,12 @@ export class JsonRulesEngineFactChecker this.retrieveIndividualFactReferences(con), ), ); + } else if ('not' in condition) { + results = results.concat( + this.retrieveIndividualFactReferences(condition.not), + ); + } else if ('condition' in condition) { + // ignore the ConditionReference type } else { results.push(condition.fact); }