Improve tasks UI

assets/demo_maps/test.site.json

@@ -1013,6 +1013,7 @@
   },
   "robots": {
     "52": {
+      "fleet": "HospitalRobot",
       "properties": {
         "Collision": {
           "config": {

crates/rmf_site_editor/src/site/inclusion.rs

@@ -31,9 +31,12 @@ impl Property for Inclusion {
     fn on_new_element(
         for_element: Entity,
         in_scenario: Entity,
-        _value: Inclusion,
+        value: Inclusion,
         world: &mut World,
     ) {
+        // Insert inclusion modifier with given value into target scenario
+        world.trigger(UpdateModifier::modify(in_scenario, for_element, value));
+
         let mut scenario_state: SystemState<
             Query<(Entity, &ScenarioModifiers<Entity>, &Affiliation<Entity>)>,
         > = SystemState::new(world);

crates/rmf_site_editor/src/widgets/creation.rs

@@ -22,7 +22,9 @@ use crate::{
         IsStatic, Members, ModelDescriptionBundle, ModelInstance, ModelMarker, ModelProperty,
         NameInSite, Recall, RecallAssetSource, Scale,
     },
-    widgets::{AssetGalleryStatus, Icons, InspectAssetSourceComponent, InspectScaleComponent},
+    widgets::{
+        AssetGalleryStatus, Icons, InspectAssetSourceComponent, InspectScaleComponent, TaskWidget,
+    },
     AppState, CurrentWorkspace,
 };
 
@@ -52,6 +54,7 @@ impl Plugin for StandardCreationPlugin {
             DrawingCreationPlugin::default(),
             ModelCreationPlugin::default(),
             BrowseFuelTogglePlugin::default(),
+            TaskPanelTogglePlugin::default(),
         ));
     }
 }
@@ -668,6 +671,50 @@ impl<'w> WidgetSystem<Tile> for BrowseFuelToggle<'w> {
     }
 }
 
+#[derive(Default)]
+pub struct TaskPanelTogglePlugin {}
+
+impl Plugin for TaskPanelTogglePlugin {
+    fn build(&self, app: &mut App) {
+        app.add_plugins(HeaderTilePlugin::<TaskPanelToggle>::new());
+    }
+}
+
+#[derive(SystemParam)]
+pub struct TaskPanelToggle<'w> {
+    task_widget: Option<ResMut<'w, TaskWidget>>,
+    app_state: Res<'w, State<AppState>>,
+}
+
+impl<'w> WidgetSystem<Tile> for TaskPanelToggle<'w> {
+    fn show(_: Tile, ui: &mut Ui, state: &mut SystemState<Self>, world: &mut World) -> () {
+        let mut params = state.get_mut(world);
+        if !matches!(params.app_state.get(), AppState::SiteEditor) {
+            return;
+        }
+
+        let enabled = params.task_widget.is_some();
+        let toggled_on = params.task_widget.as_ref().is_some_and(|panel| panel.show);
+        let tooltip = if !enabled {
+            "Task panel is not available"
+        } else if toggled_on {
+            "Close task panel"
+        } else {
+            "Open task panel"
+        };
+
+        if ui
+            .add_enabled(enabled, Button::new("📋").selected(toggled_on))
+            .on_hover_text(tooltip)
+            .clicked()
+        {
+            if let Some(panel) = &mut params.task_widget {
+                panel.show = !panel.show;
+            }
+        }
+    }
+}
+
 /// Helper funtion to display the button name on hover
 fn button_clicked(ui: &mut Ui, icon: &str, tooltip: &str) -> bool {
     ui.add(Button::new(icon)).on_hover_text(tooltip).clicked()

crates/rmf_site_editor/src/widgets/inspector/inspect_model_description/inspect_robot_properties.rs

@@ -29,7 +29,7 @@ use bevy::{
     ecs::{component::Mutable, hierarchy::ChildOf, system::SystemParam},
     prelude::Component,
 };
-use bevy_egui::egui::{ComboBox, Ui};
+use bevy_egui::egui::{ComboBox, TextEdit, Ui};
 use rmf_site_format::robot_properties::*;
 use serde_json::{Error, Value};
 use smallvec::SmallVec;
@@ -123,7 +123,7 @@ impl RobotPropertiesInspector {
 struct InspectRobotProperties<'w, 's> {
     model_instances: ModelPropertyQuery<'w, 's, Robot>,
     model_descriptions:
-        Query<'w, 's, &'static ModelProperty<Robot>, (With<ModelMarker>, With<Group>)>,
+        Query<'w, 's, &'static mut ModelProperty<Robot>, (With<ModelMarker>, With<Group>)>,
     inspect_robot_properties: Res<'w, RobotPropertiesInspector>,
     children: Query<'w, 's, &'static Children>,
 }
@@ -139,7 +139,7 @@ impl<'w, 's> WidgetSystem<Inspect> for InspectRobotProperties<'w, 's> {
         state: &mut SystemState<Self>,
         world: &mut World,
     ) {
-        let params = state.get_mut(world);
+        let mut params = state.get_mut(world);
         let Some(description_entity) = get_selected_description_entity(
             selection,
             &params.model_instances,
@@ -148,9 +148,18 @@ impl<'w, 's> WidgetSystem<Inspect> for InspectRobotProperties<'w, 's> {
             return;
         };
         // Ensure that this widget is displayed only when there is a valid Robot property
-        let Ok(ModelProperty(_robot)) = params.model_descriptions.get(description_entity) else {
+        let Ok(mut robot_model_property) = params.model_descriptions.get_mut(description_entity)
+        else {
             return;
         };
+
+        ui.horizontal(|ui| {
+            ui.label("Fleet:");
+            TextEdit::singleline(&mut robot_model_property.0.fleet)
+                .desired_width(ui.available_width())
+                .show(ui);
+        });
+
         ui.label("Robot Properties");
 
         let children: Result<SmallVec<[_; 16]>, _> = params