cleanup is_flow usage and impl (#4923)

This commit is contained in:
Lucas Abel
2024-12-13 18:08:01 +01:00
committed by GitHub
parent 30256ae6ec
commit 74a89552c7
3 changed files with 14 additions and 19 deletions
+1 -4
View File
@@ -2487,10 +2487,7 @@ impl Job {
}
pub fn is_flow(&self) -> bool {
matches!(
self.job_kind(),
JobKind::Flow | JobKind::FlowPreview | JobKind::SingleScriptFlow | JobKind::FlowNode
)
self.job_kind().is_flow()
}
pub fn job_kind(&self) -> &JobKind {
+11 -5
View File
@@ -45,6 +45,15 @@ pub enum JobKind {
AppScript,
}
impl JobKind {
pub fn is_flow(&self) -> bool {
matches!(
self,
JobKind::Flow | JobKind::FlowPreview | JobKind::SingleScriptFlow | JobKind::FlowNode
)
}
}
#[derive(sqlx::FromRow, Debug, Serialize, Clone)]
pub struct QueuedJob {
pub workspace_id: String,
@@ -116,10 +125,7 @@ impl QueuedJob {
.unwrap_or("tmp/main")
}
pub fn is_flow(&self) -> bool {
matches!(
self.job_kind,
JobKind::Flow | JobKind::FlowPreview | JobKind::SingleScriptFlow | JobKind::FlowNode
)
self.job_kind.is_flow()
}
pub fn full_path_with_workspace(&self) -> String {
@@ -278,7 +284,7 @@ pub enum JobPayload {
},
FlowNode {
id: FlowNodeId, // flow_node(id).
path: String, // flow node inner path (e.g. `outer/branchall-42`).
path: String, // flow node inner path (e.g. `outer/branchall-42`).
},
AppScript {
id: AppScriptId, // app_script(id).
+2 -10
View File
@@ -2124,10 +2124,7 @@ fn fullpath_with_workspace(
job_kind: &JobKind,
) -> String {
let path = script_path.map(String::as_str).unwrap_or("tmp/main");
let is_flow = matches!(
job_kind,
&JobKind::Flow | &JobKind::FlowPreview | &JobKind::SingleScriptFlow | &JobKind::FlowNode
);
let is_flow = job_kind.is_flow();
format!(
"{}/{}/{}",
workspace_id,
@@ -3415,12 +3412,7 @@ pub async fn push<'c, 'd>(
let interpolated_tag = tag.map(|x| interpolate_args(x, &args, workspace_id));
let default = || {
let ntag = if job_kind == JobKind::Flow
|| job_kind == JobKind::FlowPreview
|| job_kind == JobKind::SingleScriptFlow
|| job_kind == JobKind::Identity
|| job_kind == JobKind::FlowNode
{
let ntag = if job_kind.is_flow() || job_kind == JobKind::Identity {
"flow".to_string()
} else if job_kind == JobKind::Dependencies
|| job_kind == JobKind::FlowDependencies