Compare commits

..

2 Commits

Author SHA1 Message Date
Claire Lovisa
d6fccd5622 Bump frontend 2022-05-13 11:28:01 +02:00
Claire Lovisa
eb42076ec2 Forward some calls to resource directly
There seems to be an issue with mu-cache, we sometimes need to restart
the cache to see results in the "Bedinaren" page. Otherwise it shows
empty results. As a workaround while it's investigated, we talk directly
to mu-cl-resource instead.
2022-05-13 11:00:36 +02:00
11 changed files with 7 additions and 48833 deletions

View File

@@ -7,11 +7,6 @@ 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",
@@ -104,7 +99,7 @@ defmodule Acl.UserGroups.Config do
%GraphSpec{
graph: "http://mu.semte.ch/graphs/organisatieportaal",
constraint: %ResourceConstraint{
resource_types: @protected_resource_type ++ @error_type
resource_types: @protected_resource_type
}
}
]
@@ -117,7 +112,7 @@ defmodule Acl.UserGroups.Config do
%GraphSpec{
graph: "http://mu.semte.ch/graphs/organisatieportaal",
constraint: %ResourceConstraint{
resource_types: @protected_resource_type ++ @error_type
resource_types: @protected_resource_type
}
}
]

View File

@@ -73,11 +73,11 @@ defmodule Dispatcher do
end
match "/worship-administrative-units/*path", %{ accept: [:json], layer: :api} do
Proxy.forward conn, path, "http://cache/worship-administrative-units/"
Proxy.forward conn, path, "http://resource/worship-administrative-units/"
end
match "/worship-services/*path", %{ accept: [:json], layer: :api} do
Proxy.forward conn, path, "http://resource/worship-services/" # DISABLE CACHING FOR NOW (BUG OP-1404)
Proxy.forward conn, path, "http://resource/worship-services/"
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,14 +267,6 @@ 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
#################################################################

View File

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

File diff suppressed because it is too large Load Diff

View File

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

File diff suppressed because it is too large Load Diff

View File

@@ -1,11 +0,0 @@
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

@@ -1,20 +0,0 @@
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

@@ -1,32 +0,0 @@
# 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

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