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
7 changes: 7 additions & 0 deletions web/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -444,6 +444,13 @@ async function bootstrap() {
// Global Keyboard Shortcuts
window.addEventListener('keydown', (ev) => {
if (ev.key === 'Escape') {
if (el.canvasInspector && !el.canvasInspector.hidden) {
state.selectedBranchId = null;
state.selectedNodeSha = null;
el.canvasInspector.hidden = true;
renderSVG(getActionCallbacks());
}
closeDiffViewer();
if (el.modal && !el.modal.hidden) el.modal.hidden = true;
if (el.conflictStudioModal && !el.conflictStudioModal.hidden) closeConflictStudio();
if (el.securityUpdateModal && !el.securityUpdateModal.hidden) el.securityUpdateModal.hidden = true;
Expand Down
48 changes: 18 additions & 30 deletions web/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -66,16 +66,9 @@
<section class="canvas-pane dot-grid-canvas" aria-label="Parabolik Git SVG Tuvali">
<div class="canvas-viewport-box">
<div class="canvas-overlay-top">
<div class="ray-popover-anchor">
<button type="button" class="hemi-pill upper-pill" id="btn-upper-ray" title="Üst Ray (Remote / PR) detaylarını aç">▲ ÜST RAY · REMOTE / PULL REQUEST / GITHUB ACTIONS <span class="ray-pill-count" id="upper-ray-pill-count"></span></button>
<div class="ray-popover" id="popover-upper-ray" hidden>
<div class="ray-popover-head">
<span class="ray-popover-title">☁️ Üst Ray · Remote &amp; PR Listesi</span>
<button type="button" class="ray-popover-close" id="close-upper-ray" title="Kapat">✕</button>
</div>
<div class="ray-popover-body" id="upper-ray-popover-body"></div>
</div>
</div>
<button type="button" class="hemi-pill upper-pill" id="btn-upper-ray" title="Üst Ray (Remote PR &amp; CI) hatlarını odakla / filtrele">
▲ ÜST RAY · REMOTE / PULL REQUEST / GITHUB ACTIONS <span class="ray-pill-count" id="upper-ray-pill-count"></span>
</button>
<button type="button" class="spine-sync-badge interactive" id="btn-canvas-sync" title="main ↔ origin/main · Eşitlemek için tıklayın (git fetch &amp; fast-forward)">
<span class="sync-dot synced" id="canvas-sync-dot"></span>
<span id="canvas-sync-text">main ↔ origin/main (Synced)</span>
Expand All @@ -86,17 +79,22 @@
<svg id="rail-svg" xmlns="http://www.w3.org/2000/svg" role="img" aria-label="Parabolik Git Dallanma Grafiği"></svg>
</div>

<div class="canvas-overlay-bottom">
<div class="ray-popover-anchor">
<button type="button" class="hemi-pill lower-pill" id="btn-lower-ray" title="Alt Ray (Yerel Çalışma) detaylarını aç">▼ ALT RAY · LOCAL ONLY (KESİKLİ MOR PARABOL) <span class="ray-pill-count" id="lower-ray-pill-count"></span></button>
<div class="ray-popover ray-popover-bottom" id="popover-lower-ray" hidden>
<div class="ray-popover-head">
<span class="ray-popover-title">💻 Alt Ray · Yerel Çalışma Alanı</span>
<button type="button" class="ray-popover-close" id="close-lower-ray" title="Kapat">✕</button>
</div>
<div class="ray-popover-body" id="lower-ray-popover-body"></div>
<!-- Canvas-First Bağımsız Teşhis ve Aksiyon Kartı (Inspector Overlay) -->
<div class="canvas-inspector-overlay" id="canvas-inspector" hidden>
<div class="canvas-inspector-head">
<div class="canvas-inspector-title-row">
<span class="canvas-inspector-icon">🎯</span>
<span class="canvas-inspector-title" id="canvas-inspector-title">Dal ve Ray Detayları</span>
</div>
<button type="button" class="icon-close" id="canvas-inspector-close" title="Kapat (ESC)">✕</button>
</div>
<div class="canvas-inspector-body" id="inspector-detail"></div>
</div>

<div class="canvas-overlay-bottom">
<button type="button" class="hemi-pill lower-pill" id="btn-lower-ray" title="Alt Ray (Yerel Çalışma &amp; Taslaklar) hatlarını odakla / filtrele">
▼ ALT RAY · LOCAL ONLY (YEREL ÇALIŞMA &amp; TASLAKLAR) <span class="ray-pill-count" id="lower-ray-pill-count"></span>
</button>
<div class="zoom-controls" role="group" aria-label="Tuval yakınlaştırma">
<button type="button" class="z-btn" id="zoom-out" title="Uzaklaştır">−</button>
<button type="button" class="z-btn z-label" id="zoom-reset" title="Görünümü sıfırla">100%</button>
Expand All @@ -120,6 +118,7 @@
</button>
</div>
<div class="dock-tools">
<span class="foot-ready" id="engine-status">● Hazır</span>
<button type="button" class="dock-tool-btn" id="dock-copy-btn" title="Görüntülenen tüm logları panoya kopyala">📋 Kopyala</button>
<button type="button" class="dock-tool-btn" id="dock-clear-btn" title="Logları temizle">🧹 Temizle</button>
<button type="button" class="dock-tool-btn" id="dock-toggle-btn" title="Alt paneli daralt / genişlet">▼</button>
Expand All @@ -138,17 +137,6 @@
</div>
</footer>
</section>

<aside class="inspector-pane" aria-label="Dal ve Commit Stüdyosu">
<div class="panel-section detail-section" id="inspector-detail">
<div class="empty-detail">İncelemek için soldaki parabolik grafikten bir dal kapsülü veya düğüm seçin.</div>
</div>

<div class="inspector-foot">
<span>Parabolik Topoloji Motoru</span>
<span class="foot-ready" id="engine-status">● Hazır</span>
</div>
</aside>
</main>

<!-- MODAL: + YENİ PARABOLİK DAL AÇ -->
Expand Down
140 changes: 35 additions & 105 deletions web/modules/canvas.js
Original file line number Diff line number Diff line change
Expand Up @@ -544,9 +544,25 @@ export function renderSVG(callbacks = {}) {
`;
el.svg.appendChild(defs);

// 2. Background horizontal dashed guide rails
// 2. Background horizontal dashed guide rails & Ray Track Labels
el.svg.appendChild(svgEl('line', { x1: 40, y1: MAIN_Y - LANE_BASE_OFFSET, x2: sceneW - 40, y2: MAIN_Y - LANE_BASE_OFFSET, class: 'svg-guide-line' }));
el.svg.appendChild(svgEl('text', {
x: 45,
y: MAIN_Y - LANE_BASE_OFFSET - 8,
class: 'svg-ray-label upper',
}, '☁️ ÜST RAY · GITHUB REMOTE & PR HATLARI'));

el.svg.appendChild(svgEl('line', { x1: 40, y1: MAIN_Y + LANE_BASE_OFFSET, x2: sceneW - 40, y2: MAIN_Y + LANE_BASE_OFFSET, class: 'svg-guide-line' }));
el.svg.appendChild(svgEl('text', {
x: 45,
y: MAIN_Y + LANE_BASE_OFFSET + 18,
class: 'svg-ray-label lower',
}, '💻 ALT RAY · YEREL ÇALIŞMA & TASLAK HATLARI'));

const upperCount = branches.filter((b) => b.hemisphere === 'upper' && b.state === 'open').length;
const lowerCount = branches.filter((b) => b.hemisphere === 'lower' && b.state === 'open').length;
if (el.upperRayCount) el.upperRayCount.textContent = upperCount > 0 ? String(upperCount) : '';
if (el.lowerRayCount) el.lowerRayCount.textContent = lowerCount > 0 ? String(lowerCount) : '';

// 3. Parabolic Curves Layer
const arcLayer = svgEl('g', { id: 'arc-layer' });
Expand Down Expand Up @@ -797,130 +813,44 @@ export function setupCanvasInteractions(onRenderSVG = null) {
});
}

// Upper & Lower Ray Interactive Popovers
// Upper & Lower Ray Interactive Track Focus & Filter
el.btnUpperRay?.addEventListener('click', (ev) => {
ev.stopPropagation();
if (el.popoverLowerRay) el.popoverLowerRay.hidden = true;
if (el.popoverUpperRay) {
el.popoverUpperRay.hidden = !el.popoverUpperRay.hidden;
if (!el.popoverUpperRay.hidden) renderRayPopovers();
}
});

el.closeUpperRay?.addEventListener('click', (ev) => {
ev.stopPropagation();
if (el.popoverUpperRay) el.popoverUpperRay.hidden = true;
state.filter = (state.filter === 'upper' ? 'all' : 'upper');
renderKPIs();
if (onRenderSVG) onRenderSVG();
});

el.btnLowerRay?.addEventListener('click', (ev) => {
ev.stopPropagation();
if (el.popoverUpperRay) el.popoverUpperRay.hidden = true;
if (el.popoverLowerRay) {
el.popoverLowerRay.hidden = !el.popoverLowerRay.hidden;
if (!el.popoverLowerRay.hidden) renderRayPopovers();
}
});

el.closeLowerRay?.addEventListener('click', (ev) => {
ev.stopPropagation();
if (el.popoverLowerRay) el.popoverLowerRay.hidden = true;
state.filter = (state.filter === 'lower' ? 'all' : 'lower');
renderKPIs();
if (onRenderSVG) onRenderSVG();
});

window.addEventListener('click', (ev) => {
if (!ev.target.closest('#btn-upper-ray') && !ev.target.closest('#popover-upper-ray')) {
if (el.popoverUpperRay) el.popoverUpperRay.hidden = true;
}
if (!ev.target.closest('#btn-lower-ray') && !ev.target.closest('#popover-lower-ray')) {
if (el.popoverLowerRay) el.popoverLowerRay.hidden = true;
// Clicking empty canvas deselects active branch and closes canvas inspector
el.svg.addEventListener('click', (ev) => {
const target = ev.target;
if (target === el.svg || target.id === 'rail-svg' || target.classList?.contains('svg-guide-line') || target.classList?.contains('svg-spine-line') || target.classList?.contains('dot-grid-canvas')) {
state.selectedBranchId = null;
state.selectedNodeSha = null;
if (el.canvasInspector) el.canvasInspector.hidden = true;
if (onRenderSVG) onRenderSVG();
}
});
}

export function renderRayPopovers(callbacks = {}) {
const { onSelectBranch } = callbacks;
const snap = state.snapshot;
if (!snap) return;

// 1. Üst Ray: Açık PR'lar ve Remote Dallar
const upperBranches = (snap.branches || []).filter((b) => b.hemisphere === 'upper' && b.state === 'open');
if (el.upperRayCount) {
el.upperRayCount.textContent = upperBranches.length > 0 ? String(upperBranches.length) : '';
}
if (el.upperRayBody) {
if (upperBranches.length === 0) {
el.upperRayBody.innerHTML = '<div class="ray-empty">Üst rayda şu an açık PR veya uzak dal bulunmuyor.</div>';
} else {
el.upperRayBody.innerHTML = upperBranches.map((b) => {
const prTxt = b.pr ? `PR #${b.pr.number} · ${b.pr.reviewState}` : 'Remote Dal';
const ciTxt = b.pr?.ci?.state ? ` · CI: ${b.pr.ci.state}` : '';
return `
<div class="ray-item" data-branch-id="${esc(b.id)}">
<div>
<div class="ray-item-title">${esc(b.name)}</div>
<div class="ray-item-sub">${esc(prTxt)}${esc(ciTxt)}</div>
</div>
<span class="chip ${b.state === 'merged' ? 'ok' : 'accent'}">İncele</span>
</div>
`;
}).join('');

el.upperRayBody.querySelectorAll('.ray-item').forEach((item) => {
item.addEventListener('click', () => {
const bId = item.getAttribute('data-branch-id');
if (onSelectBranch) onSelectBranch(bId);
if (el.popoverUpperRay) el.popoverUpperRay.hidden = true;
});
});
}
}

// 2. Alt Ray: Yerel Dallar ve Kaydedilmemiş Çalışma Alanı
const upperCount = (snap.branches || []).filter((b) => b.hemisphere === 'upper' && b.state === 'open').length;
const lowerBranches = (snap.branches || []).filter((b) => b.hemisphere === 'lower' && b.state === 'open');
const dirtyCount = snap.repo?.dirtyCount || 0;
const lowerTotal = lowerBranches.length + (dirtyCount > 0 ? 1 : 0);
if (el.lowerRayCount) {
el.lowerRayCount.textContent = lowerTotal > 0 ? String(lowerTotal) : '';
}
if (el.lowerRayBody) {
let itemsHtml = '';
if (dirtyCount > 0) {
itemsHtml += `
<div class="ray-item" data-branch-id="local-wip-working-tree">
<div>
<div class="ray-item-title">✏️ Kaydedilmemiş Çalışma Alanı</div>
<div class="ray-item-sub">${dirtyCount} dosya bekliyor · Commit stüdyosu</div>
</div>
<span class="chip purple">Taslak</span>
</div>
`;
}
lowerBranches.forEach((b) => {
if (b.id === 'local-wip-working-tree') return;
const headTxt = b.isHead ? 'HEAD · Aktif' : `↑${b.aheadMain || 0} / ↓${b.behindMain || 0}`;
itemsHtml += `
<div class="ray-item" data-branch-id="${esc(b.id)}">
<div>
<div class="ray-item-title">${esc(b.name)}</div>
<div class="ray-item-sub">${headTxt}</div>
</div>
<span class="chip ${b.isHead ? 'ok' : 'purple'}">Seç</span>
</div>
`;
});

if (!itemsHtml) {
el.lowerRayBody.innerHTML = '<div class="ray-empty">Alt rayda açık yerel dal veya bekleyen değişiklik yok.</div>';
} else {
el.lowerRayBody.innerHTML = itemsHtml;
el.lowerRayBody.querySelectorAll('.ray-item').forEach((item) => {
item.addEventListener('click', () => {
const bId = item.getAttribute('data-branch-id');
if (onSelectBranch) onSelectBranch(bId);
if (el.popoverLowerRay) el.popoverLowerRay.hidden = true;
});
});
}
}
if (el.upperRayCount) el.upperRayCount.textContent = upperCount > 0 ? String(upperCount) : '';
if (el.lowerRayCount) el.lowerRayCount.textContent = lowerTotal > 0 ? String(lowerTotal) : '';
}


33 changes: 26 additions & 7 deletions web/modules/inspector.js
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,9 @@ export function renderInspector(callbacks = {}) {
if (state.selectedNodeSha) {
const node = snap.nodes.find((n) => n.shortSha === state.selectedNodeSha);
if (node) {
if (el.canvasInspector) el.canvasInspector.hidden = false;
if (el.canvasInspectorTitle) el.canvasInspectorTitle.textContent = `Commit ${node.shortSha}`;

el.detail.innerHTML = `
<div class="det-header">
<div class="det-title-row">
Expand All @@ -122,6 +125,12 @@ export function renderInspector(callbacks = {}) {
</div>
<div class="lock-note">🔒 <strong>main</strong> omurgasındaki commit mesajları tarihçe güvenliği için kilitlidir.</div>
`;
document.getElementById('canvas-inspector-close')?.addEventListener('click', () => {
state.selectedNodeSha = null;
state.selectedBranchId = null;
if (el.canvasInspector) el.canvasInspector.hidden = true;
if (callbacks.onSelectNode) callbacks.onSelectNode(null);
});
document.getElementById('act-node-diff')?.addEventListener('click', () => {
if (onOpenDiff) onOpenDiff(node.sha || node.shortSha, 'commit');
});
Expand Down Expand Up @@ -209,21 +218,25 @@ export function renderInspector(callbacks = {}) {

const b = snap.branches.find((x) => x.id === state.selectedBranchId);
if (!b) {
el.detail.innerHTML = `
${proposalHtml}
<div class="empty-detail">
<p>İncelemek için bir parabol eğrisine, commit düğümüne veya radar uyarısına tıklayın.</p>
<p class="empty-hint">İpucu: Üst raydaki açık PR'lar uzaktaki dalları, alt raydaki mor eğriler yerel dalları temsil eder.</p>
</div>
`;
if (snap.pendingProposal) {
if (el.canvasInspector) el.canvasInspector.hidden = false;
if (el.canvasInspectorTitle) el.canvasInspectorTitle.textContent = '🤖 AI Commit & PR Önerisi';
el.detail.innerHTML = proposalHtml;
document.getElementById('canvas-inspector-close')?.addEventListener('click', () => {
if (el.canvasInspector) el.canvasInspector.hidden = true;
});
wireProposalActions(onApplySnapshot);
return;
}
if (el.canvasInspector) el.canvasInspector.hidden = true;
el.detail.innerHTML = '';
return;
}

const isOpen = b.state === 'open';
const isVirtualWip = b.id === 'local-wip-working-tree';
if (el.canvasInspector) el.canvasInspector.hidden = false;
if (el.canvasInspectorTitle) el.canvasInspectorTitle.textContent = isVirtualWip ? '✏️ Çalışma Alanı (Taslak)' : b.name;
const hasConflict = Boolean(b.conflict?.hasConflict && !b.conflict.resolved);
const isRemoteOnly = !b.hasLocal && b.hasRemote && isOpen;
const isLive = snap.repo.mode === 'live';
Expand Down Expand Up @@ -780,6 +793,12 @@ export function renderInspector(callbacks = {}) {
document.getElementById('act-fix-ci')?.addEventListener('click', () => {
if (onFixCI) onFixCI(b.id);
});
document.getElementById('canvas-inspector-close')?.addEventListener('click', () => {
state.selectedBranchId = null;
state.selectedNodeSha = null;
if (el.canvasInspector) el.canvasInspector.hidden = true;
if (callbacks.onSelectBranch) callbacks.onSelectBranch(null);
});
document.getElementById('act-delete')?.addEventListener('click', (ev) => {
if (onDeleteBranch) onDeleteBranch(b.id, ev.currentTarget);
});
Expand Down
17 changes: 7 additions & 10 deletions web/modules/state.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,9 @@ export function initElements() {
'add-proj-cancel', 'btn-start-tour', 'tour-backdrop', 'tour-card',
'tour-step-badge', 'tour-step-title', 'tour-step-body', 'tour-prev-btn',
'tour-next-btn', 'tour-dots', 'tour-close-btn',
'btn-upper-ray', 'btn-lower-ray', 'popover-upper-ray', 'popover-lower-ray',
'upper-ray-popover-body', 'lower-ray-popover-body', 'upper-ray-pill-count', 'lower-ray-pill-count',
'close-upper-ray', 'close-lower-ray',
'btn-canvas-sync', 'canvas-sync-dot', 'canvas-sync-text', 'dock-copy-btn'
'btn-upper-ray', 'btn-lower-ray', 'upper-ray-pill-count', 'lower-ray-pill-count',
'btn-canvas-sync', 'canvas-sync-dot', 'canvas-sync-text', 'dock-copy-btn',
'canvas-inspector', 'canvas-inspector-close', 'canvas-inspector-title'
];

ids.forEach((id) => {
Expand Down Expand Up @@ -159,14 +158,12 @@ export function initElements() {

el.btnUpperRay = el['btn-upper-ray'];
el.btnLowerRay = el['btn-lower-ray'];
el.popoverUpperRay = el['popover-upper-ray'];
el.popoverLowerRay = el['popover-lower-ray'];
el.upperRayBody = el['upper-ray-popover-body'];
el.lowerRayBody = el['lower-ray-popover-body'];
el.upperRayCount = el['upper-ray-pill-count'];
el.lowerRayCount = el['lower-ray-pill-count'];
el.closeUpperRay = el['close-upper-ray'];
el.closeLowerRay = el['close-lower-ray'];

el.canvasInspector = el['canvas-inspector'];
el.canvasInspectorClose = el['canvas-inspector-close'];
el.canvasInspectorTitle = el['canvas-inspector-title'];

return el;
}
Loading
Loading