Feedback codelist redesign (#164 )

rename code list for bestrokken locale bestuuren
bump frontend
2022-09-02 09:49:37 +02:00 · 2022-09-02 09:49:01 +02:00 · 2022-08-31 20:01:03 +02:00 · 2022-08-24 16:13:12 +02:00 · 2022-07-18 12:58:14 +02:00 · 2022-07-15 15:37:14 +02:00
11 changed files with 12113 additions and 3 deletions
--- a/config/authorization/config.ex
+++ b/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
            }
          }
        ]
--- a/config/dispatcher/dispatcher.ex
+++ b/config/dispatcher/dispatcher.ex
@@ -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
  #################################################################
--- a/config/migrations/2022/20220524152541-clear-wrong-addresses.sparql
+++ b/config/migrations/2022/20220524152541-clear-wrong-addresses.sparql
--- a/config/migrations/2022/20220524152932-fix-addresses.graph
+++ b/config/migrations/2022/20220524152932-fix-addresses.graph
@@ -0,0 +1 @@
+http://mu.semte.ch/graphs/organisatieportaal
--- a/config/migrations/2022/20220524152932-fix-addresses.ttl
+++ b/config/migrations/2022/20220524152932-fix-addresses.ttl
--- a/config/migrations/2022/20220602164623-fix-typo-in-position-name.sparql
+++ b/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)" .
+  }
+}
--- a/config/migrations/2022/202206131O4623-normalize-space.sparql
+++ b/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)") ) )
+  }
+} 
--- a/config/migrations/2022/20220718112423-rename-codelist-betrokken-lb.sparql
+++ b/config/migrations/2022/20220718112423-rename-codelist-betrokken-lb.sparql
@@ -0,0 +1,26 @@
+
+# OP-1565
+
+prefix skos: <http://www.w3.org/2004/02/skos/core#>
+
+delete {
+    graph <http://mu.semte.ch/graphs/organisatieportaal>{
+        <http://lblod.data.gift/concepts/ac400cc9f135ac7873fb3e551ec738c1> skos:prefLabel ?prefLabel1.
+        <http://lblod.data.gift/concepts/86fcbbbff764f1cba4c7e10dbbae578e> skos:prefLabel ?prefLabel2.
+        <http://lblod.data.gift/concepts/0f845f00ee76099c89518cbaf6a7b77f> skos:prefLabel ?prefLabel3.
+    }
+    
+}insert {
+    graph <http://mu.semte.ch/graphs/organisatieportaal>{
+        <http://lblod.data.gift/concepts/ac400cc9f135ac7873fb3e551ec738c1> skos:prefLabel "Toezichthoudend".
+        <http://lblod.data.gift/concepts/86fcbbbff764f1cba4c7e10dbbae578e> skos:prefLabel "Mede-financierend".
+        <http://lblod.data.gift/concepts/0f845f00ee76099c89518cbaf6a7b77f> skos:prefLabel "Adviserend".
+    }
+
+}where {
+    graph <http://mu.semte.ch/graphs/organisatieportaal>{
+        <http://lblod.data.gift/concepts/ac400cc9f135ac7873fb3e551ec738c1> skos:prefLabel ?prefLabel1.
+        <http://lblod.data.gift/concepts/86fcbbbff764f1cba4c7e10dbbae578e> skos:prefLabel ?prefLabel2.
+        <http://lblod.data.gift/concepts/0f845f00ee76099c89518cbaf6a7b77f> skos:prefLabel ?prefLabel3.
+    }
+}
--- a/config/migrations/2022/20220819133740-delete-bestrokke-islam-orthodox.sparql
+++ b/config/migrations/2022/20220819133740-delete-bestrokke-islam-orthodox.sparql
@@ -0,0 +1,101 @@
+  PREFIX org: <http://www.w3.org/ns/org#>
+  PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> 
+  PREFIX locn: <http://www.w3.org/ns/locn#>
+  PREFIX schema: <http://schema.org/>
+  PREFIX regorg: <http://www.w3.org/ns/regorg#>
+  PREFIX person: <http://www.w3.org/ns/person#>
+  PREFIX vcard: <http://www.w3.org/2006/vcard/ns#>
+  PREFIX dbpedia: <http://dbpedia.org/ontology/>
+  PREFIX adms: <http://www.w3.org/ns/adms#>
+  PREFIX euro: <http://data.europa.eu/m8g/>
+  PREFIX prov: <http://www.w3.org/ns/prov#>
+  PREFIX organisatie: <https://data.vlaanderen.be/ns/organisatie#>
+  PREFIX persoon: <https://data.vlaanderen.be/ns/persoon#>
+  PREFIX adres: <https://data.vlaanderen.be/ns/adres#>
+  PREFIX generiek: <https://data.vlaanderen.be/ns/generiek#>
+  PREFIX mandaat: <http://data.vlaanderen.be/ns/mandaat#>
+  PREFIX besluit: <http://data.vlaanderen.be/ns/besluit#>
+  PREFIX lblodlg: <https://data.lblod.info/vocabularies/leidinggevenden/>
+  PREFIX dc_terms: <http://purl.org/dc/terms/>
+  PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+  PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
+  PREFIX euvoc: <http://publications.europa.eu/ontology/euvoc#>
+  PREFIX ere: <http://data.lblod.info/vocabularies/erediensten/>
+  PREFIX ch: <http://data.lblod.info/vocabularies/contacthub/>
+  PREFIX code: <http://lblod.data.gift/vocabularies/organisatie/>
+  PREFIX ext: <http://mu.semte.ch/vocabularies/ext/>
+  PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+  PREFIX adres: <https://data.vlaanderen.be/ns/adres#>
+
+  DELETE {GRAPH <http://mu.semte.ch/graphs/organisatieportaal> {
+  ?administrativeUnit ere:betrokkenBestuur ?betrokkenheid.
+  ?betrokkenheid ?p ?o 
+
+  } 
+
+
+  } 
+
+  where {
+
+  GRAPH <http://mu.semte.ch/graphs/organisatieportaal> {
+      ?betrokkenheid org:organization ?bestuur;
+        rdf:type ere:BetrokkenLokaleBesturen.
+      ?administrativeUnit ere:betrokkenBestuur ?betrokkenheid.
+
+        ?betrokkenheid org:organization ?worshipService.
+
+      ?betrokkenheid ere:typebetrokkenheid ?typebetrokkenheid.
+        
+        ?betrokkenheid ?p ?o.
+      FILTER(?typebetrokkenheid = <http://lblod.data.gift/concepts/86fcbbbff764f1cba4c7e10dbbae578e>  ).
+      
+      FILTER (?worshipService IN (
+      <http://data.lblod.info/id/besturenVanDeEredienst/6232329df9377210c3576b17e116de8b>,
+  <http://data.lblod.info/id/besturenVanDeEredienst/43fb31ca870d9c3ea47d02f153c8be6f>,
+  <http://data.lblod.info/id/besturenVanDeEredienst/bba84f42c09cd7c8b2e5a9829a820cf5>,
+  <http://data.lblod.info/id/besturenVanDeEredienst/fd4ae252fffca29852354b12ef37b086>,
+  <http://data.lblod.info/id/besturenVanDeEredienst/ca0daee18a29e187017bf236e26f1ec2>,
+  <http://data.lblod.info/id/besturenVanDeEredienst/619a5721094b28807dca8d04de69e3e0>,
+  <http://data.lblod.info/id/besturenVanDeEredienst/0f2a4604a962926d67518bb3846af1c9>,
+  <http://data.lblod.info/id/besturenVanDeEredienst/58d6bea16bd86c7df65caa9625af97aa>,
+  <http://data.lblod.info/id/besturenVanDeEredienst/928335b5a7b1cb7850c7cc98574e9ec9>,
+  <http://data.lblod.info/id/besturenVanDeEredienst/a6b5c5db3a261ca024a42fe9489496a9>,
+  <http://data.lblod.info/id/besturenVanDeEredienst/da2184c3dca9eb7c4828a50c0e9f5af4>,
+  <http://data.lblod.info/id/besturenVanDeEredienst/e0e7121368dfc45d9a809a1a36b65e32>,
+  <http://data.lblod.info/id/besturenVanDeEredienst/6b860cbdc90a8952bdd14b707817225e>,
+  <http://data.lblod.info/id/besturenVanDeEredienst/a8faa182c59167da7551f40979dc5022>,
+  <http://data.lblod.info/id/besturenVanDeEredienst/999b011fe6b90b3b546612c25db4b607>,
+  <http://data.lblod.info/id/besturenVanDeEredienst/c7d6827eb88cd977146e72583461071b>,
+  <http://data.lblod.info/id/besturenVanDeEredienst/c85d82dfc9fcf2ab5857bb9891a6c447>,
+  <http://data.lblod.info/id/besturenVanDeEredienst/c8c12d03182f27ce8710f4c2cf927f3d>,
+  <http://data.lblod.info/id/besturenVanDeEredienst/7e3fb673922f9495c48251f316c5c4ff>,
+  <http://data.lblod.info/id/besturenVanDeEredienst/a8880f3d8b482788c5f3adbf58f01b4f>,
+  <http://data.lblod.info/id/besturenVanDeEredienst/a8d9f1a45c11c6761306bdf680349593>,
+  <http://data.lblod.info/id/besturenVanDeEredienst/b81199eddd02f291bd4c1a0e29e5b9c8>,
+  <http://data.lblod.info/id/besturenVanDeEredienst/b540096ac8be2c9c72dafd59e61080c5>,
+  <http://data.lblod.info/id/besturenVanDeEredienst/24ff08070bc1e47b498ab8139b9d3792>,
+  <http://data.lblod.info/id/besturenVanDeEredienst/adeaab8a02815bf2c5816165a45ad4c5>,
+  <http://data.lblod.info/id/besturenVanDeEredienst/260312c07d8e00358064a362dee3506f>,
+  <http://data.lblod.info/id/besturenVanDeEredienst/934cb872a84a86ceb9a9e10abb1d08fa>,
+  <http://data.lblod.info/id/besturenVanDeEredienst/ef77bb3094fdc4a7ed7e09551500acfe>,
+  <http://data.lblod.info/id/besturenVanDeEredienst/08fe04ba8cb033d7d1d59f85c31f9ee0>,
+  <http://data.lblod.info/id/besturenVanDeEredienst/8c46fc84fb7a11cca44bde007a0c081c>,
+  <http://data.lblod.info/id/besturenVanDeEredienst/db46915e77fbf8f083e9861c802b2b13>,
+  <http://data.lblod.info/id/besturenVanDeEredienst/104a6b6eabd0192afdeb70d3b517aef1>,
+  <http://data.lblod.info/id/besturenVanDeEredienst/8f37ce5f576a898f5b281fa118a7d9a4>,
+  <http://data.lblod.info/id/besturenVanDeEredienst/62C7DAFED7779543F77795E5>,
+  <http://data.lblod.info/id/besturenVanDeEredienst/cd7d4208e8e6291d75b33d89e3a0a439>,
+  <http://data.lblod.info/id/besturenVanDeEredienst/a6e0531c6c4b5885552604163cfabfbc>,
+  <http://data.lblod.info/id/besturenVanDeEredienst/7b0d877894765abf5052e12c7bed553e>,
+  <http://data.lblod.info/id/besturenVanDeEredienst/4fd6da5f1e1ea6e60f611abc4df28456>,
+  <http://data.lblod.info/id/besturenVanDeEredienst/7343155a8b9a107bdbd4b65cc6318d50>,
+  <http://data.lblod.info/id/besturenVanDeEredienst/f95b761af55091b491fd62bd6bed11dc>,
+  <http://data.lblod.info/id/besturenVanDeEredienst/c1c334a2cc56ac501badce5e879aec65>
+      ))
+
+      
+    }
+  }
+
+
--- a/config/migrations/2022/20220822133740-delete-bestrokke.sparql
+++ b/config/migrations/2022/20220822133740-delete-bestrokke.sparql
@@ -0,0 +1,87 @@
+  PREFIX org: <http://www.w3.org/ns/org#>
+  PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> 
+  PREFIX locn: <http://www.w3.org/ns/locn#>
+  PREFIX schema: <http://schema.org/>
+  PREFIX regorg: <http://www.w3.org/ns/regorg#>
+  PREFIX person: <http://www.w3.org/ns/person#>
+  PREFIX vcard: <http://www.w3.org/2006/vcard/ns#>
+  PREFIX dbpedia: <http://dbpedia.org/ontology/>
+  PREFIX adms: <http://www.w3.org/ns/adms#>
+  PREFIX euro: <http://data.europa.eu/m8g/>
+  PREFIX prov: <http://www.w3.org/ns/prov#>
+  PREFIX organisatie: <https://data.vlaanderen.be/ns/organisatie#>
+  PREFIX persoon: <https://data.vlaanderen.be/ns/persoon#>
+  PREFIX adres: <https://data.vlaanderen.be/ns/adres#>
+  PREFIX generiek: <https://data.vlaanderen.be/ns/generiek#>
+  PREFIX mandaat: <http://data.vlaanderen.be/ns/mandaat#>
+  PREFIX besluit: <http://data.vlaanderen.be/ns/besluit#>
+  PREFIX lblodlg: <https://data.lblod.info/vocabularies/leidinggevenden/>
+  PREFIX dc_terms: <http://purl.org/dc/terms/>
+  PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+  PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
+  PREFIX euvoc: <http://publications.europa.eu/ontology/euvoc#>
+  PREFIX ere: <http://data.lblod.info/vocabularies/erediensten/>
+  PREFIX ch: <http://data.lblod.info/vocabularies/contacthub/>
+  PREFIX code: <http://lblod.data.gift/vocabularies/organisatie/>
+  PREFIX ext: <http://mu.semte.ch/vocabularies/ext/>
+  PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+  PREFIX adres: <https://data.vlaanderen.be/ns/adres#>
+
+  DELETE {GRAPH <http://mu.semte.ch/graphs/organisatieportaal> {
+  ?administrativeUnit ere:betrokkenBestuur ?betrokkenheid.
+  ?betrokkenheid ?p ?o 
+
+  } 
+
+
+  } 
+
+  where {
+
+  GRAPH <http://mu.semte.ch/graphs/organisatieportaal> {
+      ?betrokkenheid org:organization ?bestuur;
+        rdf:type ere:BetrokkenLokaleBesturen.
+      ?administrativeUnit ere:betrokkenBestuur ?betrokkenheid.
+
+        ?betrokkenheid org:organization ?worshipService.
+
+      ?betrokkenheid ere:typebetrokkenheid ?typebetrokkenheid.
+        
+        ?betrokkenheid ?p ?o.
+      FILTER(?typebetrokkenheid = <http://lblod.data.gift/concepts/86fcbbbff764f1cba4c7e10dbbae578e>  ).
+      
+      FILTER (?betrokkenheid IN (
+      <http://data.lblod.info/id/betrokkenLokaleBesturen/6206138D5747C883CA1D2C73>,
+      <http://data.lblod.info/id/betrokkenLokaleBesturen/62061D515747C883CA1D2C8E>,
+      <http://data.lblod.info/id/betrokkenLokaleBesturen/b683c8cfa57948756d870020effe6c5a>,
+      <http://data.lblod.info/id/betrokkenLokaleBesturen/1db65cbda72a1977c68640cc96055942>,
+      <http://data.lblod.info/id/betrokkenLokaleBesturen/61FD256D51BFC225E4ECF769>,
+      <http://data.lblod.info/id/betrokkenLokaleBesturen/61FD254851BFC225E4ECF768>,
+      <http://data.lblod.info/id/betrokkenLokaleBesturen/61FD251C51BFC225E4ECF767>,
+      <http://data.lblod.info/id/betrokkenLokaleBesturen/61FD24EA51BFC225E4ECF766>,
+      <http://data.lblod.info/id/betrokkenLokaleBesturen/61FD25ED51BFC225E4ECF76B>,
+      <http://data.lblod.info/id/betrokkenLokaleBesturen/61FA3C3851BFC225E4ECF478>,
+      <http://data.lblod.info/id/betrokkenLokaleBesturen/61FD28A051BFC225E4ECF76E>,
+      <http://data.lblod.info/id/betrokkenLokaleBesturen/328d25723be80d86c5a84ed004055693>,
+      <http://data.lblod.info/id/betrokkenLokaleBesturen/1d4d7f8bd65da0e060ec67d4f4873cb3>,
+      <http://data.lblod.info/id/betrokkenLokaleBesturen/61FD21FF51BFC225E4ECF756>,
+      <http://data.lblod.info/id/betrokkenLokaleBesturen/61FD219051BFC225E4ECF754>,
+      <http://data.lblod.info/id/betrokkenLokaleBesturen/61FD20AA51BFC225E4ECF752>,
+      <http://data.lblod.info/id/betrokkenLokaleBesturen/620611665747C883CA1D2C6F>,
+      <http://data.lblod.info/id/betrokkenLokaleBesturen/61FD215251BFC225E4ECF753>,
+      <http://data.lblod.info/id/betrokkenLokaleBesturen/61FD21C351BFC225E4ECF755>,
+      <http://data.lblod.info/id/betrokkenLokaleBesturen/61FD22AD51BFC225E4ECF758>,
+      <http://data.lblod.info/id/betrokkenLokaleBesturen/61FD1F7951BFC225E4ECF750>,
+      <http://data.lblod.info/id/betrokkenLokaleBesturen/61FD1F4551BFC225E4ECF74F>,
+      <http://data.lblod.info/id/betrokkenLokaleBesturen/61FD1F0E51BFC225E4ECF74E>,
+      <http://data.lblod.info/id/betrokkenLokaleBesturen/61FD1FE551BFC225E4ECF751>,
+      <http://data.lblod.info/id/betrokkenLokaleBesturen/6206126C5747C883CA1D2C71>,
+      <http://data.lblod.info/id/betrokkenLokaleBesturen/62061EB65747C883CA1D2C98>
+  
+      ))
+
+      
+    }
+  }
+
+
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -158,7 +158,7 @@ services:
    restart: always
    logging: *default-logging
  frontend:
-    image: lblod/frontend-organization-portal:1.9.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
Author	SHA1	Message	Date
Nordine Bittich	d8b24c358e	Feedback codelist redesign (#164 )	2022-09-02 09:49:37 +02:00
Nordine Bittich	c5e3b68e0f	rename code list for bestrokken locale bestuuren	2022-09-02 09:49:01 +02:00
Nordine Bittich	c5db3a5836	bump frontend	2022-08-31 20:01:03 +02:00
Claire Lovisa	37ed1af60a	Bump frontend	2022-08-24 16:13:12 +02:00
Nordine Bittich	c8134e2372	bump frontend	2022-07-18 12:58:14 +02:00
Nordine Bittich	3256fe6b88	bump frontend	2022-07-15 15:37:14 +02:00
Nordine Bittich	7364d1190d	bump frontend	2022-07-12 13:48:46 +02:00
Nordine Bittich	63d41ef127	Merge branch 'master' into development	2022-07-06 15:05:02 +02:00
Nordine Bittich	8c9957d256	bump frontend	2022-07-06 15:04:44 +02:00
Nordine Bittich	1e516c58ac	remove involvements (#159 )	2022-06-22 17:02:29 +02:00
Nordine Bittich	1cdc2e9c46	normalize spaces (#157 )	2022-06-16 08:27:35 +02:00
Nordine Bittich	85dc993b24	Merge branch 'master' into development	2022-06-16 05:50:41 +02:00
Nordine Bittich	532b2c9851	bump frontend	2022-06-14 15:28:49 +02:00
Nordine Bittich	ee06c53fe4	Merge branch 'master' into development	2022-06-03 09:59:48 +02:00
Claire Lovisa	27b29ff3eb	Fix typo in position name (#156 )	2022-06-02 17:02:41 +02:00
Nordine Bittich	19d52a3a73	error report service (#154 )	2022-06-02 09:24:41 +02:00
Nordine Bittich	96c384bf91	Merge branch 'master' into development	2022-05-31 09:03:30 +02:00
Claire Lovisa	b13fced72a	Merge branch 'master' into development	2022-05-31 08:39:52 +02:00
Nordine Bittich	1e0d646cd9	bump privacy service	2022-05-30 11:16:05 +02:00
Nordine Bittich	38074e9bc8	bump frontend	2022-05-30 09:08:57 +02:00
Claire Lovisa	3a81077fc8	Update addresses after CRAB validation (#155 )	2022-05-24 16:28:41 +02:00
				`@@ -0,0 +1 @@`
				`http://mu.semte.ch/graphs/organisatieportaal`