Remove the task Project tab; ⌘P selects the project
This commit is contained in:
@@ -10,7 +10,6 @@ let tabLabels: [TaskTab: String] = [
|
||||
.page: "Page",
|
||||
.terminal: "Terminal",
|
||||
.workflow: "Workflow",
|
||||
.project: "Project",
|
||||
]
|
||||
|
||||
struct HalfSplit: Layout {
|
||||
@@ -191,9 +190,13 @@ private struct TaskPane: View {
|
||||
VStack(spacing: 0) {
|
||||
TaskBar()
|
||||
VStack(spacing: 0) {
|
||||
TabStrip()
|
||||
TaskTabBody(tab: store.primaryTab)
|
||||
.frame(maxWidth: .infinity, maxHeight: .infinity)
|
||||
if store.selectedTaskId == nil {
|
||||
ProjectView()
|
||||
} else {
|
||||
TabStrip()
|
||||
TaskTabBody(tab: store.primaryTab)
|
||||
.frame(maxWidth: .infinity, maxHeight: .infinity)
|
||||
}
|
||||
}
|
||||
.overlay {
|
||||
if let sheet = store.sheet, sheet.owner == .lead {
|
||||
@@ -239,8 +242,6 @@ struct TaskTabBody: View {
|
||||
TerminalTab()
|
||||
case .workflow:
|
||||
WorkflowView()
|
||||
case .project:
|
||||
ProjectView()
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -377,13 +378,13 @@ private struct TabStrip: View {
|
||||
private func info() -> Info {
|
||||
let tab = store.sheet.flatMap { $0.owner == .lead ? nil : $0.tab } ?? store.primaryTab
|
||||
guard let taskId = store.selectedTaskId else {
|
||||
return Info(order: [.project], tab: .project)
|
||||
return Info(order: [], tab: tab)
|
||||
}
|
||||
let run = store.findTask(taskId)?.workflow != nil
|
||||
let team = !store.team(taskId).isEmpty
|
||||
let order = taskTabs.filter { t in
|
||||
if run {
|
||||
return t == .workflow || t == .project
|
||||
return t == .workflow
|
||||
}
|
||||
if t == tab {
|
||||
return true
|
||||
|
||||
Reference in New Issue
Block a user