add some minor access to archives metadata within front (#372)

medialab · May 26, 2021 · 70e816d · 70e816d
1 parent bf95cde
commit 70e816d
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 4 deletions.
diff --git a/hyphe_backend/core.tac b/hyphe_backend/core.tac
@@ -2818,6 +2818,9 @@ class Memory_Structure(customJSONRPC):
             res['size'] = data['size']
             res['encoding'] = data.get('encoding')
             res['error'] = data.get('error')
+            res['archive_url'] = data.get('archive_url')
+            res['archive_date_requested'] = data.get('archive_date_requested')
+            res['archive_date_obtained'] = data.get('archive_date_obtained')
 
         if include_body and 'body' in data:
             res['body'] = unicode(base64.b64encode(data['body']))

diff --git a/hyphe_frontend/app/views/webentity.html b/hyphe_frontend/app/views/webentity.html
@@ -482,10 +482,17 @@ <h3 style="padding: 8px; margin: 0px" ng-if="webentity.pages_total>=1">
                     <md-list-item
                       md-virtual-repeat="page in pages | filter:urlSearchQuery:false:url"
                     >
-                      <a href="{{page.url}}" target="_blank">
-                        <md-tooltip md-direction="left">Open in a new tab</md-tooltip>
-                        <md-icon>link</md-icon>
-                      </a>
+                      <div class="md-primary">
+                        <a href="{{page.url}}" target="_blank">
+                          <md-tooltip md-direction="left">Open in a new tab</md-tooltip>
+                          <md-icon>link</md-icon>
+                        </a>
+                        <br ng-if="page.archive_url" />
+                        <a ng-if="page.archive_url" href="{{page.archive_url}}" target="_blank">
+                          <md-tooltip md-direction="left">Open archived page (from {{ page.archive_date_obtained}}) in a new tab</md-tooltip>
+                          <md-icon>history</md-icon>
+                        </a>
+                      </div>
                       <div ng-if="page.url===webentity.homepage">
                         <md-tooltip md-direction="left">Homepage</md-tooltip>
                         &nbsp;<md-icon>home</md-icon>

diff --git a/hyphe_frontend/app/views/webentity.js b/hyphe_frontend/app/views/webentity.js
@@ -170,11 +170,15 @@ angular.module('hyphe.webentityController', [])
       }
       api.getPaginatedPages({
           webentityId: $scope.webentity.id
+          ,includePageMetas: true
           ,token: $scope.pagesToken
         }
         ,function(result){
           var pagesBatch = []
           result.pages.forEach(function(page){
+            if (page.archive_url && page.archive_date_obtained) {
+              page.archive_date_obtained = page.archive_date_obtained.replace(/^(....)(..)(..).*$/, "$1-$2-$3")
+            }
             if (!$scope.webentity.startpages.includes(page.url)) {
               pagesBatch.push(page)
             } else {

diff --git a/hyphe_frontend/app/views/webentity_explorer.html b/hyphe_frontend/app/views/webentity_explorer.html
@@ -201,6 +201,10 @@ <h3>
                             <md-tooltip md-direction="left">Open URL in a new tab</md-tooltip>
                             <md-icon>link</md-icon>
                           </a>
+                          <a ng-if="item.data.archive_url" href="{{item.data.archive_url}}" target="_blank">
+                            <md-tooltip md-direction="left">Open archived page (from {{ item.archive_date_obtained}}) in a new tab</md-tooltip>
+                            <md-icon>history</md-icon>
+                          </a>
                           {{ item.label }}
                         </h3>
                         <p>Page ({{ item.subtype_explicit }})</p>

diff --git a/hyphe_frontend/app/views/webentity_explorer.js b/hyphe_frontend/app/views/webentity_explorer.js
@@ -188,6 +188,7 @@ angular.module('hyphe.webentityExplorerController', [])
     function loadPages(){
       api.getPaginatedPages({
           webentityId: $scope.webentity.id
+          ,includePageMetas: true
           ,token: $scope.pagesToken || null
         }
         ,function(result){
@@ -492,6 +493,7 @@ angular.module('hyphe.webentityExplorerController', [])
           ,url: url
           ,lru: lru
           ,data: data
+          ,archive_date_obtained: (data.archive_date_obtained || '').replace(/^(....)(..)(..).*$/, "$1-$2-$3")
           ,isPrefix: isPrefix
           ,crawled: data.crawled
           ,subtype: subtype