Skip to content

Commit 5526358

Browse files
authored
Merge pull request #761 from amvanbaren/feature/issue-613
Update review list right after user posting/revoking
2 parents 436d0e3 + 445bde9 commit 5526358

File tree

3 files changed

+9
-12
lines changed

3 files changed

+9
-12
lines changed

server/src/main/java/org/eclipse/openvsx/RegistryAPI.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -894,7 +894,7 @@ public ResponseEntity<ReviewListJson> getReviews(
894894
for (var registry : getRegistries()) {
895895
try {
896896
return ResponseEntity.ok()
897-
.cacheControl(CacheControl.maxAge(10, TimeUnit.MINUTES).cachePublic())
897+
.cacheControl(CacheControl.noCache().cachePublic())
898898
.body(registry.getReviews(namespace, extension));
899899
} catch (NotFoundException exc) {
900900
// Try the next registry
@@ -1012,7 +1012,7 @@ public ResponseEntity<SearchResultJson> search(
10121012
}
10131013

10141014
return ResponseEntity.ok()
1015-
.cacheControl(CacheControl.maxAge(10, TimeUnit.MINUTES).cachePublic())
1015+
.cacheControl(CacheControl.noCache().cachePublic())
10161016
.body(result);
10171017
}
10181018

server/src/main/java/org/eclipse/openvsx/web/ShallowEtagHeaderFilter.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,12 @@
1515
public class ShallowEtagHeaderFilter extends org.springframework.web.filter.ShallowEtagHeaderFilter {
1616

1717
protected boolean shouldNotFilter(HttpServletRequest request) throws ServletException {
18-
// limit the filter to /api/{namespace}/{extension}, /api/{namespace}/details
19-
// and /api/{namespace}/{extension}/{version} endpoints
18+
// limit the filter to /api/{namespace}/{extension}, /api/{namespace}/details,
19+
// /api/{namespace}/{extension}/{version}, and /api/-/search endpoints
2020
var path = request.getRequestURI().substring(1).split("/");
21-
var applyFilter = path.length == 3 || path.length == 4;
22-
if(applyFilter) {
23-
applyFilter = path[0].equals("api") && !path[1].equals("-");
24-
}
25-
if(applyFilter && path.length == 4) {
26-
applyFilter = !(path[3].equals("review") || path[3].equals("reviews"));
21+
var applyFilter = (path.length == 3 || path.length == 4) && path[0].equals("api");
22+
if(applyFilter && path[1].equals("-")) {
23+
applyFilter = path[2].contains("search");
2724
}
2825

2926
return !applyFilter;

webui/src/pages/extension-detail/extension-review-dialog.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@ class ExtensionReviewDialogComponent extends React.Component<ExtensionReviewDial
109109
return null;
110110
}
111111
return <React.Fragment>
112-
<Button variant='contained' color='secondary' onClick={this.handleOpenButton}>
112+
{!this.state.posted && (<Button variant='contained' color='secondary' onClick={this.handleOpenButton}>
113113
Write a Review
114-
</Button>
114+
</Button>)}
115115
<Dialog open={this.state.open} onClose={this.handleCancel}>
116116
<DialogTitle>{this.props.extension.displayName || this.props.extension.name} Review</DialogTitle>
117117
<DialogContent>

0 commit comments

Comments
 (0)