diff --git a/web/khira/app.js b/web/khira/app.js index 1659369..cfff4ce 100644 --- a/web/khira/app.js +++ b/web/khira/app.js @@ -68,7 +68,7 @@ const EAPPS=['Unified Dashboard Client','Image Manipulator Pro','Image Hoster',' const PRI=[['P0','P0 · Critical'],['P1','P1 · High'],['P2','P2 · Medium'],['P3','P3 · Low']]; const SEV=[['CRITICAL','Critical'],['HIGH','High'],['MEDIUM','Medium'],['LOW','Low']]; const STAT={open:'Open',progress:'In progress',hold:'On hold',completed:'Completed'}; -const COLS=[['open','var(--out)'],['progress','var(--pri)'],['hold','var(--on-warn-c)'],['completed','var(--on-ter-c)']]; +const COLS=[['open','var(--status-open)'],['progress','var(--status-progress)'],['hold','var(--status-hold)'],['completed','var(--status-completed)']]; const EL={draft:'Drafts',unresolved:'Unresolved',escalated:'Escalated',resolved:'Resolved'}; const EMOJIS=['⚡','👩‍💻','👨‍💻','🕵️‍♂️','👤','🚀','🛡️','🎨','🤖','🦊','🦉','🦁','🔥','💡','🎯','⚙️','🌟','💻']; @@ -143,9 +143,36 @@ const adminSvgA=` `; +function getInitials(name) { + if (!name) return 'U'; + const parts = name.trim().split(/\s+/); + if (parts.length >= 2) return (parts[0][0] + parts[parts.length - 1][0]).toUpperCase(); + return name.slice(0, 2).toUpperCase(); +} + +function getUserColor(username) { + const colors = [ + { bg: '#3b82f6', text: '#ffffff' }, + { bg: '#6366f1', text: '#ffffff' }, + { bg: '#8b5cf6', text: '#ffffff' }, + { bg: '#ec4899', text: '#ffffff' }, + { bg: '#10b981', text: '#ffffff' }, + { bg: '#f59e0b', text: '#ffffff' }, + { bg: '#06b6d4', text: '#ffffff' }, + { bg: '#f97316', text: '#ffffff' } + ]; + if (!username) return colors[0]; + let hash = 0; + for (let i = 0; i < username.length; i++) { + hash = username.charCodeAt(i) + ((hash << 5) - hash); + } + const idx = Math.abs(hash) % colors.length; + return colors[idx]; +} + const resolveUser=u=>{ if(!u)return null; - if(typeof u==='string')return S.us?.find(x=>x.username===u)||{username:u,avatar:'👤'}; + if(typeof u==='string')return S.us?.find(x=>x.username===u)||{username:u,name:u}; const uname=u.username||u.author_username||u.assigned_to||u.created_by; if(uname){ const found=S.us?.find(x=>x.username===uname); @@ -154,34 +181,38 @@ const resolveUser=u=>{ return u; }; -/* Single Floating Ring Profile Avatar */ -const avHtml=(rawU,size=36)=>{ +/* Modern Initials & Profile Photo Avatar (Zero Cartoon Emojis) */ +const avHtml=(rawU,size=26)=>{ const u=resolveUser(rawU); - if(!u)return '👤'; - const rcls=roleClass(u); - let inner=''; - if(rcls==='av-admin'&&(u.avatar==='A'||!u.profile_image)){ - inner=adminSvgA; - }else if(u.avatar_type==='image'&&u.profile_image){ - inner=`${esc(u.name||'')}`; - }else if(u.avatar==='A'){ - inner=adminSvgA; - }else{ - inner=`${esc(u.avatar||'👤')}`; + if(!u)return `?`; + if(u.profile_image){ + return `${esc(u.name||u.username||'')}`; } - return `${inner}`; + const c = getUserColor(u.username || u.name); + const inits = getInitials(u.name || u.username); + return `${inits}`; }; const who=(u,alt)=>{ if(!u)return alt||'—'; const obj=typeof u==='string'?resolveUser(u):u; - return `${avHtml(obj,28)} ${esc(obj?.name||obj?.username||alt||'—')}`; + return `${avHtml(obj,22)} ${esc(obj?.name||obj?.username||alt||'—')}`; }; function updateMe(u){ const el=$('#me');if(!el)return; - el.innerHTML=avHtml(u,44); - $('#navAdmin').hidden=!isAdmin(u); + if(!u){ el.innerHTML=''; return; } + const initsAv = avHtml(u, 30); + el.innerHTML = ` + ${initsAv} +
+ ${esc(u.name || u.username)} + ${esc(u.role_display || u.role)} +
+ `; + const isAdm=isAdmin(u); + if($('#navAdmin'))$('#navAdmin').hidden=!isAdm; + if($('#navAdminGroup'))$('#navAdminGroup').hidden=!isAdm; } const usOpts=b=>[...(b?[['','Choose developer']]:[]),...S.us.map(u=>[u.username,`${u.name} · ${u.role_display}`])]; @@ -247,7 +278,10 @@ async function refresh(anim){ if(fr&&fr.filters)S.savedFilters=fr.filters; const changed=anim||newT.length!==S.t.length||newE.length!==S.e.length||JSON.stringify(newTs)!==JSON.stringify(S.ts)||JSON.stringify(newEs)!==JSON.stringify(S.es); S.t=newT;S.ts=newTs;S.e=newE;S.es=newEs;S.n=newN; - $('#dot').hidden=!S.n.some(x=>!x.read); + const unreadCount = S.n.filter(x => !x.read).length; + if($('#dot')) $('#dot').hidden = unreadCount === 0; + if($('#navTicketsBadge')) $('#navTicketsBadge').textContent = S.ts.open_assigned || S.ts.open_all || S.t.filter(x => !['completed','closed'].includes(st(x))).length || 0; + if($('#navErrorsBadge')) $('#navErrorsBadge').textContent = S.e.filter(x => x.status === 'unresolved').length || 0; if(changed)render(anim); } @@ -258,7 +292,7 @@ const render=a=>{ else if(S.sec==='admin')renderAdmin(a); }; -const tile=(n,l,k)=>``; +const tile=(n,l,k)=>`
${l}${n||0}
`; const chipRow=(items,cur,attr)=>items.map(([k,l])=>``).join(''); /* ── Tickets Filtering & Rendering ── */ @@ -328,35 +362,44 @@ function renderT(anim){ if(S.view==='board'){ put('#board',COLS.map(([k,c])=>{ const rows=f.filter(t=>st(t)===k||(!STAT[st(t)]&&k==='open')); - return`

${STAT[k]}${rows.length}

${rows.map((t,i)=>{ - const p=pri(t),n=(t.remarks||[]).length; - const avElem=avHtml(t.assignee||{avatar:t.assigned_to_avatar||'👤',role:t.assigned_to_role,username:t.assigned_to},26); - const isSel=S.bulkSelected.has(t.id); - const chkBox=S.bulkMode?``:''; - - // SLA progress calculation - let slaHtml=''; - if(t.due_date){ - const now=Date.now(),cre=new Date(t.created_at).getTime(),due=new Date(t.due_date).getTime(); - const total=Math.max(1,due-cre); - const elapsed=Math.max(0,now-cre); - const pct=Math.min(100,Math.round((elapsed/total)*100)); - const isOverdue=t.sla_breached||now>due; - const cls=isOverdue?'breached':pct>75?'danger':pct>50?'warning':'good'; - slaHtml=`
${isOverdue?'OVERDUE':ago(t.due_date)}${pct}%
`; - } + return`
+

+ ${STAT[k]} + ${rows.length} + +

+
+ ${rows.map((t,i)=>{ + const p=pri(t),n=(t.remarks||[]).length; + const avElem=avHtml(t.assignee||{role:t.assigned_to_role,username:t.assigned_to,name:t.assigned_to_name},22); + const isSel=S.bulkSelected.has(t.id); + const chkBox=S.bulkMode?``:''; + + // SLA progress calculation + let slaHtml=''; + if(t.due_date){ + const now=Date.now(),cre=new Date(t.created_at).getTime(),due=new Date(t.due_date).getTime(); + const total=Math.max(1,due-cre); + const elapsed=Math.max(0,now-cre); + const pct=Math.min(100,Math.round((elapsed/total)*100)); + const isOverdue=t.sla_breached||now>due; + const cls=isOverdue?'breached':pct>75?'danger':pct>50?'warning':'good'; + slaHtml=`
${isOverdue?'OVERDUE':ago(t.due_date)}${pct}%
`; + } - const tagsHtml=(t.tags||[]).length?`
${t.tags.map(tg=>`${esc(tg)}`).join('')}
`:''; + const tagsHtml=(t.tags||[]).length?`
${t.tags.map(tg=>`${esc(tg)}`).join('')}
`:''; - return`
- ${chkBox} -
${esc(t.id)}${t.ticket_type==='general'?'General':'App'}${p}
-

${esc(t.title)}

-
${esc(sub(t))}${n?`${ic('chat_bubble',14)} ${n}`:''}${avElem}
- ${tagsHtml} - ${slaHtml} -
`; - }).join('')||'
No tickets
'}
`; + return`
+ ${chkBox} +
${esc(t.id)}${t.ticket_type==='general'?'General':'App'}${p}
+

${esc(t.title)}

+
${esc(sub(t))}${n?`${ic('chat_bubble',12)} ${n}`:''}${avElem}
+ ${tagsHtml} + ${slaHtml} +
`; + }).join('')||'
No tickets
'} + +
`; }).join('')); initBoardDragDrop(); @@ -972,15 +1015,14 @@ async function loadAdminDatabase(){ /* ── Navigation Handler ── */ function nav(sec){ S.sec=sec;S.q='';$('#q').value=''; - $$('.nav button').forEach(b=>b.classList.toggle('on',b.dataset.s===sec)); + $$('.nav button, .sidebar-nav button').forEach(b=>b.classList.toggle('on',b.dataset.s===sec)); $('#vT').hidden=sec!=='tickets'; $('#vE').hidden=sec!=='errors'; $('#vA').hidden=sec!=='analytics'; $('#vAdmin').hidden=sec!=='admin'; - $('#q').placeholder=sec==='tickets'?'Search tickets (press / to focus)':sec==='errors'?'Search runtime errors...':sec==='analytics'?'Filter analytics...':'Search users...'; - $('#fab').hidden=sec==='analytics'||sec==='admin'; - if(sec==='tickets')$('#fabl').textContent='New ticket'; - else if(sec==='errors')$('#fabl').textContent='Report error'; + $('#q').placeholder=sec==='tickets'?'Search issues, errors, teammates... (press /)':sec==='errors'?'Search runtime errors...':sec==='analytics'?'Filter analytics...':'Search users...'; + const titleMap = { tickets: 'Tickets', errors: 'Error Telemetry', analytics: 'Analytics & SLA', admin: 'Administration' }; + put('#title', titleMap[sec] || 'Tickets'); render(true); } @@ -991,19 +1033,6 @@ function renderSheetDOM(t){ const rels=t.related_ticket_ids||[]; const kv=(k,v,m)=>`
${k}
${m==='html'?v:esc(v||'—')}
`; - let meta=''; - if(g){ - meta=(t.general_category?kv('Category',t.general_category):'') - +(t.department?kv('Department',t.department):'') - +kv('Reported by',who(t.reporter||{name:t.created_by_name,username:t.created_by,role:t.created_by_role},t.created_by_name),'html'); - }else{ - meta=(t.app||t.app_name?kv('Application',t.app||t.app_name):'') - +(t.version?kv('Version',t.version):'') - +(t.feature||t.feature_name?kv('Feature',t.feature||t.feature_name):'') - +(t.api_key?kv('API key / route',t.api_key,1):'') - +kv('Reported by',who(t.reporter||{name:t.created_by_name,username:t.created_by,role:t.created_by_role},t.created_by_name),'html'); - } - const myUser = (S.u?.username || '').toLowerCase(); const myName = (S.u?.name || '').toLowerCase(); const creatorUser = (t.created_by || t.reporter?.username || '').toLowerCase(); @@ -1019,39 +1048,149 @@ function renderSheetDOM(t){ const canDel = (isCreator || (isAdm && !isAssignee)) && (!isAssignee || isCreator); const isDone = s === 'completed' || s === 'closed'; const canArchive = isDone && (isResolver || isCreator || isAdm); - const archBtn = canArchive ? (t.archived ? `` : ``) : ''; + const archBtn = canArchive ? (t.archived ? `` : ``) : ''; const tagsList=(t.tags||[]).map(tg=>`${esc(tg)} `).join(''); const relsList=rels.map(r=>`${ic('link',12)} ${esc(r)} `).join(''); - $('#sheet').innerHTML=`
${esc(t.id)}${p}${t.archived?'Archived':`${STAT[s]||esc(s)}`}
-

${esc(t.title)}

-
${fld('a','Assignee',{t:'select',opts:usOpts(),v:t.assignee?.username||t.assigned_to||'',d:'data-act="assign"'})}${fld('p','Priority',{t:'select',opts:PRI,v:p,d:'data-act="prio"'})}
-
${meta}
+ $('#sheet').innerHTML=`
+
+ + ${esc(t.id)} + ${p} + ${t.archived?'Archived':`${STAT[s]||esc(s)}`} +
+ +
+
- -
-
Tags & Labels
-
${tagsList}
-
+
+ +
+

${esc(t.title)}

+ +
+
Description
+
${esc(t.description||'No description provided.')}
+
- -
-
Linked & Related Tickets
-
${relsList}
-
+ + ${t.linked_error_id ? ` +
+
+ ${ic('bug',14)} Linked Crash Telemetry +
+
+ ${esc(t.linked_error_id)} + +
+
` : ''} -
Description

${esc(t.description||'No description provided')}

-${atts.length?`
Attached Images / Files
${atts.map(a=>{ - const isImg=a.type==='image'||/\.(png|jpe?g|webp|gif)$/i.test(a.url); - return isImg?`
${esc(a.name)}${esc(a.name)}
` - :``; -}).join('')}
`:''} -${links.length?`
Links
${links.map(u=>`${esc(String(u).replace(/^https?:\/\//,''))}`).join('')}
`:''} + + ${atts.length?` +
+
Attachments (${atts.length})
+
${atts.map(a=>{ + const isImg=a.type==='image'||/\.(png|jpe?g|webp|gif)$/i.test(a.url); + return isImg?`
${esc(a.name)}${esc(a.name)}
` + :``; + }).join('')}
+
`:''} -
Activity · ${rem.length}
${rem.map(r=>{const sys=r.system||['created','hold','complete','reassigned','priority','resume','reopen','archive','unarchive','sla_breach','reassign','link'].includes(r.type);return`
${sys?'Khira System':who(r.author||{name:r.author_name,username:r.author_username,role:r.author_role},r.author_name)}${ago(r.created_at)}

${esc(r.text||r.body)}

`}).join('')} -
-
${canDel?``:''}${archBtn}${s==='hold'?``:''}${s==='completed'?'':(s==='hold'?'':``)+``}
`; + + ${links.length?` +
+
External References
+
${links.map(u=>`${ic('link',12)} ${esc(String(u).replace(/^https?:\/\//,''))}`).join('')}
+
`:''} + + +
+
Activity & Remarks (${rem.length})
+
+ ${rem.map(r=>{ + const sys=r.system||['created','hold','complete','reassigned','priority','resume','reopen','archive','unarchive','sla_breach','reassign','link'].includes(r.type); + return`
+
+ ${sys?'System Automation':who(r.author||{name:r.author_name,username:r.author_username,role:r.author_role},r.author_name)} + ${ago(r.created_at)} +
+

${esc(r.text||r.body)}

+
`; + }).join('')} +
+
+ + +
+
+
+ + +
+
+ + ${STAT[s]||esc(s)} +
+ +
+ + ${fld('a','',{t:'select',opts:usOpts(),v:t.assignee?.username||t.assigned_to||'',d:'data-act="assign"'})} +
+ +
+ + ${fld('p','',{t:'select',opts:PRI,v:p,d:'data-act="prio"'})} +
+ +
+ +
${who(t.reporter||{name:t.created_by_name,username:t.created_by,role:t.created_by_role},t.created_by_name)}
+
+ + ${t.due_date ? ` +
+ +
+ ${new Date(t.due_date).toLocaleDateString()} (${ago(t.due_date)}) +
+
` : ''} + + ${g ? ` + ${t.general_category ? `
${esc(t.general_category)}
` : ''} + ${t.department ? `
${esc(t.department)}
` : ''} + ` : ` + ${t.app||t.app_name ? `
${esc(t.app||t.app_name)}
` : ''} + ${t.feature||t.feature_name ? `
${esc(t.feature||t.feature_name)}
` : ''} + `} + + +
+ +
+ ${tagsList} + +
+
+ + +
+ +
+ ${relsList} + +
+
+
+
+ + +
`; // Add Tag button handler $('#btnAddTagBtn')?.addEventListener('click',()=>{ @@ -1120,7 +1259,8 @@ async function sheet(id, skipFetch){ if(!skipFetch){ try { - const full = await api(`/khira/api/tickets/${encodeURIComponent(id)}`); + const res = await api(`/khira/api/tickets/${encodeURIComponent(id)}`); + const full = (res && res.ticket) ? res.ticket : res; if(full && full.id && S.tid === id && $('#sheet').open){ const idx = S.t.findIndex(x=>x.id===id); if(idx !== -1) S.t[idx] = full; @@ -1988,7 +2128,7 @@ window.addEventListener('keydown',e=>{ if(tag==='INPUT'||tag==='TEXTAREA'||tag==='SELECT')return; if(e.key==='?'){ $('#shortcutsModal').hidden=false; - }else if(e.key==='n'||e.key==='N'){ + }else if(e.key==='n'||e.key==='N'||e.key==='c'||e.key==='C'){ newTicket(); }else if(e.key==='t'||e.key==='T'){ nav('tickets'); @@ -2322,7 +2462,7 @@ document.addEventListener('click',async e=>{ } // Notifications popup - if(x=c('[data-d]')){ + if(x=c('#pop [data-d]')){ const d=x.dataset.d; if(d==='readall'){await api('/khira/api/notifications/read','POST');await refresh();toast('All marked read');$('#pop').hidden=true} return; @@ -2337,6 +2477,38 @@ document.addEventListener('click',async e=>{ } if(c('[data-copy]'))return navigator.clipboard.writeText($('#ctx').textContent).then(()=>toast('Copied')); + if(c('#btnSidebarCreate'))return S.sec==='tickets'?newTicket():reportErr(); + if(c('#btnLogout')){ + await api('/khira/api/auth/logout','POST'); + ls('khira_session_token',''); + ls('khira_active_user',''); + boot(); + toast('Signed out'); + return; + } + if(c('#btnMobileNav')){ + $('#sidebar')?.classList.toggle('mobile-open'); + return; + } + if(x=c('[data-col-add]')){ + newTicket(); + return; + } + if(x=c('#btnSheetCopyLink')||(x=c('[data-copy-ref]'))){ + const ref = x.dataset.copyRef || S.tid || ''; + if(ref)navigator.clipboard.writeText(ref).then(()=>toast(`Reference ${ref} copied`)); + return; + } + if(x=c('[data-jump-err]')){ + const errId = x.dataset.jumpErr; + nav('errors'); + S.q = errId.toLowerCase(); + const qEl = $('#q'); + if (qEl) qEl.value = errId; + renderE(true); + return; + } + if(c('#btnLogAppErr'))return reportErr({continue_app:true}); if(c('#fab'))return S.sec==='tickets'?newTicket():reportErr(); if(c('#bell'))return pop(); @@ -2462,7 +2634,7 @@ $('#fUp')?.addEventListener('submit',async e=>{ boot(r.user); }); -$$('.demo button').forEach(b=>{ +$$('.demo button, .demo-chips button').forEach(b=>{ b.onclick=async()=>{ const uname = b.dataset.d; const pass = uname + '123'; @@ -2558,6 +2730,14 @@ async function handleRealtimeEvent(evt) { /* ── App Initialization ── */ async function boot(u){ + if (!u) { + S.u = null; + $('#app').hidden = true; + $('#auth').hidden = false; + setupTurnstile(); + clearInterval(pollId); + return; + } S.u=u; $('#auth').hidden=true; $('#app').hidden=false; diff --git a/web/khira/index.html b/web/khira/index.html index 443edf1..51c4bcb 100644 --- a/web/khira/index.html +++ b/web/khira/index.html @@ -3,175 +3,404 @@ - -Khira Enterprise Issue Tracker - + +Khira — Enterprise Issue Tracker & Telemetry + - - + + -
-
-