* feat: Add workspace diff viewer and deployment UI for forked workspaces - Add backend endpoint for comparing two workspaces - Implement comparison logic for scripts, flows, apps, resources, variables - Create ForkWorkspaceBanner component to detect and display fork status - Build WorkspaceComparisonDrawer for detailed diff viewing and deployment - Add DiffViewer component for line-by-line comparisons - Support bidirectional deployment (fork to parent or parent to fork) - Add conflict detection for items that are both ahead and behind - Include delete fork option when no changes remain Note: Backend implementation requires sqlx prepare to be run for full functionality Co-authored-by: windmill-internal-app[bot] <windmill-internal-app[bot]@users.noreply.github.com> * Fix banner and use wworkspace_diff table * satisfactory UI WIP * UI complete * Deploy button * Comaprison and reset tally * compare all types of items * Show summaries * Disable buttons during deployment * Auto select all on entering page * Change migration to have 'exists_in' cols * Show new and deleted items * frontend fixes * Block delpoyment if changes don't match (new chagnes detected) * Message to block whe changes are behind * Skip workspaces pre-migration * Remove unused code * Fix apps comparison * Only return changes where user has visibility * No deploy button if no access to all changes * Prepare sqlx * Remove redundant message * CI: update ee repo ref * eereporef bis * Small tweaks * Remove unused struct * Remove unused refactor component * Fix npm run check * Remove unused component * chore: update ee-repo-ref to bbf406edc222199ca2e6076da12c376fb4ff28c5 This commit updates the EE repository reference after PR #359 was merged in windmill-ee-private. Previous ee-repo-ref: 6aae845c5629ae32da43dbfbdc4566e5bf90fb1e New ee-repo-ref: bbf406edc222199ca2e6076da12c376fb4ff28c5 Automated by sync-ee-ref workflow. --------- Co-authored-by: claude[bot] <209825114+claude[bot]@users.noreply.github.com> Co-authored-by: windmill-internal-app[bot] <windmill-internal-app[bot]@users.noreply.github.com> Co-authored-by: Ruben Fiszel <ruben@windmill.dev>
132 lines
5.8 KiB
Rust
132 lines
5.8 KiB
Rust
/*
|
|
* Author: Ruben Fiszel
|
|
* Copyright: Windmill Labs, Inc 2022
|
|
* This file and its contents are licensed under the AGPLv3 License.
|
|
* Please see the included NOTICE for copyright information and
|
|
* LICENSE-AGPL for a copy of the license.
|
|
*/
|
|
|
|
use windmill_common::{scripts::ScriptHash, DB};
|
|
|
|
#[cfg(feature = "private")]
|
|
pub mod git_sync_ee;
|
|
pub mod git_sync_oss;
|
|
|
|
pub use git_sync_oss::{handle_deployment_metadata, handle_fork_branch_creation};
|
|
|
|
#[derive(Clone, Debug)]
|
|
pub enum DeployedObject {
|
|
Script { hash: ScriptHash, path: String, parent_path: Option<String> },
|
|
Flow { path: String, parent_path: Option<String>, version: i64 },
|
|
App { path: String, version: i64, parent_path: Option<String> },
|
|
Folder { path: String },
|
|
Resource { path: String, parent_path: Option<String> },
|
|
Variable { path: String, parent_path: Option<String> },
|
|
Schedule { path: String },
|
|
ResourceType { path: String },
|
|
User { email: String },
|
|
Group { name: String },
|
|
HttpTrigger { path: String },
|
|
WebsocketTrigger { path: String },
|
|
KafkaTrigger { path: String },
|
|
NatsTrigger { path: String },
|
|
PostgresTrigger { path: String },
|
|
MqttTrigger { path: String },
|
|
SqsTrigger { path: String },
|
|
GcpTrigger { path: String },
|
|
EmailTrigger { path: String },
|
|
Settings { setting_type: String },
|
|
Key { key_type: String },
|
|
}
|
|
|
|
impl DeployedObject {
|
|
pub fn get_path(&self) -> String {
|
|
match self {
|
|
DeployedObject::Script { path, .. } => path.to_owned(),
|
|
DeployedObject::Flow { path, .. } => path.to_owned(),
|
|
DeployedObject::App { path, .. } => path.to_owned(),
|
|
DeployedObject::Folder { path, .. } => path.to_owned(),
|
|
DeployedObject::Resource { path, .. } => path.to_owned(),
|
|
DeployedObject::Variable { path, .. } => path.to_owned(),
|
|
DeployedObject::Schedule { path, .. } => path.to_owned(),
|
|
DeployedObject::ResourceType { path, .. } => path.to_owned(),
|
|
DeployedObject::User { email } => format!("users/{email}"),
|
|
DeployedObject::Group { name } => format!("groups/{name}"),
|
|
DeployedObject::HttpTrigger { path } => path.to_owned(),
|
|
DeployedObject::WebsocketTrigger { path } => path.to_owned(),
|
|
DeployedObject::KafkaTrigger { path } => path.to_owned(),
|
|
DeployedObject::NatsTrigger { path } => path.to_owned(),
|
|
DeployedObject::PostgresTrigger { path } => path.to_owned(),
|
|
DeployedObject::MqttTrigger { path } => path.to_owned(),
|
|
DeployedObject::SqsTrigger { path } => path.to_owned(),
|
|
DeployedObject::GcpTrigger { path } => path.to_owned(),
|
|
DeployedObject::EmailTrigger { path } => path.to_owned(),
|
|
DeployedObject::Settings { .. } => "settings.yaml".to_string(),
|
|
DeployedObject::Key { .. } => "encryption_key.yaml".to_string(),
|
|
}
|
|
}
|
|
|
|
pub fn get_ignore_regex_filter(&self) -> bool {
|
|
match self {
|
|
Self::User { .. }
|
|
| Self::Group { .. }
|
|
| Self::ResourceType { .. }
|
|
| Self::Settings { .. }
|
|
| Self::Key { .. } => true,
|
|
_ => false,
|
|
}
|
|
}
|
|
|
|
pub fn get_parent_path(&self) -> Option<String> {
|
|
match self {
|
|
DeployedObject::Script { parent_path, .. } => parent_path.to_owned(),
|
|
DeployedObject::Flow { parent_path, .. } => parent_path.to_owned(),
|
|
DeployedObject::App { parent_path, .. } => parent_path.to_owned(),
|
|
DeployedObject::Folder { .. } => None,
|
|
DeployedObject::Resource { parent_path, .. } => parent_path.to_owned(),
|
|
DeployedObject::Variable { parent_path, .. } => parent_path.to_owned(),
|
|
DeployedObject::Schedule { .. } => None,
|
|
DeployedObject::ResourceType { .. } => None,
|
|
DeployedObject::User { .. } => None,
|
|
DeployedObject::Group { .. } => None,
|
|
DeployedObject::HttpTrigger { .. } => None,
|
|
DeployedObject::WebsocketTrigger { .. } => None,
|
|
DeployedObject::KafkaTrigger { .. } => None,
|
|
DeployedObject::NatsTrigger { .. } => None,
|
|
DeployedObject::PostgresTrigger { .. } => None,
|
|
DeployedObject::MqttTrigger { .. } => None,
|
|
DeployedObject::SqsTrigger { .. } => None,
|
|
DeployedObject::GcpTrigger { .. } => None,
|
|
DeployedObject::EmailTrigger { .. } => None,
|
|
DeployedObject::Settings { .. } => None,
|
|
DeployedObject::Key { .. } => None,
|
|
}
|
|
}
|
|
|
|
pub fn get_kind(&self) -> String {
|
|
match self {
|
|
DeployedObject::Script { .. } => "script",
|
|
DeployedObject::Flow { .. } => "flow",
|
|
DeployedObject::App { .. } => "app",
|
|
DeployedObject::Folder { .. } => "folder",
|
|
DeployedObject::Resource { .. } => "resource",
|
|
DeployedObject::Variable { .. } => "variable",
|
|
DeployedObject::Schedule { .. } => "schedule",
|
|
DeployedObject::ResourceType { .. } => "resource_type",
|
|
DeployedObject::User { .. } => "user",
|
|
DeployedObject::Group { .. } => "group",
|
|
DeployedObject::HttpTrigger { .. } => "http_trigger",
|
|
DeployedObject::WebsocketTrigger { .. } => "websocket_trigger",
|
|
DeployedObject::KafkaTrigger { .. } => "kafka_trigger",
|
|
DeployedObject::NatsTrigger { .. } => "nats_trigger",
|
|
DeployedObject::PostgresTrigger { .. } => "postgres_trigger",
|
|
DeployedObject::MqttTrigger { .. } => "mqtt_trigger",
|
|
DeployedObject::SqsTrigger { .. } => "sqs_trigger",
|
|
DeployedObject::GcpTrigger { .. } => "gcp_trigger",
|
|
DeployedObject::EmailTrigger { .. } => "email_trigger",
|
|
DeployedObject::Settings { .. } => "settings",
|
|
DeployedObject::Key { .. } => "key",
|
|
}.to_string()
|
|
}
|
|
}
|