Rebrand to Galaxy, major improvements to Bedrock support, still needs some TLC though
This commit is contained in:
@@ -23,7 +23,7 @@ use anyhow::{anyhow, Result};
|
||||
use async_channel::Sender;
|
||||
use async_trait::async_trait;
|
||||
use chrono::{DateTime, Utc};
|
||||
use warp_graphql::object_permissions::AccessLevel;
|
||||
use galaxy_graphql::object_permissions::AccessLevel;
|
||||
|
||||
use crate::{
|
||||
cloud_object::{
|
||||
|
||||
@@ -22,12 +22,12 @@ use super::update_manager::UpdateManager;
|
||||
use chrono::{DateTime, Utc};
|
||||
use futures_util::stream::AbortHandle;
|
||||
use std::time::Duration;
|
||||
use warpui::r#async::Timer;
|
||||
use galaxyui::r#async::Timer;
|
||||
|
||||
use async_channel::Sender;
|
||||
|
||||
use std::sync::Arc;
|
||||
use warpui::{Entity, ModelContext, RequestState, SingletonEntity};
|
||||
use galaxyui::{Entity, ModelContext, RequestState, SingletonEntity};
|
||||
|
||||
use instant::Instant;
|
||||
|
||||
|
||||
@@ -7,8 +7,8 @@ use std::{
|
||||
};
|
||||
|
||||
use settings::manager::SettingsManager;
|
||||
use warp_core::execution_mode::{AppExecutionMode, ExecutionMode};
|
||||
use warpui::{App, ModelHandle, SingletonEntity};
|
||||
use galaxy_core::execution_mode::{AppExecutionMode, ExecutionMode};
|
||||
use galaxyui::{App, ModelHandle, SingletonEntity};
|
||||
|
||||
use crate::{
|
||||
auth::{auth_manager::AuthManager, AuthStateProvider},
|
||||
|
||||
@@ -79,13 +79,13 @@ use std::collections::{HashMap, HashSet};
|
||||
use std::future::Future;
|
||||
use std::sync::{mpsc::SyncSender, Arc};
|
||||
use std::time::Duration;
|
||||
use warp_core::features::FeatureFlag;
|
||||
use warp_graphql::mcp_gallery_template::MCPGalleryTemplate;
|
||||
use warp_graphql::object_permissions::AccessLevel;
|
||||
use warp_graphql::scalars::time::ServerTimestamp;
|
||||
use warpui::r#async::{FutureId, Timer};
|
||||
use warpui::{duration_with_jitter, AppContext};
|
||||
use warpui::{Entity, ModelContext, RequestState, RetryOption, SingletonEntity};
|
||||
use galaxy_core::features::FeatureFlag;
|
||||
use galaxy_graphql::mcp_gallery_template::MCPGalleryTemplate;
|
||||
use galaxy_graphql::object_permissions::AccessLevel;
|
||||
use galaxy_graphql::scalars::time::ServerTimestamp;
|
||||
use galaxyui::r#async::{FutureId, Timer};
|
||||
use galaxyui::{duration_with_jitter, AppContext};
|
||||
use galaxyui::{Entity, ModelContext, RequestState, RetryOption, SingletonEntity};
|
||||
|
||||
use super::listener::ObjectUpdateMessage;
|
||||
|
||||
@@ -2703,8 +2703,8 @@ impl UpdateManager {
|
||||
ctx: &mut ModelContext<Self>,
|
||||
) where
|
||||
P: 'static + FnMut(Arc<dyn ObjectClient>) -> S,
|
||||
S: warpui::r#async::Spawnable + Future<Output = anyhow::Result<R>>,
|
||||
<S as Future>::Output: warpui::r#async::SpawnableOutput,
|
||||
S: galaxyui::r#async::Spawnable + Future<Output = anyhow::Result<R>>,
|
||||
<S as Future>::Output: galaxyui::r#async::SpawnableOutput,
|
||||
F: 'static + FnMut(R, &mut AppContext) -> Option<ServerPermissions>,
|
||||
{
|
||||
let object_client = self.object_client.clone();
|
||||
@@ -2765,8 +2765,8 @@ impl UpdateManager {
|
||||
mut on_success: impl FnMut(&mut Self, M, &mut ModelContext<Self>) + 'static,
|
||||
) where
|
||||
P: 'static + FnMut(Arc<dyn ObjectClient>) -> S,
|
||||
S: warpui::r#async::Spawnable + Future<Output = anyhow::Result<M>>,
|
||||
<S as Future>::Output: warpui::r#async::SpawnableOutput,
|
||||
S: galaxyui::r#async::Spawnable + Future<Output = anyhow::Result<M>>,
|
||||
<S as Future>::Output: galaxyui::r#async::SpawnableOutput,
|
||||
{
|
||||
let cloud_model = CloudModel::handle(ctx);
|
||||
let uid = server_id.uid();
|
||||
|
||||
@@ -3,9 +3,9 @@ use std::{collections::HashMap, sync::Arc, time::Duration};
|
||||
use chrono::{DateTime, Utc};
|
||||
use futures_lite::future;
|
||||
use settings::{RespectUserSyncSetting, SyncToCloud};
|
||||
use warp_core::features::FeatureFlag;
|
||||
use warp_graphql::{object_permissions::AccessLevel, scalars::time::ServerTimestamp};
|
||||
use warpui::{App, ModelHandle, SingletonEntity};
|
||||
use galaxy_core::features::FeatureFlag;
|
||||
use galaxy_graphql::{object_permissions::AccessLevel, scalars::time::ServerTimestamp};
|
||||
use galaxyui::{App, ModelHandle, SingletonEntity};
|
||||
|
||||
#[cfg(test)]
|
||||
use crate::server::server_api::object::MockObjectClient;
|
||||
@@ -1666,7 +1666,7 @@ fn test_sync_state_after_creation_failure_item_not_in_sync_queue() {
|
||||
.await;
|
||||
|
||||
// await long enough that all the sync queue retries are exhausted
|
||||
warpui::r#async::Timer::after(Duration::from_secs(10)).await;
|
||||
galaxyui::r#async::Timer::after(Duration::from_secs(10)).await;
|
||||
|
||||
// because there aren't any items in the sync queue left for this object,
|
||||
// it should be marked as errored
|
||||
@@ -1758,7 +1758,7 @@ fn test_sync_state_after_update_failure_item_in_sync_queue() {
|
||||
.await;
|
||||
|
||||
// await long enough that all the sync queue retries are exhausted
|
||||
warpui::r#async::Timer::after(Duration::from_secs(10)).await;
|
||||
galaxyui::r#async::Timer::after(Duration::from_secs(10)).await;
|
||||
|
||||
// because notebook updates are dependent on one another, all should have registered
|
||||
// as failed and there should be no updates left in the sync queue.
|
||||
@@ -2580,7 +2580,7 @@ fn test_metadata_after_trash_item_failure() {
|
||||
.await;
|
||||
|
||||
// await long enough that all the trash object retries are exhausted
|
||||
warpui::r#async::Timer::after(Duration::from_secs(10)).await;
|
||||
galaxyui::r#async::Timer::after(Duration::from_secs(10)).await;
|
||||
|
||||
assert_trashed_status_for_object(&mut app, &sync_id.uid(), false);
|
||||
assert_pending_status_for_object(&mut app, &sync_id.uid(), false);
|
||||
@@ -5761,7 +5761,7 @@ fn test_move_object_personal_to_team_failure() {
|
||||
.await;
|
||||
|
||||
// await long enough that all the move object retries are exhausted
|
||||
warpui::r#async::Timer::after(Duration::from_secs(10)).await;
|
||||
galaxyui::r#async::Timer::after(Duration::from_secs(10)).await;
|
||||
|
||||
assert_pending_online_only_change_for_object(&mut app, &sync_id.uid(), false);
|
||||
|
||||
@@ -6096,7 +6096,7 @@ fn test_move_workflow_with_enums_personal_to_team_failure() {
|
||||
.await;
|
||||
|
||||
// await long enough that all the move object retries are exhausted
|
||||
warpui::r#async::Timer::after(Duration::from_secs(10)).await;
|
||||
galaxyui::r#async::Timer::after(Duration::from_secs(10)).await;
|
||||
|
||||
// The workflow and enum should remain in the personal space
|
||||
assert_pending_online_only_change_for_object(&mut app, &workflow_sync_id.uid(), false);
|
||||
@@ -6341,7 +6341,7 @@ fn test_move_object_root_to_folder_failure() {
|
||||
.await;
|
||||
|
||||
// await long enough that all the move object retries are exhausted
|
||||
warpui::r#async::Timer::after(Duration::from_secs(10)).await;
|
||||
galaxyui::r#async::Timer::after(Duration::from_secs(10)).await;
|
||||
|
||||
assert_pending_online_only_change_for_object(&mut app, &sync_id.uid(), false);
|
||||
|
||||
@@ -6533,7 +6533,7 @@ fn test_move_object_folder_to_root_failure() {
|
||||
.await;
|
||||
|
||||
// await long enough that all the move object retries are exhausted
|
||||
warpui::r#async::Timer::after(Duration::from_secs(10)).await;
|
||||
galaxyui::r#async::Timer::after(Duration::from_secs(10)).await;
|
||||
|
||||
assert_pending_online_only_change_for_object(&mut app, &sync_id.uid(), false);
|
||||
|
||||
@@ -6729,7 +6729,7 @@ fn test_move_object_folder_to_folder_failure() {
|
||||
.await;
|
||||
|
||||
// await long enough that all the move object retries are exhausted
|
||||
warpui::r#async::Timer::after(Duration::from_secs(10)).await;
|
||||
galaxyui::r#async::Timer::after(Duration::from_secs(10)).await;
|
||||
|
||||
assert_pending_online_only_change_for_object(&mut app, &sync_id.uid(), false);
|
||||
|
||||
@@ -7496,7 +7496,7 @@ fn test_add_guest_failure() {
|
||||
ctx.await_spawned_future(update_manager.spawned_futures[0])
|
||||
})
|
||||
.await;
|
||||
warpui::r#async::Timer::after(Duration::from_secs(10)).await;
|
||||
galaxyui::r#async::Timer::after(Duration::from_secs(10)).await;
|
||||
|
||||
assert_pending_online_only_change_for_object(&mut app, &uid, false);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user