@igea/oac_frontend 1.0.56 → 1.0.58

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@igea/oac_frontend",
-  "version": "1.0.56",
+  "version": "1.0.58",
   "description": "Frontend service for the OAC project",
   "main": "src/index.js",
   "bin": {

package/src/locales/en.json

@@ -100,7 +100,9 @@
             "confirm": "Confirm",
             "download": "Download",
             "select_instance": "Select an instance",
-            "generated_output": "Generated output"
+            "generated_output": "Generated output",
+            "valid": "Valid",
+            "not_valid": "Not valid"
         }
     },
     "search": {

package/src/locales/it.json

@@ -103,7 +103,9 @@
             "confirm": "Conferma",
             "download": "Scarica",
             "select_instance": "Seleziona un'istanza",
-            "generated_output": "Output generato"
+            "generated_output": "Output generato",
+            "valid": "Valido",
+            "not_valid": "Non valido"
         }
     },
     "search": {

package/src/public/js/app/vue-investigation.js

@@ -8,6 +8,12 @@ const templateIRIToExcludeFromSearch = [
     templateIRIOfIndagine
 ];
 
+const sequenceValues = ["$UUID$", 
+    "$SEQ1$", "$SEQ2$", "$SEQ3$",
+    "$SEQ4$", "$SEQ5$", "$SEQ6$",
+    "$SEQ7$", "$SEQ8$", "$SEQ9$"
+];  
+                    
 document.addEventListener('DOMContentLoaded', () => {
     const el = document.getElementById(appId);
 
@@ -120,11 +126,12 @@ document.addEventListener('DOMContentLoaded', () => {
             searchByPrefix(){
                 if(this.search.end) return;
                 var _this = this;
-                var request = axios.post("/backend/fuseki/search/by-prefix", {
+                var data = {
                     limit: this.search.limit, 
                     offset: this.search.offset, 
                     prefix: this.search.prefix
-                });
+                }
+                var request = axios.post("/backend/fuseki/search/by-prefix", data);
                 request.then(response => {
                     var data = response.data;
                     if(data.success){
@@ -160,20 +167,17 @@ document.addEventListener('DOMContentLoaded', () => {
                     const shadow = form.shadowRoot;
                     if (!shadow) return false;  
                     
-                    // Trova la label "ID"
-                    const labels = Array.from(shadow.querySelectorAll("label"))
-                        .filter(l => l.textContent.trim() === "ID");
+                    const rokitInputList = Array.from(shadow.querySelectorAll("rokit-input"))
+                        .filter(l => sequenceValues.some(v =>
+                            (l.placeholder || '').toLowerCase().includes(v.toLowerCase())
+                        ));
+
+                    if (rokitInputList.length == 0) return false;
+                    for(var i=0; i<rokitInputList.length; i++){
+                        const rokitInput = rokitInputList[i];
+                        const container = rokitInput.closest(".property-instance");
+                        const label = container.querySelector("label");
 
-                    if (labels.length == 0) return false;
-                    for(var i=0; i<labels.length; i++){
-                        const label = labels[i];
-                        if (!label) continue;
-                        // Container della property
-                        const container = label.closest(".property-instance");
-                        if (!container) return false;
-                        
-                        // Disabilita rokit-input
-                        const rokitInput = container.querySelector("rokit-input");
                         if (rokitInput) {
                             var isIndagineIdField = templateIRIOfIndagine === rokitInput.placeholder;
                             if(rokitInput.value == ""){
@@ -185,7 +189,8 @@ document.addEventListener('DOMContentLoaded', () => {
                             rokitInput.style.pointerEvents = "none";
                            
                             var escludeSearchButton = templateIRIToExcludeFromSearch.includes(rokitInput.placeholder);
-                                   
+                            
+                            //escludeSearchButton = false;
                             if(_this.enabled && !escludeSearchButton){
                                 // Aggiungo bottone IMG per la ricerca 
                                 let next = label.nextElementSibling;
@@ -200,8 +205,12 @@ document.addEventListener('DOMContentLoaded', () => {
                                     img.style.cursor = "pointer";
                                     img.classList.add(imgClass);
                                     img.onclick = function(){
-                                        var prefix = rokitInput.placeholder.replace("$uuid$", "").replace("$UUID$", "");   
-                                        //prefix = "http://diagnostica/vocabularies/quesito-diagnostico/";
+                                        var prefix = rokitInput.placeholder;   
+                                        sequenceValues.forEach(seqVal => {
+                                            var searchStr = seqVal;
+                                            var searchStrUpp = seqVal.toUpperCase();
+                                            prefix = prefix.replace(searchStr, "").replace(searchStrUpp, "");
+                                        });       
                                         _this.searchByPrefixStart(rokitInput, prefix);
                                     }
                                     // inserisco subito dopo la label

package/src/views/investigation/form.twig

@@ -95,7 +95,7 @@
       {% if user.role != 3 %}
         <!-- Buttons -->
         <div class="col-12 text-center mt-4">
-            <button v-if="validForm" @click="save()" type="submit" class="btn btn-primary me-2">{{ t('investigation.new.submit') }}</button>
+
             <button style="margin-left:30px;" title="{{ t('investigation.new.download') }}"
               @click="download('xml')" type="button" class="btn btn-secondary">
                 <span>RDF/XML</span><i class="fa-solid fa-file-arrow-down"></i>
@@ -105,12 +105,14 @@
                 <span>TURTLE</span><i class="fa-solid fa-file-arrow-down"></i>
             </button>
 
+            <!--
             <button style="margin-left:30px;" title="{{ t('investigation.new.validate') }}"
               @click="validate()" type="button" class="btn btn-warning">
               <i class="fa-solid fa-certificate"></i>
             </button>
+            -->
 
-            <button style="margin-left:30px;" title="{{ t('investigation.new.confirm') }}"
+            <button v-if="validForm" style="margin-left:30px;" title="{{ t('investigation.new.confirm') }}"
               @click="save()" type="button" class="btn btn-primary">
               <i class="fa-solid fa-save"></i>
             </button>
@@ -119,13 +121,16 @@
               @click="reset()" type="button" class="btn btn-info">
               <i class="fa-solid fa-broom"></i>
             </button>
+
         </div>
         {% if user.role in [0, 1] %}
           <fieldset id="shacl-output" style="margin-top:10px;
               border: solid 1px gray;
               border-radius: 10px;
               padding: 10px;">
-            <legend>{{ t('investigation.new.generated_output') }}: [{@ validForm @}]</legend>
+            <legend>{{ t('investigation.new.generated_output') }}: 
+              [{@ validForm ? '{{ t('investigation.new.valid') }}': '{{ t('investigation.new.not_valid') }}' @}]
+            </legend>
             <pre :style="outputStyle">{@ serializedForm @}</pre>
           </fieldset>
         {% endif %}

package/src/views/search/advanced.twig

@@ -34,8 +34,9 @@
         <!-- The sparnatural web component with config attributes. -->
         <!-- See http://docs.sparnatural.eu/Javascript-integration.html#html-attributes-reference -->
         <spar-natural 
-            src="/backend/ontology/schema/ttl"
-            endpoint="https://dbpedia.org/sparql"
+            src="/backend/ontology/schema/ttl2"
+            endpoint="/backend/fuseki/endpoint/sparql"
+            endpoint_="https://dbpedia.org/sparql"
             lang="en"
             defaultLang="en"
             distinct="true"