feat: Use defined ontologies to describe policies

Author: smessie

app/controllers/index.js

@@ -267,7 +267,12 @@ export default class IndexController extends Controller {
     matches.prefixes = this.model.addIfNotIncluded(
       matches.prefixes,
       'pol',
-      'https://www.example.org/ns/policy#',
+      'https://w3id.org/DFDP/policy#',
+    );
+    matches.prefixes = this.model.addIfNotIncluded(
+      matches.prefixes,
+      'http',
+      'http://www.w3.org/2011/http#',
     );
 
     // Re-add the N3 rules to the resource.
@@ -325,7 +330,7 @@ export default class IndexController extends Controller {
       }
       valid &= !policy.urlError;
 
-      if (policy.executionTarget === 'http://example.org/httpRequest') {
+      if (policy.executionTarget === 'http://www.w3.org/2011/http#Request') {
         if (
           !['GET', 'POST', 'PUT', 'DELETE', 'PATCH'].includes(policy.method)
         ) {
@@ -565,15 +570,16 @@ export default class IndexController extends Controller {
     if (type && type.startsWith('policy-')) {
       let policy = { uuid: uuid(), url: '' };
       if (type === 'policy-redirect') {
-        policy.executionTarget = 'http://example.org/redirect';
+        policy.executionTarget = 'https://w3id.org/DFDP/policy#Redirect';
       } else if (type === 'policy-n3-patch') {
-        policy.executionTarget = 'http://example.org/n3Patch';
+        policy.executionTarget =
+          'http://www.w3.org/ns/solid/terms#InsertDeletePatch';
       } else if (type === 'policy-http-request') {
         policy = {
           ...policy,
           method: 'POST',
           contentType: '',
-          executionTarget: 'http://example.org/httpRequest',
+          executionTarget: 'http://www.w3.org/2011/http#Request',
         };
       }
       this.model.policies = [...this.model.policies, policy];
@@ -883,18 +889,20 @@ export default class IndexController extends Controller {
       // Add basic properties and N3 rule syntax equal for all policy types.
       let data = `
 {
-  <${this.model.loadedFormUri}> ex:event ex:Submit.
+  <${this.model.loadedFormUri}> pol:event pol:Submit.
 } => {
   ex:HttpPolicy pol:policy [
     a fno:Execution ;
     fno:executes <${policy.executionTarget}> ;
-    ex:url <${policy.url}>`;
+    http:requestURI <${policy.url}>`;
 
       // If the policy is a HTTP request, add the method and content type.
-      if (policy.executionTarget === 'http://example.org/httpRequest') {
+      if (policy.executionTarget === 'http://www.w3.org/2011/http#Request') {
         data += ` ;
-    ex:method "${policy.method}" ;
-    ex:contentType "${policy.contentType}"`;
+    http:methodName "${policy.method}" ;
+    http:headers (
+      [ http:fieldName "Content-Type" ; http:fieldValue "${policy.contentType}" ]
+    )`;
       }
 
       // Finish the policy syntax.

app/routes/index.js

@@ -99,24 +99,25 @@ export default class IndexRoute extends Route {
     // Get policies from footprint tasks.
     const options = { outputType: 'string' };
     const reasonerResult = await n3reasoner(
-      `<${formUri}> <http://example.org/event> <http://example.org/Submit> .`,
+      `<${formUri}> <https://w3id.org/DFDP/policy#event> <https://w3id.org/DFDP/policy#Submit> .`,
       content,
       options,
     );
 
     // Parse policies.
     const queryPolicy = `
       PREFIX ex: <http://example.org/>
-      PREFIX pol: <https://www.example.org/ns/policy#>
+      PREFIX pol: <https://w3id.org/DFDP/policy#>
       PREFIX fno: <https://w3id.org/function/ontology#>
+      PREFIX http: <http://www.w3.org/2011/http#>
 
       SELECT ?executionTarget ?method ?url ?contentType WHERE {
         ?id pol:policy ?policy .
         ?policy a fno:Execution .
         ?policy fno:executes ?executionTarget .
-        ?policy ex:url ?url .
-        OPTIONAL { ?policy ex:method ?method } .
-        OPTIONAL { ?policy ex:contentType ?contentType } .
+        ?policy http:requestURI ?url .
+        OPTIONAL { ?policy http:methodName ?method } .
+        OPTIONAL { ?policy http:headers ( [ http:fieldName "Content-Type" ; http:fieldValue ?contentType ] ) } .
       }
       `;
     const bindings = await (
@@ -125,7 +126,7 @@ export default class IndexRoute extends Route {
           {
             type: 'stringSource',
             value: reasonerResult,
-            mediaType: 'text/n3',
+            mediaType: 'text/turtle',
             baseIRI: formUri.split('#')[0],
           },
         ],

app/templates/index.hbs

@@ -183,17 +183,17 @@
             <div class="card">
               <div class="card-body">
                 <div class="d-flex align-items-center field-title">
-                  {{#if (this.isEqual policy.executionTarget "http://example.org/httpRequest") }}
+                  {{#if (this.isEqual policy.executionTarget "http://www.w3.org/2011/http#Request") }}
                     <h6 class="card-title">
                       <FaIcon @icon="globe" />
                       HTTP Request
                     </h6>
-                  {{else if (this.isEqual policy.executionTarget "http://example.org/redirect") }}
+                  {{else if (this.isEqual policy.executionTarget "https://w3id.org/DFDP/policy#Redirect") }}
                     <h6 class="card-title">
                       <FaIcon @icon="external-link" />
                       Redirect
                     </h6>
-                  {{else if (this.isEqual policy.executionTarget "http://example.org/n3Patch") }}
+                  {{else if (this.isEqual policy.executionTarget "http://www.w3.org/ns/solid/terms#InsertDeletePatch") }}
                     <h6 class="card-title">
                       <FaIcon @icon="file-code" />
                       N3 Patch
@@ -220,7 +220,7 @@
                   </div>
                 </div>
 
-                {{#if (this.isEqual policy.executionTarget "http://example.org/httpRequest") }}
+                {{#if (this.isEqual policy.executionTarget "http://www.w3.org/2011/http#Request") }}
                   <div class="mb-3 row">
                     <label for="method-{{policy.uuid}}" id="label-method-{{policy.uuid}}"
                            class="col-sm-3 col-form-label">HTTP Method</label>
@@ -387,7 +387,8 @@
                             <div class="input-group mt-3">
                               <Input @type="text" class="form-control" id="label-{{option.uuid}}" placeholder="Label"
                                      @value={{option.label}} aria-describedby="delete-{{option.uuid}}" />
-                              <Input @type="text" class="form-control" id="binding-{{option.uuid}}" placeholder="Binding"
+                              <Input @type="text" class="form-control" id="binding-{{option.uuid}}"
+                                     placeholder="Binding"
                                      @value={{option.property}} aria-describedby="delete-{{option.uuid}}" {{ on
                                 "change" (fn this.updateBinding option) }} />
                               <button class="btn btn-outline-danger" type="button" id="delete-{{option.uuid}}" {{ on

package-lock.json

@@ -28,7 +28,7 @@
     "@babel/core": "^7.23.6",
     "@babel/eslint-parser": "^7.22.15",
     "@babel/plugin-transform-class-properties": "^7.23.3",
-    "@comunica/query-sparql": "^2.6.9",
+    "@comunica/query-sparql": "^2.10.1",
     "@ember/optional-features": "^2.0.0",
     "@ember/string": "^3.1.1",
     "@ember/test-helpers": "^3.2.0",