From a24365237c8f4a0605512ecaf4a838b0d12f09ee Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Tue, 17 Sep 2024 17:33:52 +0200 Subject: [PATCH] rm legacy hubScripts --- backend/windmill-api/src/workspaces.rs | 16 +++++++--------- frontend/src/lib/hubPaths.json | 6 +----- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/backend/windmill-api/src/workspaces.rs b/backend/windmill-api/src/workspaces.rs index d826be203b6cf..f6e478730ede2 100644 --- a/backend/windmill-api/src/workspaces.rs +++ b/backend/windmill-api/src/workspaces.rs @@ -168,9 +168,9 @@ pub struct WorkspaceSettings { pub error_handler: Option, pub error_handler_extra_args: Option, pub error_handler_muted_on_cancel: Option, - pub large_file_storage: Option, // effectively: DatasetsStorage - pub git_sync: Option, // effectively: WorkspaceGitSyncSettings - pub deploy_ui: Option, // effectively: WorkspaceDeploymentUISettings + pub large_file_storage: Option, // effectively: DatasetsStorage + pub git_sync: Option, // effectively: WorkspaceGitSyncSettings + pub deploy_ui: Option, // effectively: WorkspaceDeploymentUISettings pub default_app: Option, pub automatic_billing: bool, pub default_scripts: Option, @@ -236,7 +236,7 @@ struct EditCopilotConfig { struct LargeFileStorageWithSecondary { #[serde(flatten)] large_file_storage: LargeFileStorage, - + #[serde(default)] secondary_storage: HashMap, } @@ -1071,7 +1071,6 @@ async fn edit_deploy_ui_config( )); } - #[cfg(feature = "enterprise")] async fn edit_deploy_ui_config( authed: ApiAuthed, @@ -1097,8 +1096,9 @@ async fn edit_deploy_ui_config( .await?; if let Some(deploy_ui_settings) = new_config.deploy_ui_settings { - let serialized_config = serde_json::to_value::(deploy_ui_settings) - .map_err(|err| Error::InternalErr(err.to_string()))?; + let serialized_config = + serde_json::to_value::(deploy_ui_settings) + .map_err(|err| Error::InternalErr(err.to_string()))?; sqlx::query!( "UPDATE workspace_settings SET deploy_ui = $1 WHERE workspace_id = $2", @@ -1120,8 +1120,6 @@ async fn edit_deploy_ui_config( Ok(format!("Edit deployment UI config for workspace {}", &w_id)) } - - #[derive(Deserialize)] pub struct EditDefaultApp { pub default_app_path: Option, diff --git a/frontend/src/lib/hubPaths.json b/frontend/src/lib/hubPaths.json index e11589f320446..71b75430cb9c3 100644 --- a/frontend/src/lib/hubPaths.json +++ b/frontend/src/lib/hubPaths.json @@ -1,14 +1,10 @@ { - "gitSyncLegacy0": "hub/8931/sync-script-to-git-repo-windmill", "gitSync": "hub/9074/sync-script-to-git-repo-windmill", "gitSyncTest": "hub/9073/git-repo-test-read-write-windmill", "slackErrorHandler": "hub/9079/workspace-or-schedule-error-handler-slack", - "slackErrorHandler_0": "hub/6512/workspace-or-schedule-error-handler-slack", "slackRecoveryHandler": "hub/9080/slack/schedule-recovery-handler-slack", - "slackRecoveryHandler_1": "hub/9067/slack/schedule-recovery-handler-slack", - "slackRecoveryHandler_0": "hub/2430/slack/schedule-recovery-handler-slack", "slackSuccessHandler": "hub/9072/slack/schedule-success-handler-slack", "slackReport": "hub/9084/slack", "discordReport": "hub/9085/discord", "smtpReport": "hub/9086/smtp" -} \ No newline at end of file +}