Обновить UI сети и профиль

shine-UI/js/pages/network/adapter.js

@@ -10,7 +10,10 @@ function normLogin(value) {
 
 const FAMILY_ROLES = ['parent', 'child', 'spouse', 'sibling'];
 
-function relationTypeFromRole(role) {
+function relationTypeFromRelation(relation) {
+  const explicit = String(relation?.mark?.relationType || '').trim().toLowerCase();
+  if (explicit === 'close_friend' || explicit === 'friend' || explicit === 'contact') return explicit;
+  const role = relation?.role;
   if (FAMILY_ROLES.includes(role)) return 'family';
   if (role === 'friend') return 'friend';
   return 'contact';
@@ -22,6 +25,7 @@ function relationTypeFromRole(role) {
 //  - взаимные дружеские связи ближе односторонних.
 function deriveStrength(relation) {
   if (relation.isRelative) return 0.9;
+  if (relation?.mark?.relationType === 'close_friend') return 0.9;
   if (relation.role === 'contact') return 0.4;
   if (relation.forward && relation.backward) return 0.8;
   return 0.55;
@@ -38,7 +42,7 @@ export function engineModelFromGraphModel(graphModel) {
   const focusNode = {
     id: focusLogin,
     login: focusLogin,
-    name: '',
+    name: centerMark?.displayName || centerMark?.login || focusLogin,
     avatar: centerMark?.avatar || null,
     relationType: 'self',
     strength: 1,
@@ -58,9 +62,9 @@ export function engineModelFromGraphModel(graphModel) {
       return {
         id: login,
         login,
-        name: '',
+        name: r?.mark?.displayName || login,
         avatar: r?.mark?.avatar || null,
-        relationType: relationTypeFromRole(r?.role),
+        relationType: relationTypeFromRelation(r),
         strength: deriveStrength(r || {}),
         shining: Boolean(r?.mark?.shine),
         tier: 1,

shine-UI/js/pages/network/force-graph.js

@@ -86,6 +86,7 @@ const DOUBLE_TAP_MS = 320;      // окно двойного тапа по фо
 const RELATION_COLORS = {
   family: 'rgba(255, 159, 94, 0.92)',
   friend: 'rgba(120, 179, 255, 0.9)',
+  close_friend: 'rgba(120, 179, 255, 0.98)',
   business: 'rgba(190, 150, 255, 0.9)',
   contact: 'rgba(170, 190, 220, 0.7)',
 };
@@ -593,7 +594,7 @@ export function createForceGraph({ stage, model, onCenterTap, onNodeTap, onNodeL
   function updateA11y() {
     const focus = nodes.find((n) => n.isFocus);
     const tier1 = nodes.filter((n) => n.tier === 1 && !n.isFocus);
-    const rel = { family: 'семья', friend: 'друг', business: 'бизнес', contact: 'контакт' };
+    const rel = { family: 'семья', friend: 'друг', close_friend: 'близкий друг', business: 'бизнес', contact: 'контакт' };
     const items = tier1.map((n) => `<li>${escapeHtml(n.name || n.login || String(n.id))}${n.shining ? ' — сияющий' : ''} (${rel[n.relationType] || 'связь'})</li>`).join('');
     a11y.innerHTML = `<p>Центр: ${escapeHtml(focus ? (focus.name || focus.login || '') : '')}. Связей 1-го уровня: ${tier1.length}.</p><ul>${items}</ul>`;
   }

shine-UI/js/pages/network/node-menu.js

@@ -31,7 +31,7 @@ export function relationLabelRu(relationType) {
  * @param {{x:number,y:number,rect?:DOMRect}} opts.point - экранная точка/rect узла
  * @param {Array<{label:string, onClick:Function, disabled?:boolean}>} opts.actions - пункты меню
  */
-export function openNodeMenu({ login, relationType, point, actions = [] } = {}) {
+export function openNodeMenu({ login, displayName = '', relationType, point, actions = [] } = {}) {
   const root = document.getElementById('modal-root');
   if (!(root instanceof HTMLElement)) return;
 
@@ -43,7 +43,7 @@ export function openNodeMenu({ login, relationType, point, actions = [] } = {})
     <div class="fg-menu-overlay" id="fg-menu-overlay">
       <div class="fg-menu" id="fg-menu" role="menu">
         <div class="fg-menu-head">
-          <span class="fg-menu-login">${escapeHtml(login)}</span>
+          <span class="fg-menu-login">${escapeHtml(displayName || login)}</span>${displayName && displayName !== login ? `<small class="fg-menu-secondary-login">${escapeHtml(login)}</small>` : ''}
           <span class="fg-menu-rel">${escapeHtml(relationLabelRu(relationType))}</span>
         </div>
         ${itemsHtml}