@igea/oac_frontend 1.0.97 → 1.0.98

package/package.json

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

package/src/controllers/investigation.js

@@ -29,10 +29,13 @@ module.exports = function(serviceName) {
     router.get('/view/:uuid', (req, res) => {
         const { uuid } = req.params;
 
+        //const formId = OntologyForm.getIdFromUuid(uuid);
+
         let data = new DataModel(req, {
             root: serviceName,
             title: 'Indagine viewer',
             uuid,
+            //form_id: formId,
 
             // 👇 NASCONDE MENU E SIDEBAR
             activeMenu: null,

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

@@ -158,6 +158,7 @@ document.addEventListener('DOMContentLoaded', () => {
                 form_keep_lock_timer: null,
                 form_keep_locking: false,
                 inEditing: false,
+                inEditingViewer: false,
                 isVisible: false,
                 enabled: el.dataset.editing == "true",
                 serializedForm: "",
@@ -190,6 +191,7 @@ document.addEventListener('DOMContentLoaded', () => {
                 if (showForm && this.uuid) {
                     this.isVisible = true;
                     this.inEditing = true;
+                    this.inEditingViewer = false;
                     this.resetShaclForm(this.uuid, true); // ❌ uuid non definito
                 }
 
@@ -242,6 +244,8 @@ document.addEventListener('DOMContentLoaded', () => {
                 _this.form_id = null;
                 //_this.resetShaclForm(null, true);
                 clearInterval(_this.form_keep_lock_timer);
+                window.location.reload();
+                
             });
 
             window.addEventListener('beforeunload', () => {
@@ -771,7 +775,58 @@ document.addEventListener('DOMContentLoaded', () => {
             },
             reset() {
                 window.location.reload();
-            }
+            },
+            stopEdit() {
+                console.log('STOP EDIT (viewer)');
+                window.dispatchEvent(new CustomEvent('edit-stop'));
+            },
+            async startEdit() {
+    try {
+      // entra subito in editing → UI aggiornata
+      this.inEditingViewer = true;
+      this.enabled   = true;
+
+      // cerco l'indagine tramite uuid
+      const res = await fetch('/backend/ontology/form/search', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ query: this.uuid, limit: 1 })
+      });
+
+      const response = await res.json();
+      if (!response.success || !response.data?.length) {
+        alert("Indagine non trovata");
+        this.inEditing = false;
+        this.enabled = false;
+        return;
+      }
+
+      const item = response.data[0];
+
+      // lock
+      const lockResp = await fetch(
+        `/backend/ontology/form/lock/${item.id}/${CLIENT_UUID}`
+      ).then(r => r.json());
+
+      if (!lockResp.success) {
+        alert("Indagine in modifica da un altro utente");
+        this.inEditing = false;
+        this.enabled = false;
+        return;
+      }
+
+      // entra ufficialmente in editing
+      window.dispatchEvent(new CustomEvent('edit-item', {
+        detail: { id: item.id, uuid: item.uuid }
+      }));
+
+    } catch (e) {
+      console.error(e);
+      alert("Errore durante l'attivazione della modifica");
+      this.inEditing = false;
+      this.enabled = false;
+    }
+  }
         }
     });
 

package/src/public/js/lib/sparnatural-main.js

@@ -1,3 +1,4 @@
+
 //
 // Place any custom JS here
 //
@@ -11,14 +12,24 @@ const sparnatural = document.querySelector("spar-natural");
 
 let viewMode = "direct";
 
+// cache risultati
+let directResults = null;        // risposta SPARQL originale
+let indaginiResults = null;      // risposta SPARQL costruita
+
+// per evitare race condition
+let currentRunId = 0;
+
+
 document.querySelectorAll('input[name="viewMode"]').forEach(radio => {
   radio.addEventListener("change", e => {
     viewMode = e.target.value;
-	sparnatural.enablePlayBtn();
+    updateView();
+    sparnatural.enablePlayBtn();
     console.log("View mode:", viewMode);
   });
 });
 
+
 /* =========================
    INDAGINE RESOLVERS MAP
 ========================= */
@@ -38,6 +49,10 @@ const INDAGINE_RESOLVERS = {
   },
   "j.0:S13_Sample": {
     property: "crm:P16_used_specific_object"
+  },
+  // 🆕 ATTIVITÀ DIAGNOSTICA
+  "crm:E7_Activity": {
+    property: "crm:P134_continued"
   }
 };
 
@@ -89,64 +104,179 @@ yasr.plugins["TableX"].config.uriHrefAdapter = function (uri) {
    QUERY RESPONSE HANDLER
 ========================= */
 
-yasqe.on("queryResponse", function (_yasqe, response, duration) {
-  yasr.setResponse(response, duration);
+yasqe.on("queryResponse", async function (_yasqe, response, duration) {
+  const runId = ++currentRunId;
 
-	if (viewMode === "indagine") {
-		resolvedIndagini.clear();
-		const sparqlResponse = normalizeSparqlResponse(response);
-		if (sparqlResponse) {
-			resolveIndagini(sparqlResponse);
-		}
-	}
+  const normalized = normalizeSparqlResponse(response);
+  sparnatural.enablePlayBtn();
+
+  if (!normalized) {
+    directResults = null;
+    indaginiResults = null;
+    yasr.setResponse(emptyResponse("Risposta SPARQL non valida"), duration);
+    return;
+  }
+
+  // salva risultati diretti
+  directResults = normalized;
+
+  // mostra subito i diretti
+  yasr.setResponse(directResults, duration);
+
+  // calcola DERIVATE (in background)
+  // CASO SPECIALE: ricerca INDAGINE
+  if (await isIndagineSearch(normalized)) {
+
+  // Tabella B = stessa risposta della A
+    indaginiResults = normalized;
+
+    if (viewMode === "indagine") {
+      yasr.setResponse(indaginiResults);
+    }
+
+  } else {
+    resolveIndagini(normalized, runId);
+  }
 
 
-  sparnatural.enablePlayBtn();
 });
 
+
 /* =========================
    RESOLVER PIPELINE
 ========================= */
 
-function resolveIndagini(response) {
+async function isIndagineSearch(response) {
   const uris = extractUrisFromResponse(response);
+  if (!uris.length) return false;
+
+  // sicurezza: tutte sotto namespace indagine
+  if (!uris.every(u => u.startsWith("http://indagine/"))) {
+    return false;
+  }
+
+  // controllo RDF type
+  return await areAllIndaginiRoot(uris);
+}
+
+function updateView() {
+  if (viewMode === "direct") {
+    yasr.setResponse(directResults ?? emptyResponse("Nessun risultato"));
+  } else if (viewMode === "indagine") {
+    yasr.setResponse(indaginiResults ?? emptyResponse("Calcolo in corso..."));
+  }
+}
+
+async function areAllIndaginiRoot(uris) {
+  const values = uris.map(u => `(<${u}>)`).join(" ");
+
+  const query = `
+PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+PREFIX crm: <http://www.cidoc-crm.org/cidoc-crm/>
+
+SELECT ?x ?type WHERE {
+  VALUES (?x) { ${values} }
 
-  console.log("URIs trovate:", uris);
+  ?x rdf:type crm:E7_Activity .
+
+  # root = non deve essere continuazione di un'altra activity
+  FILTER NOT EXISTS {
+    ?parent crm:P134_continued ?x .
+  }
+}
+`;
+
+  const data = await fetchSparql(query);
+  const bindings = data?.results?.bindings || [];
+
+  // devono tornare TUTTE
+  return bindings.length === uris.length;
+}
+
+
+
+function resolveIndagini(response, runId) {
+  const uris = extractUrisFromResponse(response);
+
+  if (!uris.length) {
+    indaginiResults = emptyResponse("Nessuna indagine collegata");
+    return;
+  }
+
+  resolvedIndagini.clear();
+
+  let pending = 0;
 
   uris.forEach(uri => {
-    resolveIndagineFromUri(uri);
+    pending++;
+    resolveIndagineFromUri(uri, runId, () => {
+      pending--;
+      if (pending === 0 && runId === currentRunId) {
+        buildIndaginiResponse();
+      }
+    });
   });
 }
 
-function resolveIndagineFromUri(uri) {
+
+function buildIndaginiResponse() {
+  const bindings = Array.from(resolvedIndagini).map(uri => ({
+    indagine: { type: "uri", value: uri }
+  }));
+
+  indaginiResults = bindings.length
+    ? {
+        head: { vars: ["indagine"] },
+        results: { bindings }
+      }
+    : emptyResponse("Nessuna indagine collegata");
+
+  // se l’utente è già in vista “indagine”, aggiorna subito
+  if (viewMode === "indagine") {
+    yasr.setResponse(indaginiResults);
+  }
+}
+
+
+function resolveIndagineFromUri(uri, runId, done) {
   const typeQuery = `
 PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-
-SELECT DISTINCT ?type
-WHERE {
+SELECT DISTINCT ?type WHERE {
   <${uri}> rdf:type ?type .
 }
-LIMIT 10
 `;
 
   fetchSparql(typeQuery).then(data => {
     const types = data.results.bindings
-	.map(b => normalizeRdfType(b.type.value))
-	.filter(Boolean);
-
-	console.log("Tipi normalizzati:", types);
-
-	types.forEach(t => {
-	const resolver = INDAGINE_RESOLVERS[t];
-	if (!resolver) return;
-
-	const q = buildResolverQuery(uri, resolver.property);
-	fetchIndagini(q);
-	});
+      .map(b => normalizeRdfType(b.type.value))
+      .filter(Boolean);
+
+    let innerPending = 0;
+
+    types.forEach(t => {
+      const resolver = INDAGINE_RESOLVERS[t];
+      if (!resolver) return;
+
+      innerPending++;
+      const q = buildResolverQuery(uri, resolver.property);
+
+      fetchSparql(q).then(r => {
+        r.results?.bindings?.forEach(b => {
+          if (b.indagine?.type === "uri") {
+            resolvedIndagini.add(b.indagine.value);
+          }
+        });
+      }).finally(() => {
+        innerPending--;
+        if (innerPending === 0) done();
+      });
+    });
 
+    if (types.length === 0) done();
   });
 }
 
+
 let resolvedIndagini = new Set();
 
 function fetchIndagini(query) {

package/src/views/investigation/view.twig

@@ -46,9 +46,7 @@
 
 <div class="viewer-container">
 
-  <div class="viewer-header">
-    <h2>Indagine</h2>
-  </div>
+
 
   {# --------------------------------------------------
      Vue root (SENZA search)
@@ -58,12 +56,39 @@
      id="investigation-app"
      data-cur_role="{{ user.role }}"
      data-uuid="{{ uuid }}"
-     data-editing="{{ user.role != 3 }}"
+     data-form-id="{{ form_id }}"
+     data-editing="false"
      data-show-form="true"
      data-label_save_ok="{{ t('investigation.save_ok') }}"
      data-label_save_err="{{ t('investigation.save_err') }}"
 >
 
+  <div class="viewer-header">
+  {% if user.role != 3 %}
+<!-- MODIFICA -->
+<button v-if="!inEditingViewer"
+        title="{{ t('investigation.edit_item') }}"
+        @click="startEdit"
+        type="button"
+        class="btn btn-info">
+  <i class="fa-solid fa-pen-to-square"></i>
+</button>
+
+<!-- STOP EDITING -->
+<button v-if="inEditingViewer"
+        title="{{ t('investigation.stop_edit') }}"
+        @click="stopEdit"
+        type="button"
+        class="btn btn-success">
+  <i class="fa-solid fa-circle-stop" style="color:red;"></i>
+</button>
+
+{% endif %}
+
+
+
+  </div>
+
 
     <template v-if="isVisible">
 
@@ -81,7 +106,7 @@
           TURTLE
         </button>
 
-        <button v-if="inEditing && validForm"
+        <button v-if="inEditingViewer  && validForm"
                 :disabled="saving"
                 class="btn btn-primary mx-2"
                 @click="save(false)">
@@ -89,6 +114,8 @@
           <i v-else class="fa-solid fa-save"></i>
         </button>
 
+
+
       </div>
       {% endif %}
 
@@ -110,7 +137,7 @@
 
       {# ---------------- DEBUG OUTPUT (admin) ---------------- #}
       {% if user.role in [0,1] %}
-      <fieldset v-if="inEditing"
+      <fieldset v-if="inEditingViewer"
         style="margin-top:15px;
                border: solid 1px gray;
                border-radius: 6px;
@@ -150,6 +177,72 @@ function tryCloseViewer() {
     if (hint) hint.style.display = 'block';
   }, 200);
 }
+
+
+async function startEditFromViewer(btn) {
+  if (btn) {
+    btn.disabled = true;
+    btn.classList.add('disabled');
+  }
+
+  const appEl = document.getElementById('investigation-app');
+  if (!appEl) return;
+
+  const uuid = appEl.dataset.uuid;
+  if (!uuid) {
+    alert("UUID non disponibile");
+    if (btn) btn.disabled = false;
+    return;
+  }
+
+  try {
+    // 🔍 riuso search
+    const res = await fetch('/backend/ontology/form/search', {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ query: uuid, limit: 1 })
+    });
+
+    const response = await res.json();
+
+    if (!response.success || !response.data?.length) {
+      alert("Indagine non trovata");
+      if (btn) btn.disabled = false;
+      return;
+    }
+
+    const item = response.data[0];
+
+    // 🔐 lock
+    const lockResp = await fetch(
+      `/backend/ontology/form/lock/${item.id}/${window.CLIENT_UUID}`
+    ).then(r => r.json());
+
+    if (!lockResp.success) {
+      alert("Indagine in modifica da un altro UTENTES");
+      if (btn) btn.disabled = false;
+      return;
+    }
+
+    // 🔥 entra in editing
+    window.dispatchEvent(
+      new CustomEvent('edit-item', {
+        detail: {
+          id: item.id,
+          uuid: item.uuid
+        }
+      })
+    );
+
+  } catch (e) {
+    console.error(e);
+    alert("Errore durante l'attivazione della modifica");
+    if (btn) btn.disabled = false;
+  }
+}
+
+
+
 </script>
 
-{% endblock %}
+{% endblock %}

package/src/views/v2/investigation/view.twig

@@ -5,6 +5,15 @@
 <div class="container my-4">
 
   <h2>Indagine</h2>
+  
+  <h2 class="d-flex justify-content-between align-items-center">
+  <span>Indagine</span>
+
+  <button id="btn-edit"
+          class="btn btn-primary btn-sm">
+    <i class="fa-solid fa-pen"></i> Modifica
+  </button>
+</h2>
 
   <div id="shacl-container"
        style="margin-top:10px;
@@ -25,4 +34,19 @@
 
 </div>
 
+<script>
+  document.getElementById('btn-edit')?.addEventListener('click', function () {
+    const form = document.getElementById('shacl-form');
+    if (!form) return;
+
+    // rimuove readonly → entra in editing
+    form.removeAttribute('data-readonly');
+
+    // feedback UI
+    this.disabled = true;
+    this.innerHTML = '<i class="fa-solid fa-lock-open"></i> Modifica attiva';
+  });
+</script>
+
+
 {% endblock %}