CalvinBackup/anonymous_github
1
0
Fork 0
mirror of https://github.com/tdurieux/anonymous_github.git synced 2026-09-15 15:15:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: clear failed searches without racing subsequent requests

Browse Source
This commit is contained in:
tdurieux
2026-09-06 10:47:09 +02:00
parent a27f9f34d6
commit a6e17e18d9
4 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/asset-manifest.json
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"core.min.js": "core.6332b3c288.min.js", "core.min.js": "core.6332b3c288.min.js",
"vendor.min.js": "vendor.9de44b9059.min.js", "vendor.min.js": "vendor.8a52e2f74f.min.js",
"mermaid.min.js": "mermaid.f848a72d16.min.js", "mermaid.min.js": "mermaid.f848a72d16.min.js",
"all.min.css": "all.99ce8f3e14.min.css" "all.min.css": "all.99ce8f3e14.min.css"
} }
public/script/app.js
+6 -4
View File
@@ -2614,11 +2614,13 @@ angular
return; return;
} }
$scope.fileSearchLoading = true; $scope.fileSearchLoading = true;
searchCanceller = $q.defer(); const requestCanceller = $q.defer();
searchCanceller = requestCanceller;
$http.get( $http.get(
`/api/repo/${$scope.repoId}/files/search?q=${encodeURIComponent(query)}`, `/api/repo/${$scope.repoId}/files/search?q=${encodeURIComponent(query)}`,
{ timeout: searchCanceller.promise } { timeout: requestCanceller.promise }
).then(function (res) { ).then(function (res) {
if (destroyed || searchCanceller !== requestCanceller) return;
searchCanceller = null; searchCanceller = null;
$scope.fileSearchLoading = false; $scope.fileSearchLoading = false;
// Merge search results into $scope.files so the tree can render them. // Merge search results into $scope.files so the tree can render them.
@@ -2668,8 +2670,8 @@ angular
} }
$scope.fileSearchResults = res.data; $scope.fileSearchResults = res.data;
}, function () { }, function () {
// Only clear loading if this wasn't a cancellation if (!destroyed && searchCanceller === requestCanceller) {
if (!searchCanceller) { searchCanceller = null;
$scope.fileSearchLoading = false; $scope.fileSearchLoading = false;
$scope.fileSearchResults = []; $scope.fileSearchResults = [];
} }
public/script/vendor.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
test/frontend-regressions.test.js
+7
View File
@@ -91,4 +91,11 @@ describe("frontend production regressions", function () {
expect(h.scope.repoId).to.equal("new-repo"); expect(h.scope.files).to.have.length(0); expect(h.scope.repoId).to.equal("new-repo"); expect(h.scope.files).to.have.length(0);
expect(h.requests.at(-1).url).to.equal("/api/repo/new-repo/options"); expect(h.requests.at(-1).url).to.equal("/api/repo/new-repo/options");
}); });
it("finishes failed searches without letting canceled requests reset the next search", async function () {
const h = explorer(); h.scope.fileSearchQuery = "old"; h.scope.onFileSearchChange(); const old = h.requests.at(-1);
h.scope.fileSearchQuery = "new"; h.scope.onFileSearchChange(); const current = h.requests.at(-1);
old.reject({ status: -1 }); await h.flush(); expect(h.scope.fileSearchLoading).to.equal(true);
current.reject({ status: 500 }); await h.flush(); expect(h.scope.fileSearchLoading).to.equal(false);
expect(h.scope.fileSearchResults).to.have.length(0);
});
}); });