Compare commits

...

15 Commits

Author SHA1 Message Date
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
9 changed files with 11931 additions and 3 deletions

View File

@@ -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
}
}
]

View File

@@ -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
#################################################################

File diff suppressed because it is too large Load Diff

View File

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

File diff suppressed because it is too large Load Diff

View File

@@ -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)" .
}
}

View File

@@ -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)") ) )
}
}

View File

@@ -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>
))
}
}

View File

@@ -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.0-0
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