SHA256
Добавить Canvas v4 для исследования связей
This commit is contained in:
@@ -5,6 +5,7 @@ import { authService, state } from '../../state.js';
|
||||
import { makeProfileRoute, makeProfileLinksRoute } from '../../services/shine-routes.js';
|
||||
import { CONNECTIONS_GRAPH_CHANGED } from '../../services/connections-graph-cache.js';
|
||||
import { createForceGraph } from '../network-legacy/force-graph.js';
|
||||
import { createExplorerCanvasGraph } from '../network-canvas-v4/graph-renderer.js';
|
||||
import { openNodeMenu } from '../network-legacy/node-menu.js';
|
||||
import { createExplorerGraph, keyOf, EXPLORER_DEFAULT_DEPTH, EXPLORER_MAX_DEPTH } from './graph-model.js';
|
||||
import { getExplorerGraph, readExplorerCachedGraphs, clearExplorerGraphCache, explorerCacheScope, explorerGraphSavedAt } from './graph-cache.js';
|
||||
@@ -33,12 +34,24 @@ function hash01(value) {
|
||||
return (h >>> 0) / 4294967296;
|
||||
}
|
||||
|
||||
// V3 state survives switching between tabs; long-term graph responses reside in IndexedDB.
|
||||
// V3/V4 сохраняют исследование при переключении версий внутри вкладки.
|
||||
// Новый вход через нижнюю кнопку «Связи» очищает карту и IndexedDB-графы.
|
||||
let retained = null;
|
||||
let resetBarrier = Promise.resolve();
|
||||
export function resetExplorerOnTabEntry() {
|
||||
retained = null;
|
||||
// Новые загрузки обязаны дождаться очистки, иначе IndexedDB вернёт старую карту.
|
||||
resetBarrier = resetBarrier.catch(() => {}).then(() => clearExplorerGraphCache());
|
||||
}
|
||||
|
||||
export function render({ navigate, route, chrome } = {}) {
|
||||
export function render(context = {}) {
|
||||
return renderExplorer(context);
|
||||
}
|
||||
|
||||
// Общие для V3 и V4 поиск, кэш, BFS, фильтры и жизненный цикл страницы.
|
||||
export function renderExplorer({ navigate, route, chrome } = {}, { canvas = false } = {}) {
|
||||
const screen = document.createElement('section');
|
||||
screen.className = 'network-screen network-explorer';
|
||||
screen.className = `network-screen network-explorer${canvas ? ' network-explorer--canvas' : ''}`;
|
||||
const stage = document.createElement('div');
|
||||
stage.className = 'network-stage';
|
||||
const board = document.createElement('div');
|
||||
@@ -137,7 +150,7 @@ export function render({ navigate, route, chrome } = {}) {
|
||||
layoutY: session.positions.get(node.id)?.y || 0, fixedLayout: true,
|
||||
}));
|
||||
if (engine) engine.setModel(model);
|
||||
else engine = createForceGraph({
|
||||
else engine = (canvas ? createExplorerCanvasGraph : createForceGraph)({
|
||||
stage: board, model, explorerMode: true,
|
||||
onNodeTap: (node) => { void load(node.login, true); },
|
||||
onCenterTap: (node) => nodeMenu(node, false),
|
||||
@@ -157,11 +170,12 @@ export function render({ navigate, route, chrome } = {}) {
|
||||
});
|
||||
}
|
||||
function nodeMenu(node, long = false, point = null) {
|
||||
const rect = node?.el?.getBoundingClientRect?.();
|
||||
const canvasPoint = canvas ? engine?.nodeScreenPoint?.(node) : null;
|
||||
const rect = node?.el?.getBoundingClientRect?.() || canvasPoint?.rect;
|
||||
openNodeMenu({
|
||||
login: normalizeLogin(node?.login), displayName: String(node?.name || '').trim(),
|
||||
relationType: node?.relationType,
|
||||
point: point || (rect ? { x: rect.left + rect.width / 2, y: rect.top, rect } : undefined),
|
||||
point: point || canvasPoint || (rect ? { x: rect.left + rect.width / 2, y: rect.top, rect } : undefined),
|
||||
actions: [
|
||||
{ label: t(long ? 'screens.network_view.text_006' : 'screens.network_view.text_004'), onClick: () => navigate?.(profileRoute(node?.login)) },
|
||||
{ label: t(long ? 'screens.network_view.text_007' : 'screens.network_view.text_005'), onClick: () => navigate?.(`chat/${encodeURIComponent(normalizeLogin(node?.login))}`) },
|
||||
@@ -446,17 +460,21 @@ export function render({ navigate, route, chrome } = {}) {
|
||||
searchClose?.();
|
||||
// TopBar lifetime owned by AppShell, not this screen.
|
||||
};
|
||||
// Восстановление уже открытых веток из IndexedDB (без сетевых запросов).
|
||||
// Первую карту показываем сразу, восстановление идёт параллельно.
|
||||
void readExplorerCachedGraphs(scope).then((entries) => {
|
||||
// Кэш графов восстанавливаем только после завершения возможного сброса вкладки.
|
||||
// Фотографии и кэш изображений сброс не затрагивает.
|
||||
void resetBarrier.then(async () => {
|
||||
if (disposed || session !== retained) return;
|
||||
const entries = await readExplorerCachedGraphs(scope);
|
||||
if (disposed || cacheWasCleared || session !== retained) return;
|
||||
entries.forEach((entry) => {
|
||||
const login = entry?.graph?.login || entry?.key?.slice(scope.length + 1);
|
||||
if (login && !session.graph.isFresh(login)) session.graph.add(entry.graph, login, entry.savedAt);
|
||||
});
|
||||
scheduleDraw();
|
||||
if (centerLogin) void load(centerLogin);
|
||||
else window.setTimeout(() => { if (!disposed) openSearchModal(); }, 0);
|
||||
}).catch((error) => {
|
||||
if (!disposed) { console.warn('[Network explorer] Cache reset/read failed', error); if (centerLogin) void load(centerLogin); }
|
||||
});
|
||||
if (centerLogin) void load(centerLogin);
|
||||
else window.setTimeout(() => { if (!disposed) openSearchModal(); }, 0);
|
||||
return screen;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user