Commit Log
-
+
+
+
+
+
+
}
>
-
+
);
}
diff --git a/web/renderer/components/pageComponents/DatabasePage/ForReleases/ReleaseList/index.module.css b/web/renderer/components/pageComponents/DatabasePage/ForReleases/ReleaseList/index.module.css
index f35976d4..486a1760 100644
--- a/web/renderer/components/pageComponents/DatabasePage/ForReleases/ReleaseList/index.module.css
+++ b/web/renderer/components/pageComponents/DatabasePage/ForReleases/ReleaseList/index.module.css
@@ -108,3 +108,7 @@
@apply block ml-2;
}
}
+
+.button {
+ @apply mr-4;
+}
diff --git a/web/renderer/components/pageComponents/DatabasePage/ForReleases/ReleaseList/index.tsx b/web/renderer/components/pageComponents/DatabasePage/ForReleases/ReleaseList/index.tsx
index 50c95b67..6e10071a 100644
--- a/web/renderer/components/pageComponents/DatabasePage/ForReleases/ReleaseList/index.tsx
+++ b/web/renderer/components/pageComponents/DatabasePage/ForReleases/ReleaseList/index.tsx
@@ -9,11 +9,11 @@ import { gqlDepNotFound } from "@lib/errors/graphql";
import { errorMatches } from "@lib/errors/helpers";
import { OptionalRefParams } from "@lib/params";
import { refetchTagQueries } from "@lib/refetchQueries";
-import { newRelease } from "@lib/urls";
+import { compare, newRelease } from "@lib/urls";
import { useState } from "react";
import List from "./List";
-import css from "./index.module.css";
import { useTagList } from "./useTagList";
+import css from "./index.module.css";
type Props = {
params: OptionalRefParams;
@@ -38,22 +38,29 @@ function Inner({ tags, ...props }: InnerProps) {
Releases
-
-
-
+
+
+
-
+
+
+
+
+
+
{tags?.length ? (
-
+
+
+
) : (
No releases found
diff --git a/web/renderer/components/pageComponents/DatabasePage/ForRemotes/RemotesPage/FetchRemoteModal/RemoteBranchRow.tsx b/web/renderer/components/pageComponents/DatabasePage/ForRemotes/RemotesPage/FetchRemoteModal/RemoteBranchRow.tsx
index 890888f6..942ef53c 100644
--- a/web/renderer/components/pageComponents/DatabasePage/ForRemotes/RemotesPage/FetchRemoteModal/RemoteBranchRow.tsx
+++ b/web/renderer/components/pageComponents/DatabasePage/ForRemotes/RemotesPage/FetchRemoteModal/RemoteBranchRow.tsx
@@ -1,13 +1,16 @@
-import { QueryHandler } from "@dolthub/react-components";
+import { Button, QueryHandler } from "@dolthub/react-components";
import {
BranchFragment,
RemoteFragment,
useRemoteBranchDiffCountsQuery,
} from "@gen/graphql-types";
import { OptionalRefParams } from "@lib/params";
+import { diff } from "@lib/urls";
+import Link from "@components/links/Link";
import { getBranchName } from "./utils";
import SyncButton from "./SyncButton";
import BehindAheadCount from "./BehindAheadCount";
+import css from "./index.module.css";
type Props = {
branch: BranchFragment;
@@ -53,6 +56,22 @@ export default function RemoteBranchRow({
currentBranch={currentBranch}
/>
+
+ {(!!data.remoteBranchDiffCounts.ahead ||
+ !!data.remoteBranchDiffCounts.behind) && (
+
+ View Diff
+
+ )}
+ |
)}
/>
diff --git a/web/renderer/components/pageComponents/DatabasePage/ForRemotes/RemotesPage/FetchRemoteModal/RemoteBranches.tsx b/web/renderer/components/pageComponents/DatabasePage/ForRemotes/RemotesPage/FetchRemoteModal/RemoteBranches.tsx
index 4b87afba..4beb8a64 100644
--- a/web/renderer/components/pageComponents/DatabasePage/ForRemotes/RemotesPage/FetchRemoteModal/RemoteBranches.tsx
+++ b/web/renderer/components/pageComponents/DatabasePage/ForRemotes/RemotesPage/FetchRemoteModal/RemoteBranches.tsx
@@ -28,6 +28,7 @@ function Inner(props: InnerProps) {
Remote {pluralize(props.remoteBranches.length, "branch")} |
Behind | Ahead |
Sync |
+
Diff |
diff --git a/web/renderer/components/pageComponents/DatabasePage/ForRemotes/RemotesPage/FetchRemoteModal/index.module.css b/web/renderer/components/pageComponents/DatabasePage/ForRemotes/RemotesPage/FetchRemoteModal/index.module.css
index 66162228..c03fec92 100644
--- a/web/renderer/components/pageComponents/DatabasePage/ForRemotes/RemotesPage/FetchRemoteModal/index.module.css
+++ b/web/renderer/components/pageComponents/DatabasePage/ForRemotes/RemotesPage/FetchRemoteModal/index.module.css
@@ -79,3 +79,9 @@
.buttons {
@apply flex items-center justify-between;
}
+
+.viewDiffButton {
+ button {
+ @apply text-left mt-2 mb-4 lg:my-0;
+ }
+}
diff --git a/web/renderer/components/pageComponents/FileUploadPage/Layout/index.module.css b/web/renderer/components/pageComponents/FileUploadPage/Layout/index.module.css
index a0e5a56c..7e2cb847 100644
--- a/web/renderer/components/pageComponents/FileUploadPage/Layout/index.module.css
+++ b/web/renderer/components/pageComponents/FileUploadPage/Layout/index.module.css
@@ -1,5 +1,5 @@
.header {
- @apply w-full bg-storm-500 text-center p-4 justify-between hidden lg:flex;
+ @apply w-full bg-storm-500 text-center p-4 justify-between hidden absolute top-12 lg:flex;
h1 {
@apply text-white text-2xl font-normal;
diff --git a/web/renderer/lib/diffRange.tsx b/web/renderer/lib/diffRange.tsx
index 7f4e5086..d8431769 100644
--- a/web/renderer/lib/diffRange.tsx
+++ b/web/renderer/lib/diffRange.tsx
@@ -4,6 +4,6 @@ type Commits = {
};
export default function splitDiffRange(diffRange: string): Commits {
- const [fromCommitId, toCommitId] = diffRange.split(/\.+/);
+ const [fromCommitId, toCommitId] = diffRange.split(/\.{2,}/);
return { fromCommitId, toCommitId };
}
diff --git a/web/renderer/lib/urls.ts b/web/renderer/lib/urls.ts
index 97df2c0d..b91a22cd 100644
--- a/web/renderer/lib/urls.ts
+++ b/web/renderer/lib/urls.ts
@@ -87,10 +87,13 @@ export const commit = (p: ps.CommitParams): Route =>
export const diff = (p: ps.DiffParams): Route =>
commit({ ...p, commitId: getDiffRange(p) });
+export const compare = (p: ps.DatabaseParams): Route =>
+ database(p).addStatic("compare");
+
function getDiffRange(p: ps.DiffParams): string {
if (!p.fromCommitId && !p.toCommitId) return "";
if (!p.toCommitId) return p.fromCommitId ?? "";
- return `${p.fromCommitId ?? ""}..${p.toCommitId}`;
+ return encodeURIComponent(`${p.fromCommitId ?? ""}..${p.toCommitId}`);
}
export const releases = (p: ps.OptionalRefParams): Route =>