osr-plastic/osr-discourse-src
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

FIX: prevents double network calls and other quirks on admin emails (#7074)

Browse Source
This commit is contained in:
Joffrey JAFFEUX
2019-02-26 17:53:52 +01:00
committed by GitHub
parent 75aaae5d5c
commit fbedaea5ed
11 changed files with 66 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/javascripts/admin/controllers/admin-email-bounced.js.es6
+2 -3
View File
@@ -1,9 +1,8 @@
import AdminEmailLogsController from "admin/controllers/admin-email-logs";
import debounce from "discourse/lib/debounce";
import EmailLog from "admin/models/email-log";
export default AdminEmailLogsController.extend({
filterEmailLogs: debounce(function() {
EmailLog.findAll(this.get("filter")).then(logs => this.set("model", logs));
}, 250).observes("filter.{user,address,type}")
this.loadLogs();
}, 250).observes("filter.{status,user,address,type}")
});
app/assets/javascripts/admin/controllers/admin-email-incomings.js.es6
-25
View File
@@ -1,25 +0,0 @@
import IncomingEmail from "admin/models/incoming-email";
export default Ember.Controller.extend({
loading: false,
actions: {
loadMore() {
if (this.get("loading") || this.get("model.allLoaded")) {
return;
}
this.set("loading", true);
IncomingEmail.findAll(this.get("filter"), this.get("model.length"))
.then(incoming => {
if (incoming.length < 50) {
this.get("model").set("allLoaded", true);
}
this.get("model").addObjects(incoming);
})
.finally(() => {
this.set("loading", false);
});
}
}
});
app/assets/javascripts/admin/controllers/admin-email-logs.js.es6
+26 -15
View File
@@ -3,23 +3,34 @@ import EmailLog from "admin/models/email-log";
export default Ember.Controller.extend({
loading: false,
loadLogs(sourceModel, loadMore) {
if ((loadMore && this.get("loading")) || this.get("model.allLoaded")) {
return;
}
this.set("loading", true);
sourceModel = sourceModel || EmailLog;
return sourceModel
.findAll(this.get("filter"), loadMore ? this.get("model.length") : null)
.then(logs => {
if (this.get("model") && loadMore && logs.length < 50) {
this.get("model").set("allLoaded", true);
}
if (this.get("model") && loadMore) {
this.get("model").addObjects(logs);
} else {
this.set("model", logs);
}
})
.finally(() => this.set("loading", false));
},
actions: {
loadMore() {
if (this.get("loading") || this.get("model.allLoaded")) {
return;
}
this.set("loading", true);
return EmailLog.findAll(this.get("filter"), this.get("model.length"))
.then(logs => {
if (logs.length < 50) {
this.get("model").set("allLoaded", true);
}
this.get("model").addObjects(logs);
})
.finally(() => {
this.set("loading", false);
});
this.loadLogs(EmailLog, true);
}
}
});
app/assets/javascripts/admin/controllers/admin-email-received.js.es6
+10 -6
View File
@@ -1,11 +1,15 @@
import AdminEmailIncomingsController from "admin/controllers/admin-email-incomings";
import AdminEmailLogsController from "admin/controllers/admin-email-logs";
import debounce from "discourse/lib/debounce";
import IncomingEmail from "admin/models/incoming-email";
export default AdminEmailIncomingsController.extend({
export default AdminEmailLogsController.extend({
filterIncomingEmails: debounce(function() {
IncomingEmail.findAll(this.get("filter")).then(incomings =>
this.set("model", incomings)
);
}, 250).observes("filter.{from,to,subject}")
this.loadLogs(IncomingEmail);
}, 250).observes("filter.{status,from,to,subject}"),
actions: {
loadMore() {
this.loadLogs(IncomingEmail, true);
}
}
});
app/assets/javascripts/admin/controllers/admin-email-rejected.js.es6
+10 -6
View File
@@ -1,11 +1,15 @@
import AdminEmailIncomingsController from "admin/controllers/admin-email-incomings";
import AdminEmailLogsController from "admin/controllers/admin-email-logs";
import debounce from "discourse/lib/debounce";
import IncomingEmail from "admin/models/incoming-email";
export default AdminEmailIncomingsController.extend({
export default AdminEmailLogsController.extend({
filterIncomingEmails: debounce(function() {
IncomingEmail.findAll(this.get("filter")).then(incomings =>
this.set("model", incomings)
);
}, 250).observes("filter.{from,to,subject,error}")
this.loadLogs(IncomingEmail);
}, 250).observes("filter.{status,from,to,subject,error}"),
actions: {
loadMore() {
this.loadLogs(IncomingEmail, true);
}
}
});
app/assets/javascripts/admin/controllers/admin-email-sent.js.es6
+2 -3
View File
@@ -1,9 +1,8 @@
import AdminEmailLogsController from "admin/controllers/admin-email-logs";
import debounce from "discourse/lib/debounce";
import EmailLog from "admin/models/email-log";
export default AdminEmailLogsController.extend({
filterEmailLogs: debounce(function() {
EmailLog.findAll(this.get("filter")).then(logs => this.set("model", logs));
}, 250).observes("filter.{user,address,type,reply_key}")
this.loadLogs();
}, 250).observes("filter.{status,user,address,type,reply_key}")
});
app/assets/javascripts/admin/controllers/admin-email-skipped.js.es6
+2 -3
View File
@@ -1,9 +1,8 @@
import AdminEmailLogsController from "admin/controllers/admin-email-logs";
import debounce from "discourse/lib/debounce";
import EmailLog from "admin/models/email-log";
export default AdminEmailLogsController.extend({
filterEmailLogs: debounce(function() {
EmailLog.findAll(this.get("filter")).then(logs => this.set("model", logs));
}, 250).observes("filter.{user,address,type}")
this.loadLogs();
}, 250).observes("filter.{status,user,address,type}")
});