mirror of
https://github.com/Studio-Saelix/sencho.git
synced 2026-08-19 23:06:49 +00:00
feat: ordered multi-file Compose for Git sources (#1380)
* feat: ordered multi-file Compose for Git sources
Extend Git sources to deploy an ordered list of compose files merged with
docker compose -f base.yaml -f override.yaml ..., plus an optional project
directory.
- Pick and reorder compose files from the repository tree (drag to reorder on
desktop, up/down arrows on phones); manual path entry is also supported.
- The ordered set drives every stack-scoped compose command (deploy, update,
start/stop/restart/down, image scans, Compose Doctor) and the container
lookup, so a service or image declared only in an override is handled too.
- Runtime keys off the materialized set, not the saved configuration: saving a
source does not change deploy args until the pull is applied, and apply
materializes from the pending snapshot rather than live config.
- The project directory is passed as --project-directory, with -p <stack>
pinning the Compose project so container labels stay stable.
- The Mesh override is layered last; single-file sources are byte-identical to
before, and existing rows keep working via the single-path fallback.
Docs cover the picker, ordering, project directory, and the new troubleshooting
and limitations (referenced files are not materialized; the dependency graph,
drift, and networking views read the primary file).
* fix: harden multi-file Git source (hash, unlink, collisions, node id)
- hashContent folds ordered file CONTENTS (not paths) so a clean multi-file
stack is not flagged as locally edited: create/apply hash the fetched files
(repo paths) while pull hashes the on-disk files (materialized paths), which
previously disagreed and showed a false "local edits detected".
- Block unlinking a multi-file or project-directory Git source (409): the deploy
spec lives on the source row, so removing it would silently revert deploys to
root compose.yaml. Single-file sources still unlink.
- Reject materialized-path collisions in the selection validator: an additional
file equal to or nested under compose.yaml, an ancestor/descendant overlap
between selected files, and a project directory nested under a compose file
(previously a 500 at materialization).
- DockerController.getContainersByStack uses the controller's node compose dir
and passes its node id to the authored prefix, instead of the process default.
* fix: CI failures on multi-file Git source (test crash, aria query, path barrier)
- GitSourceFields no longer crashes when repoUrl/branch are falsy: the canBrowse
trim() is optional-chained, so a reusable field component tolerates partial
props. Fixes the apply-binding panel test, which feeds a minimal source object.
- GitSourcePanel tests query the footer Remove button by its exact name, so the
picker's per-file "Remove <path>" buttons no longer collide with the broad
/remove/i match (the test intent, footer Remove present/absent, is unchanged).
- validateCompose uses an inline resolve + startsWith barrier at the context-dir
mkdir sink (CodeQL does not credit the wrapped isPathWithinBase helper),
clearing the js/path-injection alert. The containment check is equivalent and
contextDir is also validated upstream.
* test: update Git source E2E spec for the multi-file compose picker
The compose-file picker replaced the single #git-source-path input and added
per-file Remove buttons, so the E2E spec drove selectors that no longer exist:
- Drop the redundant compose.yaml fills (the picker defaults to compose.yaml).
- Select the footer Remove button by exact name so the picker's per-file
"Remove <path>" buttons no longer make the locator ambiguous.
- Set a custom compose path through the picker (add via the manual input, press
Enter, then remove the default compose.yaml).
* test: match the footer Remove button with an exact Playwright name
Playwright's getByRole name option is a substring match by default, so
{ name: 'Remove' } also matched the picker's "Remove <path>" buttons. Require an
exact match so only the footer Remove button is selected.
This commit is contained in:
@@ -10,6 +10,7 @@ import { useNodes } from '@/context/NodeContext';
|
||||
import { toast } from '@/components/ui/toast-store';
|
||||
import { GitSourceDiffDialog, type PullResult } from './GitSourceDiffDialog';
|
||||
import { GitSourceFields, type ApplyMode } from './GitSourceFields';
|
||||
import type { GitBrowseResult } from './GitComposeFilePicker';
|
||||
|
||||
export interface GitSource {
|
||||
id: number;
|
||||
@@ -17,6 +18,8 @@ export interface GitSource {
|
||||
repo_url: string;
|
||||
branch: string;
|
||||
compose_path: string;
|
||||
compose_paths: string[];
|
||||
context_dir: string | null;
|
||||
sync_env: boolean;
|
||||
env_path: string | null;
|
||||
auth_type: 'none' | 'token';
|
||||
@@ -64,7 +67,8 @@ export function GitSourcePanel({
|
||||
|
||||
const [repoUrl, setRepoUrl] = useState('');
|
||||
const [branch, setBranch] = useState('main');
|
||||
const [composePath, setComposePath] = useState('compose.yaml');
|
||||
const [composePaths, setComposePaths] = useState<string[]>(['compose.yaml']);
|
||||
const [contextDir, setContextDir] = useState('');
|
||||
const [syncEnv, setSyncEnv] = useState(false);
|
||||
const [authType, setAuthType] = useState<'none' | 'token'>('none');
|
||||
const [token, setToken] = useState('');
|
||||
@@ -82,7 +86,8 @@ export function GitSourcePanel({
|
||||
setSource(null);
|
||||
setRepoUrl('');
|
||||
setBranch('main');
|
||||
setComposePath('compose.yaml');
|
||||
setComposePaths(['compose.yaml']);
|
||||
setContextDir('');
|
||||
setSyncEnv(false);
|
||||
setAuthType('none');
|
||||
setToken('');
|
||||
@@ -102,7 +107,8 @@ export function GitSourcePanel({
|
||||
setSource(data);
|
||||
setRepoUrl(data.repo_url);
|
||||
setBranch(data.branch);
|
||||
setComposePath(data.compose_path);
|
||||
setComposePaths(data.compose_paths?.length ? data.compose_paths : [data.compose_path]);
|
||||
setContextDir(data.context_dir ?? '');
|
||||
setSyncEnv(data.sync_env);
|
||||
setAuthType(data.auth_type);
|
||||
setToken('');
|
||||
@@ -131,8 +137,8 @@ export function GitSourcePanel({
|
||||
}, [open, load]);
|
||||
|
||||
const save = async () => {
|
||||
if (!repoUrl.trim() || !branch.trim() || !composePath.trim()) {
|
||||
toast.error('Repository URL, branch, and compose path are required.');
|
||||
if (!repoUrl.trim() || !branch.trim() || composePaths.length === 0) {
|
||||
toast.error('Repository URL, branch, and at least one compose file are required.');
|
||||
return;
|
||||
}
|
||||
if (!/^https:\/\//i.test(repoUrl.trim())) {
|
||||
@@ -147,7 +153,8 @@ export function GitSourcePanel({
|
||||
const body: Record<string, unknown> = {
|
||||
repo_url: repoUrl.trim(),
|
||||
branch: branch.trim(),
|
||||
compose_path: composePath.trim(),
|
||||
compose_paths: composePaths,
|
||||
context_dir: contextDir.trim() || null,
|
||||
sync_env: syncEnv,
|
||||
auth_type: authType,
|
||||
auto_apply_on_webhook: autoApply,
|
||||
@@ -179,6 +186,35 @@ export function GitSourcePanel({
|
||||
}
|
||||
};
|
||||
|
||||
const browseRepo = async (): Promise<GitBrowseResult | null> => {
|
||||
if (!repoUrl.trim() || !branch.trim()) {
|
||||
toast.error('Enter a repository URL and branch first.');
|
||||
return null;
|
||||
}
|
||||
try {
|
||||
const body: Record<string, unknown> = {
|
||||
repo_url: repoUrl.trim(),
|
||||
branch: branch.trim(),
|
||||
auth_type: authType,
|
||||
};
|
||||
if (authType === 'token' && token !== '') body.token = token;
|
||||
const res = await apiFetch(`/stacks/${encodeURIComponent(stackName)}/git-source/browse`, {
|
||||
method: 'POST',
|
||||
body: JSON.stringify(body),
|
||||
});
|
||||
if (res.ok) {
|
||||
const data = await res.json();
|
||||
return { files: data.files ?? [], truncated: data.truncated ?? false };
|
||||
}
|
||||
const err = await res.json().catch(() => ({}));
|
||||
toast.error(err?.error || 'Failed to browse repository.');
|
||||
return null;
|
||||
} catch (e) {
|
||||
toast.error((e as Error)?.message || 'Network error.');
|
||||
return null;
|
||||
}
|
||||
};
|
||||
|
||||
const remove = async () => {
|
||||
if (!source) return;
|
||||
setRemoveConfirmOpen(false);
|
||||
@@ -343,7 +379,8 @@ export function GitSourcePanel({
|
||||
disabled={!canEdit || saving}
|
||||
repoUrl={repoUrl}
|
||||
branch={branch}
|
||||
composePath={composePath}
|
||||
composePaths={composePaths}
|
||||
contextDir={contextDir}
|
||||
syncEnv={syncEnv}
|
||||
authType={authType}
|
||||
token={token}
|
||||
@@ -351,11 +388,13 @@ export function GitSourcePanel({
|
||||
applyMode={applyMode}
|
||||
onRepoUrlChange={setRepoUrl}
|
||||
onBranchChange={setBranch}
|
||||
onComposePathChange={setComposePath}
|
||||
onComposePathsChange={setComposePaths}
|
||||
onContextDirChange={setContextDir}
|
||||
onSyncEnvChange={setSyncEnv}
|
||||
onAuthTypeChange={setAuthType}
|
||||
onTokenChange={setToken}
|
||||
onApplyModeChange={setApplyModeOverride}
|
||||
onBrowse={browseRepo}
|
||||
/>
|
||||
|
||||
{source && (
|
||||
|
||||
Reference in New Issue
Block a user