From e23f939391e93c5b725da64d8a5848c46899ae7b Mon Sep 17 00:00:00 2001 From: Martin Vanbrabant <6448245+mvanbrab@users.noreply.github.com> Date: Wed, 9 Apr 2025 13:37:51 +0200 Subject: [PATCH 1/6] Merging for v1.7.0 (2) (#198) --- CHANGELOG.md | 1 + RELEASE.md | 17 +++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a56bc25..21e87d6b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -239,3 +239,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [1.5.0]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/releases/tag/v1.5.0 [1.6.0]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/releases/tag/v1.6.0 [1.7.0]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/releases/tag/v1.7.0 +[Unreleased]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/compare/v1.7.0...HEAD diff --git a/RELEASE.md b/RELEASE.md index 23633c38..283490b5 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -37,14 +37,15 @@ Squash and merge. Still in the github web interface... -Create a new release, with the option to create a new git tag (our release tag, example: `v1.7.0`) on the main branch. - -In the release description, copy from [CHANGELOG.md](./CHANGELOG.md): - -* the new release section created above -* the new release link created above - -Make sure to set the release as the latest release. +Create a new release: + +* Choose a tag: create a new git tag (our release tag, example: `v1.7.0`). +* Target: the main branch. +* Release title, example: `Release v1.7.0`. +* In the release description, copy from [CHANGELOG.md](./CHANGELOG.md): + * the new release section created above + * the new release link created above +* Set as the latest release. ## Back on the development branch From 78c8c7747f247ab265e28dbe5fedb36e980756ca Mon Sep 17 00:00:00 2001 From: Martin Vanbrabant <6448245+mvanbrab@users.noreply.github.com> Date: Wed, 9 Apr 2025 14:16:03 +0200 Subject: [PATCH 2/6] Merging for v1.7.0 (3) (#200) --- RELEASE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE.md b/RELEASE.md index 283490b5..ea54facb 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -10,7 +10,7 @@ Define the release tag. Example: `v1.7.0`. -> Dut do not create the tag in git yet. +> Do not create the tag in git yet. ## Finalize work on the development branch From 16faa6d3bf2d1abed67268855505beebebabc672 Mon Sep 17 00:00:00 2001 From: Pieter Heyvaert Date: Fri, 18 Apr 2025 13:41:15 +0200 Subject: [PATCH 3/6] Add 2 class-related queries --- main/configs/oslo-kg/config.json | 28 ++++++++++++++++++- .../all-aps-that-use-a-specific-class.rq | 11 ++++++++ .../all-classes-used-by-a-specific-ap.rq | 9 ++++++ .../queries/variableQueries/class-in-ap.rq | 12 ++++++++ 4 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 main/configs/oslo-kg/public/queries/all-aps-that-use-a-specific-class.rq create mode 100644 main/configs/oslo-kg/public/queries/all-classes-used-by-a-specific-ap.rq create mode 100644 main/configs/oslo-kg/public/queries/variableQueries/class-in-ap.rq diff --git a/main/configs/oslo-kg/config.json b/main/configs/oslo-kg/config.json index 0cf3f0b3..6a908e5c 100644 --- a/main/configs/oslo-kg/config.json +++ b/main/configs/oslo-kg/config.json @@ -61,7 +61,7 @@ { "id": "104", "queryLocation": "all-aps-that-use-a-specific-property.rq", - "name": "All application profiles that use a specific-property", + "name": "All application profiles that use a specific property", "comunicaContext": { "sources": [ "https://raw.githubusercontent.com/KNowledgeOnWebScale/data-vlaanderen-bundled-rdf/refs/heads/main/bundle.ttl" @@ -83,6 +83,32 @@ "indirectVariables": { "queryLocations": ["variableQueries/ap.rq"] } + }, + { + "id": "106", + "queryLocation": "all-aps-that-use-a-specific-class.rq", + "name": "All application profiles that use a specific class", + "comunicaContext": { + "sources": [ + "https://raw.githubusercontent.com/KNowledgeOnWebScale/data-vlaanderen-bundled-rdf/refs/heads/main/bundle.ttl" + ] + }, + "indirectVariables": { + "queryLocations": ["variableQueries/class-in-ap.rq"] + } + }, + { + "id": "107", + "queryLocation": "all-classes-used-by-a-specific-ap.rq", + "name": "All classes used by a specific application profile", + "comunicaContext": { + "sources": [ + "https://raw.githubusercontent.com/KNowledgeOnWebScale/data-vlaanderen-bundled-rdf/refs/heads/main/bundle.ttl" + ] + }, + "indirectVariables": { + "queryLocations": ["variableQueries/ap.rq"] + } } ] } diff --git a/main/configs/oslo-kg/public/queries/all-aps-that-use-a-specific-class.rq b/main/configs/oslo-kg/public/queries/all-aps-that-use-a-specific-class.rq new file mode 100644 index 00000000..208433fe --- /dev/null +++ b/main/configs/oslo-kg/public/queries/all-aps-that-use-a-specific-class.rq @@ -0,0 +1,11 @@ +PREFIX shacl: +PREFIX rdfs: + +SELECT DISTINCT ?ap WHERE { + ?shape a shacl:NodeShape; + shacl:targetClass $class. + + ?ap rdfs:member ?shape. + + rdfs:member ?ap. +} diff --git a/main/configs/oslo-kg/public/queries/all-classes-used-by-a-specific-ap.rq b/main/configs/oslo-kg/public/queries/all-classes-used-by-a-specific-ap.rq new file mode 100644 index 00000000..c8f3dc29 --- /dev/null +++ b/main/configs/oslo-kg/public/queries/all-classes-used-by-a-specific-ap.rq @@ -0,0 +1,9 @@ +PREFIX shacl: +PREFIX rdfs: + +SELECT DISTINCT ?class WHERE { + ?shape a shacl:NodeShape; + shacl:targetClass ?class. + + $ap rdfs:member ?shape. +} diff --git a/main/configs/oslo-kg/public/queries/variableQueries/class-in-ap.rq b/main/configs/oslo-kg/public/queries/variableQueries/class-in-ap.rq new file mode 100644 index 00000000..0e0976d4 --- /dev/null +++ b/main/configs/oslo-kg/public/queries/variableQueries/class-in-ap.rq @@ -0,0 +1,12 @@ +PREFIX shacl: +PREFIX rdfs: + +SELECT DISTINCT ?class +WHERE { + ?shape1 a shacl:NodeShape; + shacl:targetClass ?class. + + ?ap1 rdfs:member ?shape1. + + rdfs:member ?ap1. +} From f0c2d79e81856aa6b748eb5538b04a499b1199cc Mon Sep 17 00:00:00 2001 From: Pieter Heyvaert Date: Fri, 18 Apr 2025 16:35:17 +0200 Subject: [PATCH 4/6] Use smaller sources where possible --- main/configs/oslo-kg/config.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/main/configs/oslo-kg/config.json b/main/configs/oslo-kg/config.json index 6a908e5c..161f91b0 100644 --- a/main/configs/oslo-kg/config.json +++ b/main/configs/oslo-kg/config.json @@ -64,7 +64,7 @@ "name": "All application profiles that use a specific property", "comunicaContext": { "sources": [ - "https://raw.githubusercontent.com/KNowledgeOnWebScale/data-vlaanderen-bundled-rdf/refs/heads/main/bundle.ttl" + "https://raw.githubusercontent.com/KNowledgeOnWebScale/data-vlaanderen-bundled-rdf/refs/heads/main/predicates-ap.ttl" ] }, "indirectVariables": { @@ -77,7 +77,7 @@ "name": "All properties used by a specific application profile", "comunicaContext": { "sources": [ - "https://raw.githubusercontent.com/KNowledgeOnWebScale/data-vlaanderen-bundled-rdf/refs/heads/main/bundle.ttl" + "https://raw.githubusercontent.com/KNowledgeOnWebScale/data-vlaanderen-bundled-rdf/refs/heads/main/predicates-ap.ttl" ] }, "indirectVariables": { @@ -90,7 +90,7 @@ "name": "All application profiles that use a specific class", "comunicaContext": { "sources": [ - "https://raw.githubusercontent.com/KNowledgeOnWebScale/data-vlaanderen-bundled-rdf/refs/heads/main/bundle.ttl" + "https://raw.githubusercontent.com/KNowledgeOnWebScale/data-vlaanderen-bundled-rdf/refs/heads/main/classes-ap.ttl" ] }, "indirectVariables": { @@ -103,7 +103,7 @@ "name": "All classes used by a specific application profile", "comunicaContext": { "sources": [ - "https://raw.githubusercontent.com/KNowledgeOnWebScale/data-vlaanderen-bundled-rdf/refs/heads/main/bundle.ttl" + "https://raw.githubusercontent.com/KNowledgeOnWebScale/data-vlaanderen-bundled-rdf/refs/heads/main/classes-ap.ttl" ] }, "indirectVariables": { From a6e81b1d292079d2e2eb25684299c1a018609d08 Mon Sep 17 00:00:00 2001 From: Pieter Heyvaert Date: Tue, 22 Apr 2025 11:58:52 +0200 Subject: [PATCH 5/6] Update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 21e87d6b..4c38090d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,12 +13,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - A favicon (#188). - A cache to remember the entire result table (useful when scrolling through pages of a lengthy result table) (#193). +- OSLO KG config: two class-related queries. ### Changed - Using new verification library v0.2.0 (#184). - Refactoring, avoiding the usage of an internal, undocumented react-admin component (#185). - Removed the loading indicator / refresh button in the appbar (#195). +- OSLO KG config: use smaller datasets for queries. ### Fixed From f072abc51648b30a7adf1473544befd5b291aba6 Mon Sep 17 00:00:00 2001 From: Martin Vanbrabant <6448245+mvanbrab@users.noreply.github.com> Date: Tue, 22 Apr 2025 13:55:23 +0200 Subject: [PATCH 6/6] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c38090d..c6bba4e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - A favicon (#188). - A cache to remember the entire result table (useful when scrolling through pages of a lengthy result table) (#193). -- OSLO KG config: two class-related queries. +- configs/oslo-kg: two class-related queries. ### Changed