Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions src/features/projects/data/GitHubProjectDataSource.ts
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ export default class GitHubProjectDataSource implements IProjectDataSource {
const specifications = ref.files.filter(file => {
return this.isOpenAPISpecification(file.name)
}).map(file => {
const isFileChanged = ref.changedFiles?.includes(file.name) ?? false
return {
id: file.name,
name: file.name,
Expand All @@ -132,16 +133,16 @@ export default class GitHubProjectDataSource implements IProjectDataSource {
ref: ref.id
}),
editURL: `https://github.com/${ownerName}/${repositoryName}/edit/${ref.name}/${encodeURIComponent(file.name)}`,
diffURL: this.getGitHubDiffURL({
diffURL: isFileChanged ? this.getGitHubDiffURL({
ownerName,
repositoryName,
path: file.name,
baseRefOid: ref.baseRefOid,
headRefOid: ref.id
}),
diffBaseBranch: ref.baseRef,
diffBaseOid: ref.baseRefOid,
diffPrUrl: ref.prNumber ? `https://github.com/${ownerName}/${repositoryName}/pull/${ref.prNumber}` : undefined,
}) : undefined,
diffBaseBranch: isFileChanged ? ref.baseRef : undefined,
diffBaseOid: isFileChanged ? ref.baseRefOid : undefined,
diffPrUrl: isFileChanged && ref.prNumber ? `https://github.com/${ownerName}/${repositoryName}/pull/${ref.prNumber}` : undefined,
isDefault: false // initial value
}
}).sort((a, b) => a.name.localeCompare(b.name))
Expand Down
24 changes: 21 additions & 3 deletions src/features/projects/data/GitHubRepositoryDataSource.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ type GraphQLPullRequest = {
readonly headRefName: string
readonly baseRefName: string
readonly baseRefOid: string
readonly changedFiles: string[]
}

export default class GitHubProjectDataSource implements IGitHubRepositoryDataSource {
Expand Down Expand Up @@ -129,7 +130,8 @@ export default class GitHubProjectDataSource implements IGitHubRepositoryDataSou
baseRef: pr?.baseRefName,
baseRefOid: pr?.baseRefOid,
prNumber: pr?.number,
files: branch.node.target.tree.entries
files: branch.node.target.tree.entries,
changedFiles: pr?.changedFiles
}
})

Expand Down Expand Up @@ -174,6 +176,11 @@ export default class GitHubProjectDataSource implements IGitHubRepositoryDataSou
headRefName
baseRefName
baseRefOid
files(first: 100) {
nodes {
path
}
}
}
}
}
Expand All @@ -199,15 +206,26 @@ export default class GitHubProjectDataSource implements IGitHubRepositoryDataSou
const pullRequests = new Map<string, GraphQLPullRequest>()

if (repoData?.pullRequests?.edges) {
const pullRequestEdges = repoData.pullRequests.edges as Edge<GraphQLPullRequest>[]
type RawGraphQLPullRequest = {
number: number
headRefName: string
baseRefName: string
baseRefOid: string
files?: {
nodes?: { path: string }[]
}
}
const pullRequestEdges = repoData.pullRequests.edges as Edge<RawGraphQLPullRequest>[]

pullRequestEdges.forEach(edge => {
const pr = edge.node
const changedFiles = pr.files?.nodes?.map(f => f.path) || []
pullRequests.set(pr.headRefName, {
number: pr.number,
headRefName: pr.headRefName,
baseRefName: pr.baseRefName,
baseRefOid: pr.baseRefOid
baseRefOid: pr.baseRefOid,
changedFiles
})
})
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,7 @@ export type GitHubRepositoryRef = {
readonly files: {
readonly name: string
}[]
}

export default interface IGitHubRepositoryDataSource {
getRepositories(): Promise<GitHubRepository[]>
readonly changedFiles?: string[]
}

export default interface IGitHubRepositoryDataSource {
Expand Down
35 changes: 27 additions & 8 deletions src/features/projects/view/toolbar/Selector.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,16 @@ import {
MenuItem,
SelectChangeEvent,
FormControl,
Typography
Typography,
Box,
Tooltip
} from "@mui/material"
import MenuItemHover from "@/common/ui/MenuItemHover"

interface SelectorItem {
readonly id: string
readonly name: string
readonly hasChanges?: boolean
}

const Selector = ({
Expand Down Expand Up @@ -45,13 +48,29 @@ const Selector = ({
{items.map(item => (
<MenuItem key={item.id} value={item.id}>
<MenuItemHover>
<Typography sx={{
overflow: "hidden",
whiteSpace: "nowrap",
textOverflow: "ellipsis"
}}>
{item.name}
</Typography>
<Box sx={{ display: "flex", alignItems: "center", gap: 0.5 }}>
<Typography sx={{
overflow: "hidden",
whiteSpace: "nowrap",
textOverflow: "ellipsis"
}}>
{item.name}
</Typography>
{item.hasChanges && (
<Tooltip title="Has changes" arrow>
<Box
component="span"
sx={{
width: 6,
height: 6,
borderRadius: "50%",
backgroundColor: "warning.main",
flexShrink: 0
}}
/>
</Tooltip>
)}
</Box>
</MenuItemHover>
</MenuItem>
))}
Expand Down