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
22 changes: 22 additions & 0 deletions dashboard/src/lib/settings-updaters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,28 @@ export const buildGitHubModeProjectSettingsOverride = (
};
};

export const buildProjectCreationSettingsOverride = (input: {
githubMode?: DashboardSettings["git"]["githubMode"];
selectedTechstackId?: DashboardSettings["techstack"]["selectedTechstackId"];
applicationKind?: DashboardSettings["techstack"]["applicationKind"];
}): ProjectSettingsOverride => {
const override: ProjectSettingsOverride = input.githubMode
? buildGitHubModeProjectSettingsOverride(input.githubMode)
: {};

if (
Object.prototype.hasOwnProperty.call(input, "selectedTechstackId")
|| Object.prototype.hasOwnProperty.call(input, "applicationKind")
) {
override.techstack = {
selectedTechstackId: input.selectedTechstackId ?? null,
applicationKind: input.applicationKind ?? null,
};
}

return override;
};

export const updateCiIntelligence = (
settings: DashboardSettings,
patch: Partial<DashboardSettings["ciIntelligence"]>
Expand Down
12 changes: 11 additions & 1 deletion dashboard/src/lib/settings.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { DashboardSettings, ExternalSettingsHints, GuardrailSettings } from "../types.js";
import type { DashboardSettings, ExternalSettingsHints, GuardrailSettings, TechstackCatalogSettings } from "../types.js";
import { DEFAULT_DASHBOARD_SETTINGS } from "../../../src/repositories/settings-defaults.js";

export { DEFAULT_DASHBOARD_SETTINGS };
Expand All @@ -16,6 +16,14 @@ export const cloneGuardrails = (guardrails: GuardrailSettings): GuardrailSetting
},
});

export const cloneTechstackCatalog = (catalog: TechstackCatalogSettings): TechstackCatalogSettings => ({
defaultTechstackId: catalog.defaultTechstackId,
entries: catalog.entries.map((entry) => ({
...entry,
items: entry.items.map((item) => ({ ...item })),
})),
});

export const cloneDefaultSettings = (): DashboardSettings => ({
dashboardPort: DEFAULT_DASHBOARD_SETTINGS.dashboardPort,
consoleLogLevel: DEFAULT_DASHBOARD_SETTINGS.consoleLogLevel,
Expand Down Expand Up @@ -47,6 +55,8 @@ export const cloneDefaultSettings = (): DashboardSettings => ({
]),
) as DashboardSettings["aiProvider"]["invocationRouting"],
},
techstackCatalog: cloneTechstackCatalog(DEFAULT_DASHBOARD_SETTINGS.techstackCatalog),
techstack: { ...DEFAULT_DASHBOARD_SETTINGS.techstack },
git: { ...DEFAULT_DASHBOARD_SETTINGS.git },
jira: { ...DEFAULT_DASHBOARD_SETTINGS.jira },
ciIntelligence: { ...DEFAULT_DASHBOARD_SETTINGS.ciIntelligence },
Expand Down
12 changes: 11 additions & 1 deletion dashboard/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,12 @@ import type {
BackgroundPattern,
TaskPrTemplateSections,
SprintPrTemplateSections,
PrDescriptionSettings
PrDescriptionSettings,
ApplicationKind,
TechstackItemSettings,
TechstackCatalogEntrySettings,
TechstackCatalogSettings,
TechstackSelectionSettings
} from "../../src/contracts/app-types.js";
import type {
EffectiveSettingsResponse,
Expand Down Expand Up @@ -200,6 +205,11 @@ export type {
TaskPrTemplateSections,
SprintPrTemplateSections,
PrDescriptionSettings,
ApplicationKind,
TechstackItemSettings,
TechstackCatalogEntrySettings,
TechstackCatalogSettings,
TechstackSelectionSettings,
EffectiveSettingsResponse,
ProjectProviderSettings,
ProjectSettings,
Expand Down
16 changes: 12 additions & 4 deletions dashboard/src/v2/ProjectsPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ import {
} from "lucide-preact";
import type { Source, SourceStatus } from "./types.js";
import { AddProjectModal, type AddProjectModalSubmission, type SourceType as AddProjectModalSourceType } from "./components/ui/AddProjectModal.js";
import { buildGitHubModeProjectSettingsOverride } from "../lib/settings-updaters.js";
import { buildProjectCreationSettingsOverride } from "../lib/settings-updaters.js";
import { DEFAULT_DASHBOARD_SETTINGS } from "../lib/settings.js";
import { StatusDot } from "./components/ui/StatusDot.js";
import { WaveFluid } from "./components/ui/WaveFluid.js";
import { BorderTrace } from "./components/ui/BorderTrace.js";
Expand Down Expand Up @@ -457,6 +458,7 @@ export const ProjectsPage: FunctionComponent = () => {
quicksprints: true,
previewScript: true,
ci: true,
techstack: true,
});
const [activeFilter, setActiveFilter] = useState<Filter>('All');
const {
Expand Down Expand Up @@ -545,6 +547,7 @@ export const ProjectsPage: FunctionComponent = () => {
quicksprints: boolean;
previewScript: boolean;
ci: boolean;
techstack: boolean;
},
) => {
setRunningSetupProjectIds(prev => new Set(prev).add(projectId));
Expand Down Expand Up @@ -615,7 +618,11 @@ export const ProjectsPage: FunctionComponent = () => {
initMode: project.initMode,
remoteProvider: project.remoteProvider,
isPrivate: project.isPrivate,
...(isLocalProject ? { settingsOverrides: buildGitHubModeProjectSettingsOverride("LOCAL") } : {}),
settingsOverrides: buildProjectCreationSettingsOverride({
...(isLocalProject ? { githubMode: "LOCAL" as const } : {}),
selectedTechstackId: project.selectedTechstackId ?? DEFAULT_DASHBOARD_SETTINGS.techstackCatalog.defaultTechstackId,
applicationKind: project.applicationKind ?? null,
}),
});
return;
}
Expand All @@ -625,7 +632,7 @@ export const ProjectsPage: FunctionComponent = () => {
sourceType: project.type,
sourceRef: project.path,
cloneDir: project.cloneDir,
...(project.type === "local" ? { settingsOverrides: buildGitHubModeProjectSettingsOverride("LOCAL") } : {}),
...(project.type === "local" ? { settingsOverrides: buildProjectCreationSettingsOverride({ githubMode: "LOCAL" }) } : {}),
});
if (project.setup?.enabled) {
launchProjectSetup(createdProject.id, createdProject.name, project.setup.options);
Expand Down Expand Up @@ -803,7 +810,7 @@ export const ProjectsPage: FunctionComponent = () => {
onDelete={() => { void deleteProject(source.id); }}
onSetup={() => {
setSetupProjectId(source.id);
setSetupOptions({ agents: true, quicksprints: true, previewScript: true, ci: true });
setSetupOptions({ agents: true, quicksprints: true, previewScript: true, ci: true, techstack: true });
setSetupError(null);
}}
onOpenInvocation={() => {
Expand Down Expand Up @@ -864,6 +871,7 @@ export const ProjectsPage: FunctionComponent = () => {
{ key: "quicksprints", label: "Quicksprints", description: "Sprint templates." },
{ key: "previewScript", label: "Preview Script", description: "Container startup." },
{ key: "ci", label: "CI", description: "Basic checks." },
{ key: "techstack", label: "Techstack", description: "Detect and assign from manifests." },
] as const).map((option) => (
<button
key={option.key}
Expand Down
Loading