diff --git a/internal/khira/db.go b/internal/khira/db.go
index f218cea..c017f1d 100644
--- a/internal/khira/db.go
+++ b/internal/khira/db.go
@@ -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)
}
}
diff --git a/internal/khira/handlers.go b/internal/khira/handlers.go
index 5140852..849c10e 100644
--- a/internal/khira/handlers.go
+++ b/internal/khira/handlers.go
@@ -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 {
diff --git a/internal/khira/store.go b/internal/khira/store.go
index b0ad133..3d756c2 100644
--- a/internal/khira/store.go
+++ b/internal/khira/store.go
@@ -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
diff --git a/web/khira/app.js b/web/khira/app.js
index 37cb097..9c4f9c0 100644
--- a/web/khira/app.js
+++ b/web/khira/app.js
@@ -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 ``;
+ }
+ if(u.avatar==='A'){
+ return `A`;
+ }
+ return `${esc(u.avatar||'๐ค')}`;
+};
+
const who=(u,alt)=>{
if(!u)return alt||'โ';
- if(u.avatar_type==='image'&&u.profile_image){
- return `
${esc(u.name)}`;
- }
- return `${u.avatar||'๐ค'} ${esc(u.name)}`;
+ return `${avHtml(u,20)} ${esc(u.name)}`;
};
+
+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=`
`;
- }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`
${STAT[k]}${rows.length}
${rows.map((t,i)=>{
const p=pri(t),n=(t.remarks||[]).length;
- const avHtml=t.assignee?.avatar_type==='image'&&t.assignee?.profile_image
- ?``
- :`${esc(t.assignee?.avatar||t.assigned_to_avatar||'๐ค')}`;
- return`
${esc(t.title)}
${esc(t.title)}
${esc(t.assistance||t.assistance_required||'โ')}
${esc(t.context||t.additional_info||'No logs provided')}${esc(r.text||r.body)}
delete Are you sure you want to permanently delete this ticket and all its remarks? This action cannot be undone.
', + 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 `