Fix ObjectPreviewPage to have own ObjectKey

lusingander · Sep 9, 2024 · 77f52bd · 77f52bd
1 parent afbf4b6
commit 77f52bd
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 7 deletions.
diff --git a/src/app.rs b/src/app.rs
@@ -494,6 +494,9 @@ impl App {
     }
 
     pub fn complete_preview_object(&mut self, result: Result<CompletePreviewObjectResult>) {
+        let object_detail_page = self.page_stack.current_page().as_object_detail();
+        let current_object_key = object_detail_page.current_object_key().clone();
+
         match result {
             Ok(CompletePreviewObjectResult {
                 obj,
@@ -506,6 +509,7 @@ impl App {
                     file_version_id,
                     obj,
                     path,
+                    current_object_key,
                     self.config.preview.clone(),
                     self.tx.clone(),
                 );

diff --git a/src/pages/object_preview.rs b/src/pages/object_preview.rs
@@ -8,7 +8,7 @@ use crate::{
     config::PreviewConfig,
     event::{AppEventType, Sender},
     key_code, key_code_char,
-    object::{FileDetail, RawObject},
+    object::{FileDetail, ObjectKey, RawObject},
     pages::util::{build_helps, build_short_helps},
     widget::{InputDialog, InputDialogState, TextPreview, TextPreviewState},
 };
@@ -21,6 +21,7 @@ pub struct ObjectPreviewPage {
     file_version_id: Option<String>,
     object: RawObject,
     path: String,
+    object_key: ObjectKey,
 
     view_state: ViewState,
 
@@ -40,6 +41,7 @@ impl ObjectPreviewPage {
         file_version_id: Option<String>,
         object: RawObject,
         path: String,
+        object_key: ObjectKey,
         preview_config: PreviewConfig,
         tx: Sender,
     ) -> Self {
@@ -54,6 +56,7 @@ impl ObjectPreviewPage {
             file_detail,
             file_version_id,
             path,
+            object_key,
             view_state: ViewState::Default,
             tx,
         }
@@ -218,6 +221,10 @@ impl ObjectPreviewPage {
             version_id,
         ));
     }
+
+    pub fn current_object_key(&self) -> &ObjectKey {
+        &self.object_key
+    }
 }
 
 #[cfg(test)]
@@ -250,9 +257,20 @@ mod tests {
             ];
             let object = object(&preview);
             let file_path = "file.txt".to_string();
+            let object_key = ObjectKey {
+                bucket_name: "test-bucket".to_string(),
+                object_path: vec![file_path.clone()],
+            };
             let preview_config = PreviewConfig::default();
-            let mut page =
-                ObjectPreviewPage::new(file_detail, None, object, file_path, preview_config, tx);
+            let mut page = ObjectPreviewPage::new(
+                file_detail,
+                None,
+                object,
+                file_path,
+                object_key,
+                preview_config,
+                tx,
+            );
             let area = Rect::new(0, 0, 30, 10);
             page.render(f, area);
         })?;
@@ -289,9 +307,20 @@ mod tests {
             let preview = ["Hello, world!"; 20];
             let object = object(&preview);
             let file_path = "file.txt".to_string();
+            let object_key = ObjectKey {
+                bucket_name: "test-bucket".to_string(),
+                object_path: vec![file_path.clone()],
+            };
             let preview_config = PreviewConfig::default();
-            let mut page =
-                ObjectPreviewPage::new(file_detail, None, object, file_path, preview_config, tx);
+            let mut page = ObjectPreviewPage::new(
+                file_detail,
+                None,
+                object,
+                file_path,
+                object_key,
+                preview_config,
+                tx,
+            );
             let area = Rect::new(0, 0, 30, 10);
             page.render(f, area);
         })?;
@@ -333,9 +362,20 @@ mod tests {
             ];
             let object = object(&preview);
             let file_path = "file.txt".to_string();
+            let object_key = ObjectKey {
+                bucket_name: "test-bucket".to_string(),
+                object_path: vec![file_path.clone()],
+            };
             let preview_config = PreviewConfig::default();
-            let mut page =
-                ObjectPreviewPage::new(file_detail, None, object, file_path, preview_config, tx);
+            let mut page = ObjectPreviewPage::new(
+                file_detail,
+                None,
+                object,
+                file_path,
+                object_key,
+                preview_config,
+                tx,
+            );
             page.open_save_dialog();
             let area = Rect::new(0, 0, 30, 10);
             page.render(f, area);

diff --git a/src/pages/page.rs b/src/pages/page.rs
@@ -66,6 +66,7 @@ impl Page {
         file_version_id: Option<String>,
         object: RawObject,
         path: String,
+        object_key: ObjectKey,
         preview_config: PreviewConfig,
         tx: Sender,
     ) -> Self {
@@ -74,6 +75,7 @@ impl Page {
             file_version_id,
             object,
             path,
+            object_key,
             preview_config,
             tx,
         )))