fixed snapshot bug

Author: timea-solid

src/adminPage/adminSnapshots.js

@@ -44,7 +44,8 @@ async function manageSnapshots(snapshotTable) {
 
             const userDiv = document.createElement('div')
             userDiv.setAttribute('class', 'nameDiv')
-            const snapshotCreator = store.any(UI.rdf.sym(sortedSnapshotFileNames[i]+"#this"), UI.rdf.sym('http://purl.org/dc/terms/creator'), null)
+            await store.fetcher.load(sortedSnapshotFileNames[i])
+            const snapshotCreator = await store.any(UI.rdf.sym(sortedSnapshotFileNames[i]+'#this'), UI.rdf.sym('http://purl.org/dc/terms/creator'), null, UI.rdf.sym(sortedSnapshotFileNames[i]))
             if (snapshotCreator) {
                 userDiv.textContent = snapshotCreator.value
             } else {
@@ -102,10 +103,13 @@ async function manageSnapshots(snapshotTable) {
         }
 
     } else {
+        const noSnapMessageDiv = document.createElement('div')
         const message = document.createElement('span')
         message.setAttribute('id', 'spanMessage')
         message.textContent = "The system has no snapshots yet"
-        snapshotTable.appendChild(message)
+        noSnapMessageDiv.appendChild(message)
+        snapshotTable.appendChild(noSnapMessageDiv)
+        snapshotTable.setAttribute('class', 'noSnapshots')
     }
 
     const createSnapDiv = document.createElement('div')
@@ -124,6 +128,7 @@ async function manageSnapshots(snapshotTable) {
     const messageCreateSpan = document.createElement('span')
     messageCreateSpan.setAttribute('class', 'spanshotCreateMessage')
     messageCreateSpan.setAttribute('id', 'createSnap')
+
     createSnapDiv.appendChild(createSnapshotButton)
     createSnapDiv.appendChild(messageCreateSpan)
 

src/adminPage/snapshots/snapshot.js

@@ -8,7 +8,7 @@ async function snapshotsLogic(linkToKG, linkToGKsnapshotContainer, KGname, thres
     await loadOrCreateContainer(store, linkToGKsnapshotContainer)
     const snapshots = await getContainerMembers(store, UI.rdf.sym(linkToGKsnapshotContainer))
     const sortedSnapshotFileNames = snapshots.map(snapshot => snapshot.value).sort() // the first element contains the oldest content
-    
+        
     const currentKG = await store.fetcher.load(linkToKG)
 
     if (sortedSnapshotFileNames && sortedSnapshotFileNames.length === 0) {
@@ -17,25 +17,21 @@ async function snapshotsLogic(linkToKG, linkToGKsnapshotContainer, KGname, thres
         const latestSnapshotLink = sortedSnapshotFileNames[sortedSnapshotFileNames.length - 1] // last element contains the newest content
         let latestSnapshotKG
         try {
-            latestSnapshotKG = await store.fetcher?.load(latestSnapshotLink)
+            latestSnapshotKG = await getSnapshotWithoutAdditionalTriples(store, latestSnapshotLink)
         } catch (err) {
             console.log(err) 
             latestSnapshotKG = {}
             latestSnapshotKG.responseText = ''
         }
 
         if (latestSnapshotKG.responseText !== currentKG.responseText) {
-            //console.log(latestSnapshotKG.responseText !== currentKG.responseText) 
-            //console.log(latestSnapshotKG.responseText)
-            //console.log(currentKG.responseText) 
             sortedSnapshotFileNames.push(await createSnapshot(store, currentKG, KGname))
         }
     }
 
     if (sortedSnapshotFileNames && sortedSnapshotFileNames.length > threshold) {
         deleteOlderSnapshots(store, sortedSnapshotFileNames, threshold)
     }
-
 }
 
 async function createSnapshot(store, currentKG, nameOfSnapshot) {
@@ -79,7 +75,7 @@ async function createSnapshotNow(store, linkToCurrentKG, snapName, sortedSnapsho
     console.info('creating snapshot')
     element.textContent = 'Working...'
     try {
-        const currentKG = await store.fetcher?.load(linkToCurrentKG)
+        const currentKG = await store.fetcher.load(linkToCurrentKG)
         sortedSnapshotFileNames.push(await createSnapshot(store, currentKG, snapName))
     } catch (err) {
         const msg = 'Something went wrong'
@@ -93,14 +89,24 @@ async function switchSnapshot(store, url, element, linkToKG) {
     console.info("switching snapshot")
     element.textContent = 'Working...'
     try {
-        const snapshotKG = await store.fetcher?.load(url)
-        await store.fetcher?.webOperation('DELETE', UI.rdf.sym(linkToKG))
-        await store.fetcher?.webOperation('PUT', linkToKG, { data: snapshotKG.responseText, contentType: 'text/turtle', Link: '<http://www.w3.org/ns/ldp#BasicContainer>; rel="type"' })
-        const currentKG = await store.fetcher?.load(linkToKG)
+        const snapshotKG = await getSnapshotWithoutAdditionalTriples(store, url)
+        await store.fetcher.webOperation('DELETE', UI.rdf.sym(linkToKG))
+        await store.fetcher.webOperation('PUT', linkToKG, { data: snapshotKG.responseText, contentType: 'text/turtle', Link: '<http://www.w3.org/ns/ldp#BasicContainer>; rel="type"' })
+        const currentKG = await store.fetcher.load(linkToKG)
     } catch (err) {
         const msg = 'could not switch snapshot '
         element.textContent = msg
         throw new Error(msg);
     }
     element.textContent = "Successful"
+}
+
+async function getSnapshotWithoutAdditionalTriples(store, linkToResource) {
+    let loadedResource = await store.fetcher.load(linkToResource)
+    const creator = store.statementsMatching(null, UI.rdf.sym("http://purl.org/dc/terms/creator"), null, UI.rdf.sym(linkToResource))
+    const modified = store.statementsMatching(null, UI.rdf.sym("http://purl.org/dc/terms/modified"), null, UI.rdf.sym(linkToResource))
+    await store.updater.update(creator.concat(modified), [])
+    loadedResource = await store.fetcher.load(linkToResource)
+    await store.updater.update([], creator.concat(modified))
+    return loadedResource
 }

src/editDataPage/editData.html

@@ -39,13 +39,8 @@ <h1>Edit the Solid Hello Worlds examples</h1>
     <script type="text/javascript" src="../../lib/solid-ui.js"></script>
     <script type="text/javascript" src="../config.js"></script>
     <script type="text/javascript" src="./loadData.js"></script>
-    <script  type="text/javascript" src="../adminPage/snapshots/container.js"></script>
+    <script type="text/javascript" src="../adminPage/snapshots/container.js"></script>
     <script type="text/javascript" src="../adminPage/snapshots/snapshot.js"></script>
-    <!--<script type="text/javascript">
-        document.addEventListener('DOMContentLoaded', function () {
-            snapshotsLogic()
-        }, false)
-    </script>-->
 
 </body>
 

src/editDataPage/loadData.js

@@ -1,7 +1,9 @@
-document.addEventListener('DOMContentLoaded', function () {
-    snapshotsLogic(appConfig.LINK_TO_KNOWLEDGE_GRAPH, appConfig.LINK_TO_KNOWLEDGE_GRAPH_SNAPSHOTS, appConfig.KNOWLEDGE_GRAPH_SNAPSHOT_NAME, appConfig.NUMBER_OF_SNAPSHOTS )
-    loadData()
-        }, false)
+window.onload = function() {
+    if (window.location.href.indexOf('editData.html') > -1) {
+        snapshotsLogic(appConfig.LINK_TO_KNOWLEDGE_GRAPH, appConfig.LINK_TO_KNOWLEDGE_GRAPH_SNAPSHOTS, appConfig.KNOWLEDGE_GRAPH_SNAPSHOT_NAME, appConfig.NUMBER_OF_SNAPSHOTS)
+        loadData()
+    }
+}
 
 function complainIfBad(ok, message) {
     if (ok) return

src/style.css

@@ -149,6 +149,12 @@ nav {
   margin: 1em;
 }
 
+.noSnapshots {
+  width: fit-content;
+  text-align: center;
+  margin-left: 12em;
+}
+
 .snapshotTable {
   width: fit-content;
   text-align: center;