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
17 changes: 8 additions & 9 deletions apps/desktop/lint-baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@
"ade-ui/no-fixed-overlay": 1,
"ade-ui/no-raw-z-index": 1
},
"apps/desktop/src/renderer/components/app/TabNav.tsx": {
"ade-ui/no-fixed-overlay": 1
},
"apps/desktop/src/renderer/components/capture/CaptureFlyIn.tsx": {
"ade-ui/no-fixed-overlay": 1,
"ade-ui/no-raw-z-index": 1
Expand Down Expand Up @@ -90,12 +87,15 @@
"ade-ui/no-raw-z-index": 1
},
"apps/desktop/src/renderer/components/lanes/LanesPage.tsx": {
"ade-ui/no-fixed-overlay": 4,
"ade-ui/no-raw-z-index": 7
"ade-ui/no-fixed-overlay": 2,
"ade-ui/no-raw-z-index": 2
},
"apps/desktop/src/renderer/components/lanes/LinearIssueBadge.tsx": {
"ade-ui/no-raw-z-index": 1
},
"apps/desktop/src/renderer/components/lanes/sidebar/PointMenu.tsx": {
"ade-ui/no-fixed-overlay": 1
},
"apps/desktop/src/renderer/components/onboarding/HelpMenu.tsx": {
"ade-ui/no-fixed-overlay": 1,
"ade-ui/no-raw-z-index": 1
Expand Down Expand Up @@ -166,6 +166,9 @@
"apps/desktop/src/renderer/components/terminals/useWorkLaneContextMenu.tsx": {
"ade-ui/no-fixed-overlay": 1
},
"apps/desktop/src/renderer/components/ui/AnchoredMenu.tsx": {
"ade-ui/no-fixed-overlay": 1
},
"apps/desktop/src/renderer/components/ui/MenuSubmenu.tsx": {
"ade-ui/no-fixed-overlay": 1,
"ade-ui/no-raw-z-index": 1
Expand All @@ -181,10 +184,6 @@
"apps/desktop/src/renderer/components/ui/paneMenuTokens.ts": {
"ade-ui/no-raw-z-index": 1
},
"apps/desktop/src/renderer/components/work/SessionLifecycleChips.tsx": {
"ade-ui/no-fixed-overlay": 1,
"ade-ui/no-raw-z-index": 1
},
"apps/desktop/src/renderer/webclient/shell/ScreenShell.tsx": {
"ade-ui/no-fixed-overlay": 2
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ import type {
} from "../../../shared/types";
import { AUTOMATION_TRIGGER_TYPES, NO_DEFAULT_LANE_TEMPLATE } from "../../../shared/types";
import {
DEFAULT_LANE_BANNER_BUDGET,
DEFAULT_REBASE_SUGGESTIONS,
DEFAULT_REBASE_SUGGESTION_MIN_BEHIND,
laneSetupScriptHasWork,
Expand Down Expand Up @@ -2067,13 +2066,11 @@ function coerceConfigFile(value: unknown): ProjectConfigFile {
const newLaneBaseSource = asNewLaneBaseSource(value.git.newLaneBaseSource);
const rebaseSuggestions = asRebaseSuggestionDisplay(value.git.rebaseSuggestions);
const rebaseSuggestionMinBehind = asNonNegativeInt(value.git.rebaseSuggestionMinBehind);
const laneBannerBudget = asNonNegativeInt(value.git.laneBannerBudget);
const out: NonNullable<ProjectConfigFile["git"]> = {};
if (autoRebaseOnHeadChange != null) out.autoRebaseOnHeadChange = autoRebaseOnHeadChange;
if (newLaneBaseSource) out.newLaneBaseSource = newLaneBaseSource;
if (rebaseSuggestions) out.rebaseSuggestions = rebaseSuggestions;
if (rebaseSuggestionMinBehind != null) out.rebaseSuggestionMinBehind = rebaseSuggestionMinBehind;
if (laneBannerBudget != null) out.laneBannerBudget = laneBannerBudget;
return Object.keys(out).length ? out : undefined;
})();

Expand Down Expand Up @@ -2513,7 +2510,6 @@ function resolveEffectiveConfig(shared: ProjectConfigFile, local: ProjectConfigF
newLaneBaseSource: mergedGit?.newLaneBaseSource ?? "remote",
rebaseSuggestions: mergedGit?.rebaseSuggestions ?? DEFAULT_REBASE_SUGGESTIONS,
rebaseSuggestionMinBehind: mergedGit?.rebaseSuggestionMinBehind ?? DEFAULT_REBASE_SUGGESTION_MIN_BEHIND,
laneBannerBudget: mergedGit?.laneBannerBudget ?? DEFAULT_LANE_BANNER_BUDGET,
},
...(effectiveAi ? { ai: effectiveAi } : {}),
...(mergedProviders ? { providers: mergedProviders } : {}),
Expand Down
Loading
Loading