From 52739862051cf517f844b8b9f3ee230b26ae3892 Mon Sep 17 00:00:00 2001
From: EttoreM <ettore.murabito@manchester.ac.uk>
Date: Sat, 24 Jan 2026 10:25:26 +0000
Subject: [PATCH] Merged 7_requested_workflow_run.tll files.

---
 .../{must => }/7_requested_workflow_run.ttl   | 37 +++++++++++++++++--
 .../should/7_requested_workflow_run.ttl       | 36 ------------------
 2 files changed, 33 insertions(+), 40 deletions(-)
 rename rocrate_validator/profiles/five-safes-crate/{must => }/7_requested_workflow_run.ttl (79%)
 delete mode 100644 rocrate_validator/profiles/five-safes-crate/should/7_requested_workflow_run.ttl

diff --git a/rocrate_validator/profiles/five-safes-crate/must/7_requested_workflow_run.ttl b/rocrate_validator/profiles/five-safes-crate/7_requested_workflow_run.ttl
similarity index 79%
rename from rocrate_validator/profiles/five-safes-crate/must/7_requested_workflow_run.ttl
rename to rocrate_validator/profiles/five-safes-crate/7_requested_workflow_run.ttl
index d1a9ff6d..d803330e 100644
--- a/rocrate_validator/profiles/five-safes-crate/must/7_requested_workflow_run.ttl
+++ b/rocrate_validator/profiles/five-safes-crate/7_requested_workflow_run.ttl
@@ -22,6 +22,8 @@
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
 
+#=== MUST shapes ===#
+
 five-safes-crate:RootDataEntityMentionsCreateAction
     a sh:NodeShape ;
     sh:name "RootDataEntity" ;
@@ -54,7 +56,16 @@ five-safes-crate:CreateActionInstrumentAndStatus
         sh:minCount 1 ;
         sh:severity sh:Violation ;
         sh:message "`CreateAction` MUST have the `instrument` property" ;
-    ]  ;
+    ] .
+
+
+five-safes-crate:CreateActionInstrumentAndStatus
+    a sh:NodeShape ;
+    sh:name "CreateAction" ;
+    sh:targetClass schema:CreateAction ;
+    sh:description "" ; 
+    sh:severity sh:Violation ;
+
     sh:sparql [
         a sh:SPARQLConstraint ;
         sh:name "instrument" ;
@@ -67,7 +78,6 @@ five-safes-crate:CreateActionInstrumentAndStatus
             FILTER (?instrument != ?main)
         }
         """ ;
-        sh:severity sh:Violation ;
         sh:message "`CreateAction` --> `instrument` MUST reference the same entity as `Root Data Entity` --> `mainEntity`" ;
     ] ;
     sh:sparql [
@@ -81,6 +91,25 @@ five-safes-crate:CreateActionInstrumentAndStatus
                 FILTER NOT EXISTS {  ?object a ?type . }
             }
         """ ;
-        sh:severity sh:Violation ;
         sh:message "Each `object` in `CreateAction` MUST reference an existing entity." ;
-    ] .
\ No newline at end of file
+    ] .
+
+
+#=== SHOULD shapes ===#
+
+# CreateAction SHOULD have object property with minimum cardinality 1
+five-safes-crate:CreateActionShouldHaveObjectProperty
+    a sh:NodeShape ;
+    sh:targetClass schema:CreateAction ;
+    sh:name "CreateAction" ;
+    sh:property [
+        sh:path schema:object ;
+        sh:minCount 1 ;
+        sh:nodeKind sh:IRI ;
+        sh:severity sh:Warning ;
+        sh:message "`CreateAction` SHOULD have the property `object` with IRI values." ;
+    ] .
+
+
+#=== MAY shapes ===#
+# (none)
\ No newline at end of file
diff --git a/rocrate_validator/profiles/five-safes-crate/should/7_requested_workflow_run.ttl b/rocrate_validator/profiles/five-safes-crate/should/7_requested_workflow_run.ttl
deleted file mode 100644
index 41af739c..00000000
--- a/rocrate_validator/profiles/five-safes-crate/should/7_requested_workflow_run.ttl
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright (c) 2025 eScience Lab, The University of Manchester
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-@prefix ro: <./> .
-@prefix ro-crate: <https://github.com/crs4/rocrate-validator/profiles/ro-crate/> .
-@prefix five-safes-crate: <https://github.com/eScienceLab/rocrate-validator/profiles/five-safes-crate/> .
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix schema: <http://schema.org/> .
-@prefix sh: <http://www.w3.org/ns/shacl#> .
-@prefix validator: <https://github.com/crs4/rocrate-validator/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-
-
-# CreateAction SHOULD have object property with minimum cardinality 1
-five-safes-crate:CreateActionShouldHaveObjectProperty
-    a sh:NodeShape ;
-    sh:targetClass schema:CreateAction ;
-    sh:name "CreateAction" ;
-    sh:property [
-        sh:path schema:object ;
-        sh:minCount 1 ;
-        sh:nodeKind sh:IRI ;
-        sh:severity sh:Warning ;
-        sh:message "`CreateAction` SHOULD have the property `object` with IRI values." ;
-    ] .
\ No newline at end of file