Author: sebb Date: Fri Feb 13 15:55:37 2026 New Revision: 1931855 Log: Tweaks from tooling work
Modified: comdev/reporter.apache.org/trunk/README.txt comdev/reporter.apache.org/trunk/scripts/committee_info.py comdev/reporter.apache.org/trunk/scripts/mailglomper2.py comdev/reporter.apache.org/trunk/scripts/parsepmcs.py comdev/reporter.apache.org/trunk/site/wizard/js/source/drafts.js comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js Modified: comdev/reporter.apache.org/trunk/README.txt ============================================================================== --- comdev/reporter.apache.org/trunk/README.txt Fri Feb 13 15:47:09 2026 (r1931854) +++ comdev/reporter.apache.org/trunk/README.txt Fri Feb 13 15:55:37 2026 (r1931855) @@ -55,6 +55,12 @@ There are additional jobs for projects.a Scripts: - scripts/health.py Creates data/health.json + Reads: + data/maildata_extended.json + data/pmcs.json + data/projects.json + data/releases/%s.json % project + https://whimsy.apache.org/public/committee-info.json via committee_info - scripts/parsepmcs.py Updates data/pmcs.json and data/projects.json (from Whimsy public data) @@ -67,22 +73,18 @@ Scripts: Creates site/reportingcycles.json from committee_info.json - scripts/mailglomper2.py - Updates data/maildata_extended.json from https://lists.apache.org/ + Updates data/maildata_extended.json and data/maildata_partial.json from https://lists.apache.org/ - scripts/readjira.py For each .json file found under data/JSON (apart from jira_projects.json) it recreates the file. Also refreshes data/JIRA/jira_projects.json +- scripts/bugzillastats.py + Creates data/bugzillastats.json + - site/addrelease.py Updates data/releases/%s.json % committee from form data Data file consumers: - chi.py data/health.json - -- health.py - data/maildata_extended.json - data/pmcs.json - data/projects.json - data/releases/%s.json % project - https://whimsy.apache.org/public/committee-info.json Modified: comdev/reporter.apache.org/trunk/scripts/committee_info.py ============================================================================== --- comdev/reporter.apache.org/trunk/scripts/committee_info.py Fri Feb 13 15:47:09 2026 (r1931854) +++ comdev/reporter.apache.org/trunk/scripts/committee_info.py Fri Feb 13 15:55:37 2026 (r1931855) @@ -161,7 +161,6 @@ def cycles(): # prefix cycles with next epoch report_cycles[ctte] = [c['nextMeetingEpoch']] report_cycles[ctte].extend(c['report']) - # Duplicate some entries for now so the code can find them (the existing json has the duplicates) return report_cycles def getPMCs(uid, incubator=False): Modified: comdev/reporter.apache.org/trunk/scripts/mailglomper2.py ============================================================================== --- comdev/reporter.apache.org/trunk/scripts/mailglomper2.py Fri Feb 13 15:47:09 2026 (r1931854) +++ comdev/reporter.apache.org/trunk/scripts/mailglomper2.py Fri Feb 13 15:55:37 2026 (r1931855) @@ -10,6 +10,7 @@ Updates: data/maildata_extended.json - output data for display + data/maildata_partial.json - output data for display """ import sys Modified: comdev/reporter.apache.org/trunk/scripts/parsepmcs.py ============================================================================== --- comdev/reporter.apache.org/trunk/scripts/parsepmcs.py Fri Feb 13 15:47:09 2026 (r1931854) +++ comdev/reporter.apache.org/trunk/scripts/parsepmcs.py Fri Feb 13 15:55:37 2026 (r1931855) @@ -198,7 +198,7 @@ with open(__HOME + "history/pmcs.json", for project in projects: for id in projects[project]: - del projects[project][id][2] + del projects[project][id][2] # drop the last seen date print("Writing history/projects.json") with open(__HOME + "history/projects.json", "w", encoding='utf-8') as f: Modified: comdev/reporter.apache.org/trunk/site/wizard/js/source/drafts.js ============================================================================== --- comdev/reporter.apache.org/trunk/site/wizard/js/source/drafts.js Fri Feb 13 15:47:09 2026 (r1931854) +++ comdev/reporter.apache.org/trunk/site/wizard/js/source/drafts.js Fri Feb 13 15:55:37 2026 (r1931855) @@ -170,7 +170,11 @@ function report_published(state, json) { modal("Your report was successfully posted to the board agenda!"); draft_stepper.editor.check_changes(true); } else { - modal("Something went wrong, and we couldn't publish your report.<br/>Please check with the Whimsy tool to see if there is already a report posted!"); + if (json && json.message) { + modal(`We couldn't publish your report: Error:<br/>${json.message}`); + } else { + modal("Something went wrong, and we couldn't publish your report.<br/>Please check with the Whimsy tool to see if there is already a report posted!"); + } } // Force whimsy reload of report meta data Modified: comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js ============================================================================== --- comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js Fri Feb 13 15:47:09 2026 (r1931854) +++ comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js Fri Feb 13 15:55:37 2026 (r1931855) @@ -1183,7 +1183,11 @@ function report_published(state, json) { modal("Your report was successfully posted to the board agenda!"); draft_stepper.editor.check_changes(true); } else { - modal("Something went wrong, and we couldn't publish your report.<br/>Please check with the Whimsy tool to see if there is already a report posted!"); + if (json && json.message) { + modal(`We couldn't publish your report: Error:<br/>${json.message}`); + } else { + modal("Something went wrong, and we couldn't publish your report.<br/>Please check with the Whimsy tool to see if there is already a report posted!"); + } } // Force whimsy reload of report meta data
