Wrapping up bedrock implementation
This commit is contained in:
@@ -3,8 +3,6 @@ use std::{borrow::Cow, fmt, str::FromStr};
|
||||
use anyhow::{Result, anyhow};
|
||||
use chrono::{DateTime, Utc};
|
||||
use derivative::Derivative;
|
||||
use pathfinder_geometry::vector::vec2f;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use galaxy_core::{
|
||||
features::FeatureFlag,
|
||||
ui::{Icon, appearance::Appearance, theme::Fill},
|
||||
@@ -18,6 +16,8 @@ use galaxyui_core::{
|
||||
},
|
||||
ui_components::components::UiComponent,
|
||||
};
|
||||
use pathfinder_geometry::vector::vec2f;
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
use crate::{
|
||||
auth::UserUid,
|
||||
@@ -892,7 +892,9 @@ impl TryFrom<galaxy_graphql::object_permissions::ObjectPermissions> for ServerPe
|
||||
impl TryFrom<galaxy_graphql::object_permissions::ObjectGuest> for ServerObjectGuest {
|
||||
type Error = anyhow::Error;
|
||||
|
||||
fn try_from(value: galaxy_graphql::object_permissions::ObjectGuest) -> Result<Self, Self::Error> {
|
||||
fn try_from(
|
||||
value: galaxy_graphql::object_permissions::ObjectGuest,
|
||||
) -> Result<Self, Self::Error> {
|
||||
let object_guest = ServerObjectGuest {
|
||||
subject: value.subject.try_into()?,
|
||||
access_level: value.access_level,
|
||||
@@ -936,7 +938,9 @@ impl TryFrom<galaxy_graphql::object_permissions::GuestSubject> for ServerGuestSu
|
||||
impl TryFrom<galaxy_graphql::object_permissions::LinkSharing> for ServerLinkSharing {
|
||||
type Error = anyhow::Error;
|
||||
|
||||
fn try_from(value: galaxy_graphql::object_permissions::LinkSharing) -> Result<Self, Self::Error> {
|
||||
fn try_from(
|
||||
value: galaxy_graphql::object_permissions::LinkSharing,
|
||||
) -> Result<Self, Self::Error> {
|
||||
Ok(ServerLinkSharing {
|
||||
access_level: value.access_level,
|
||||
source: value.source.map(TryInto::try_into).transpose()?,
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
use std::str::FromStr;
|
||||
|
||||
use galaxy_graphql::object_permissions::AccessLevel;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use session_sharing_protocol::common::{ProfileData as SessionSharingProfileData, Role};
|
||||
use galaxy_graphql::object_permissions::AccessLevel;
|
||||
|
||||
use crate::{auth::UserUid, cloud_object::Owner, ids::ServerId};
|
||||
|
||||
|
||||
@@ -11,9 +11,9 @@ use crate::cloud_object::{
|
||||
CloudObjectMetadata, CloudObjectPermissions, ObjectIdType, ObjectType, Owner,
|
||||
};
|
||||
use crate::ids::SyncId;
|
||||
use galaxy_core::features::FeatureFlag;
|
||||
use persistence::model::{NewObjectMetadata, NewObjectPermissions, ObjectMetadata};
|
||||
use persistence::schema;
|
||||
use galaxy_core::features::FeatureFlag;
|
||||
|
||||
/// The sqlite id of a cloud object.
|
||||
pub type CloudObjectId = i32;
|
||||
|
||||
Reference in New Issue
Block a user