Merge pull request #457 from sarub0b0/423-support-opening-yaml-tab-fr…

…om-resource-list feat: Support opening YAML popup from resource list
sarub0b0 · Jan 4, 2024 · a4fe77c · a4fe77c
2 parents 055c305 + 934e6e0
commit a4fe77c
Show file tree

Hide file tree

Showing 15 changed files with 804 additions and 459 deletions.
diff --git a/src/action.rs b/src/action.rs
@@ -62,6 +62,8 @@ pub mod view_id {
     generate_id!(popup_yaml_kind);
     generate_id!(popup_yaml_return);
 
+    generate_id!(popup_yaml);
+
     generate_id!(popup_help);
 }
 
@@ -440,9 +442,17 @@ pub fn update_contents(
                         widget.update_widget_item(Item::Array(error_lines!(e)));
                     }
                 },
-                Yaml(res) => {
+                SelectedYaml(res) => {
                     update_widget_item_for_vec(window, view_id::tab_yaml_widget_yaml, res);
                 }
+                DirectedYaml { kind, name, yaml } => {
+                    let widget = window
+                        .find_widget_mut(view_id::popup_yaml)
+                        .widget_config_mut();
+                    *(widget.append_title_mut()) = Some(format!(" : {}/{}", kind, name).into());
+
+                    update_widget_item_for_vec(window, view_id::popup_yaml, yaml);
+                }
             }
         }
 

diff --git a/src/event/kubernetes.rs b/src/event/kubernetes.rs
@@ -43,8 +43,8 @@ use self::{
     pod::{LogMessage, LogWorker},
     worker::{AbortWorker, PollWorker, Worker},
     yaml::{
-        fetch_resource_list::FetchResourceList,
-        worker::{YamlWorker, YamlWorkerRequest},
+        direct::DirectedYamlWorker,
+        select::{resources::FetchResourceList, worker::SelectedYamlWorker},
         YamlMessage, YamlRequest, YamlResponse,
     },
 };
@@ -481,23 +481,13 @@ impl Worker for MainWorker {
                                 tx.send(YamlResponse::Resource(fetched_data).into())
                                     .expect("Failed to send YamlResponse::Resource");
                             }
-                            Yaml {
-                                kind,
-                                name,
-                                namespace,
-                            } => {
+                            SelectedYaml(req) => {
                                 if let Some(handler) = yaml_handler {
                                     handler.abort();
                                 }
 
-                                let req = YamlWorkerRequest {
-                                    kind,
-                                    name,
-                                    namespace,
-                                };
-
                                 yaml_handler = Some(
-                                    YamlWorker::new(
+                                    SelectedYamlWorker::new(
                                         is_terminated.clone(),
                                         tx,
                                         kube_client.clone(),
@@ -508,6 +498,23 @@ impl Worker for MainWorker {
                                 );
                                 task::yield_now().await;
                             }
+
+                            DirectedYaml(req) => {
+                                if let Some(handler) = yaml_handler {
+                                    handler.abort();
+                                }
+
+                                yaml_handler = Some(
+                                    DirectedYamlWorker::new(
+                                        is_terminated.clone(),
+                                        tx,
+                                        kube_client.clone(),
+                                        req,
+                                    )
+                                    .spawn(),
+                                );
+                                task::yield_now().await;
+                            }
                         }
                     }