From cec23087c4eaf5aa1bfa5b263d114a7fb652200e Mon Sep 17 00:00:00 2001 From: Raufabdul8 Date: Wed, 20 Jul 2022 23:49:35 +0530 Subject: [PATCH 1/3] refactor: add function to get timestamp from snapshot --- src/adminPage/adminSnapshots.js | 6 +++--- src/adminPage/snapshots/snapshot.js | 8 ++++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/adminPage/adminSnapshots.js b/src/adminPage/adminSnapshots.js index 4e4057b..5272d27 100644 --- a/src/adminPage/adminSnapshots.js +++ b/src/adminPage/adminSnapshots.js @@ -24,8 +24,8 @@ async function manageSnapshots(snapshotTable) { snapshotTable.appendChild(snapshotsUL) sortedSnapshotFileNames.reverse(function (x, y) { - const timestampx = x.substring(x.lastIndexOf('-')+1, x.indexOf('.ttl')) - const timestampy = y.substring(y.lastIndexOf('-')+1, y.indexOf('.ttl')) + const timestampx = getTimestampFromSnapshot(x) + const timestampy = getTimestampFromSnapshot(y) return timestampx - timestampy; }) @@ -39,7 +39,7 @@ async function manageSnapshots(snapshotTable) { const timestampDiv = document.createElement('div') timestampDiv.setAttribute('class', 'timstampDiv') - const timestamp = sortedSnapshotFileNames[i].substring(sortedSnapshotFileNames[i].lastIndexOf('-') + 1, sortedSnapshotFileNames[i].indexOf('.ttl')) + const timestamp = getTimestampFromSnapshot(sortedSnapshotFileNames[i]) timestampDiv.textContent = (new Date(parseInt(timestamp))).toISOString() const userDiv = document.createElement('div') diff --git a/src/adminPage/snapshots/snapshot.js b/src/adminPage/snapshots/snapshot.js index d9018ab..9c4fafb 100644 --- a/src/adminPage/snapshots/snapshot.js +++ b/src/adminPage/snapshots/snapshot.js @@ -48,8 +48,8 @@ async function createSnapshot(store, currentKG, nameOfSnapshot) { function deleteOlderSnapshots(store, snapshots, threshold) { snapshots.sort(function (x, y) { - const timestampx = x.substring(x.lastIndexOf('-')+1, x.indexOf('.ttl')) - const timestampy = y.substring(y.lastIndexOf('-')+1, y.indexOf('.ttl')) + const timestampx = getTimestampFromSnapshot(x) + const timestampy = getTimestampFromSnapshot(y) return timestampx - timestampy; }) for (let i = 0; i < snapshots.length-threshold; i++) { @@ -109,4 +109,8 @@ async function getSnapshotWithoutAdditionalTriples(store, linkToResource) { loadedResource = await store.fetcher.load(linkToResource) await store.updater.update([], creator.concat(modified)) return loadedResource +} + +async function getTimestampFromSnapshot(snapshot) { + return snapshot.substring(snapshot.lastIndexOf('-')+1, snapshot.indexOf('.ttl')) } \ No newline at end of file From 27c45ec7fc271aa5b25f73b4a98eff7db96809a1 Mon Sep 17 00:00:00 2001 From: Raufabdul8 Date: Wed, 20 Jul 2022 23:54:03 +0530 Subject: [PATCH 2/3] fix: remove async from function definition --- src/adminPage/snapshots/snapshot.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/adminPage/snapshots/snapshot.js b/src/adminPage/snapshots/snapshot.js index 9c4fafb..d42faac 100644 --- a/src/adminPage/snapshots/snapshot.js +++ b/src/adminPage/snapshots/snapshot.js @@ -111,6 +111,6 @@ async function getSnapshotWithoutAdditionalTriples(store, linkToResource) { return loadedResource } -async function getTimestampFromSnapshot(snapshot) { +function getTimestampFromSnapshot(snapshot) { return snapshot.substring(snapshot.lastIndexOf('-')+1, snapshot.indexOf('.ttl')) } \ No newline at end of file From 2ca86bd6449fe34740e64a275075665ed2f6fa2f Mon Sep 17 00:00:00 2001 From: Raufabdul8 Date: Thu, 21 Jul 2022 16:52:16 +0530 Subject: [PATCH 3/3] fix: change fuction to handle all file types --- src/adminPage/snapshots/snapshot.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/adminPage/snapshots/snapshot.js b/src/adminPage/snapshots/snapshot.js index d42faac..0fae97c 100644 --- a/src/adminPage/snapshots/snapshot.js +++ b/src/adminPage/snapshots/snapshot.js @@ -112,5 +112,5 @@ async function getSnapshotWithoutAdditionalTriples(store, linkToResource) { } function getTimestampFromSnapshot(snapshot) { - return snapshot.substring(snapshot.lastIndexOf('-')+1, snapshot.indexOf('.ttl')) + return snapshot.substring(snapshot.lastIndexOf('-')+1, snapshot.lastIndexOf('.')) } \ No newline at end of file