+
@@ -424,6 +523,25 @@
postNone: "- none",
postPipeline: "pipeline #{id}",
legend: "Legend: ✅ success · ❌ failed · 🔄 running · ⏭ canceled or skipped · ⚠️ no pipeline",
+ chooseIssues: "Issues",
+ issuesChosen: "{chosen} of {count} chosen",
+ issueFilter: "Filter by key or summary",
+ issuesAll: "All {count}",
+ issuesChosenView: "Chosen {count}",
+ groupDone: "Done",
+ groupNotDone: "Not done",
+ noIssuesMatch: "No issues match.",
+ shipsAnyway: "ships anyway",
+ shipsAnywayTitle: "Not chosen, but a picked tag ships it",
+ reachUntagged: "no tag yet",
+ reachElsewhere: "in prod or not merged",
+ notInReport: "not in this report",
+ linkedTo: "linked to",
+ planFor: "for",
+ planAlso: "also ships",
+ planNoTag: "{keys}: no tag yet.",
+ planElsewhere: "{keys}: in production or not merged, nothing to pick",
+ planMissed: "{tag} does not ship {keys}",
},
ru: {
language: "Язык",
@@ -501,6 +619,25 @@
postNone: "- нет",
postPipeline: "пайплайн #{id}",
legend: "Обозначения: ✅ прошёл · ❌ упал · 🔄 выполняется · ⏭ отменён или пропущен · ⚠️ нет пайплайна",
+ chooseIssues: "Задачи",
+ issuesChosen: "выбрано {chosen} из {count}",
+ issueFilter: "Фильтр по ключу или названию",
+ issuesAll: "Все {count}",
+ issuesChosenView: "Выбранные {count}",
+ groupDone: "Готово",
+ groupNotDone: "Не готово",
+ noIssuesMatch: "Ничего не найдено.",
+ shipsAnyway: "войдёт и так",
+ shipsAnywayTitle: "Задача не выбрана, но выбранный тег её содержит",
+ reachUntagged: "нет тега",
+ reachElsewhere: "на проде или не влита",
+ notInReport: "нет в этом отчёте",
+ linkedTo: "связан с",
+ planFor: "для",
+ planAlso: "также войдут",
+ planNoTag: "{keys}: тега ещё нет.",
+ planElsewhere: "{keys}: уже на проде или не влиты, выбирать нечего",
+ planMissed: "{tag} не содержит {keys}",
},
};
@@ -564,6 +701,50 @@
} catch {}
};
+ const byKey = (a, b) => a.localeCompare(b, undefined, { numeric: true });
+
+ const reachOf = (report) => {
+ const issues = report.jira ? report.jira.issues : {};
+ const reach = Object.fromEntries(Object.keys(issues).map((key) => [key, []]));
+ const projects = new Set(report.services.map((service) => service.project));
+ for (const service of report.services) {
+ const first = { key: new Map(), iid: new Map(), sha: new Map() };
+ service.rows.forEach((row, index) => {
+ for (const item of row.jira_keys) if (!first.key.has(item.key)) first.key.set(item.key, index);
+ for (const item of row.merge_requests) if (!first.iid.has(item.iid)) first.iid.set(item.iid, index);
+ for (const item of row.commits) if (!first.sha.has(item.sha)) first.sha.set(item.sha, index);
+ });
+ for (const [key, issue] of Object.entries(issues)) {
+ const links = issue.links.filter((link) => link.project === service.project);
+ const indexes = [
+ first.key.get(key),
+ ...links.map((link) => (link.iid != null ? first.iid.get(link.iid) : first.sha.get(link.sha))),
+ ].filter((index) => index !== undefined);
+ const project = service.project;
+ if (service.error) {
+ if (links.length) reach[key].push({ project, state: "failed" });
+ continue;
+ }
+ if (!indexes.length) {
+ if (links.length) reach[key].push({ project, state: "elsewhere" });
+ continue;
+ }
+ const index = Math.min(...indexes);
+ let tagIndex = index;
+ while (tagIndex >= 0 && !service.rows[tagIndex].tags.length) tagIndex--;
+ const tags = tagIndex >= 0 ? service.rows[tagIndex].tags : [];
+ reach[key].push(tags.length
+ ? { project, state: "tag", index, tagIndex, tag: tags[tags.length - 1].name }
+ : { project, state: "untagged", index });
+ }
+ }
+ for (const [key, issue] of Object.entries(issues)) {
+ const outside = new Set(issue.links.map((link) => link.project).filter((project) => !projects.has(project)));
+ for (const project of outside) reach[key].push({ project, state: "outside" });
+ }
+ return reach;
+ };
+
document.addEventListener("alpine:init", () => {
Alpine.data("releaseScope", () => ({
report: null,
@@ -575,6 +756,12 @@
openCount: 0,
lang: "en",
theme: "auto",
+ reach: {},
+ chosen: [],
+ autoPicks: {},
+ issueFilter: "",
+ issueView: "all",
+ issueViewKeys: [],
async init() {
const lang = stored("release-scope-lang");
@@ -588,6 +775,7 @@
const tag = service.release && service.release.tag ? service.release.tag.name : "";
this.picks[service.project] = service.candidates.some((item) => item.tag.name === tag) ? tag : "";
}
+ this.reach = reachOf(report);
this.report = report;
this.readHash();
window.addEventListener("hashchange", () => this.readHash());
@@ -701,6 +889,84 @@
.join("\n");
},
+ get issueKeys() {
+ return Object.keys(this.reach).sort(byKey);
+ },
+ get issueGroups() {
+ const text = this.issueFilter.trim().toLowerCase();
+ const keys = this.issueKeys.filter(
+ (key) =>
+ (this.issueView === "all" || this.issueViewKeys.includes(key)) &&
+ (!text || `${key} ${this.issue(key).summary}`.toLowerCase().includes(text)),
+ );
+ const done = (key) => this.issue(key).status_category === "done";
+ return [
+ { name: "groupDone", keys: keys.filter(done) },
+ { name: "groupNotDone", keys: keys.filter((key) => !done(key)) },
+ ].filter((group) => group.keys.length);
+ },
+ get plan() {
+ const plan = new Map();
+ for (const key of this.chosen) {
+ for (const item of this.reach[key]) {
+ if (!plan.has(item.project)) {
+ plan.set(item.project, { project: item.project, state: item.state, keys: [], best: null, untagged: [], elsewhere: [] });
+ }
+ const entry = plan.get(item.project);
+ entry.keys.push(key);
+ if (item.state === "tag" && (!entry.best || item.tagIndex < entry.best.tagIndex)) entry.best = item;
+ if (item.state === "untagged") entry.untagged.push(key);
+ if (item.state === "elsewhere") entry.elsewhere.push(key);
+ }
+ }
+ return plan;
+ },
+ get unlisted() {
+ return [...this.plan.values()].filter((entry) => entry.state === "outside");
+ },
+ planOf(service) {
+ return this.plan.get(service.project);
+ },
+ alsoShips(service) {
+ const candidate = this.pickOf(service);
+ return candidate ? candidate.jira_keys.map((item) => item.key).filter((key) => !this.chosen.includes(key)) : [];
+ },
+ missedBy(service) {
+ const tag = this.picks[service.project];
+ if (!tag || !this.planOf(service)) return [];
+ const picked = service.rows.findIndex((row) => row.tags.some((item) => item.name === tag));
+ return this.chosen.filter((key) =>
+ this.reach[key].some((item) => item.project === service.project && item.state === "tag" && picked > item.index));
+ },
+ shipsAnyway(key) {
+ return !this.chosen.includes(key) && this.picked.some(({ candidate }) => candidate.jira_keys.some((item) => item.key === key));
+ },
+ reachText(item) {
+ const name = item.project.split("/").pop();
+ const states = { untagged: "reachUntagged", elsewhere: "reachElsewhere", outside: "notInReport", failed: "failedToCollect" };
+ return `${name} ${item.state === "tag" ? item.tag : this.t(states[item.state])}`;
+ },
+ showIssues(view) {
+ this.issueView = view;
+ this.issueViewKeys = [...this.chosen];
+ },
+ toggleIssue(key) {
+ this.chosen = this.chosen.includes(key) ? this.chosen.filter((item) => item !== key) : [...this.chosen, key].sort(byKey);
+ this.applyIssues();
+ this.writeHash();
+ },
+ applyIssues() {
+ const next = {};
+ for (const entry of this.plan.values()) {
+ if (entry.best && !entry.untagged.length) next[entry.project] = entry.best.tag;
+ }
+ for (const [project, tag] of Object.entries(this.autoPicks)) {
+ if (this.picks[project] === tag && !(project in next)) this.picks[project] = "";
+ }
+ Object.assign(this.picks, next);
+ this.autoPicks = next;
+ },
+
pick(service, tag, element) {
this.picks[service.project] = tag;
element.closest("details").open = false;
@@ -721,6 +987,10 @@
location.hash.slice(1).split("&").filter(Boolean)
.map((part) => part.split("=", 2).map(decode)),
);
+ const issues = (wanted.get("issues") || "").split(",").filter(Boolean);
+ wanted.delete("issues");
+ this.chosen = issues.filter((key) => key in this.reach).sort(byKey);
+ this.applyIssues();
if (wanted.size) {
for (const service of this.pickable) {
const tag = wanted.get(service.project) || "";
@@ -729,12 +999,16 @@
if (known) wanted.delete(service.project);
}
}
- this.ignored = [...wanted].map(([project, tag]) => (tag ? `${project} ${tag}` : project));
+ this.ignored = [
+ ...issues.filter((key) => !(key in this.reach)),
+ ...[...wanted].map(([project, tag]) => (tag ? `${project} ${tag}` : project)),
+ ];
this.writeHash();
},
writeHash() {
const encode = (value) => encodeURIComponent(value).replaceAll("%2F", "/");
- const hash = this.picked.map(({ service, candidate }) => `${encode(service.project)}=${encode(candidate.tag.name)}`).join("&");
+ const picks = this.picked.map(({ service, candidate }) => `${encode(service.project)}=${encode(candidate.tag.name)}`);
+ const hash = [...(this.chosen.length ? [`issues=${this.chosen.map(encode).join(",")}`] : []), ...picks].join("&");
history.replaceState(null, "", hash ? `#${hash}` : location.pathname + location.search);
},
pickOf(service) {