Skip to content

Commit 90c5b15

Browse files
ozkatzozkatz
authored
UI: Unify uncommitted changes tab into objects (#9181)
1 parent e21d0ae commit 90c5b15

File tree

12 files changed

+629
-430
lines changed

12 files changed

+629
-430
lines changed

‎webui/src/lib/components/repository/compareBranches.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {refs as refsAPI} from "../../../lib/api";
33
import Alert from "react-bootstrap/Alert";
44
import {RefTypeBranch, RefTypeCommit} from "../../../constants";
55
import {useAPIWithPagination} from "../../hooks/api";
6-
import {appendMoreResults} from "../../../pages/repositories/repository/changes";
6+
import {appendMoreResults} from "../../../pages/repositories/repository/objects";
77
import {AlertError, Loading} from "../controls";
88
import {ChangesTreeContainer, defaultGetMoreChanges} from "./changes";
99
import {URINavigator} from "./tree";

‎webui/src/lib/components/repository/tabs.jsx

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
import React from "react";
22

33
import Nav from "react-bootstrap/Nav";
4-
import {FileDiffIcon, GitCommitIcon, DatabaseIcon, GitBranchIcon, GitPullRequestIcon, GitCompareIcon, PlayIcon, GearIcon, TagIcon} from "@primer/octicons-react";
4+
import {GitCommitIcon, DatabaseIcon, GitBranchIcon, GitPullRequestIcon, GitCompareIcon, PlayIcon, GearIcon, TagIcon} from "@primer/octicons-react";
55

66
import {useRefs} from "../../hooks/repo";
77
import {Link, NavItem} from "../nav";
88
import {useRouter} from "../../hooks/router";
9-
import {RefTypeBranch} from "../../../constants";
109

1110
export const RepositoryNavTabs = ({ active }) => {
1211
const { reference } = useRefs();
@@ -32,22 +31,13 @@ export const RepositoryNavTabs = ({ active }) => {
3231
return url;
3332
};
3433

35-
const withBranchContext = (url) => {
36-
const params = new URLSearchParams();
37-
if (!!reference && reference.type === RefTypeBranch) params.append('ref', reference.id);
38-
if (params.toString())
39-
return `${url}?${params.toString()}`;
40-
return url;
41-
};
34+
4235

4336
return (
4437
<Nav variant="tabs" >
4538
<Link active={active === 'objects'} href={withRefContext(`/repositories/${repoId}/objects`)} component={NavItem}>
4639
<DatabaseIcon/> Objects
4740
</Link>
48-
<Link active={active === 'changes'} href={withBranchContext(`/repositories/${repoId}/changes`)} component={NavItem}>
49-
<FileDiffIcon/> Uncommitted Changes
50-
</Link>
5141
<Link active={active === 'commits'} href={withRefContext(`/repositories/${repoId}/commits`)} component={NavItem}>
5242
<GitCommitIcon/> Commits
5343
</Link>

‎webui/src/lib/components/repository/tree.jsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -407,9 +407,9 @@ const OriginModal = ({ show, onHide, entry, repo, reference }) => {
407407
<Link
408408
className="me-2"
409409
href={{
410-
pathname: "/repositories/:repoId/changes",
410+
pathname: "/repositories/:repoId/objects",
411411
params: { repoId: repo.id },
412-
query: { ref: reference.id },
412+
query: { ref: reference.id, showChanges: 'true' },
413413
}}
414414
>
415415
uncommitted change
@@ -533,7 +533,7 @@ const EntryRow = ({ config, repo, reference, path, entry, onDelete, showActions
533533
diffIndicator = (
534534
<OverlayTrigger
535535
placement="bottom"
536-
overlay={<Tooltip>removed in diff</Tooltip>}
536+
overlay={<Tooltip>removed</Tooltip>}
537537
>
538538
<span>
539539
<TrashIcon />
@@ -545,7 +545,7 @@ const EntryRow = ({ config, repo, reference, path, entry, onDelete, showActions
545545
diffIndicator = (
546546
<OverlayTrigger
547547
placement="bottom"
548-
overlay={<Tooltip>added in diff</Tooltip>}
548+
overlay={<Tooltip>added</Tooltip>}
549549
>
550550
<span>
551551
<PlusIcon />
@@ -557,7 +557,7 @@ const EntryRow = ({ config, repo, reference, path, entry, onDelete, showActions
557557
diffIndicator = (
558558
<OverlayTrigger
559559
placement="bottom"
560-
overlay={<Tooltip>changed in diff</Tooltip>}
560+
overlay={<Tooltip>changed</Tooltip>}
561561
>
562562
<span>
563563
<PencilIcon />
@@ -586,7 +586,7 @@ const EntryRow = ({ config, repo, reference, path, entry, onDelete, showActions
586586
return (
587587
<>
588588
<tr className={rowClass}>
589-
{diffIndicator && <td className="diff-indicator">{diffIndicator}</td>}
589+
<td className="diff-indicator">{diffIndicator || ""}</td>
590590
<td className="tree-path">
591591
{entry.path_type === "common_prefix" ? (
592592
<FileDirectoryIcon />

‎webui/src/pages/index.jsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import RepositoriesPage from "./repositories";
1313
import {RepositoryPageLayout} from "../lib/components/repository/layout.jsx";
1414
import RepositoryObjectsPage from "./repositories/repository/objects";
1515
import RepositoryObjectsViewPage from "./repositories/repository/objectViewer";
16-
import RepositoryChangesPage from "./repositories/repository/changes";
16+
1717
import RepositoryCommitsPage from "./repositories/repository/commits";
1818
import RepositoryCommitPage from "./repositories/repository/commits/commit";
1919
import RepositoryBranchesPage from "./repositories/repository/branches";
@@ -58,7 +58,6 @@ export const IndexPage = () => {
5858
<Route path=":repoId" element={<RepositoryPageLayout/>}>
5959
<Route path="objects" element={<RepositoryObjectsPage/>}/>
6060
<Route path="object" element={<RepositoryObjectsViewPage/>}/>
61-
<Route path="changes" element={<RepositoryChangesPage/>}/>
6261
<Route path="commits">
6362
<Route index element={<RepositoryCommitsPage/>}/>
6463
<Route path=":commitId" element={<RepositoryCommitPage/>}/>

0 commit comments

Comments
 (0)