feat(khira): add delete ticket option and admin-exclusive 'A' avatar

This commit is contained in:
2026-10-26 12:10:58 +05:30
parent 1fedc000bb
commit 4c9a6b4ebe
6 changed files with 134 additions and 26 deletions
+3 -3
View File
@@ -174,7 +174,7 @@ func seedDefaultUsers(db *sql.DB) error {
roleDisplay string
avatar string
}{
{"admin", "System Administrator", "admin", "team_lead", "Team Lead", "⚡"},
{"admin", "System Administrator", "admin", "team_lead", "Team Lead", "A"},
{"alice", "Alice Sharma", "alice123", "frontend_dev", "Frontend Dev", "👩‍💻"},
{"bob", "Bob Anderson", "bob123", "backend_dev", "Backend Dev", "👨‍💻"},
{"charlie", "Charlie Diaz", "charlie123", "tester", "Tester", "🕵️‍♂️"},
@@ -195,9 +195,9 @@ func seedDefaultUsers(db *sql.DB) error {
slog.Error("failed to seed user", "username", u.username, "err", err)
}
} else if u.username == "admin" {
// Ensure admin password is "admin"
// Ensure admin password is "admin" and avatar is "A"
hash := hashPassword("admin")
_, _ = db.Exec("UPDATE users SET password_hash = $1 WHERE username = 'admin'", hash)
_, _ = db.Exec("UPDATE users SET password_hash = $1, avatar = 'A' WHERE username = 'admin'", hash)
}
}
+24
View File
@@ -107,6 +107,8 @@ func (s *Server) RegisterRoutes(r chi.Router) {
api.Get("/tickets", s.handleListTickets)
api.Post("/tickets", s.handleCreateTicket)
api.Get("/tickets/{id}", s.handleGetTicket)
api.Delete("/tickets/{id}", s.handleDeleteTicket)
api.Post("/tickets/{id}/delete", s.handleDeleteTicket)
api.Post("/tickets/{id}/remarks", s.handleAddRemark)
api.Post("/tickets/{id}/hold", s.handleHoldTicket)
api.Post("/tickets/{id}/resume", s.handleResumeTicket)
@@ -257,6 +259,11 @@ func (s *Server) handleUpdateProfile(w http.ResponseWriter, r *http.Request) {
pass = strings.TrimSpace(req.Password)
}
if strings.TrimSpace(req.Avatar) == "A" && !s.isAdmin(actor) {
s.writeJSON(w, http.StatusForbidden, map[string]string{"error": "The 'A' avatar is exclusively reserved for administrators"})
return
}
updated, err := s.Store.UpdateUserProfileFull(actor.Username, req.Name, req.Role, req.Avatar, req.AvatarType, req.ProfileImage, pass)
if err != nil {
s.writeJSON(w, http.StatusBadRequest, map[string]string{"error": err.Error()})
@@ -447,6 +454,23 @@ func (s *Server) handleGetTicket(w http.ResponseWriter, r *http.Request) {
})
}
func (s *Server) handleDeleteTicket(w http.ResponseWriter, r *http.Request) {
actor := s.getActor(r)
if actor == nil {
s.writeJSON(w, http.StatusUnauthorized, map[string]string{"error": "Please sign in to delete tickets"})
return
}
id := chi.URLParam(r, "id")
if err := s.Store.DeleteTicket(id, actor); err != nil {
s.writeJSON(w, http.StatusBadRequest, map[string]string{"error": err.Error()})
return
}
s.writeJSON(w, http.StatusOK, map[string]any{
"status": "ok",
"message": fmt.Sprintf("Ticket %s deleted successfully", id),
})
}
func (s *Server) handleAddRemark(w http.ResponseWriter, r *http.Request) {
actor := s.getActor(r)
if actor == nil {
+45 -1
View File
@@ -245,7 +245,14 @@ func (s *Store) UpdateUserProfileFull(username, name, role, avatar, avatarType,
}
}
if strings.TrimSpace(avatar) != "" {
u.Avatar = strings.TrimSpace(avatar)
newAv := strings.TrimSpace(avatar)
if newAv == "A" {
isAdmin := strings.EqualFold(u.Username, "admin") || strings.EqualFold(u.Role, "team_lead") || strings.EqualFold(u.Role, "lead")
if !isAdmin {
return nil, errors.New("the 'A' avatar is exclusively reserved for administrators")
}
}
u.Avatar = newAv
}
if strings.TrimSpace(avatarType) != "" {
u.AvatarType = strings.TrimSpace(avatarType)
@@ -430,6 +437,43 @@ func (s *Store) GetTicket(id string) (*Ticket, error) {
return &t, nil
}
func (s *Store) DeleteTicket(ticketID string, actor *User) error {
var createdBy, assignedTo string
err := s.primaryDB.QueryRow("SELECT created_by, assigned_to FROM tickets WHERE id = $1", ticketID).Scan(&createdBy, &assignedTo)
if err != nil {
return errors.New("ticket not found")
}
isAdmin := actor != nil && (strings.EqualFold(actor.Username, "admin") || actor.Role == string(RoleLead) || strings.EqualFold(actor.Role, "team_lead") || strings.EqualFold(actor.Role, "lead"))
isOwner := actor != nil && (strings.EqualFold(actor.Username, createdBy) || strings.EqualFold(actor.Username, assignedTo))
if !isAdmin && !isOwner {
return errors.New("permission denied: only administrators or the ticket creator can delete this ticket")
}
tx, err := s.primaryDB.Begin()
if err != nil {
return err
}
defer tx.Rollback()
// 1. Unlink any errors referencing this ticket
_, _ = tx.Exec("UPDATE errors SET linked_ticket_id = '', status = 'unresolved' WHERE linked_ticket_id = $1", ticketID)
// 2. Delete notifications referencing this ticket
_, _ = tx.Exec("DELETE FROM notifications WHERE ticket_id = $1", ticketID)
// 3. Delete ticket (cascade deletes ticket_remarks, ticket_attachments, ticket_links)
res, err := tx.Exec("DELETE FROM tickets WHERE id = $1", ticketID)
if err != nil {
return fmt.Errorf("failed to delete ticket: %w", err)
}
if n, _ := res.RowsAffected(); n == 0 {
return errors.New("ticket not found")
}
return tx.Commit()
}
func (s *Store) ListTickets(status, priority, app, assignee, reporter, query, ticketType string) []*Ticket {
var conds []string
+52 -20
View File
@@ -34,13 +34,28 @@ async function api(p,m='GET',b){
const pri=t=>{const p=(t.priority||'P3').toUpperCase();return{CRITICAL:'P0',HIGH:'P1',MEDIUM:'P2',LOW:'P3'}[p]||p};
const st=t=>{const s=(t.status||'open').toLowerCase();return s==='in_progress'?'progress':s==='on_hold'?'hold':s};
const ek=e=>e.status==='resolved'?'resolved':e.escalated_ticket_id?'escalated':'unresolved';
const avHtml=(u,size=36)=>{
if(!u)return '👤';
if(u.avatar_type==='image'&&u.profile_image){
return `<img src="${esc(u.profile_image)}" alt="${esc(u.name||'')}" style="width:${size}px;height:${size}px;border-radius:50%;object-fit:cover;vertical-align:middle;">`;
}
if(u.avatar==='A'){
return `<span class="av-admin-a" style="width:${size}px;height:${size}px;font-size:${Math.round(size*0.48)}px">A</span>`;
}
return `<span style="font-size:${Math.round(size*0.55)}px">${esc(u.avatar||'👤')}</span>`;
};
const who=(u,alt)=>{
if(!u)return alt||'—';
if(u.avatar_type==='image'&&u.profile_image){
return `<span class="r" style="display:inline-flex;align-items:center;gap:6px"><img src="${esc(u.profile_image)}" style="width:20px;height:20px;border-radius:50%;object-fit:cover;vertical-align:middle;"> ${esc(u.name)}</span>`;
}
return `${u.avatar||'👤'} ${esc(u.name)}`;
return `<span class="r" style="display:inline-flex;align-items:center;gap:6px">${avHtml(u,20)} ${esc(u.name)}</span>`;
};
function updateMe(u){
const el=$('#me');if(!el)return;
el.innerHTML=avHtml(u,36);
}
const usOpts=b=>[...(b?[['','Choose developer']]:[]),...S.us.map(u=>[u.username,`${u.name} · ${u.role_display}`])];
function ago(iso){if(!iso)return'—';const d=new Date(iso);if(isNaN(d))return iso;const s=Math.floor((Date.now()-d)/1e3);if(s<60)return'just now';const m=Math.floor(s/60);if(m<60)return m+'m ago';const h=Math.floor(m/60);if(h<24)return h+'h ago';const x=Math.floor(h/24);return x<30?x+'d ago':d.toLocaleDateString()}
const greet=()=>{const h=new Date().getHours();return h<5?'Working late':h<12?'Good morning':h<17?'Good afternoon':h<21?'Good evening':'Working late'};
@@ -49,15 +64,6 @@ let tt;function toast(m,t){const s=$('#snack');s.textContent=m;s.style.backgroun
const busy=async(b,fn)=>{b.disabled=true;try{return await fn()}finally{b.disabled=false}};
const chk=f=>{f.querySelectorAll('.bad').forEach(x=>x.classList.remove('bad'));const bad=[...f.querySelectorAll('[required]:not(:disabled)')].filter(x=>!x.value.trim());bad.forEach(x=>x.closest('.fld').classList.add('bad'));if(bad.length){bad[0].focus();toast('Fill in the required fields','err')}return!bad.length};
function updateMe(u){
const el=$('#me');if(!el)return;
if(u&&u.avatar_type==='image'&&u.profile_image){
el.innerHTML=`<img src="${esc(u.profile_image)}" alt="${esc(u.name)}">`;
}else{
el.textContent=u?(u.avatar||'👤'):'👤';
}
}
/* ── form builders ── */
function fld(n,l,o={}){
const r=o.req?' required':'',t=o.t||'text';let c;
@@ -145,10 +151,8 @@ function renderT(anim){
const rows=f.filter(t=>st(t)===k||(!STAT[st(t)]&&k==='open'));
return`<section class="col"><h3><i style="--c:${c}"></i>${STAT[k]}<small>${rows.length}</small></h3>${rows.map((t,i)=>{
const p=pri(t),n=(t.remarks||[]).length;
const avHtml=t.assignee?.avatar_type==='image'&&t.assignee?.profile_image
?`<img src="${esc(t.assignee.profile_image)}" style="width:20px;height:20px;border-radius:50%;object-fit:cover;">`
:`<span>${esc(t.assignee?.avatar||t.assigned_to_avatar||'👤')}</span>`;
return`<article class="card" tabindex="0" role="button" data-t="${esc(t.id)}" style="--i:${i}"><div class="r"><span class="id">${esc(t.id)}</span><span class="tag">${t.ticket_type==='general'?'General':'App'}</span><span class="pb ${p.toLowerCase()}">${p}</span></div><h4>${esc(t.title)}</h4><div class="r m"><span class="ell">${esc(sub(t))}</span>${n?`<span class="r">${ms('chat_bubble').replace('class="ms"','class="ms" style="font-size:16px"')}${n}</span>`:''}${avHtml}</div></article>`;
const avElem=avHtml(t.assignee||{avatar:t.assigned_to_avatar||'👤'},20);
return`<article class="card" tabindex="0" role="button" data-t="${esc(t.id)}" style="--i:${i}"><div class="r"><span class="id">${esc(t.id)}</span><span class="tag">${t.ticket_type==='general'?'General':'App'}</span><span class="pb ${p.toLowerCase()}">${p}</span></div><h4>${esc(t.title)}</h4><div class="r m"><span class="ell">${esc(sub(t))}</span>${n?`<span class="r">${ms('chat_bubble').replace('class="ms"','class="ms" style="font-size:16px"')}${n}</span>`:''}${avElem}</div></article>`;
}).join('')||'<div class="empty">No tickets</div>'}</section>`;
}).join(''));
}else{
@@ -190,20 +194,22 @@ function sheet(id){
$('#sheet').innerHTML=`<div class="sbd"><header class="sh"><button class="ib" data-x aria-label="Close">${ms('close')}</button><span class="id">${esc(t.id)}</span><span class="pb ${p.toLowerCase()}">${p}</span><span class="stt ${s}">${STAT[s]||esc(s)}</span></header>
<div class="sb"><h2>${esc(t.title)}</h2>
<div class="g2">${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"'})}</div>
<dl>${meta}${kv('Reported by',who(t.reporter,t.created_by_name))}</dl>
<dl>${meta}${kv('Reported by',who(t.reporter||{name:t.created_by_name},t.created_by_name))}</dl>
<div><h5>Assistance required</h5><p>${esc(t.assistance||t.assistance_required||'—')}</p></div>
<div><h5>Diagnostic context<button class="ib" data-copy aria-label="Copy">${ms('content_copy')}</button></h5><pre class="code" id="ctx">${esc(t.context||t.additional_info||'No logs provided')}</pre></div>
${links.length?`<div class="lk"><h5>Links</h5>${links.map(u=>`<a href="${esc(u)}" target="_blank" rel="noopener">${esc(String(u).replace(/^https?:\/\//,''))}</a>`).join('')}</div>`:''}
<div><h5>Activity · ${rem.length}</h5>${rem.map(r=>{const sys=r.system||['created','hold','complete','reassigned','priority','resume'].includes(r.type);return`<div class="tle${sys?' sys':''}"><b>${sys?'Khira':esc(r.author?.name||r.author_name||'Anonymous')}</b><small>${ago(r.created_at)}</small><p>${esc(r.text||r.body)}</p></div>`}).join('')}
<form class="cmp" id="rf"><textarea id="rt" rows="1" placeholder="Add a remark"></textarea><button class="ib" aria-label="Send">${ms('send')}</button></form></div></div>
<footer class="sf">${s==='hold'?`<button class="tn" data-do="resume">${ms('play_arrow')}Resume</button>`:''}${s==='completed'?'':(s==='hold'?'':`<button class="tn" data-do="hold">${ms('pause')}Hold</button>`)+`<button class="fb" data-do="done">Complete</button>`}</footer></div>`;
<footer class="sf"><button class="del-btn" data-do="del"><span class="ms">delete</span>Delete</button>${s==='hold'?`<button class="tn" data-do="resume">${ms('play_arrow')}Resume</button>`:''}${s==='completed'?'':(s==='hold'?'':`<button class="tn" data-do="hold">${ms('pause')}Hold</button>`)+`<button class="fb" data-do="done">Complete</button>`}</footer></div>`;
if(!$('#sheet').open)$('#sheet').showModal();
}
async function act(a,b,m){
const r=await api(`/khira/api/tickets/${encodeURIComponent(S.tid)}/${a}`,'POST',b);
if(r._f){toast(r.error,'err');return false}
toast(m);await refresh();sheet(S.tid);
}
async function remark(){
const ta=$('#rt'),b=ta.value.trim();
if(!b){toast('Write a remark first','err');return}
@@ -211,9 +217,26 @@ async function remark(){
if(r._f){toast(r.error,'err');return}
toast('Remark posted');await refresh();sheet(S.tid);
}
const holdD=()=>dlg({title:'Put ticket on hold',sub:'Say what is blocking this ticket.',body:fld('reason','Reason',{t:'area',rows:4,req:1}),ok:'Hold ticket',go:v=>act('hold',{reason:v.reason},'Ticket on hold')});
const doneD=()=>dlg({title:'Complete ticket',sub:'Describe how it was resolved.',body:fld('resolution','Resolution',{t:'area',rows:4,req:1}),ok:'Complete ticket',go:v=>act('complete',{remarks:v.resolution,resolution:v.resolution},'Ticket completed')});
function deleteTicketD(id){
dlg({
title:'Delete ticket',
sub:id,
body:'<p style="color:var(--err);font-weight:500"><span class="ms">delete</span> Are you sure you want to permanently delete this ticket and all its remarks? This action cannot be undone.</p>',
ok:'Delete ticket',
go:async()=>{
const r=await api(`/khira/api/tickets/${encodeURIComponent(id)}`,'DELETE');
if(r._f||r.error){toast(r.error||'Could not delete ticket','err');return false}
toast(r.message||'Ticket deleted');
$('#sheet').close();
await refresh();
}
});
}
/* ── create ticket ── */
function newTicket(){
dlg({wide:1,title:'New ticket',sub:`Reporting as ${esc(S.u.name)}`,ok:'Create ticket',
@@ -310,14 +333,22 @@ function profile(){
let curAvatar=S.u.avatar||'👤';
let curType=S.u.avatar_type||'emoji';
let curImg=S.u.profile_image||'';
const isAdmin=S.u&&(S.u.username==='admin'||S.u.role==='team_lead'||S.u.role==='lead');
const previewHtml=()=>{
if(curType==='image'&&curImg){
return `<img src="${esc(curImg)}" alt="Preview">`;
}
if(curAvatar==='A'){
return `<span class="av-admin-a" style="font-size:32px">A</span>`;
}
return esc(curAvatar);
};
const adminOption=isAdmin
?`<button type="button" class="av-opt av-opt-admin${curAvatar==='A'&&curType==='emoji'?' on':''}" data-em="A" title="Admin Exclusive Avatar"><span class="av-admin-a" style="width:26px;height:26px;font-size:13px">A</span></button>`
:'';
dlg({
title:'Profile Settings',
sub:`@${esc(S.u.username)} · ${esc(S.u.role_display||S.u.role)}`,
@@ -332,7 +363,7 @@ function profile(){
</div>
<div id="avEmojiBox" class="${curType==='emoji'?'':'hidden'}" style="width:100%">
<div class="av-grid">
${EMOJIS.map(em=>`<button type="button" class="av-opt${em===curAvatar&&curType==='emoji'?' on':''}" data-em="${em}">${em}</button>`).join('')}
${adminOption}${EMOJIS.map(em=>`<button type="button" class="av-opt${em===curAvatar&&curType==='emoji'?' on':''}" data-em="${em}">${em}</button>`).join('')}
</div>
</div>
<div id="avUploadBox" class="av-upload-box ${curType==='image'?'':'hidden'}">
@@ -446,6 +477,7 @@ document.addEventListener('click',async e=>{
if(x=c('[data-d]')){$('#lu').value=x.dataset.d;$('#lp').value=x.dataset.d==='admin'?'admin':(x.dataset.d+'123');return $('#fIn').requestSubmit()}
if(x=c('[data-do]')){
const d=x.dataset.do;
if(d==='del')return deleteTicketD(S.tid);
if(d==='hold')return holdD();if(d==='done')return doneD();
if(d==='resume')return act('resume',undefined,'Ticket resumed');
if(d==='readall'){await api('/khira/api/notifications/read','POST');await refresh();toast('All marked read');$('#pop').hidden=true}
+1 -1
View File
@@ -9,7 +9,7 @@
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Roboto+Flex:wght@400;500;600&family=Roboto+Mono:wght@400;500&display=swap" rel="stylesheet">
<link href="https://fonts.googleapis.com/css2?family=Material+Symbols+Rounded:opsz,wght,FILL,GRAD@24,400,0,0&icon_names=add,bug_report,chat_bubble,check,close,cloud_sync,confirmation_number,content_copy,dark_mode,error,expand_more,face,history,light_mode,logout,notifications,pause,photo_camera,play_arrow,search,send,sync,upgrade,upload,view_kanban,view_list&display=block" rel="stylesheet">
<link href="https://fonts.googleapis.com/css2?family=Material+Symbols+Rounded:opsz,wght,FILL,GRAD@24,400,0,0&icon_names=add,bug_report,chat_bubble,check,close,cloud_sync,confirmation_number,content_copy,dark_mode,delete,error,expand_more,face,history,light_mode,logout,notifications,pause,photo_camera,play_arrow,search,send,sync,upgrade,upload,view_kanban,view_list&display=block" rel="stylesheet">
<link rel="stylesheet" href="/khira/styles.css">
<script>try{document.documentElement.dataset.theme=localStorage.khira_theme||(matchMedia('(prefers-color-scheme:dark)').matches?'dark':'light')}catch(e){}</script>
</head>
+9 -1
View File
@@ -166,7 +166,9 @@ dt{font-size:12px;color:var(--on-sv)}dd{word-break:break-word}
.cmp{display:flex;gap:8px;align-items:flex-end;margin-top:8px}
.cmp textarea{flex:1;min-width:0;font:inherit;font-size:15px;color:var(--on-s);background:var(--sc);border:0;border-radius:24px;padding:12px 18px;outline:0;resize:none;max-height:140px}
.cmp .ib{background:var(--pri);color:var(--on-pri);flex:none}
.sf{display:flex;gap:8px;justify-content:flex-end;padding:12px 16px calc(12px + env(safe-area-inset-bottom));background:var(--sc-hi);border-top:1px solid var(--out-v)}
.sf{display:flex;gap:8px;align-items:center;justify-content:flex-end;padding:12px 16px calc(12px + env(safe-area-inset-bottom));background:var(--sc-hi);border-top:1px solid var(--out-v)}
.del-btn{margin-right:auto;color:var(--err);padding:0 12px;height:40px;border-radius:20px;font-weight:500;display:inline-flex;align-items:center;gap:6px}
.del-btn:hover{background:var(--err-c);color:var(--on-err-c)}
.lk a{color:var(--pri);display:block;padding:2px 0;word-break:break-all}
.snack{position:fixed;left:50%;bottom:calc(96px + env(safe-area-inset-bottom));z-index:99;transform:translate(-50%,24px);opacity:0;pointer-events:none;background:var(--on-s);color:var(--surf);padding:14px 20px;border-radius:12px;font-size:14px;max-width:calc(100% - 32px);transition:all .3s var(--e)}
@@ -220,3 +222,9 @@ dt{font-size:12px;color:var(--on-sv)}dd{word-break:break-word}
.upload-btn{height:36px;border-radius:18px;border:1px dashed var(--pri);background:var(--sc-hi);color:var(--pri);display:flex;align-items:center;justify-content:center;gap:8px;font-size:13px;font-weight:500;cursor:pointer}
.upload-btn:hover{background:var(--sec-c)}
/* Special Admin Avatar "A" */
.av-admin-a{font-family:"Roboto Flex",system-ui,sans-serif;font-weight:800;font-size:18px;color:#fff;background:linear-gradient(135deg,#FFB800 0%,#E65100 50%,#B71C1C 100%);width:100%;height:100%;display:grid;place-items:center;border-radius:50%;box-shadow:0 0 8px rgba(255,184,0,0.4);user-select:none;line-height:1}
.av-opt-admin{position:relative;border:2px solid #FFB800!important}
.av-opt-admin::after{content:"ADMIN";position:absolute;bottom:-6px;font-size:8px;font-weight:700;background:#E65100;color:#fff;padding:0 3px;border-radius:3px;letter-spacing:0.4px}