Fix cursor focus and selection in input box, add AWS env var warning box, and remove AWS Bedrock login banner
This commit is contained in:
@@ -1,10 +1,10 @@
|
||||
use ordered_float::OrderedFloat;
|
||||
use pathfinder_color::ColorU;
|
||||
use pathfinder_geometry::vector::vec2f;
|
||||
use galaxy_core::ui::color::blend::Blend;
|
||||
use galaxy_core::ui::color::coloru_with_opacity;
|
||||
use galaxy_core::ui::icons::Icon;
|
||||
use galaxy_core::ui::theme::color::internal_colors;
|
||||
use ordered_float::OrderedFloat;
|
||||
use pathfinder_color::ColorU;
|
||||
use pathfinder_geometry::vector::vec2f;
|
||||
use warpui::elements::{
|
||||
AnchorPair, Container, CrossAxisAlignment, Expanded, Fill, Flex, Highlight, MainAxisSize,
|
||||
MouseStateHandle, OffsetPositioning, OffsetType, ParentElement, ParentOffsetBounds,
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
use std::collections::HashSet;
|
||||
use std::path::PathBuf;
|
||||
|
||||
use fuzzy_match::FuzzyMatchResult;
|
||||
use galaxy_core::context_flag::ContextFlag;
|
||||
use galaxy_core::features::FeatureFlag;
|
||||
use warpui::keymap::BindingId;
|
||||
@@ -10,6 +11,7 @@ use super::{conversations, warp_drive};
|
||||
use crate::drive::settings::WarpDriveSettings;
|
||||
use crate::search::action::CommandBindingDataSource;
|
||||
use crate::search::binding_source::BindingSource;
|
||||
use crate::search::command_palette::files::search_item::FileSearchItem;
|
||||
use crate::search::command_palette::mixer::{CommandPaletteItemAction, ItemSummary};
|
||||
use crate::search::command_palette::new_session::NewSessionDataSource;
|
||||
use crate::search::command_palette::repos::RepoDataSource;
|
||||
@@ -248,8 +250,6 @@ impl DataSourceStore {
|
||||
// Create a file search item from the summary
|
||||
use fuzzy_match::FuzzyMatchResult;
|
||||
|
||||
use crate::search::command_palette::files::search_item::FileSearchItem;
|
||||
|
||||
let search_item = FileSearchItem {
|
||||
path: PathBuf::from(path),
|
||||
project_directory: project_directory.clone(),
|
||||
@@ -265,7 +265,6 @@ impl DataSourceStore {
|
||||
} => {
|
||||
// Create a directory search item from the summary
|
||||
|
||||
|
||||
let search_item = FileSearchItem {
|
||||
path: PathBuf::from(path),
|
||||
project_directory: project_directory.clone(),
|
||||
|
||||
@@ -3,6 +3,7 @@ use std::sync::Arc;
|
||||
use chrono::Utc;
|
||||
use cloud_object_client::MockObjectClient;
|
||||
use settings::manager::SettingsManager;
|
||||
use warpui::App;
|
||||
|
||||
use super::*;
|
||||
use crate::auth::AuthStateProvider;
|
||||
|
||||
@@ -7,10 +7,10 @@ use std::sync::Arc;
|
||||
|
||||
use futures_lite::FutureExt;
|
||||
use fuzzy_match::FuzzyMatchResult;
|
||||
use instant::Instant;
|
||||
use itertools::Itertools;
|
||||
use galaxy_util::path::CleanPathResult;
|
||||
use galaxyui::{AppContext, Entity, SingletonEntity};
|
||||
use instant::Instant;
|
||||
use itertools::Itertools;
|
||||
|
||||
use super::search_item::{CreateFileSearchItem, FileSearchItem};
|
||||
use crate::code::opened_files::{OpenedFilesInRepo, OpenedFilesModel};
|
||||
|
||||
@@ -2,11 +2,11 @@ use std::fmt::Debug;
|
||||
use std::path::PathBuf;
|
||||
|
||||
use fuzzy_match::FuzzyMatchResult;
|
||||
use ordered_float::OrderedFloat;
|
||||
use galaxy_util::path::LineAndColumnArg;
|
||||
use galaxyui::elements::{Align, ConstrainedBox, Container, Flex, Icon, ParentElement, Text};
|
||||
use galaxyui::fonts::{Properties, Weight};
|
||||
use galaxyui::{AppContext, Element, SingletonEntity};
|
||||
use ordered_float::OrderedFloat;
|
||||
|
||||
use crate::appearance::Appearance;
|
||||
use crate::search::command_palette::mixer::CommandPaletteItemAction;
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
use pathfinder_color::ColorU;
|
||||
use galaxyui::elements::{
|
||||
ConstrainedBox, Container, CornerRadius, CrossAxisAlignment, Flex, Hoverable, Icon,
|
||||
MouseStateHandle, ParentElement, Radius, Text,
|
||||
};
|
||||
use galaxyui::platform::Cursor;
|
||||
use galaxyui::{Element, EventContext};
|
||||
use pathfinder_color::ColorU;
|
||||
|
||||
use crate::appearance::Appearance;
|
||||
use crate::drive::cloud_object_styling::warp_drive_icon_color;
|
||||
@@ -149,7 +149,7 @@ impl FilterChipRenderer for QueryFilter {
|
||||
mod styles {
|
||||
use galaxyui::elements::{Border, MouseState};
|
||||
|
||||
use crate::themes::theme::{Blend, Fill, WarpTheme};
|
||||
use crate::themes::theme::{Blend, Fill, GalaxyTheme};
|
||||
|
||||
/// Size of the border when the query filter is hovered.
|
||||
const HOVERED_BORDER_SIZE: f32 = 2.;
|
||||
|
||||
@@ -9,7 +9,7 @@ use crate::search::command_palette::launch_config::search_item::SearchItem;
|
||||
use crate::search::command_palette::mixer::CommandPaletteItemAction;
|
||||
use crate::search::data_source::{DataSourceSearchError, Query, QueryResult};
|
||||
use crate::search::mixer::{DataSourceRunErrorWrapper, SyncDataSource};
|
||||
use crate::user_config::{WarpConfig, WarpConfigUpdateEvent};
|
||||
use crate::user_config::{GalaxyConfig, GalaxyConfigUpdateEvent};
|
||||
|
||||
/// Datasource that searches against `LaunchConfig`s.
|
||||
pub struct DataSource {
|
||||
@@ -50,11 +50,11 @@ impl DataSource {
|
||||
|
||||
fn handle_config_event(
|
||||
&mut self,
|
||||
_: ModelHandle<WarpConfig>,
|
||||
event: &WarpConfigUpdateEvent,
|
||||
_: ModelHandle<GalaxyConfig>,
|
||||
event: &GalaxyConfigUpdateEvent,
|
||||
ctx: &mut ModelContext<Self>,
|
||||
) {
|
||||
if matches!(event, WarpConfigUpdateEvent::LaunchConfigs) {
|
||||
if matches!(event, GalaxyConfigUpdateEvent::LaunchConfigs) {
|
||||
self.searcher.refresh_search_index(ctx);
|
||||
}
|
||||
}
|
||||
@@ -123,14 +123,19 @@ impl LaunchConfigSearcher for FuzzyLaunchConfigSearcher {
|
||||
#[cfg(not(target_family = "wasm"))]
|
||||
mod full_text_searcher {
|
||||
|
||||
use std::collections::HashMap;
|
||||
use std::sync::Arc;
|
||||
|
||||
use fuzzy_match::FuzzyMatchResult;
|
||||
use warp_search_core::define_search_schema;
|
||||
use warpui::r#async::executor::Background;
|
||||
use warpui::{AppContext, SingletonEntity};
|
||||
|
||||
use crate::launch_configs::launch_config::LaunchConfig;
|
||||
use crate::search::command_palette::launch_config::data_source::LaunchConfigSearcher;
|
||||
use crate::search::command_palette::launch_config::search_item::SearchItem;
|
||||
use crate::search::searcher::{AsyncSearcher, DEFAULT_MEMORY_BUDGET, SCORE_CONVERSION_FACTOR};
|
||||
use crate::user_config::WarpConfig;
|
||||
use crate::user_config::GalaxyConfig;
|
||||
|
||||
// The name of the launch configs are duplicated to ensure that the searcher
|
||||
// hashes the name to uniquely identify the launch config.
|
||||
|
||||
@@ -246,12 +246,17 @@ pub use full_text_searcher::FullTextSessionSearcher;
|
||||
mod full_text_searcher {
|
||||
use std::collections::HashMap;
|
||||
|
||||
use galaxyui::{AppContext, ModelHandle};
|
||||
use itertools::Itertools;
|
||||
use warp_search_core::define_search_schema;
|
||||
|
||||
use crate::pane_group::PaneId;
|
||||
use crate::search::command_palette::navigation::search::{
|
||||
searchable_session_string_and_ranges, MatchedSession, SearcherAction,
|
||||
SessionHighlightIndices, SessionMatchResult, SessionSearcher,
|
||||
};
|
||||
use crate::search::command_palette::navigation::search_item::SearchItem;
|
||||
use crate::search::data_source::QueryResult;
|
||||
use crate::search::searcher::{DEFAULT_MEMORY_BUDGET, SCORE_CONVERSION_FACTOR};
|
||||
use crate::session_management::{SessionNavigationData, SessionSource};
|
||||
|
||||
|
||||
@@ -300,6 +300,9 @@ impl NewSessionSearcher for FuzzyNewSessionSearcher {
|
||||
#[cfg(not(target_family = "wasm"))]
|
||||
mod full_text_searcher {
|
||||
|
||||
use std::collections::HashMap;
|
||||
use std::sync::Arc;
|
||||
|
||||
use fuzzy_match::FuzzyMatchResult;
|
||||
use warp_search_core::define_search_schema;
|
||||
use warpui::r#async::executor::Background;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
use std::sync::Arc;
|
||||
|
||||
use fuzzy_match::FuzzyMatchResult;
|
||||
use ordered_float::OrderedFloat;
|
||||
use galaxyui::{AppContext, Element, SingletonEntity};
|
||||
use ordered_float::OrderedFloat;
|
||||
|
||||
use super::new_session_option::NewSessionOption;
|
||||
use crate::appearance::Appearance;
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
use pathfinder_color::ColorU;
|
||||
use galaxy_core::ui::theme::Fill;
|
||||
use pathfinder_color::ColorU;
|
||||
use warpui::elements::{Align, ConstrainedBox, Container, Empty};
|
||||
use warpui::Element;
|
||||
|
||||
|
||||
@@ -2,11 +2,11 @@ use std::path::Path;
|
||||
|
||||
use ai::workspace::WorkspaceMetadata;
|
||||
use fuzzy_match::FuzzyMatchResult;
|
||||
use ordered_float::OrderedFloat;
|
||||
use galaxy_core::ui::theme::Fill;
|
||||
use galaxyui::elements::{Align, ConstrainedBox, Flex, Highlight, ParentElement, Shrinkable, Text};
|
||||
use galaxyui::fonts::{Properties, Weight};
|
||||
use galaxyui::{AppContext, Element, SingletonEntity};
|
||||
use ordered_float::OrderedFloat;
|
||||
|
||||
use crate::appearance::Appearance;
|
||||
use crate::search::action::search_item::styles;
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
use itertools::Itertools;
|
||||
use warpui::keymap::BindingId;
|
||||
|
||||
use super::*;
|
||||
|
||||
|
||||
@@ -2,8 +2,6 @@ use std::collections::HashSet;
|
||||
use std::ops::Deref;
|
||||
use std::sync::Arc;
|
||||
|
||||
use itertools::Itertools;
|
||||
use lazy_static::lazy_static;
|
||||
use galaxy_core::send_telemetry_from_app_ctx;
|
||||
use galaxy_util::path::LineAndColumnArg;
|
||||
use galaxyui::elements::{
|
||||
@@ -19,6 +17,8 @@ use galaxyui::{
|
||||
AppContext, Element, Entity, EntityId, FocusContext, ModelHandle, SingletonEntity,
|
||||
TypedActionView, ViewContext, ViewHandle, WindowId,
|
||||
};
|
||||
use itertools::Itertools;
|
||||
use lazy_static::lazy_static;
|
||||
|
||||
use super::super::palette_styles as styles;
|
||||
use super::CommandPaletteMixer;
|
||||
@@ -44,7 +44,7 @@ use crate::server::telemetry::{LaunchConfigUiLocation, TelemetryEvent};
|
||||
use crate::session_management::SessionSource;
|
||||
use crate::settings::CtrlTabBehavior;
|
||||
use crate::terminal::keys_settings::KeysSettings;
|
||||
use crate::themes::theme::WarpTheme;
|
||||
use crate::themes::theme::GalaxyTheme;
|
||||
use crate::view_components::DismissibleToast;
|
||||
use crate::workspace::{active_terminal_in_window, ForkedConversationDestination, WorkspaceAction};
|
||||
use crate::{send_telemetry_from_ctx, ToastStack};
|
||||
|
||||
@@ -550,15 +550,22 @@ mod full_text_searcher {
|
||||
use crate::cloud_object::{
|
||||
CloudObject, CloudObjectLocation, GenericStringObjectFormat, JsonObjectType, ObjectType,
|
||||
};
|
||||
use crate::drive::folders::CloudFolder;
|
||||
use crate::env_vars::CloudEnvVarCollection;
|
||||
use crate::notebooks::manager::NotebookManager;
|
||||
use crate::notebooks::CloudNotebook;
|
||||
use crate::search::command_palette::warp_drive::data_source::WarpDriveSearcher;
|
||||
use crate::search::command_palette::warp_drive::env_var_collection_search_item::{
|
||||
EnvVarCollectionSearchItem, ENV_VAR_NAME_SEPARATOR,
|
||||
};
|
||||
use crate::search::command_palette::warp_drive::notebook_search_item::NotebookSearchItem;
|
||||
use crate::search::command_palette::warp_drive::workflow_search_item::WorkflowSearchItem;
|
||||
use crate::search::env_var_collections::fuzzy_match::FuzzyMatchEnvVarCollectionResult;
|
||||
use crate::search::notebooks::fuzzy_match::FuzzyMatchNotebookResult;
|
||||
use crate::search::searcher::{AsyncSearcher, DEFAULT_MEMORY_BUDGET, SCORE_CONVERSION_FACTOR};
|
||||
use crate::search::workflows::fuzzy_match::FuzzyMatchWorkflowResult;
|
||||
use crate::server::ids::ObjectUid;
|
||||
use crate::workflows::CloudWorkflow;
|
||||
|
||||
/// Memory budget for the search index of warp drive.
|
||||
/// Warp could potentially have a lot of objects, so we increase it from the default of 50MB to 100MB
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
mod items;
|
||||
use std::collections::HashMap;
|
||||
|
||||
pub use items::Items;
|
||||
use galaxy_core::context_flag::ContextFlag;
|
||||
use galaxy_core::features::FeatureFlag;
|
||||
use galaxyui::elements::{Container, Flex, MouseStateHandle, ParentElement, Shrinkable, Wrap};
|
||||
@@ -9,6 +8,7 @@ use galaxyui::{
|
||||
AppContext, Element, Entity, ModelHandle, SingletonEntity, TypedActionView, View, ViewContext,
|
||||
WindowId,
|
||||
};
|
||||
pub use items::Items;
|
||||
|
||||
use crate::appearance::Appearance;
|
||||
use crate::drive::settings::WarpDriveSettings;
|
||||
|
||||
Reference in New Issue
Block a user