bump frontend

config/authorization/config.ex

@@ -7,6 +7,11 @@ alias Acl.GroupSpec, as: GroupSpec
 alias Acl.GroupSpec.GraphCleanup, as: GraphCleanup
 
 defmodule Acl.UserGroups.Config do
+
+ @error_type [
+   "https://docs.oasis-open-projects.org/oslc-op/core/v3.0/os/core-vocab.html#Error"
+ ]
+
  @protected_resource_type [
                         "http://www.w3.org/ns/org#Organization",
                         "http://data.vlaanderen.be/ns/besluit#Besluit",
@@ -99,7 +104,7 @@ defmodule Acl.UserGroups.Config do
           %GraphSpec{
             graph: "http://mu.semte.ch/graphs/organisatieportaal",
             constraint: %ResourceConstraint{
-              resource_types: @protected_resource_type
+              resource_types: @protected_resource_type ++ @error_type
             }
           }
         ]
@@ -112,7 +117,7 @@ defmodule Acl.UserGroups.Config do
           %GraphSpec{
             graph: "http://mu.semte.ch/graphs/organisatieportaal",
             constraint: %ResourceConstraint{
-              resource_types: @protected_resource_type
+              resource_types: @protected_resource_type ++ @error_type
             }
           }
         ]

config/dispatcher/dispatcher.ex

@@ -73,11 +73,11 @@ defmodule Dispatcher do
   end
 
   match "/worship-administrative-units/*path", %{ accept: [:json], layer: :api} do
-    Proxy.forward conn, path, "http://resource/worship-administrative-units/"
+    Proxy.forward conn, path, "http://cache/worship-administrative-units/"
   end
 
   match "/worship-services/*path", %{ accept: [:json], layer: :api} do
-    Proxy.forward conn, path, "http://resource/worship-services/"
+    Proxy.forward conn, path, "http://resource/worship-services/" # DISABLE CACHING FOR NOW (BUG OP-1404)
   end
 
   match "/recognized-worship-types/*path", %{ accept: [:json], layer: :api} do
@@ -204,7 +204,7 @@ defmodule Dispatcher do
   ###############
 
   match "/accounts", %{ accept: [:json], layer: :api} do
-    Proxy.forward conn, [], "http://resource/accounts/"
+   Proxy.forward conn, [], "http://resource/accounts/"
   end
   match "/accounts/*path", %{ accept: [:json], layer: :api} do
     Proxy.forward conn, path, "http://accountdetail/accounts/"
@@ -267,6 +267,14 @@ defmodule Dispatcher do
   end
 
 
+  #################################################################
+  # ERROR REPORT
+  #################################################################
+
+  match "/error-reports/*path", %{ layer: :api_services, accept: %{ json: true } } do
+    forward conn, path, "http://error-report-service/error-reports/"
+  end
+
   #################################################################
   # FILES
   #################################################################

config/migrations/2022/20220516171921-fix-addresses.graph

@@ -0,0 +1 @@
+http://mu.semte.ch/graphs/organisatieportaal

config/migrations/2022/20220518092941-fix-broken-link-person-position.sparql

@@ -1,21 +0,0 @@
-INSERT DATA {
-  GRAPH <http://mu.semte.ch/graphs/organisatieportaal> {
-    <http://data.lblod.info/id/mandatarissen/61B762983C1A230C43B4522F> <http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan> <http://data.lblod.info/id/personen/db8e4a5d76da636c6268487fb5339f00> .
-  }
-}
-
-# The associated call to trigger a reindex is :
-# curl --location --request POST '<ip-addres-search>/update' \
-# --header 'Content-Type: application/vnd.api+json' \
-# --data-raw '    [
-#       {
-#           "deletes": [],
-#           "inserts": [
-#               {
-#                   "subject": { "type": "uri", "value": "http://data.lblod.info/id/mandatarissen/61B762983C1A230C43B4522F" },
-#                   "predicate": { "type": "uri", "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type" },
-#                   "object": { "type": "uri", "value": "http://data.lblod.info/vocabularies/erediensten/EredienstMandataris" }
-#               }
-#           ]
-#       }
-#     ]'

config/migrations/2022/20220518103943-change-status-ckb-aartselaar.sparql

@@ -1,41 +0,0 @@
-PREFIX regorg: <http://www.w3.org/ns/regorg#>
-
-DELETE {
-  GRAPH ?g {
-    <http://data.lblod.info/id/centraleBesturenVanDeEredienst/44e123c39fb439274be6727eca6e1880>
-      regorg:orgStatus <http://lblod.data.gift/concepts/63cc561de9188d64ba5840a42ae8f0d6> . # Actief
-  }
-} INSERT {
-  GRAPH ?g {
-    <http://data.lblod.info/id/centraleBesturenVanDeEredienst/44e123c39fb439274be6727eca6e1880>
-      regorg:orgStatus <http://lblod.data.gift/concepts/d02c4e12bf88d2fdf5123b07f29c9311> . # Niet Actief
-
-  }
-} WHERE {
-  GRAPH ?g {
-    <http://data.lblod.info/id/centraleBesturenVanDeEredienst/44e123c39fb439274be6727eca6e1880>
-      regorg:orgStatus <http://lblod.data.gift/concepts/63cc561de9188d64ba5840a42ae8f0d6> .
-  }
-}
-
-# The associated call to trigger a reindex is :
-# curl --location --request POST '<ip-of-mu-search>/update' \
-# --header 'Content-Type: application/vnd.api+json' \
-# --data-raw '    [
-#       {
-#           "deletes": [
-#               {
-#                   "subject": { "type": "uri", "value": "http://data.lblod.info/id/centraleBesturenVanDeEredienst/44e123c39fb439274be6727eca6e1880" },
-#                   "predicate": { "type": "uri", "value": "http://www.w3.org/ns/regorg#orgStatus" },
-#                   "object": { "type": "uri", "value": "http://lblod.data.gift/concepts/63cc561de9188d64ba5840a42ae8f0d6" }
-#               }
-#           ],
-#           "inserts": [
-#               {
-#                   "subject": { "type": "uri", "value": "http://data.lblod.info/id/centraleBesturenVanDeEredienst/44e123c39fb439274be6727eca6e1880" },
-#                   "predicate": { "type": "uri", "value": "http://www.w3.org/ns/regorg#orgStatus" },
-#                   "object": { "type": "uri", "value": "http://lblod.data.gift/concepts/d02c4e12bf88d2fdf5123b07f29c9311" }
-#               }
-#           ]
-#       }
-#     ]'

config/migrations/2022/20220518120232-delete-some-positions-Kerkfabriek-H-Maria-van-Boutersem.sparql

@@ -1,51 +0,0 @@
-DELETE {
-  GRAPH ?g {
-    <http://data.lblod.info/id/eredienstbestuursorganen/6807c53e4474343331d31577bc1e9166>
-      <http://www.w3.org/ns/org#hasPost> ?post .
-
-    ?post ?ppost ?opost .
-
-    ?role <http://www.w3.org/ns/org#holds> ?post ;
-      <http://schema.org/contactPoint> ?contactPoint ;
-      ?prole ?orole .
-
-    ?contactPoint <http://www.w3.org/ns/locn#address> ?address ;
-      ?pcontactPoint ?ocontactPoint .
-
-    ?address ?paddress ?oaddress .
-  }
-} WHERE {
-  GRAPH ?g {
-    <http://data.lblod.info/id/eredienstbestuursorganen/6807c53e4474343331d31577bc1e9166>
-      <http://www.w3.org/ns/org#hasPost> ?post .
-
-    ?post ?ppost ?opost .
-
-    ?role <http://www.w3.org/ns/org#holds> ?post ;
-      ?prole ?orole .
-
-    OPTIONAL {
-      ?role <http://schema.org/contactPoint> ?contactPoint .
-
-      ?contactPoint ?pcontactPoint ?ocontactPoint .
-
-      OPTIONAL {
-        ?contactPoint <http://www.w3.org/ns/locn#address> ?address .
-        ?address ?paddress ?oaddress .
-      }
-    }
-
-    FILTER(
-      ?role NOT IN (
-        <http://data.lblod.info/id/mandatarissen/19f21fc41077ddf80b0679f2465438d6>,
-        <http://data.lblod.info/id/mandatarissen/4908a3d11300f1df876b749a3009d097>,
-        <http://data.lblod.info/id/mandatarissen/a2e0749d26d7dc3ce46ebbec21ae0f5c>,
-        <http://data.lblod.info/id/mandatarissen/1773a92782ef3201719c636e835577f7>,
-        <http://data.lblod.info/id/mandatarissen/c97e46465d129b91e9f9772919088e95>,
-        <http://data.lblod.info/id/mandatarissen/0df45364976635807d721fd13adb5d88>,
-        <http://data.lblod.info/id/mandatarissen/d386eff67844ada5f56466fe61be468b>,
-        <http://data.lblod.info/id/mandatarissen/8771130ab6cb3bda7cb2dc79e7896129>
-      )
-    )
-  }
-}

config/migrations/2022/20220524152932-fix-addresses.graph

@@ -0,0 +1 @@
+http://mu.semte.ch/graphs/organisatieportaal

config/migrations/2022/20220602164623-fix-typo-in-position-name.sparql

@@ -0,0 +1,11 @@
+DELETE DATA {
+  GRAPH <http://mu.semte.ch/graphs/organisatieportaal> {
+    <http://lblod.data.gift/concepts/fa4191f9d7050fe62ec3fc0e16541711> <http://www.w3.org/2004/02/skos/core#prefLabel> "Kapelaan van de kerken te Antwerpen en te Elsene (Geünifieerde anglikaanse kerk)" .
+  }
+}
+;
+INSERT DATA {
+  GRAPH <http://mu.semte.ch/graphs/organisatieportaal> {
+    <http://lblod.data.gift/concepts/fa4191f9d7050fe62ec3fc0e16541711> <http://www.w3.org/2004/02/skos/core#prefLabel> "Kapelaan van de kerken te Antwerpen en te Elsene (Geünifieerde anglicaanse kerk)" .
+  }
+}

config/migrations/2022/202206131O4623-normalize-space.sparql

@@ -0,0 +1,20 @@
+DELETE {
+  graph <http://mu.semte.ch/graphs/organisatieportaal> {
+   ?s ?p ?o.
+  }
+
+}
+INSERT {
+  graph <http://mu.semte.ch/graphs/organisatieportaal> {
+    ?s ?p ?normalize.
+  }
+}
+WHERE {
+  graph <http://mu.semte.ch/graphs/organisatieportaal> {
+    ?s ?p ?o.
+    BIND(replace(?o, "\\s+|\\t", " ") AS ?single_space)
+    BIND(replace(?single_space, "^(\\s+)|(\\s+)$|(\\t)$|(\\t)", "") AS ?normalize)
+
+    FILTER ( isLiteral(?o) && ( regex(?o, "\\s+|\\t") || regex(?o, "^(\\s+)|(\\s+)$|(\\t)$|(\\t)") ) )
+  }
+} 

config/migrations/2022/20220620112423-remove-involvements.sparql

@@ -0,0 +1,32 @@
+
+# OP-1520 & OP-1529 - OP-1519 & OP-1518
+
+prefix org: <http://www.w3.org/ns/org#>
+prefix ere: <http://data.lblod.info/vocabularies/erediensten/>
+prefix skos: <http://www.w3.org/2004/02/skos/core#>
+
+delete where {
+
+graph <http://mu.semte.ch/graphs/organisatieportaal>  {
+
+?involvement a ere:BetrokkenLokaleBesturen;
+               org:organization ?worshipService;
+               ere:typebetrokkenheid ?typebetrokkenheid.
+
+?betrokkenBestuur  ere:betrokkenBestuur ?involvement.
+?involvement ?p ?o.
+
+filter (?typebetrokkenheid = <http://lblod.data.gift/concepts/86fcbbbff764f1cba4c7e10dbbae578e> && 
+(?worshipService = <http://data.lblod.info/id/besturenVanDeEredienst/1f3b446da13c8ebd75ee52ac7746c53a> 
+|| ?worshipService = <http://data.lblod.info/id/besturenVanDeEredienst/f99035f2eca9a50996e719c445d2cfd2>
+|| ?worshipService = <http://data.lblod.info/id/besturenVanDeEredienst/0277a5125962d8d5f0f00606d200be9a>
+|| ?worshipService = <http://data.lblod.info/id/besturenVanDeEredienst/9222f5c5557cb2ca0c07873fbaf02da7>
+|| ?worshipService = <http://data.lblod.info/id/besturenVanDeEredienst/8d4c1066736ac9be7886d273b86751b8>
+ 
+ ))
+}
+} 
+
+
+
+

docker-compose.yml

@@ -158,7 +158,7 @@ services:
     restart: always
     logging: *default-logging
   frontend:
-    image: lblod/frontend-organization-portal:1.8.0
+    image: lblod/frontend-organization-portal:1.10.1
     volumes:
       - ./config/frontend/add-x-frame-options-header.conf:/config/add-x-frame-options.conf
     environment:
@@ -414,3 +414,8 @@ services:
     environment:
       - discovery.type=single-node 
     restart: always
+
+  error-report-service:
+    image: lblod/error-report-service:0.1.0
+    links:
+      - db:database