Move edit link from metaA/B level up to diff level
The edit button should edit the most current version of
the file, and doesn't make sense to have multiple edit
links within a patchset for one file.
Change-Id: I7d872ca11a935bc68c3b36177efb2a2a26c757bf
diff --git a/Documentation/rest-api-changes.txt b/Documentation/rest-api-changes.txt
index d3635b3..cf01be9 100644
--- a/Documentation/rest-api-changes.txt
+++ b/Documentation/rest-api-changes.txt
@@ -7058,9 +7058,6 @@
|`web_links` |optional|
Links to the file in external sites as a list of
link:rest-api-changes.html#web-link-info[WebLinkInfo] entries.
-|`edit_web_links` |optional|
-Links to edit the file in external sites as a list of
-link:rest-api-changes.html#web-link-info[WebLinkInfo] entries.
|==========================
[[diff-info]]
@@ -7090,6 +7087,9 @@
|`web_links` |optional|
Links to the file diff in external sites as a list of
link:rest-api-changes.html#diff-web-link-info[DiffWebLinkInfo] entries.
+|`edit_web_links` |optional|
+Links to edit the file in external sites as a list of
+link:rest-api-changes.html#web-link-info[WebLinkInfo] entries.
|`binary` |not set if `false`|Whether the file is binary.
|==========================
diff --git a/java/com/google/gerrit/acceptance/AbstractDaemonTest.java b/java/com/google/gerrit/acceptance/AbstractDaemonTest.java
index 003df28..3e8cf3b 100644
--- a/java/com/google/gerrit/acceptance/AbstractDaemonTest.java
+++ b/java/com/google/gerrit/acceptance/AbstractDaemonTest.java
@@ -1268,6 +1268,7 @@
assertThat(diff.diffHeader).isNotNull();
assertThat(diff.intralineStatus).isNull();
assertThat(diff.webLinks).isNull();
+ assertThat(diff.editWebLinks).isNull();
assertThat(diff.metaA).isNull();
assertThat(diff.metaB).isNotNull();
@@ -1284,7 +1285,6 @@
assertThat(diff.metaB.lines).isEqualTo(expectedLines.size());
assertThat(diff.metaB.name).isEqualTo(path);
assertThat(diff.metaB.webLinks).isNull();
- assertThat(diff.metaB.editWebLinks).isNull();
assertThat(diff.content).hasSize(1);
DiffInfo.ContentEntry contentEntry = diff.content.get(0);
diff --git a/java/com/google/gerrit/extensions/common/DiffInfo.java b/java/com/google/gerrit/extensions/common/DiffInfo.java
index 5a59613..5a9b82b 100644
--- a/java/com/google/gerrit/extensions/common/DiffInfo.java
+++ b/java/com/google/gerrit/extensions/common/DiffInfo.java
@@ -32,6 +32,8 @@
public List<ContentEntry> content;
// Links to the file diff in external sites
public List<DiffWebLinkInfo> webLinks;
+ // Links to edit the file in external sites
+ public List<WebLinkInfo> editWebLinks;
// Binary file
public Boolean binary;
@@ -52,8 +54,6 @@
public Integer lines;
// Links to the file in external sites
public List<WebLinkInfo> webLinks;
- // Links to edit the file in external sites
- public List<WebLinkInfo> editWebLinks;
}
public static final class ContentEntry {
diff --git a/java/com/google/gerrit/extensions/common/testing/DiffInfoSubject.java b/java/com/google/gerrit/extensions/common/testing/DiffInfoSubject.java
index e258134..b800d17 100644
--- a/java/com/google/gerrit/extensions/common/testing/DiffInfoSubject.java
+++ b/java/com/google/gerrit/extensions/common/testing/DiffInfoSubject.java
@@ -74,6 +74,11 @@
return check("webLinks").that(diffInfo.webLinks);
}
+ public IterableSubject editWebLinks() {
+ isNotNull();
+ return check("editWebLinks").that(diffInfo.editWebLinks);
+ }
+
public BooleanSubject binary() {
isNotNull();
return check("binary").that(diffInfo.binary);
diff --git a/java/com/google/gerrit/extensions/common/testing/FileMetaSubject.java b/java/com/google/gerrit/extensions/common/testing/FileMetaSubject.java
index d0212f3..0953bfe 100644
--- a/java/com/google/gerrit/extensions/common/testing/FileMetaSubject.java
+++ b/java/com/google/gerrit/extensions/common/testing/FileMetaSubject.java
@@ -64,9 +64,4 @@
isNotNull();
return check("webLinks").that(fileMeta.webLinks);
}
-
- public IterableSubject editWebLinks() {
- isNotNull();
- return check("editWebLinks").that(fileMeta.editWebLinks);
- }
}
diff --git a/java/com/google/gerrit/server/diff/DiffInfoCreator.java b/java/com/google/gerrit/server/diff/DiffInfoCreator.java
index 53f0019..606e42b 100644
--- a/java/com/google/gerrit/server/diff/DiffInfoCreator.java
+++ b/java/com/google/gerrit/server/diff/DiffInfoCreator.java
@@ -73,6 +73,8 @@
ImmutableList<DiffWebLinkInfo> links = webLinksProvider.getDiffLinks();
result.webLinks = links.isEmpty() ? null : links;
+ ImmutableList<WebLinkInfo> editLinks = webLinksProvider.getEditWebLinks();
+ result.editWebLinks = editLinks.isEmpty() ? null : editLinks;
if (ps.isBinary()) {
result.binary = true;
@@ -158,8 +160,6 @@
result.lines = fileInfo.content.getSize();
ImmutableList<WebLinkInfo> fileLinks = webLinksProvider.getFileWebLinks(side.type());
result.webLinks = fileLinks.isEmpty() ? null : fileLinks;
- ImmutableList<WebLinkInfo> editLinks = webLinksProvider.getEditWebLinks(side.type());
- result.editWebLinks = editLinks.isEmpty() ? null : editLinks;
result.commitId = fileInfo.commitId;
return Optional.of(result);
}
diff --git a/java/com/google/gerrit/server/diff/DiffWebLinksProvider.java b/java/com/google/gerrit/server/diff/DiffWebLinksProvider.java
index d4c7f5b..2590ebc 100644
--- a/java/com/google/gerrit/server/diff/DiffWebLinksProvider.java
+++ b/java/com/google/gerrit/server/diff/DiffWebLinksProvider.java
@@ -24,9 +24,9 @@
/** Returns links associated with the diff view */
ImmutableList<DiffWebLinkInfo> getDiffLinks();
+ /** Returns edit links associated with the diff view */
+ ImmutableList<WebLinkInfo> getEditWebLinks();
+
/** Returns file links associated with the diff side */
ImmutableList<WebLinkInfo> getFileWebLinks(DiffSide.Type fileInfoType);
-
- /** Returns edit links associated with the diff side */
- ImmutableList<WebLinkInfo> getEditWebLinks(DiffSide.Type fileInfoType);
}
diff --git a/java/com/google/gerrit/server/restapi/change/GetDiff.java b/java/com/google/gerrit/server/restapi/change/GetDiff.java
index d48d76a..2169d57 100644
--- a/java/com/google/gerrit/server/restapi/change/GetDiff.java
+++ b/java/com/google/gerrit/server/restapi/change/GetDiff.java
@@ -226,10 +226,8 @@
}
@Override
- public ImmutableList<WebLinkInfo> getEditWebLinks(DiffSide.Type type) {
- String rev = getSideRev(type);
- DiffSide side = getDiffSide(type);
- return webLinks.getEditLinks(projectName.get(), rev, side.fileName());
+ public ImmutableList<WebLinkInfo> getEditWebLinks() {
+ return webLinks.getEditLinks(projectName.get(), revB, sideB.fileName());
}
@Override
diff --git a/java/com/google/gerrit/server/restapi/change/GetFixPreview.java b/java/com/google/gerrit/server/restapi/change/GetFixPreview.java
index 5191fc8..99c8a0a 100644
--- a/java/com/google/gerrit/server/restapi/change/GetFixPreview.java
+++ b/java/com/google/gerrit/server/restapi/change/GetFixPreview.java
@@ -137,12 +137,12 @@
}
@Override
- public ImmutableList<WebLinkInfo> getFileWebLinks(Type fileInfoType) {
+ public ImmutableList<WebLinkInfo> getEditWebLinks() {
return ImmutableList.of();
}
@Override
- public ImmutableList<WebLinkInfo> getEditWebLinks(Type fileInfoType) {
+ public ImmutableList<WebLinkInfo> getFileWebLinks(Type fileInfoType) {
return ImmutableList.of();
}
}
diff --git a/javatests/com/google/gerrit/acceptance/api/revision/RevisionDiffIT.java b/javatests/com/google/gerrit/acceptance/api/revision/RevisionDiffIT.java
index 37b4a1c..9bdc420 100644
--- a/javatests/com/google/gerrit/acceptance/api/revision/RevisionDiffIT.java
+++ b/javatests/com/google/gerrit/acceptance/api/revision/RevisionDiffIT.java
@@ -160,9 +160,8 @@
.revision(result.getCommit().name())
.file(fileName)
.diff();
- assertThat(info.metaB.editWebLinks).hasSize(1);
- assertThat(info.metaB.editWebLinks.get(0).url)
- .isEqualTo("http://edit/" + project + "/" + fileName);
+ assertThat(info.editWebLinks).hasSize(1);
+ assertThat(info.editWebLinks.get(0).url).isEqualTo("http://edit/" + project + "/" + fileName);
}
}
diff --git a/polygerrit-ui/app/types/diff.ts b/polygerrit-ui/app/types/diff.ts
index d30917a0..35c5726 100644
--- a/polygerrit-ui/app/types/diff.ts
+++ b/polygerrit-ui/app/types/diff.ts
@@ -51,6 +51,12 @@
* entries.
*/
web_links?: DiffWebLinkInfo[];
+
+ /**
+ * Links to edit the file in external sites as a list of WebLinkInfo
+ * entries.
+ */
+ edit_web_links?: WebLinkInfo[];
}
/**
@@ -74,11 +80,6 @@
export interface DiffFileMetaInfo extends DiffFileMetaInfoApi {
/** Links to the file in external sites as a list of WebLinkInfo entries. */
web_links?: WebLinkInfo[];
- /**
- * Links to edit the file in external sites as a list of WebLinkInfo
- * entries.
- */
- edit_web_links?: WebLinkInfo[];
}
/**