Skip to content

Convert benlesh Q and its error handling to promise #341

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gocs wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Convert benlesh Q and its error handling to promise #341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion static/files/js/omni-controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,8 @@ app.controller("OmniController", function(

search
.all($scope.inputs.provider, $scope.inputs.omni, $scope.page)
.success(function(results) {
.then(function (resp) {
let results = resp.data;
if (!results || results.length === 0) {
$scope.noResults = true;
$scope.hasMore = false;
Expand Down
42 changes: 25 additions & 17 deletions static/files/js/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,22 @@

app.factory("api", function($rootScope, $http, reqerr) {
window.http = $http;
var request = function(action, data) {
var request = async function(action, data) {
var url = "api/" + action;
$rootScope.apiing = true;
return $http({
let req; // should be resp
try { req = await $http({
method: "POST",
url: url,
data: data,
transformRequest: []
})
.error(reqerr)
.finally(function() {
$rootScope.apiing = false;
});
}); } catch (e) {
console.error(`Failed to request ${action}`, e);
if (req.error) req.error(reqerr);
} finally {
$rootScope.apiing = false;
}
return req;
};
var api = {};
var actions = [
Expand All @@ -33,25 +36,30 @@ app.factory("api", function($rootScope, $http, reqerr) {

app.factory("search", function($rootScope, $http, reqerr) {
return {
all: function(provider, query, page) {
all: async function(provider, query, page) {
var params = { query: query };
if (page !== undefined) params.page = page;
$rootScope.searching = true;
var req = $http.get("search/" + provider, { params: params });
req.error(reqerr);
req.finally(function() {
let req;
try { req = await $http.get("search/" + provider, { params: params }); } catch (e) {
console.error(`Failed to search ${provider} for ${query}`, e);
if (req.error) req.error(reqerr);
} finally {
$rootScope.searching = false;
});
}
return req;
},
one: function(provider, path) {
one: async function(provider, path) {
var opts = { params: { item: path } };
$rootScope.searching = true;
var req = $http.get("search/" + provider + "/item", opts);
req.error(reqerr);
req.finally(function() {

let req;
try { req = await $http.get("search/" + provider + "/item", opts); } catch (e) {
console.error(`Failed to search ${provider} for ${query}`, e);
if (req.error) req.error(reqerr);
} finally {
$rootScope.searching = false;
});
}
return req;
}
};
Expand Down