bump frontend

Merge pull request #256 from lblod/feature/adapt-public-producer-to-hardsplit
Adapt public producer to hardsplit
2023-03-24 13:47:24 +01:00 · 2023-03-22 11:12:28 +01:00 · 2023-03-22 10:35:48 +01:00 · 2023-03-22 08:20:01 +01:00 · 2023-03-21 17:19:56 +01:00 · 2023-03-21 11:30:03 +01:00
5 changed files with 185 additions and 9 deletions
--- a/config/authorization/config.ex
+++ b/config/authorization/config.ex
@@ -186,12 +186,12 @@ defmodule Acl.UserGroups.Config do
        name: "public",
        useage: [:read],
        access: %AlwaysAccessible{},
-        graphs: [ 
+        graphs: [
          %GraphSpec{
-                    graph: "http://mu.semte.ch/graphs/public", 
+                    graph: "http://mu.semte.ch/graphs/public",
                    constraint: %ResourceConstraint{
                      resource_types: @public_type
-                    } 
+                    }
          },
          %GraphSpec{
            graph: "http://mu.semte.ch/graphs/shared",
--- a/config/delta-producer/public/export.json
+++ b/config/delta-producer/public/export.json
@@ -13,6 +13,7 @@
        "http://www.w3.org/2004/02/skos/core#inScheme"
      ],
      "properties": [
+        "http://mu.semte.ch/vocabularies/core/uuid",
        "http://www.w3.org/2004/02/skos/core#prefLabel",
        "http://www.w3.org/2004/02/skos/core#altLabel",
        "http://www.w3.org/ns/adms#identifier",
@@ -25,8 +26,6 @@
        "http://www.w3.org/ns/org#linkedTo",
        "http://www.w3.org/ns/org#hasSubOrganization",
        "http://www.w3.org/ns/org#classification",
-        "http://data.lblod.info/vocabularies/erediensten/betrokkenBestuur",
-        "http://mu.semte.ch/vocabularies/ext/werkingsgebiedNiveau",
        "http://data.lblod.info/vocabularies/erediensten/denominatie",
        "http://data.lblod.info/vocabularies/erediensten/grensoverschrijdend",
        "http://data.lblod.info/vocabularies/erediensten/wordtBediendDoor",
@@ -45,6 +44,7 @@
        "http://www.w3.org/2004/02/skos/core#inScheme"
      ],
      "properties": [
+        "http://mu.semte.ch/vocabularies/core/uuid",
        "http://www.w3.org/2004/02/skos/core#prefLabel",
        "http://www.w3.org/2004/02/skos/core#altLabel",
        "http://www.w3.org/ns/adms#identifier",
@@ -57,14 +57,88 @@
        "http://www.w3.org/ns/org#linkedTo",
        "http://www.w3.org/ns/org#hasSubOrganization",
        "http://www.w3.org/ns/org#classification",
-        "http://data.lblod.info/vocabularies/erediensten/betrokkenBestuur",
-        "http://mu.semte.ch/vocabularies/ext/werkingsgebiedNiveau",
        "http://data.lblod.info/vocabularies/erediensten/typeEredienst"
      ]
    },
+    {
+      "type": "http://data.vlaanderen.be/ns/besluit#Bestuurseenheid",
+      "strictTypeExport": "true",
+      "graphsFilter": [
+        "http://mu.semte.ch/graphs/worship-service",
+        "http://mu.semte.ch/graphs/shared",
+        "http://mu.semte.ch/graphs/administrative-unit"
+      ],
+      "pathToConceptScheme": [
+        "http://www.w3.org/ns/org#classification",
+        "http://www.w3.org/2004/02/skos/core#inScheme"
+      ],
+      "properties": [
+        "http://mu.semte.ch/vocabularies/core/uuid",
+        "http://data.lblod.info/vocabularies/erediensten/betrokkenBestuur",
+        "http://data.lblod.info/vocabularies/erediensten/denominatie",
+        "http://data.lblod.info/vocabularies/erediensten/grensoverschrijdend",
+        "http://data.lblod.info/vocabularies/erediensten/typeEredienst",
+        "http://data.lblod.info/vocabularies/erediensten/wordtBediendDoor",
+        "http://data.vlaanderen.be/ns/besluit#werkingsgebied",
+        "http://www.opengis.net/ont/geosparql#sfWithin",
+        "http://www.w3.org/2002/07/owl#sameAs",
+        "http://www.w3.org/2004/02/skos/core#altLabel",
+        "http://www.w3.org/2004/02/skos/core#prefLabel",
+        "http://www.w3.org/ns/adms#identifier",
+        "http://www.w3.org/ns/org#changedBy",
+        "http://www.w3.org/ns/org#classification",
+        "http://www.w3.org/ns/org#hasPost",
+        "http://www.w3.org/ns/org#hasPrimarySite",
+        "http://www.w3.org/ns/org#hasSite",
+        "http://www.w3.org/ns/org#hasSubOrganization",
+        "http://www.w3.org/ns/org#linkedTo",
+        "http://www.w3.org/ns/org#resultedFrom",
+        "http://www.w3.org/ns/regorg#orgStatus"
+      ]
+    },
+    {
+      "type": "http://data.lblod.info/vocabularies/erediensten/RepresentatiefOrgaan",
+      "graphsFilter": [
+        "http://mu.semte.ch/graphs/shared",
+        "http://mu.semte.ch/graphs/worship-service"
+      ],
+      "properties": [
+        "http://mu.semte.ch/vocabularies/core/uuid",
+        "http://www.w3.org/2004/02/skos/core#prefLabel",
+        "http://www.w3.org/ns/org#linkedTo",
+        "http://data.lblod.info/vocabularies/erediensten/typeEredienst",
+        "http://www.w3.org/ns/adms#identifier"
+      ]
+    },
+    {
+      "type": "http://data.lblod.info/vocabularies/erediensten/BetrokkenLokaleBesturen",
+      "graphsFilter": [
+        "http://mu.semte.ch/graphs/shared",
+        "http://mu.semte.ch/graphs/worship-service"
+      ],
+      "properties": [
+        "http://mu.semte.ch/vocabularies/core/uuid",
+        "http://data.lblod.info/vocabularies/erediensten/typebetrokkenheid",
+        "http://www.w3.org/ns/org#organization",
+        "http://data.lblod.info/vocabularies/erediensten/financieringspercentage"
+      ]
+    },
+    {
+      "type": "http://data.lblod.info/vocabularies/erediensten/PositieBedienaar",
+      "graphsFilter": [
+        "http://mu.semte.ch/graphs/shared",
+        "http://mu.semte.ch/graphs/worship-service"
+      ],
+      "properties": [
+        "http://mu.semte.ch/vocabularies/core/uuid",
+        "http://www.w3.org/ns/org#role",
+        "http://data.lblod.info/vocabularies/erediensten/functie"
+      ]
+    },
    {
      "type": "http://www.w3.org/ns/org#Site",
      "graphsFilter": [
+        "http://mu.semte.ch/graphs/shared",
        "http://mu.semte.ch/graphs/worship-service",
        "http://mu.semte.ch/graphs/administrative-unit"
      ],
@@ -74,6 +148,7 @@
        "http://www.w3.org/2004/02/skos/core#inScheme"
      ],
      "properties": [
+        "http://mu.semte.ch/vocabularies/core/uuid",
        "http://www.w3.org/ns/org#siteAddress",
        "https://data.vlaanderen.be/ns/organisatie#bestaatUit",
        "http://data.lblod.info/vocabularies/erediensten/vestigingstype"
@@ -82,6 +157,7 @@
    {
      "type": "http://www.w3.org/ns/locn#Address",
      "graphsFilter": [
+        "http://mu.semte.ch/graphs/shared",
        "http://mu.semte.ch/graphs/worship-service",
        "http://mu.semte.ch/graphs/administrative-unit"
      ],
@@ -92,6 +168,7 @@
        "http://www.w3.org/2004/02/skos/core#inScheme"
      ],
      "properties": [
+        "http://mu.semte.ch/vocabularies/core/uuid",
        "https://data.vlaanderen.be/ns/adres#Adresvoorstelling.huisnummer",
        "https://data.vlaanderen.be/ns/adres#Adresvoorstelling.busnummer",
        "http://www.w3.org/ns/locn#thoroughfare",
@@ -141,6 +218,7 @@
        "http://www.w3.org/2004/02/skos/core#inScheme"
      ],
      "properties": [
+        "http://mu.semte.ch/vocabularies/core/uuid",
        "http://www.w3.org/2004/02/skos/core#notation",
        "https://data.vlaanderen.be/ns/generiek#gestructureerdeIdentificator"
      ]
@@ -159,6 +237,7 @@
        "http://www.w3.org/2004/02/skos/core#inScheme"
      ],
      "properties": [
+        "http://mu.semte.ch/vocabularies/core/uuid",
        "https://data.vlaanderen.be/ns/generiek#lokaleIdentificator"
      ]
    },
@@ -171,6 +250,7 @@
        "http://www.w3.org/2004/02/skos/core#inScheme"
      ],
      "properties": [
+        "http://mu.semte.ch/vocabularies/core/uuid",
        "http://www.w3.org/2004/02/skos/core#prefLabel"
      ]
    },
@@ -187,11 +267,36 @@
        "http://www.w3.org/2004/02/skos/core#inScheme"
      ],
      "properties": [
+        "http://mu.semte.ch/vocabularies/core/uuid",
        "http://data.vlaanderen.be/ns/mandaat#bindingEinde",
        "http://data.vlaanderen.be/ns/mandaat#bindingStart",
        "http://data.vlaanderen.be/ns/besluit#bestuurt",
        "http://www.w3.org/ns/org#classification",
-        "https://data.vlaanderen.be/ns/generiek#isTijdspecialisatieVan"
+        "https://data.vlaanderen.be/ns/generiek#isTijdspecialisatieVan",
+        "http://www.w3.org/ns/org#hasPost"
+      ]
+    },
+    {
+      "type": "http://data.vlaanderen.be/ns/besluit#Bestuursorgaan",
+      "strictTypeExport": "true",
+      "graphsFilter": [
+        "http://mu.semte.ch/graphs/shared",
+        "http://mu.semte.ch/graphs/worship-service",
+        "http://mu.semte.ch/graphs/administrative-unit"
+      ],
+      "pathToConceptScheme": [
+        "https://data.vlaanderen.be/ns/generiek#isTijdspecialisatieVan",
+        "http://www.w3.org/ns/org#classification",
+        "http://www.w3.org/2004/02/skos/core#inScheme"
+      ],
+      "properties": [
+        "http://mu.semte.ch/vocabularies/core/uuid",
+        "http://data.vlaanderen.be/ns/mandaat#bindingEinde",
+        "http://data.vlaanderen.be/ns/mandaat#bindingStart",
+        "http://data.vlaanderen.be/ns/besluit#bestuurt",
+        "http://www.w3.org/ns/org#classification",
+        "https://data.vlaanderen.be/ns/generiek#isTijdspecialisatieVan",
+        "http://www.w3.org/ns/org#hasPost"
      ]
    },
    {
@@ -203,6 +308,7 @@
        "http://www.w3.org/2004/02/skos/core#inScheme"
      ],
      "properties": [
+        "http://mu.semte.ch/vocabularies/core/uuid",
        "http://www.w3.org/2004/02/skos/core#prefLabel"
      ]
    },
@@ -215,6 +321,7 @@
        "http://www.w3.org/2004/02/skos/core#inScheme"
      ],
      "properties": [
+        "http://mu.semte.ch/vocabularies/core/uuid",
        "http://www.w3.org/2004/02/skos/core#prefLabel"
      ]
    },
@@ -230,6 +337,7 @@
        "http://www.w3.org/2004/02/skos/core#inScheme"
      ],
      "properties": [
+        "http://mu.semte.ch/vocabularies/core/uuid",
        "http://purl.org/dc/terms/date",
        "http://purl.org/dc/terms/description",
        "http://data.lblod.info/vocabularies/contacthub/typeWijziging",
@@ -250,6 +358,7 @@
        "http://www.w3.org/2004/02/skos/core#inScheme"
      ],
      "properties": [
+        "http://mu.semte.ch/vocabularies/core/uuid",
        "http://www.w3.org/2004/02/skos/core#prefLabel"
      ]
    },
@@ -262,6 +371,7 @@
        "http://www.w3.org/2004/02/skos/core#inScheme"
      ],
      "properties": [
+        "http://mu.semte.ch/vocabularies/core/uuid",
        "http://www.w3.org/2004/02/skos/core#prefLabel"
      ]
    },
@@ -274,6 +384,44 @@
        "http://www.w3.org/2004/02/skos/core#inScheme"
      ],
      "properties": [
+        "http://mu.semte.ch/vocabularies/core/uuid",
+        "http://www.w3.org/2004/02/skos/core#prefLabel"
+      ]
+    },
+    {
+      "type": "http://data.vlaanderen.be/ns/mandaat#Mandaat",
+      "graphsFilter": [
+        "http://mu.semte.ch/graphs/shared",
+        "http://mu.semte.ch/graphs/worship-service",
+        "http://mu.semte.ch/graphs/administrative-unit"
+      ],
+      "pathToConceptScheme": [
+        "^http://www.w3.org/ns/org#hasPost",
+        "https://data.vlaanderen.be/ns/generiek#isTijdspecialisatieVan",
+        "http://www.w3.org/ns/org#classification",
+        "http://www.w3.org/2004/02/skos/core#inScheme"
+      ],
+      "properties": [
+        "http://mu.semte.ch/vocabularies/core/uuid",
+        "http://www.w3.org/ns/org#role"
+      ]
+    },
+    {
+      "type": "http://data.lblod.info/vocabularies/leidinggevenden/Bestuursfunctie",
+      "graphsFilter": [
+        "http://mu.semte.ch/graphs/shared",
+        "http://mu.semte.ch/graphs/worship-service",
+        "http://mu.semte.ch/graphs/administrative-unit"
+      ],
+      "pathToConceptScheme": [
+        "^http://data.lblod.info/vocabularies/leidinggevenden/heeftBestuursfunctie",
+        "https://data.vlaanderen.be/ns/generiek#isTijdspecialisatieVan",
+        "http://www.w3.org/ns/org#classification",
+        "http://www.w3.org/2004/02/skos/core#inScheme"
+      ],
+      "properties": [
+        "http://mu.semte.ch/vocabularies/core/uuid",
+        "http://www.w3.org/ns/org#role",
        "http://www.w3.org/2004/02/skos/core#prefLabel"
      ]
    }
--- a/config/dispatcher/dispatcher.ex
+++ b/config/dispatcher/dispatcher.ex
@@ -354,6 +354,14 @@ defmodule Dispatcher do
    Proxy.forward conn, path, "http://delta-producer-json-diff-file-publisher-organizations/files/"
  end

+  #################################################################
+  #  DELTA: public
+  #################################################################
+
+  get "/sync/public/files/*path" do
+    Proxy.forward conn, path, "http://delta-producer-json-diff-publisher-public/files/"
+  end
+
  #################################################################
  #  DELTA: posts
  #################################################################
--- a/config/migrations/2023/20230228155501-publish-all-bestuurseenheden-in-public.sparql
+++ b/config/migrations/2023/20230228155501-publish-all-bestuurseenheden-in-public.sparql
@@ -0,0 +1,20 @@
+INSERT DATA {
+  GRAPH <http://mu.semte.ch/graphs/public> {
+    <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/f9cac08a-13c1-49da-9bcb-f650b0604054> <http://www.w3.org/2004/02/skos/core#inScheme> <http://lblod.data.gift/concept-schemes/10caf4a4-1ff5-4c05-917e-56489910d68b>. #Centraal bestuur van de eredienst"
+    <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/5ab0e9b8a3b2ca7c5e000001> <http://www.w3.org/2004/02/skos/core#inScheme> <http://lblod.data.gift/concept-schemes/10caf4a4-1ff5-4c05-917e-56489910d68b>. #Gemeente"
+    <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/5ab0e9b8a3b2ca7c5e000000> <http://www.w3.org/2004/02/skos/core#inScheme> <http://lblod.data.gift/concept-schemes/10caf4a4-1ff5-4c05-917e-56489910d68b>. #Provincie"
+    <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/66ec74fd-8cfc-4e16-99c6-350b35012e86> <http://www.w3.org/2004/02/skos/core#inScheme> <http://lblod.data.gift/concept-schemes/10caf4a4-1ff5-4c05-917e-56489910d68b>. #Bestuur van de eredienst"
+    <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/36a82ba0-7ff1-4697-a9dd-2e94df73b721> <http://www.w3.org/2004/02/skos/core#inScheme> <http://lblod.data.gift/concept-schemes/10caf4a4-1ff5-4c05-917e-56489910d68b>. #Autonoom gemeentebedrijf"
+    <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/cc4e2d67-603b-4784-9b61-e50bac1ec089> <http://www.w3.org/2004/02/skos/core#inScheme> <http://lblod.data.gift/concept-schemes/10caf4a4-1ff5-4c05-917e-56489910d68b>. #OCMW vereniging"
+    <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/ea446861-2c51-45fa-afd3-4e4a37b71562> <http://www.w3.org/2004/02/skos/core#inScheme> <http://lblod.data.gift/concept-schemes/10caf4a4-1ff5-4c05-917e-56489910d68b>. #Hulpverleningszone"
+    <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/a3922c6d-425b-474f-9a02-ffb71a436bfc> <http://www.w3.org/2004/02/skos/core#inScheme> <http://lblod.data.gift/concept-schemes/10caf4a4-1ff5-4c05-917e-56489910d68b>. #Politiezone"
+    <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/b156b67f-c5f4-4584-9b30-4c090be02fdc> <http://www.w3.org/2004/02/skos/core#inScheme> <http://lblod.data.gift/concept-schemes/10caf4a4-1ff5-4c05-917e-56489910d68b>. #Projectvereniging"
+    <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/cd93f147-3ece-4308-acab-5c5ada3ec63d> <http://www.w3.org/2004/02/skos/core#inScheme> <http://lblod.data.gift/concept-schemes/10caf4a4-1ff5-4c05-917e-56489910d68b>. #Opdrachthoudende vereniging"
+    <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/d01bb1f6-2439-4e33-9c25-1fc295de2e71> <http://www.w3.org/2004/02/skos/core#inScheme> <http://lblod.data.gift/concept-schemes/10caf4a4-1ff5-4c05-917e-56489910d68b>. #Dienstverlenende vereniging"
+    <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/5ab0e9b8a3b2ca7c5e000003> <http://www.w3.org/2004/02/skos/core#inScheme> <http://lblod.data.gift/concept-schemes/10caf4a4-1ff5-4c05-917e-56489910d68b>. #District"
+    <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/5ab0e9b8a3b2ca7c5e000002> <http://www.w3.org/2004/02/skos/core#inScheme> <http://lblod.data.gift/concept-schemes/10caf4a4-1ff5-4c05-917e-56489910d68b>. #OCMW"
+    <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/80310756-ce0a-4a1b-9b8e-7c01b6cc7a2d> <http://www.w3.org/2004/02/skos/core#inScheme> <http://lblod.data.gift/concept-schemes/10caf4a4-1ff5-4c05-917e-56489910d68b>. #Autonoom provinciebedrijf"
+  }
+}
+
+
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -179,7 +179,7 @@ services:
    restart: always
    logging: *default-logging
  frontend:
-    image: lblod/frontend-organization-portal:1.16.0-0
+    image: lblod/frontend-organization-portal:1.16.0
    volumes:
      - ./config/frontend/add-x-frame-options-header.conf:/config/add-x-frame-options.conf
    environment:
Author	SHA1	Message	Date
Nordine Bittich	b05f69a615	bump frontend	2023-03-24 13:47:24 +01:00
Claire Lovisa	9eea11c2e0	Merge pull request #256 from lblod/feature/adapt-public-producer-to-hardsplit Adapt public producer to hardsplit	2023-03-22 11:12:28 +01:00
Claire Lovisa	211708754c	Adapting query for QA and DEV deploy On QA and DEV, the hardsplit has already been deployed, so we need to adjust the migration. On prod, the migration has already run, so there is no risk of missing data.	2023-03-22 10:35:48 +01:00
Claire Lovisa	8d5c4958ea	Fix auth config	2023-03-22 08:20:01 +01:00
Claire Lovisa	86d30c2b37	Merge branch 'master' into feature/adapt-public-producer-to-hardsplit	2023-03-21 17:19:56 +01:00
Claire Lovisa	be12f3587a	Adapt producer to hardsplit graphs	2023-03-21 11:30:03 +01:00
Claire Lovisa	7b37d91012	Fix public producer config	2023-03-21 11:10:05 +01:00
Claire Lovisa	ba39434853	Add betrokken and positie bedienaar to public export	2023-03-21 08:39:46 +01:00
Claire Lovisa	0e52e2bcf6	Add uuids and ROs to public producer	2023-03-20 17:29:53 +01:00
Nordine Bittich	7b2b577cc1	bump frontend	2023-03-15 16:27:00 +01:00
Boris De Vloed	a61d6bed35	fix query adding all bestuurseenheden	2023-03-08 14:10:43 +00:00
Boris De Vloed	50a3ff2929	publish delta files	2023-03-02 10:17:41 +00:00
Boris De Vloed	b5fbf09c08	extend public producer	2023-02-28 15:07:27 +00:00
Boris De Vloed	384a237bc4	Merge pull request #228 from lblod/fix/domain-json-syntax-error typo in target	2023-01-27 10:36:32 +01:00
Boris De Vloed	eb78e3a6aa	typo in target	2023-01-26 11:01:58 +00:00
Boris De Vloed	b3621bc103	Merge pull request #227 from lblod/fix/domain-json-syntax-error Syntax error in domain.json	2023-01-26 11:05:38 +01:00
Boris De Vloed	03e5c42dcc	removed comma	2023-01-26 10:01:44 +00:00
Claire Lovisa	c5e1436ea8	Enable local involvements for central worship services I had to deactivate parts of the cache, causing the frontend to have very weird behaviours when the data was correct	2023-01-25 14:34:18 +01:00