Skip to content

Commit 25f5233

Browse files
authored
Merge pull request #33 from LonoxX/develop
fix: projectData only for Projects, not repo issues
2 parents 2198226 + 355732d commit 25f5233

2 files changed

Lines changed: 5 additions & 64 deletions

File tree

src/issue-file-manager.ts

Lines changed: 3 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { App, TFile } from "obsidian";
2-
import { GitHubTrackerSettings, RepositoryTracking, ProjectData } from "./types";
2+
import { GitHubTrackerSettings, RepositoryTracking } from "./types";
33
import { escapeBody } from "./util/escapeUtils";
44
import { NoticeManager } from "./notice-manager";
55
import { GitHubClient } from "./github-client";
@@ -56,41 +56,14 @@ export class IssueFileManager {
5656
allIssuesIncludingRecentlyClosed,
5757
);
5858

59-
// Batch fetch project data if tracking is enabled globally
60-
let projectDataMap = new Map<string, ProjectData[]>();
61-
if (this.settings.enableProjectTracking) {
62-
const nodeIds = openIssues
63-
.filter((issue: any) => issue.node_id)
64-
.map((issue: any) => issue.node_id);
65-
66-
if (nodeIds.length > 0) {
67-
this.noticeManager.debug(
68-
`Fetching project data for ${nodeIds.length} issues`
69-
);
70-
projectDataMap = await this.gitHubClient.fetchProjectDataForItems(nodeIds);
71-
}
72-
}
73-
74-
// Get tracked project IDs from global settings
75-
const trackedProjectIds = this.settings.trackedProjects.map(p => p.id);
76-
7759
// Create or update issue files (openIssues contains filtered issues from main.ts)
60+
// Note: projectData is only added for project items, not for repository issues
7861
for (const issue of openIssues) {
79-
let projectData = issue.node_id ? projectDataMap.get(issue.node_id) : undefined;
80-
81-
// Filter by tracked projects from global settings
82-
if (projectData && trackedProjectIds.length > 0) {
83-
projectData = projectData.filter(p =>
84-
trackedProjectIds.includes(p.projectId)
85-
);
86-
}
87-
8862
await this.createOrUpdateIssueFile(
8963
effectiveRepo,
9064
ownerCleaned,
9165
repoCleaned,
9266
issue,
93-
projectData,
9467
);
9568
}
9669
}
@@ -100,7 +73,6 @@ export class IssueFileManager {
10073
ownerCleaned: string,
10174
repoCleaned: string,
10275
issue: any,
103-
projectData?: ProjectData[],
10476
): Promise<void> {
10577
// Generate filename using template
10678
const templateData = createIssueTemplateData(issue, repo.repository);
@@ -141,7 +113,7 @@ export class IssueFileManager {
141113
);
142114
}
143115

144-
let content = await this.contentGenerator.createIssueContent(issue, repo, comments, this.settings, projectData);
116+
let content = await this.contentGenerator.createIssueContent(issue, repo, comments, this.settings);
145117

146118
if (file) {
147119
if (file instanceof TFile) {
@@ -174,7 +146,6 @@ export class IssueFileManager {
174146
repo,
175147
comments,
176148
this.settings,
177-
projectData,
178149
);
179150

180151
// Merge persist blocks back into new content

src/pr-file-manager.ts

Lines changed: 2 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { App, TFile } from "obsidian";
2-
import { GitHubTrackerSettings, RepositoryTracking, ProjectData } from "./types";
2+
import { GitHubTrackerSettings, RepositoryTracking } from "./types";
33
import { escapeBody } from "./util/escapeUtils";
44
import { NoticeManager } from "./notice-manager";
55
import { GitHubClient } from "./github-client";
@@ -58,41 +58,13 @@ export class PullRequestFileManager {
5858
allPullRequestsIncludingRecentlyClosed,
5959
);
6060

61-
// Batch fetch project data if tracking is enabled globally
62-
let projectDataMap = new Map<string, ProjectData[]>();
63-
if (this.settings.enableProjectTracking) {
64-
const nodeIds = openPullRequests
65-
.filter((pr: any) => pr.node_id)
66-
.map((pr: any) => pr.node_id);
67-
68-
if (nodeIds.length > 0) {
69-
this.noticeManager.debug(
70-
`Fetching project data for ${nodeIds.length} pull requests`
71-
);
72-
projectDataMap = await this.gitHubClient.fetchProjectDataForItems(nodeIds);
73-
}
74-
}
75-
76-
// Get tracked project IDs from global settings
77-
const trackedProjectIds = this.settings.trackedProjects.map(p => p.id);
78-
7961
// Create or update pull request files (openPullRequests contains filtered PRs from main.ts)
8062
for (const pr of openPullRequests) {
81-
let projectData = pr.node_id ? projectDataMap.get(pr.node_id) : undefined;
82-
83-
// Filter by tracked projects from global settings
84-
if (projectData && trackedProjectIds.length > 0) {
85-
projectData = projectData.filter(p =>
86-
trackedProjectIds.includes(p.projectId)
87-
);
88-
}
89-
9063
await this.createOrUpdatePullRequestFile(
9164
effectiveRepo,
9265
ownerCleaned,
9366
repoCleaned,
9467
pr,
95-
projectData,
9668
);
9769
}
9870
}
@@ -102,7 +74,6 @@ export class PullRequestFileManager {
10274
ownerCleaned: string,
10375
repoCleaned: string,
10476
pr: any,
105-
projectData?: ProjectData[],
10677
): Promise<void> {
10778
// Generate filename using template
10879
const templateData = createPullRequestTemplateData(pr, repo.repository);
@@ -143,7 +114,7 @@ export class PullRequestFileManager {
143114
);
144115
}
145116

146-
let content = await this.contentGenerator.createPullRequestContent(pr, repo, comments, this.settings, projectData);
117+
let content = await this.contentGenerator.createPullRequestContent(pr, repo, comments, this.settings);
147118

148119
if (file) {
149120
if (file instanceof TFile) {
@@ -176,7 +147,6 @@ export class PullRequestFileManager {
176147
repo,
177148
comments,
178149
this.settings,
179-
projectData,
180150
);
181151

182152
// Merge persist blocks back into new content

0 commit comments

Comments
 (0)