Skip to content

Commit

Permalink
rm legacy hubScripts
Browse files Browse the repository at this point in the history
  • Loading branch information
rubenfiszel committed Sep 17, 2024
1 parent c661ac8 commit a243652
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 14 deletions.
16 changes: 7 additions & 9 deletions backend/windmill-api/src/workspaces.rs
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,9 @@ pub struct WorkspaceSettings {
pub error_handler: Option<String>,
pub error_handler_extra_args: Option<serde_json::Value>,
pub error_handler_muted_on_cancel: Option<bool>,
pub large_file_storage: Option<serde_json::Value>, // effectively: DatasetsStorage
pub git_sync: Option<serde_json::Value>, // effectively: WorkspaceGitSyncSettings
pub deploy_ui: Option<serde_json::Value>, // effectively: WorkspaceDeploymentUISettings
pub large_file_storage: Option<serde_json::Value>, // effectively: DatasetsStorage
pub git_sync: Option<serde_json::Value>, // effectively: WorkspaceGitSyncSettings
pub deploy_ui: Option<serde_json::Value>, // effectively: WorkspaceDeploymentUISettings
pub default_app: Option<String>,
pub automatic_billing: bool,
pub default_scripts: Option<serde_json::Value>,
Expand Down Expand Up @@ -236,7 +236,7 @@ struct EditCopilotConfig {
struct LargeFileStorageWithSecondary {
#[serde(flatten)]
large_file_storage: LargeFileStorage,

#[serde(default)]
secondary_storage: HashMap<String, LargeFileStorage>,
}

Expand Down Expand Up @@ -1071,7 +1071,6 @@ async fn edit_deploy_ui_config(
));
}


#[cfg(feature = "enterprise")]
async fn edit_deploy_ui_config(
authed: ApiAuthed,
Expand All @@ -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::<WorkspaceDeploymentUISettings>(deploy_ui_settings)
.map_err(|err| Error::InternalErr(err.to_string()))?;
let serialized_config =
serde_json::to_value::<WorkspaceDeploymentUISettings>(deploy_ui_settings)
.map_err(|err| Error::InternalErr(err.to_string()))?;

sqlx::query!(
"UPDATE workspace_settings SET deploy_ui = $1 WHERE workspace_id = $2",
Expand All @@ -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<String>,
Expand Down
6 changes: 1 addition & 5 deletions frontend/src/lib/hubPaths.json
Original file line number Diff line number Diff line change
@@ -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"
}
}

0 comments on commit a243652

Please sign in to comment.