handle delete markers in search results for files

quiltdata · Jan 12, 2021 · 918c61f · 918c61f
1 parent ae8ff91
commit 918c61f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/catalog/app/components/SearchResults/SearchResults.js b/catalog/app/components/SearchResults/SearchResults.js
@@ -236,7 +236,11 @@ function VersionInfo({ bucket, path, version, versions }) {
               {' from '}
               <Bold>{v.updated.toLocaleString()}</Bold>
               {' | '}
-              <Bold>{readableBytes(v.size)}</Bold>
+              {v.deleteMarker ? (
+                <Bold>Delete Marker</Bold>
+              ) : (
+                <Bold>{readableBytes(v.size)}</Bold>
+              )}
             </M.Typography>
           ))}
         </SmallerSection>

diff --git a/catalog/app/utils/search.js b/catalog/app/utils/search.js
@@ -66,6 +66,7 @@ const extractObjData = ({ bucket, score, src }) => {
           lastModified: parseDate(src.last_modified),
           size: src.size,
           meta: src.user_meta,
+          deleteMarker: src.delete_marker,
         },
       ],
     },

diff --git a/lambdas/search/index.py b/lambdas/search/index.py
@@ -103,8 +103,19 @@ def lambda_handler(request):
                 }
             }
         _source = user_source or [
-            'key', 'version_id', 'updated', 'last_modified', 'size', 'user_meta',
-            'comment', 'handle', 'hash', 'tags', 'metadata', 'pointer_file'
+            'key',
+            'version_id',
+            'updated',
+            'last_modified',
+            'size',
+            'user_meta',
+            'comment',
+            'handle',
+            'hash',
+            'tags',
+            'metadata',
+            'pointer_file',
+            'delete_marker',
         ]
         size = DEFAULT_SIZE
     elif action == 'stats':