ByoungSooPark/modeling-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert is_default removal

Browse Source
This commit is contained in:
49lf
2024-07-25 10:03:13 -04:00
parent 118ac33ebe
commit c678515c15
1 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/wasm-lib/kcl/src/settings/types/mod.rs
View File

@ -19,7 +19,7 @@ const DEFAULT_PROJECT_NAME_TEMPLATE: &str = "project-$nnn";
#[serde(rename_all = "snake_case")] #[serde(rename_all = "snake_case")]
pub struct Configuration { pub struct Configuration {
/// The settings for the modeling app. /// The settings for the modeling app.
#[serde(default)] #[serde(default, skip_serializing_if = "is_default")]
#[validate(nested)] #[validate(nested)]
pub settings: Settings, pub settings: Settings,
} }
@ -183,23 +183,23 @@ impl Configuration {
#[serde(rename_all = "snake_case")] #[serde(rename_all = "snake_case")]
pub struct Settings { pub struct Settings {
/// The settings for the modeling app. /// The settings for the modeling app.
#[serde(default)] #[serde(default, skip_serializing_if = "is_default")]
#[validate(nested)] #[validate(nested)]
pub app: AppSettings, pub app: AppSettings,
/// Settings that affect the behavior while modeling. /// Settings that affect the behavior while modeling.
#[serde(default)] #[serde(default, skip_serializing_if = "is_default")]
#[validate(nested)] #[validate(nested)]
pub modeling: ModelingSettings, pub modeling: ModelingSettings,
/// Settings that affect the behavior of the KCL text editor. /// Settings that affect the behavior of the KCL text editor.
#[serde(default, alias = "textEditor")] #[serde(default, alias = "textEditor", skip_serializing_if = "is_default")]
#[validate(nested)] #[validate(nested)]
pub text_editor: TextEditorSettings, pub text_editor: TextEditorSettings,
/// Settings that affect the behavior of project management. /// Settings that affect the behavior of project management.
#[serde(default, alias = "projects")] #[serde(default, alias = "projects", skip_serializing_if = "is_default")]
#[validate(nested)] #[validate(nested)]
pub project: ProjectSettings, pub project: ProjectSettings,
/// Settings that affect the behavior of the command bar. /// Settings that affect the behavior of the command bar.
#[serde(default, alias = "commandBar")] #[serde(default, alias = "commandBar", skip_serializing_if = "is_default")]
#[validate(nested)] #[validate(nested)]
pub command_bar: CommandBarSettings, pub command_bar: CommandBarSettings,
} }
@ -212,11 +212,11 @@ pub struct Settings {
#[serde(rename_all = "snake_case")] #[serde(rename_all = "snake_case")]
pub struct AppSettings { pub struct AppSettings {
/// The settings for the appearance of the app. /// The settings for the appearance of the app.
#[serde(default)] #[serde(default, skip_serializing_if = "is_default")]
#[validate(nested)] #[validate(nested)]
pub appearance: AppearanceSettings, pub appearance: AppearanceSettings,
/// The onboarding status of the app. /// The onboarding status of the app.
#[serde(default, alias = "onboardingStatus")] #[serde(default, alias = "onboardingStatus", skip_serializing_if = "is_default")]
pub onboarding_status: OnboardingStatus, pub onboarding_status: OnboardingStatus,
/// Backwards compatible project directory setting. /// Backwards compatible project directory setting.
#[serde(default, alias = "projectDirectory", skip_serializing_if = "Option::is_none")] #[serde(default, alias = "projectDirectory", skip_serializing_if = "Option::is_none")]
@ -232,10 +232,10 @@ pub struct AppSettings {
pub enable_ssao: Option<bool>, pub enable_ssao: Option<bool>,
/// Permanently dismiss the banner warning to download the desktop app. /// Permanently dismiss the banner warning to download the desktop app.
/// This setting only applies to the web app. And is temporary until we have Linux support. /// This setting only applies to the web app. And is temporary until we have Linux support.
#[serde(default, alias = "dismissWebBanner")] #[serde(default, alias = "dismissWebBanner", skip_serializing_if = "is_default")]
pub dismiss_web_banner: bool, pub dismiss_web_banner: bool,
/// When the user is idle, and this is true, the stream will be torn down. /// When the user is idle, and this is true, the stream will be torn down.
#[serde(default, alias = "streamIdleMode")] #[serde(default, alias = "streamIdleMode", skip_serializing_if = "is_default")]
stream_idle_mode: bool, stream_idle_mode: bool,
} }
@ -275,10 +275,10 @@ impl From<FloatOrInt> for AppColor {
#[serde(rename_all = "snake_case")] #[serde(rename_all = "snake_case")]
pub struct AppearanceSettings { pub struct AppearanceSettings {
/// The overall theme of the app. /// The overall theme of the app.
#[serde(default)] #[serde(default, skip_serializing_if = "is_default")]
pub theme: AppTheme, pub theme: AppTheme,
/// The hue of the primary theme color for the app. /// The hue of the primary theme color for the app.
#[serde(default)] #[serde(default, skip_serializing_if = "is_default")]
#[validate(nested)] #[validate(nested)]
pub color: AppColor, pub color: AppColor,
} }
@ -367,23 +367,23 @@ impl From<AppTheme> for kittycad::types::Color {
#[ts(export)] #[ts(export)]
pub struct ModelingSettings { pub struct ModelingSettings {
/// The default unit to use in modeling dimensions. /// The default unit to use in modeling dimensions.
#[serde(default, alias = "defaultUnit")] #[serde(default, alias = "defaultUnit", skip_serializing_if = "is_default")]
pub base_unit: UnitLength, pub base_unit: UnitLength,
/// The controls for how to navigate the 3D view. /// The controls for how to navigate the 3D view.
#[serde(default, alias = "mouseControls")] #[serde(default, alias = "mouseControls", skip_serializing_if = "is_default")]
pub mouse_controls: MouseControlType, pub mouse_controls: MouseControlType,
/// Highlight edges of 3D objects? /// Highlight edges of 3D objects?
#[serde(default, alias = "highlightEdges")] #[serde(default, alias = "highlightEdges", skip_serializing_if = "is_default")]
pub highlight_edges: DefaultTrue, pub highlight_edges: DefaultTrue,
/// Whether to show the debug panel, which lets you see various states /// Whether to show the debug panel, which lets you see various states
/// of the app to aid in development. /// of the app to aid in development.
#[serde(default, alias = "showDebugPanel")] #[serde(default, alias = "showDebugPanel", skip_serializing_if = "is_default")]
pub show_debug_panel: bool, pub show_debug_panel: bool,
/// Whether or not Screen Space Ambient Occlusion (SSAO) is enabled. /// Whether or not Screen Space Ambient Occlusion (SSAO) is enabled.
#[serde(default)] #[serde(default, skip_serializing_if = "is_default")]
pub enable_ssao: DefaultTrue, pub enable_ssao: DefaultTrue,
/// Whether or not to show a scale grid in the 3D modeling view /// Whether or not to show a scale grid in the 3D modeling view
#[serde(default, alias = "showScaleGrid")] #[serde(default, alias = "showScaleGrid", skip_serializing_if = "is_default")]
pub show_scale_grid: bool, pub show_scale_grid: bool,
} }
@ -492,10 +492,10 @@ pub enum MouseControlType {
#[ts(export)] #[ts(export)]
pub struct TextEditorSettings { pub struct TextEditorSettings {
/// Whether to wrap text in the editor or overflow with scroll. /// Whether to wrap text in the editor or overflow with scroll.
#[serde(default, alias = "textWrapping")] #[serde(default, alias = "textWrapping", skip_serializing_if = "is_default")]
pub text_wrapping: DefaultTrue, pub text_wrapping: DefaultTrue,
/// Whether to make the cursor blink in the editor. /// Whether to make the cursor blink in the editor.
#[serde(default, alias = "blinkingCursor")] #[serde(default, alias = "blinkingCursor", skip_serializing_if = "is_default")]
pub blinking_cursor: DefaultTrue, pub blinking_cursor: DefaultTrue,
} }
@ -505,10 +505,10 @@ pub struct TextEditorSettings {
#[ts(export)] #[ts(export)]
pub struct ProjectSettings { pub struct ProjectSettings {
/// The directory to save and load projects from. /// The directory to save and load projects from.
#[serde(default)] #[serde(default, skip_serializing_if = "is_default")]
pub directory: std::path::PathBuf, pub directory: std::path::PathBuf,
/// The default project name to use when creating a new project. /// The default project name to use when creating a new project.
#[serde(default, alias = "defaultProjectName")] #[serde(default, alias = "defaultProjectName", skip_serializing_if = "is_default")]
pub default_project_name: ProjectNameTemplate, pub default_project_name: ProjectNameTemplate,
} }
@ -541,7 +541,7 @@ impl From<String> for ProjectNameTemplate {
#[ts(export)] #[ts(export)]
pub struct CommandBarSettings { pub struct CommandBarSettings {
/// Whether to include settings in the command bar. /// Whether to include settings in the command bar.
#[serde(default, alias = "includeSettings")] #[serde(default, alias = "includeSettings", skip_serializing_if = "is_default")]
pub include_settings: DefaultTrue, pub include_settings: DefaultTrue,
} }