project-logbook 1.3.0 → 1.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/commands/answer.d.ts +1 -0
- package/dist/commands/answer.js +41 -0
- package/dist/commands/answer.js.map +1 -0
- package/dist/commands/answers.d.ts +6 -0
- package/dist/commands/answers.js +37 -0
- package/dist/commands/answers.js.map +1 -0
- package/dist/commands/ask.d.ts +1 -0
- package/dist/commands/ask.js +30 -0
- package/dist/commands/ask.js.map +1 -0
- package/dist/commands/build.js +18 -2
- package/dist/commands/build.js.map +1 -1
- package/dist/commands/deprecate-qna.d.ts +1 -0
- package/dist/commands/deprecate-qna.js +33 -0
- package/dist/commands/deprecate-qna.js.map +1 -0
- package/dist/commands/status.js +3 -0
- package/dist/commands/status.js.map +1 -1
- package/dist/commands/unanswered.d.ts +1 -0
- package/dist/commands/unanswered.js +25 -0
- package/dist/commands/unanswered.js.map +1 -0
- package/dist/index.js +37 -0
- package/dist/index.js.map +1 -1
- package/dist/lib/config.d.ts +8 -0
- package/dist/lib/config.js +10 -0
- package/dist/lib/config.js.map +1 -1
- package/dist/lib/template-helpers.d.ts +2 -1
- package/dist/lib/template-helpers.js +29 -0
- package/dist/lib/template-helpers.js.map +1 -1
- package/dist/lib/template-types.d.ts +12 -0
- package/dist/lib/templates.js +9 -1
- package/dist/lib/templates.js.map +1 -1
- package/dist/linters/index.js +2 -0
- package/dist/linters/index.js.map +1 -1
- package/dist/linters/qna.d.ts +3 -0
- package/dist/linters/qna.js +120 -0
- package/dist/linters/qna.js.map +1 -0
- package/dist/templates/hub.js +123 -8
- package/dist/templates/qna.md +11 -0
- package/dist/templates/steer.txt +2 -0
- package/dist/templates/styles.css +53 -0
- package/dist/utils/qna.d.ts +46 -0
- package/dist/utils/qna.js +157 -0
- package/dist/utils/qna.js.map +1 -0
- package/dist/watch/__tests__/git-utils.test.d.ts +1 -0
- package/dist/watch/__tests__/git-utils.test.js +17 -0
- package/dist/watch/__tests__/git-utils.test.js.map +1 -0
- package/dist/watch/collectors/acli.js +2 -2
- package/dist/watch/collectors/acli.js.map +1 -1
- package/dist/watch/collectors/entries.js +3 -3
- package/dist/watch/collectors/entries.js.map +1 -1
- package/dist/watch/collectors/glab.js +126 -37
- package/dist/watch/collectors/glab.js.map +1 -1
- package/dist/watch/collectors/jira.js +3 -2
- package/dist/watch/collectors/jira.js.map +1 -1
- package/dist/watch/dashboard-html.js +8 -0
- package/dist/watch/dashboard-html.js.map +1 -1
- package/dist/watch/git-utils.d.ts +10 -4
- package/dist/watch/git-utils.js +22 -6
- package/dist/watch/git-utils.js.map +1 -1
- package/dist/watch/hub-state.d.ts +3 -1
- package/dist/watch/hub-state.js +2 -0
- package/dist/watch/hub-state.js.map +1 -1
- package/dist/watch/hub.js +35 -2
- package/dist/watch/hub.js.map +1 -1
- package/dist/watch/state.d.ts +5 -1
- package/dist/watch/state.js.map +1 -1
- package/dist/watch/types.d.ts +21 -0
- package/dist/watch/types.js.map +1 -1
- package/dist/watch/watcher.js +13 -2
- package/dist/watch/watcher.js.map +1 -1
- package/package.json +7 -2
- package/src/templates/hub.js +123 -8
- package/src/templates/qna.md +11 -0
- package/src/templates/steer.txt +2 -0
- package/src/templates/styles.css +53 -0
|
@@ -0,0 +1,157 @@
|
|
|
1
|
+
import fs from 'fs-extra';
|
|
2
|
+
import { join } from 'node:path';
|
|
3
|
+
import matter from 'gray-matter';
|
|
4
|
+
function isQnaStatus(value) {
|
|
5
|
+
return value === 'asked' || value === 'answered' || value === 'deprecated';
|
|
6
|
+
}
|
|
7
|
+
function parseNumericId(idInput) {
|
|
8
|
+
const id = parseInt(idInput, 10);
|
|
9
|
+
return isNaN(id) ? null : id;
|
|
10
|
+
}
|
|
11
|
+
export async function resolveQnaEntry(qnaDir, idInput) {
|
|
12
|
+
const id = parseNumericId(idInput);
|
|
13
|
+
if (id === null) {
|
|
14
|
+
return { error: `Invalid ID '${idInput}': must be a numeric value.` };
|
|
15
|
+
}
|
|
16
|
+
const found = await findQnaById(qnaDir, id);
|
|
17
|
+
if (!found) {
|
|
18
|
+
return { error: `QnA question #${id} not found.` };
|
|
19
|
+
}
|
|
20
|
+
return { id, item: found.item, filepath: found.filepath };
|
|
21
|
+
}
|
|
22
|
+
export function sortQnaItems(items) {
|
|
23
|
+
return [...items].sort((a, b) => {
|
|
24
|
+
if (a.status === 'asked' && b.status !== 'asked')
|
|
25
|
+
return -1;
|
|
26
|
+
if (a.status !== 'asked' && b.status === 'asked')
|
|
27
|
+
return 1;
|
|
28
|
+
const timeA = new Date(a.dateAsked).getTime() || 0;
|
|
29
|
+
const timeB = new Date(b.dateAsked).getTime() || 0;
|
|
30
|
+
if (timeA !== timeB)
|
|
31
|
+
return timeA - timeB;
|
|
32
|
+
return a.id - b.id;
|
|
33
|
+
});
|
|
34
|
+
}
|
|
35
|
+
export function slugifyQuestion(text, maxLen = 40) {
|
|
36
|
+
let slug = text
|
|
37
|
+
.toLowerCase()
|
|
38
|
+
.replace(/[^a-z0-9]+/g, '-')
|
|
39
|
+
.replace(/^-+|-+$/g, '');
|
|
40
|
+
if (slug.length > maxLen) {
|
|
41
|
+
slug = slug.substring(0, maxLen).replace(/-+$/, '');
|
|
42
|
+
}
|
|
43
|
+
return slug || 'question';
|
|
44
|
+
}
|
|
45
|
+
export function parseQnaContent(body) {
|
|
46
|
+
const questionMatch = body.match(/###\s+Question\s*\n([\s\S]*?)(?=###\s+Answer|$)/i);
|
|
47
|
+
const answerMatch = body.match(/###\s+Answer\s*\n([\s\S]*)$/i);
|
|
48
|
+
return {
|
|
49
|
+
question: questionMatch ? questionMatch[1].trim() : '',
|
|
50
|
+
answer: answerMatch ? answerMatch[1].trim() : '',
|
|
51
|
+
};
|
|
52
|
+
}
|
|
53
|
+
export function formatQnaMarkdown(params) {
|
|
54
|
+
const lines = ['---', `id: ${params.id}`, `status: ${params.status}`, `dateAsked: ${params.dateAsked}`];
|
|
55
|
+
if (params.dateAnswered)
|
|
56
|
+
lines.push(`dateAnswered: ${params.dateAnswered}`);
|
|
57
|
+
if (params.dateDeprecated)
|
|
58
|
+
lines.push(`dateDeprecated: ${params.dateDeprecated}`);
|
|
59
|
+
lines.push('---', '', '### Question', params.question.trim(), '', '### Answer', (params.answer || '').trim(), '');
|
|
60
|
+
return lines.join('\n');
|
|
61
|
+
}
|
|
62
|
+
async function parseQnaFile(filepath) {
|
|
63
|
+
if (!(await fs.pathExists(filepath)))
|
|
64
|
+
return null;
|
|
65
|
+
const raw = await fs.readFile(filepath, 'utf8');
|
|
66
|
+
const { data, content } = matter(raw);
|
|
67
|
+
if (data.id === undefined)
|
|
68
|
+
return null;
|
|
69
|
+
const id = Number(data.id);
|
|
70
|
+
const status = isQnaStatus(data.status) ? data.status : 'asked';
|
|
71
|
+
let dateAsked = '';
|
|
72
|
+
if (data.dateAsked instanceof Date) {
|
|
73
|
+
dateAsked = data.dateAsked.toISOString().split('T')[0];
|
|
74
|
+
}
|
|
75
|
+
else if (typeof data.dateAsked === 'string') {
|
|
76
|
+
dateAsked = data.dateAsked.split('T')[0];
|
|
77
|
+
}
|
|
78
|
+
let dateAnswered;
|
|
79
|
+
if (data.dateAnswered instanceof Date) {
|
|
80
|
+
dateAnswered = data.dateAnswered.toISOString().split('T')[0];
|
|
81
|
+
}
|
|
82
|
+
else if (typeof data.dateAnswered === 'string') {
|
|
83
|
+
dateAnswered = data.dateAnswered.split('T')[0];
|
|
84
|
+
}
|
|
85
|
+
let dateDeprecated;
|
|
86
|
+
if (data.dateDeprecated instanceof Date) {
|
|
87
|
+
dateDeprecated = data.dateDeprecated.toISOString().split('T')[0];
|
|
88
|
+
}
|
|
89
|
+
else if (typeof data.dateDeprecated === 'string') {
|
|
90
|
+
dateDeprecated = data.dateDeprecated.split('T')[0];
|
|
91
|
+
}
|
|
92
|
+
const { question, answer } = parseQnaContent(content);
|
|
93
|
+
const filename = filepath.split('/').pop() || '';
|
|
94
|
+
return {
|
|
95
|
+
id,
|
|
96
|
+
status,
|
|
97
|
+
dateAsked,
|
|
98
|
+
dateAnswered,
|
|
99
|
+
dateDeprecated,
|
|
100
|
+
question,
|
|
101
|
+
answer,
|
|
102
|
+
filename,
|
|
103
|
+
filepath,
|
|
104
|
+
};
|
|
105
|
+
}
|
|
106
|
+
export async function getAllQna(qnaDir) {
|
|
107
|
+
if (!(await fs.pathExists(qnaDir)))
|
|
108
|
+
return [];
|
|
109
|
+
const files = await fs.readdir(qnaDir);
|
|
110
|
+
const items = [];
|
|
111
|
+
for (const file of files) {
|
|
112
|
+
if (!file.endsWith('.md'))
|
|
113
|
+
continue;
|
|
114
|
+
const filepath = join(qnaDir, file);
|
|
115
|
+
if ((await fs.stat(filepath)).isDirectory())
|
|
116
|
+
continue;
|
|
117
|
+
const item = await parseQnaFile(filepath);
|
|
118
|
+
if (item)
|
|
119
|
+
items.push(item);
|
|
120
|
+
}
|
|
121
|
+
return items;
|
|
122
|
+
}
|
|
123
|
+
export async function getNextQnaId(qnaDir) {
|
|
124
|
+
if (!(await fs.pathExists(qnaDir)))
|
|
125
|
+
return 1;
|
|
126
|
+
const files = await fs.readdir(qnaDir);
|
|
127
|
+
let maxId = 0;
|
|
128
|
+
for (const file of files) {
|
|
129
|
+
if (!file.endsWith('.md'))
|
|
130
|
+
continue;
|
|
131
|
+
const m = file.match(/^(\d+)-/);
|
|
132
|
+
if (m) {
|
|
133
|
+
const num = parseInt(m[1], 10);
|
|
134
|
+
if (num > maxId)
|
|
135
|
+
maxId = num;
|
|
136
|
+
}
|
|
137
|
+
// Also try frontmatter if needed
|
|
138
|
+
const filepath = join(qnaDir, file);
|
|
139
|
+
try {
|
|
140
|
+
const item = await parseQnaFile(filepath);
|
|
141
|
+
if (item && item.id > maxId)
|
|
142
|
+
maxId = item.id;
|
|
143
|
+
}
|
|
144
|
+
catch {
|
|
145
|
+
// ignore
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
return maxId + 1;
|
|
149
|
+
}
|
|
150
|
+
export async function findQnaById(qnaDir, id) {
|
|
151
|
+
const items = await getAllQna(qnaDir);
|
|
152
|
+
const match = items.find((q) => q.id === id);
|
|
153
|
+
if (!match)
|
|
154
|
+
return null;
|
|
155
|
+
return { item: match, filepath: match.filepath };
|
|
156
|
+
}
|
|
157
|
+
//# sourceMappingURL=qna.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"qna.js","sourceRoot":"","sources":["../../src/utils/qna.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,MAAM,MAAM,aAAa,CAAC;AAkBjC,SAAS,WAAW,CAAC,KAAc;IACjC,OAAO,KAAK,KAAK,OAAO,IAAI,KAAK,KAAK,UAAU,IAAI,KAAK,KAAK,YAAY,CAAC;AAC7E,CAAC;AAED,SAAS,cAAc,CAAC,OAAe;IACrC,MAAM,EAAE,GAAG,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IACjC,OAAO,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;AAC/B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,MAAc,EACd,OAAe;IAEf,MAAM,EAAE,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;IACnC,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;QAChB,OAAO,EAAE,KAAK,EAAE,eAAe,OAAO,6BAA6B,EAAE,CAAC;IACxE,CAAC;IACD,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IAC5C,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,EAAE,KAAK,EAAE,iBAAiB,EAAE,aAAa,EAAE,CAAC;IACrD,CAAC;IACD,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC;AAC5D,CAAC;AAED,MAAM,UAAU,YAAY,CAAiE,KAAU;IACrG,OAAO,CAAC,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QAC9B,IAAI,CAAC,CAAC,MAAM,KAAK,OAAO,IAAI,CAAC,CAAC,MAAM,KAAK,OAAO;YAAE,OAAO,CAAC,CAAC,CAAC;QAC5D,IAAI,CAAC,CAAC,MAAM,KAAK,OAAO,IAAI,CAAC,CAAC,MAAM,KAAK,OAAO;YAAE,OAAO,CAAC,CAAC;QAC3D,MAAM,KAAK,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACnD,MAAM,KAAK,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACnD,IAAI,KAAK,KAAK,KAAK;YAAE,OAAO,KAAK,GAAG,KAAK,CAAC;QAC1C,OAAO,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,IAAY,EAAE,SAAiB,EAAE;IAC/D,IAAI,IAAI,GAAG,IAAI;SACZ,WAAW,EAAE;SACb,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC;SAC3B,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IAC3B,IAAI,IAAI,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC;QACzB,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IACtD,CAAC;IACD,OAAO,IAAI,IAAI,UAAU,CAAC;AAC5B,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,IAAY;IAC1C,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,kDAAkD,CAAC,CAAC;IACrF,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAC;IAC/D,OAAO;QACL,QAAQ,EAAE,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE;QACtD,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE;KACjD,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,MAQjC;IACC,MAAM,KAAK,GAAa,CAAC,KAAK,EAAE,OAAO,MAAM,CAAC,EAAE,EAAE,EAAE,WAAW,MAAM,CAAC,MAAM,EAAE,EAAE,cAAc,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC;IAClH,IAAI,MAAM,CAAC,YAAY;QAAE,KAAK,CAAC,IAAI,CAAC,iBAAiB,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC5E,IAAI,MAAM,CAAC,cAAc;QAAE,KAAK,CAAC,IAAI,CAAC,mBAAmB,MAAM,CAAC,cAAc,EAAE,CAAC,CAAC;IAClF,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,EAAE,cAAc,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE,YAAY,EAAE,CAAC,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;IAClH,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC;AAED,KAAK,UAAU,YAAY,CAAC,QAAgB;IAC1C,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC;IAClD,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAChD,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;IACtC,IAAI,IAAI,CAAC,EAAE,KAAK,SAAS;QAAE,OAAO,IAAI,CAAC;IAEvC,MAAM,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC3B,MAAM,MAAM,GAAc,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;IAE3E,IAAI,SAAS,GAAG,EAAE,CAAC;IACnB,IAAI,IAAI,CAAC,SAAS,YAAY,IAAI,EAAE,CAAC;QACnC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACzD,CAAC;SAAM,IAAI,OAAO,IAAI,CAAC,SAAS,KAAK,QAAQ,EAAE,CAAC;QAC9C,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3C,CAAC;IAED,IAAI,YAAgC,CAAC;IACrC,IAAI,IAAI,CAAC,YAAY,YAAY,IAAI,EAAE,CAAC;QACtC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/D,CAAC;SAAM,IAAI,OAAO,IAAI,CAAC,YAAY,KAAK,QAAQ,EAAE,CAAC;QACjD,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACjD,CAAC;IAED,IAAI,cAAkC,CAAC;IACvC,IAAI,IAAI,CAAC,cAAc,YAAY,IAAI,EAAE,CAAC;QACxC,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACnE,CAAC;SAAM,IAAI,OAAO,IAAI,CAAC,cAAc,KAAK,QAAQ,EAAE,CAAC;QACnD,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACrD,CAAC;IAED,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;IACtD,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC;IAEjD,OAAO;QACL,EAAE;QACF,MAAM;QACN,SAAS;QACT,YAAY;QACZ,cAAc;QACd,QAAQ;QACR,MAAM;QACN,QAAQ;QACR,QAAQ;KACT,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,MAAc;IAC5C,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAAE,OAAO,EAAE,CAAC;IAC9C,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACvC,MAAM,KAAK,GAAc,EAAE,CAAC;IAE5B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;YAAE,SAAS;QACpC,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACpC,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,WAAW,EAAE;YAAE,SAAS;QACtD,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,QAAQ,CAAC,CAAC;QAC1C,IAAI,IAAI;YAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,MAAc;IAC/C,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAAE,OAAO,CAAC,CAAC;IAC7C,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACvC,IAAI,KAAK,GAAG,CAAC,CAAC;IAEd,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;YAAE,SAAS;QACpC,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAChC,IAAI,CAAC,EAAE,CAAC;YACN,MAAM,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAC/B,IAAI,GAAG,GAAG,KAAK;gBAAE,KAAK,GAAG,GAAG,CAAC;QAC/B,CAAC;QACD,iCAAiC;QACjC,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACpC,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,QAAQ,CAAC,CAAC;YAC1C,IAAI,IAAI,IAAI,IAAI,CAAC,EAAE,GAAG,KAAK;gBAAE,KAAK,GAAG,IAAI,CAAC,EAAE,CAAC;QAC/C,CAAC;QAAC,MAAM,CAAC;YACP,SAAS;QACX,CAAC;IACH,CAAC;IAED,OAAO,KAAK,GAAG,CAAC,CAAC;AACnB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,MAAc,EAAE,EAAU;IAC1D,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,MAAM,CAAC,CAAC;IACtC,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;IAC7C,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IACxB,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC;AACnD,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { describe, it, expect } from 'vitest';
|
|
2
|
+
import { extractTicketFromBranch } from '../git-utils.js';
|
|
3
|
+
describe('extractTicketFromBranch', () => {
|
|
4
|
+
it('extracts a Jira ticket by configured prefix', () => {
|
|
5
|
+
expect(extractTicketFromBranch('feat/LB-34-cool-thing', 'LB', undefined)).toBe('LB-34');
|
|
6
|
+
});
|
|
7
|
+
it('extracts a bare numeric GitLab work item when a gitlab prefix is set', () => {
|
|
8
|
+
expect(extractTicketFromBranch('feat/36-content-api-garbage-endpoints', 'LB', '#')).toBe('#36');
|
|
9
|
+
});
|
|
10
|
+
it('handles a literal #-prefixed GitLab branch segment', () => {
|
|
11
|
+
expect(extractTicketFromBranch('feat/#32-api-anbindung', 'LB', '#')).toBe('#32');
|
|
12
|
+
});
|
|
13
|
+
it('returns undefined when neither prefix matches', () => {
|
|
14
|
+
expect(extractTicketFromBranch('feat/36-thing', 'LB', undefined)).toBeUndefined();
|
|
15
|
+
});
|
|
16
|
+
});
|
|
17
|
+
//# sourceMappingURL=git-utils.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"git-utils.test.js","sourceRoot":"","sources":["../../../src/watch/__tests__/git-utils.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAE1D,QAAQ,CAAC,yBAAyB,EAAE,GAAG,EAAE;IACvC,EAAE,CAAC,6CAA6C,EAAE,GAAG,EAAE;QACrD,MAAM,CAAC,uBAAuB,CAAC,uBAAuB,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC1F,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sEAAsE,EAAE,GAAG,EAAE;QAC9E,MAAM,CAAC,uBAAuB,CAAC,uCAAuC,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAClG,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oDAAoD,EAAE,GAAG,EAAE;QAC5D,MAAM,CAAC,uBAAuB,CAAC,wBAAwB,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACnF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+CAA+C,EAAE,GAAG,EAAE;QACvD,MAAM,CAAC,uBAAuB,CAAC,eAAe,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;IACpF,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -15,7 +15,7 @@ import { execSync, exec } from 'node:child_process';
|
|
|
15
15
|
import { existsSync, readFileSync } from 'node:fs';
|
|
16
16
|
import { promisify } from 'node:util';
|
|
17
17
|
import { join } from 'node:path';
|
|
18
|
-
import { getConfig } from '../../lib/config.js';
|
|
18
|
+
import { getConfig, GITLAB_PREFIX } from '../../lib/config.js';
|
|
19
19
|
import { getCurrentBranch } from '../../lib/git-helpers.js';
|
|
20
20
|
import { extractTicketFromBranch } from '../git-utils.js';
|
|
21
21
|
/** Check if acli CLI is installed. */
|
|
@@ -169,7 +169,7 @@ export const acliCollector = {
|
|
|
169
169
|
updated: updatedMap.get(issue.key) ?? new Date().toISOString(),
|
|
170
170
|
}));
|
|
171
171
|
const config = getConfig(cwd);
|
|
172
|
-
const ticketKey = state.activeTicketId ?? extractTicketFromBranch(getCurrentBranch(cwd), config.jiraPrefix);
|
|
172
|
+
const ticketKey = state.activeTicketId ?? extractTicketFromBranch(getCurrentBranch(cwd), config.jiraPrefix, GITLAB_PREFIX);
|
|
173
173
|
if (ticketKey) {
|
|
174
174
|
try {
|
|
175
175
|
const issueOut = execSync(`acli jira workitem view ${ticketKey} --json`, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"acli.js","sourceRoot":"","sources":["../../../src/watch/collectors/acli.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"acli.js","sourceRoot":"","sources":["../../../src/watch/collectors/acli.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
*/
|
|
8
8
|
import { existsSync, readFileSync } from 'node:fs';
|
|
9
9
|
import matter from 'gray-matter';
|
|
10
|
-
import { getConfig, getLogbookDirPath } from '../../lib/config.js';
|
|
10
|
+
import { getConfig, GITLAB_PREFIX, getLogbookDirPath } from '../../lib/config.js';
|
|
11
11
|
import { getEntryFilePaths } from '../../lib/entry-paths.js';
|
|
12
12
|
import { getLastLogEntry } from '../log-utils.js';
|
|
13
13
|
import { resolveActiveTicketId, readActiveTicketSlug } from '../git-utils.js';
|
|
@@ -55,7 +55,7 @@ export const entriesCollector = {
|
|
|
55
55
|
state.hasActiveTicket = true;
|
|
56
56
|
state.hasLockfile = true;
|
|
57
57
|
state.activeTicketSlug = slug;
|
|
58
|
-
state.activeTicketId = resolveActiveTicketId(cwd, state.branch, config.jiraPrefix);
|
|
58
|
+
state.activeTicketId = resolveActiveTicketId(cwd, state.branch, config.jiraPrefix, GITLAB_PREFIX);
|
|
59
59
|
const { log: logPath } = getEntryFilePaths(entriesDir, slug);
|
|
60
60
|
const logEntry = getLastLogEntry(logPath);
|
|
61
61
|
if (logEntry) {
|
|
@@ -82,7 +82,7 @@ export const entriesCollector = {
|
|
|
82
82
|
state.latestLogTimestamp = undefined;
|
|
83
83
|
state.hasNarrativePlaceholders = false;
|
|
84
84
|
state.isReleased = false;
|
|
85
|
-
state.activeTicketId = resolveActiveTicketId(cwd, state.branch, config.jiraPrefix);
|
|
85
|
+
state.activeTicketId = resolveActiveTicketId(cwd, state.branch, config.jiraPrefix, GITLAB_PREFIX);
|
|
86
86
|
state.hasActiveTicket = !!state.activeTicketId;
|
|
87
87
|
}
|
|
88
88
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entries.js","sourceRoot":"","sources":["../../../src/watch/collectors/entries.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,MAAM,MAAM,aAAa,CAAC;AAEjC,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"entries.js","sourceRoot":"","sources":["../../../src/watch/collectors/entries.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
/* eslint-disable max-lines */
|
|
1
2
|
/**
|
|
2
3
|
* GitLab collector for logbook watch.
|
|
3
4
|
*
|
|
@@ -9,7 +10,12 @@
|
|
|
9
10
|
import { execSync } from 'node:child_process';
|
|
10
11
|
import { getCurrentBranch } from '../../lib/git-helpers.js';
|
|
11
12
|
import { getDefaultBranch } from '../../lib/git-helpers.js';
|
|
13
|
+
import { logTime } from '../watcher-http.js';
|
|
12
14
|
import { parsePipelineStatus } from './type-guards.js';
|
|
15
|
+
/** Debug log with the same timestamp prefix as the watcher. */
|
|
16
|
+
function dbg(msg) {
|
|
17
|
+
console.log(`[${logTime()}] [glab] ${msg}`);
|
|
18
|
+
}
|
|
13
19
|
/** Check if glab CLI is available and authenticated. */
|
|
14
20
|
async function isGlabAvailable() {
|
|
15
21
|
try {
|
|
@@ -26,10 +32,38 @@ async function isGlabAvailable() {
|
|
|
26
32
|
return false;
|
|
27
33
|
}
|
|
28
34
|
}
|
|
29
|
-
/**
|
|
35
|
+
/** Format an execSync error, preferring stderr for a real glab message. */
|
|
36
|
+
function formatGitError(err) {
|
|
37
|
+
if (!err || typeof err !== 'object')
|
|
38
|
+
return String(err);
|
|
39
|
+
if ('stderr' in err && typeof err.stderr === 'object' && err.stderr !== null) {
|
|
40
|
+
const line = String(err.stderr);
|
|
41
|
+
if (line.trim())
|
|
42
|
+
return line.trim();
|
|
43
|
+
}
|
|
44
|
+
if ('message' in err && typeof err.message === 'string') {
|
|
45
|
+
return err.message;
|
|
46
|
+
}
|
|
47
|
+
return String(err);
|
|
48
|
+
}
|
|
49
|
+
/** Resolve the git remote origin that glab will use to pick the project. */
|
|
50
|
+
function getRemoteUrl(cwd) {
|
|
51
|
+
try {
|
|
52
|
+
return execSync('git remote get-url origin', {
|
|
53
|
+
encoding: 'utf8',
|
|
54
|
+
cwd,
|
|
55
|
+
stdio: ['ignore', 'pipe', 'ignore'],
|
|
56
|
+
}).trim();
|
|
57
|
+
}
|
|
58
|
+
catch {
|
|
59
|
+
return '(no origin remote) ';
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
/** Fetch open MRs from glab. Returns null on command failure (caller keeps last known state). */
|
|
30
63
|
function fetchMrs(cwd) {
|
|
31
64
|
try {
|
|
32
|
-
|
|
65
|
+
// `glab mr list` has no --state flag on this version; open is the default.
|
|
66
|
+
const output = execSync('glab mr list --output json --per-page 100', {
|
|
33
67
|
encoding: 'utf8',
|
|
34
68
|
cwd,
|
|
35
69
|
stdio: ['ignore', 'pipe', 'ignore'],
|
|
@@ -39,8 +73,9 @@ function fetchMrs(cwd) {
|
|
|
39
73
|
const items = JSON.parse(output);
|
|
40
74
|
return items;
|
|
41
75
|
}
|
|
42
|
-
catch {
|
|
43
|
-
|
|
76
|
+
catch (err) {
|
|
77
|
+
dbg(`mr list failed: ${formatGitError(err)}`);
|
|
78
|
+
return null;
|
|
44
79
|
}
|
|
45
80
|
}
|
|
46
81
|
/** Fetch pipeline status for the current branch. */
|
|
@@ -77,6 +112,39 @@ function hasRecentPipeline(cwd, branch, status) {
|
|
|
77
112
|
return false;
|
|
78
113
|
}
|
|
79
114
|
}
|
|
115
|
+
/** Fetch open work items (issues) for the current project from glab. Null on failure. */
|
|
116
|
+
function fetchWorkItems(cwd) {
|
|
117
|
+
try {
|
|
118
|
+
// open is the default state; --per-page lifts the default 30-item cap.
|
|
119
|
+
const output = execSync('glab issue list --output json --per-page 100', {
|
|
120
|
+
encoding: 'utf8',
|
|
121
|
+
cwd,
|
|
122
|
+
stdio: ['ignore', 'pipe', 'ignore'],
|
|
123
|
+
}).trim();
|
|
124
|
+
if (!output) {
|
|
125
|
+
dbg('issue list returned empty output');
|
|
126
|
+
return [];
|
|
127
|
+
}
|
|
128
|
+
const items = JSON.parse(output);
|
|
129
|
+
return items.map((it) => {
|
|
130
|
+
const url = it.web_url ?? '';
|
|
131
|
+
const projectUrl = url.replace(/\/-\/(?:issues|work_items)\/\d+$/, '');
|
|
132
|
+
return {
|
|
133
|
+
iid: it.iid,
|
|
134
|
+
title: it.title,
|
|
135
|
+
status: it.state,
|
|
136
|
+
url,
|
|
137
|
+
projectUrl,
|
|
138
|
+
projectName: projectUrl.split('/').pop() ?? '',
|
|
139
|
+
updated: it.updated_at ?? '',
|
|
140
|
+
};
|
|
141
|
+
});
|
|
142
|
+
}
|
|
143
|
+
catch (err) {
|
|
144
|
+
dbg(`issue list failed: ${formatGitError(err)}`);
|
|
145
|
+
return null;
|
|
146
|
+
}
|
|
147
|
+
}
|
|
80
148
|
/** Determine MR status from a glab MR item. */
|
|
81
149
|
function determineMrStatus(mr, _branch) {
|
|
82
150
|
if (mr.state === 'merged')
|
|
@@ -118,48 +186,59 @@ export const glabCollector = {
|
|
|
118
186
|
const branch = getCurrentBranch(cwd);
|
|
119
187
|
if (!branch)
|
|
120
188
|
return;
|
|
189
|
+
const remote = getRemoteUrl(cwd);
|
|
190
|
+
dbg(`project remote: ${remote} (branch '${branch}')`);
|
|
121
191
|
try {
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
192
|
+
// All open MRs for the project (drives the GitLab tab).
|
|
193
|
+
const allMrs = fetchMrs(cwd);
|
|
194
|
+
if (allMrs === null) {
|
|
195
|
+
// Fetch failed (transient/API) — keep last known MR state instead of wiping it.
|
|
196
|
+
dbg('mr list unavailable — preserving last known MR state');
|
|
197
|
+
return;
|
|
198
|
+
}
|
|
199
|
+
dbg(`fetched ${allMrs.length} open MR(s) for the project`);
|
|
200
|
+
state.glabLastUpdated = new Date().toISOString();
|
|
201
|
+
// Branch-specific card status uses open MRs for the current branch.
|
|
202
|
+
const mrs = allMrs.filter((mr) => mr.source_branch === branch).sort((a, b) => b.iid - a.iid);
|
|
203
|
+
dbg(`${mrs.length} MR(s) for current branch`);
|
|
125
204
|
if (mrs.length === 0) {
|
|
126
205
|
state.mrStatus = 'none';
|
|
127
206
|
state.mrUrl = undefined;
|
|
128
207
|
state.mrTitle = undefined;
|
|
129
208
|
state.mrOpenThreads = undefined;
|
|
130
209
|
state.mrHasConflicts = undefined;
|
|
131
|
-
state.
|
|
132
|
-
state.glabLastUpdated = new Date().toISOString();
|
|
133
|
-
return;
|
|
134
|
-
}
|
|
135
|
-
const mr = mrs[0];
|
|
136
|
-
// Check pipeline status via mr head_pipeline first, fall back to ci status
|
|
137
|
-
if (mr.head_pipeline) {
|
|
138
|
-
state.pipelineStatus = parsePipelineStatus(mr.head_pipeline.status);
|
|
210
|
+
state.pipelineStatus = 'none';
|
|
139
211
|
}
|
|
140
212
|
else {
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
213
|
+
const mr = mrs[0];
|
|
214
|
+
// Check pipeline status via mr head_pipeline first, fall back to ci status
|
|
215
|
+
if (mr.head_pipeline) {
|
|
216
|
+
state.pipelineStatus = parsePipelineStatus(mr.head_pipeline.status);
|
|
217
|
+
}
|
|
218
|
+
else {
|
|
219
|
+
state.pipelineStatus = fetchPipelineStatus(cwd, branch);
|
|
220
|
+
}
|
|
221
|
+
// Fallback: check for recent running/failed pipelines if head_pipeline is stale
|
|
222
|
+
if (state.pipelineStatus === 'none' || state.pipelineStatus === 'passed') {
|
|
223
|
+
const defaultBranch = getDefaultBranch(cwd);
|
|
224
|
+
if (branch !== defaultBranch) {
|
|
225
|
+
if (hasRecentPipeline(cwd, branch, 'running')) {
|
|
226
|
+
state.pipelineStatus = 'running';
|
|
227
|
+
}
|
|
228
|
+
else if (hasRecentPipeline(cwd, branch, 'failed')) {
|
|
229
|
+
state.pipelineStatus = 'failed';
|
|
230
|
+
}
|
|
152
231
|
}
|
|
153
232
|
}
|
|
233
|
+
state.mrStatus = determineMrStatus(mr, branch);
|
|
234
|
+
state.mrUrl = mr.web_url;
|
|
235
|
+
state.mrTitle = mr.title;
|
|
236
|
+
state.mrHasConflicts = mr.conflicts;
|
|
237
|
+
// Count open threads (note_count - resolved)
|
|
238
|
+
state.mrOpenThreads = 0;
|
|
154
239
|
}
|
|
155
|
-
state.mrStatus
|
|
156
|
-
|
|
157
|
-
state.mrTitle = mr.title;
|
|
158
|
-
state.mrHasConflicts = mr.conflicts;
|
|
159
|
-
// Count open threads (note_count - resolved)
|
|
160
|
-
state.mrOpenThreads = 0;
|
|
161
|
-
// Build full MR list for the GitLab tab (all open MRs for the project).
|
|
162
|
-
const allMrs = fetchMrs(cwd);
|
|
240
|
+
dbg(`branch mrStatus='${state.mrStatus ?? 'none'}' mrUrl=${state.mrUrl ?? '(none)'}`);
|
|
241
|
+
// Build full MR list for the GitLab tab (ALL MRs for the project).
|
|
163
242
|
const projectUrl = allMrs[0]?.web_url ? allMrs[0].web_url.replace(/\/-\/merge_requests\/\d+$/, '') : '';
|
|
164
243
|
state.glabOpenMrs = allMrs.map((item) => ({
|
|
165
244
|
iid: item.iid,
|
|
@@ -174,10 +253,20 @@ export const glabCollector = {
|
|
|
174
253
|
.pop()
|
|
175
254
|
?.replace(/\.git$/, '') ?? '',
|
|
176
255
|
}));
|
|
177
|
-
state.
|
|
256
|
+
dbg(`glabOpenMrs has ${state.glabOpenMrs.length} entry/entries`);
|
|
257
|
+
// Open work items (issues) for the current project.
|
|
258
|
+
const workItems = fetchWorkItems(cwd);
|
|
259
|
+
if (workItems === null) {
|
|
260
|
+
dbg('work item list unavailable — preserving last known work item state');
|
|
261
|
+
}
|
|
262
|
+
else {
|
|
263
|
+
state.glabWorkItems = workItems;
|
|
264
|
+
state.glabWorkItemsLastUpdated = new Date().toISOString();
|
|
265
|
+
dbg(`glabWorkItems has ${workItems.length} entry/entries`);
|
|
266
|
+
}
|
|
178
267
|
}
|
|
179
|
-
catch {
|
|
180
|
-
|
|
268
|
+
catch (err) {
|
|
269
|
+
dbg(`collect failed: ${err instanceof Error ? err.message : String(err)}`);
|
|
181
270
|
}
|
|
182
271
|
},
|
|
183
272
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"glab.js","sourceRoot":"","sources":["../../../src/watch/collectors/glab.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"glab.js","sourceRoot":"","sources":["../../../src/watch/collectors/glab.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/** HTTP Jira collector — fallback when acli is not available. */
|
|
2
2
|
import { request } from 'node:https';
|
|
3
3
|
import { execSync } from 'node:child_process';
|
|
4
|
-
import { getConfig } from '../../lib/config.js';
|
|
4
|
+
import { getConfig, GITLAB_PREFIX } from '../../lib/config.js';
|
|
5
5
|
import { getCurrentBranch } from '../../lib/git-helpers.js';
|
|
6
6
|
import { extractTicketFromBranch } from '../git-utils.js';
|
|
7
7
|
import { isJiraIssue } from './type-guards.js';
|
|
@@ -97,7 +97,8 @@ export const jiraCollector = {
|
|
|
97
97
|
updated: issue.fields.updated,
|
|
98
98
|
}));
|
|
99
99
|
const branch = getCurrentBranch(cwd);
|
|
100
|
-
const ticketKey = state.activeTicketId ??
|
|
100
|
+
const ticketKey = state.activeTicketId ??
|
|
101
|
+
(branch ? extractTicketFromBranch(branch, config.jiraPrefix, GITLAB_PREFIX) : undefined);
|
|
101
102
|
if (ticketKey) {
|
|
102
103
|
const issue = await fetchIssue(baseUrl, token, ticketKey);
|
|
103
104
|
state.jiraStatus = issue?.fields.status.name;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jira.js","sourceRoot":"","sources":["../../../src/watch/collectors/jira.ts"],"names":[],"mappings":"AAAA,iEAAiE;AAEjE,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"jira.js","sourceRoot":"","sources":["../../../src/watch/collectors/jira.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,6 +17,7 @@ export function dashboardHtml(aboutHtml) {
|
|
|
17
17
|
<button class="tab-btn active" data-tab="projects">Local Projects <span class="tab-count" id="project-count">0</span></button>
|
|
18
18
|
<button class="tab-btn" data-tab="jira">Jira <span class="tab-count" id="jira-count">0</span></button>
|
|
19
19
|
<button class="tab-btn" data-tab="gitlab">GitLab <span class="tab-count" id="gitlab-count">0</span></button>
|
|
20
|
+
<button class="tab-btn" data-tab="workitems">GitLab Work Items <span class="tab-count" id="workitems-count">0</span></button>
|
|
20
21
|
<button class="tab-btn" data-tab="help">Help</button>
|
|
21
22
|
<button class="tab-btn" data-tab="about">About</button>
|
|
22
23
|
</nav>
|
|
@@ -60,6 +61,13 @@ export function dashboardHtml(aboutHtml) {
|
|
|
60
61
|
</div>
|
|
61
62
|
<div class="tab-collector-footer" id="gitlab-tab-footer" style="display:none"></div>
|
|
62
63
|
</div>
|
|
64
|
+
<div id="tab-workitems" class="tab-content">
|
|
65
|
+
<h2 class="tab-heading">Open GitLab Work Items</h2>
|
|
66
|
+
<div id="workitems-content">
|
|
67
|
+
<div class="placeholder-msg">No open work items found.<br>Install the <code>glab</code> CLI and run <code>glab auth login</code> to connect.</div>
|
|
68
|
+
</div>
|
|
69
|
+
<div class="tab-collector-footer" id="workitems-tab-footer" style="display:none"></div>
|
|
70
|
+
</div>
|
|
63
71
|
</div>
|
|
64
72
|
<div class="connection-status" id="conn-status">connected</div>
|
|
65
73
|
<div class="lightbox" id="lightbox">
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dashboard-html.js","sourceRoot":"","sources":["../../src/watch/dashboard-html.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;;;GAIG;AACH,MAAM,UAAU,aAAa,CAAC,SAAiB;IAC7C,OAAO
|
|
1
|
+
{"version":3,"file":"dashboard-html.js","sourceRoot":"","sources":["../../src/watch/dashboard-html.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;;;GAIG;AACH,MAAM,UAAU,aAAa,CAAC,SAAiB;IAC7C,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mCAiC0B,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;SAkCnC,CAAC;AACV,CAAC"}
|