Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/src/models/banner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ export enum BannerType {
SuccessfulReorder = 'SuccessfulReorder',
ConflictsFound = 'ConflictsFound',
OSVersionNoLongerSupported = 'OSVersionNoLongerSupported',
WorktreesEnabled = 'WorktreesEnabled',
}

export type Banner =
Expand Down Expand Up @@ -122,3 +123,4 @@ export type Banner =
readonly onOpenConflictsDialog: () => void
}
| { readonly type: BannerType.OSVersionNoLongerSupported }
| { readonly type: BannerType.WorktreesEnabled }
5 changes: 5 additions & 0 deletions app/src/ui/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -966,6 +966,11 @@ export class App extends React.Component<IAppProps, IAppState> {
return
}

if (!this.state.showWorktrees) {
this.props.dispatcher.setShowWorktrees(true)
this.setBanner({ type: BannerType.WorktreesEnabled })
}

if (
this.state.currentFoldout &&
this.state.currentFoldout.type === FoldoutType.Worktree
Expand Down
28 changes: 28 additions & 0 deletions app/src/ui/banners/render-banner.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import * as React from 'react'
import { assertNever } from '../../lib/fatal-error'

import { Banner, BannerType } from '../../models/banner'
import { PopupType } from '../../models/popup'
import { PreferencesTab } from '../../models/preferences'

import { Dispatcher } from '../dispatcher'
import { MergeConflictsBanner } from './merge-conflicts-banner'
Expand All @@ -19,6 +21,7 @@ import { SuccessfulSquash } from './successful-squash'
import { SuccessBanner } from './success-banner'
import { ConflictsFoundBanner } from './conflicts-found-banner'
import { OSVersionNoLongerSupportedBanner } from './os-version-no-longer-supported-banner'
import { LinkButton } from '../lib/link-button'

export function renderBanner(
banner: Banner,
Expand Down Expand Up @@ -171,6 +174,31 @@ export function renderBanner(
)
case BannerType.OSVersionNoLongerSupported:
return <OSVersionNoLongerSupportedBanner onDismissed={onDismissed} />
case BannerType.WorktreesEnabled: {
const label = __DARWIN__
? 'Appearance Settings'
: 'Appearance Options'
return (
<SuccessBanner
key="worktrees-enabled"
timeout={8000}
onDismissed={onDismissed}
>
Worktrees enabled. You can change this in{' '}
<LinkButton
onClick={() =>
dispatcher.showPopup({
type: PopupType.Preferences,
initialSelectedTab: PreferencesTab.Appearance,
})
}
>
{label}
</LinkButton>
.
</SuccessBanner>
)
}
default:
return assertNever(banner, `Unknown popup type: ${banner}`)
}
Expand Down
Loading