@social-mail/social-mail-client 1.2.200 → 1.2.201
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/admin/AdminAppIndex.pack.js +8 -2
- package/dist/admin/AdminAppIndex.pack.js.map +1 -1
- package/dist/admin/AdminAppIndex.pack.min.js +1 -1
- package/dist/admin/AdminAppIndex.pack.min.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/web/AppIndex.pack.js +8 -2
- package/dist/web/AppIndex.pack.js.map +1 -1
- package/dist/web/AppIndex.pack.min.js +1 -1
- package/dist/web/AppIndex.pack.min.js.map +1 -1
- package/dist/web/page/mails/service/MailService.d.ts.map +1 -1
- package/dist/web/page/mails/service/MailService.js +8 -2
- package/dist/web/page/mails/service/MailService.js.map +1 -1
- package/package.json +1 -1
- package/src/web/page/mails/service/MailService.ts +7 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MailService.d.ts","sourceRoot":"","sources":["../../../../../src/web/page/mails/service/MailService.ts"],"names":[],"mappings":"AAGA,OAAO,EAAgC,QAAQ,EAAE,MAAM,EAAiD,MAAM,yBAAyB,CAAC;AAOxI,MAAM,CAAC,OAAO,OAAO,WAAW;IAG5B,OAAO,CAAC,aAAa,CAAgB;IAE/B,OAAO,CAAC,SAAS,EAAE,MAAM;IAYzB,IAAI,CAAC,EACP,MAAW,EACX,SAAS,EACT,KAAS,EACT,IAAS,EACT,OAAW,EACX,WAAmB,EACnB,WAAW,EACd;;;;;;;;KAAA;
|
|
1
|
+
{"version":3,"file":"MailService.d.ts","sourceRoot":"","sources":["../../../../../src/web/page/mails/service/MailService.ts"],"names":[],"mappings":"AAGA,OAAO,EAAgC,QAAQ,EAAE,MAAM,EAAiD,MAAM,yBAAyB,CAAC;AAOxI,MAAM,CAAC,OAAO,OAAO,WAAW;IAG5B,OAAO,CAAC,aAAa,CAAgB;IAE/B,OAAO,CAAC,SAAS,EAAE,MAAM;IAYzB,IAAI,CAAC,EACP,MAAW,EACX,SAAS,EACT,KAAS,EACT,IAAS,EACT,OAAW,EACX,WAAmB,EACnB,WAAW,EACd;;;;;;;;KAAA;IAsBK,GAAG,CAAC,KAAK,EAAE,MAAM;IAWjB,IAAI,CAAC,KAAK,EAAE,MAAM;IAsBlB,gBAAgB,CAAC,IAAI,EAAE,QAAQ;CAQxC"}
|
|
@@ -54,13 +54,19 @@ System.register(["tslib", "@web-atoms/core/dist/di/DISingleton", "@web-atoms/cor
|
|
|
54
54
|
let q = this.entityService.query(MailboxContact).where({
|
|
55
55
|
mailboxID,
|
|
56
56
|
showBlocked
|
|
57
|
-
}, p => x => x.mailboxID === p.mailboxID && x.blocked === p.showBlocked)
|
|
57
|
+
}, p => x => x.mailboxID === p.mailboxID && x.blocked === p.showBlocked);
|
|
58
58
|
if (search) {
|
|
59
|
-
const likeSearch =
|
|
59
|
+
const likeSearch = `${search}%`;
|
|
60
60
|
q = q.where({
|
|
61
61
|
search,
|
|
62
62
|
likeSearch
|
|
63
63
|
}, p => x => x.emailAddress.emailAddress === p.search || Sql.text.iLike(x.lastEmail.textBody, p.likeSearch) || Sql.text.iLike(x.lastEmail.subject, p.likeSearch) || Sql.text.iLike(x.emailAddress.name, p.likeSearch) || Sql.text.iLike(x.lastEmail.senderName, p.likeSearch));
|
|
64
|
+
q = q.orderByDescending({
|
|
65
|
+
search,
|
|
66
|
+
likeSearch
|
|
67
|
+
}, p => x => x.emailAddress.emailAddress === p.search || Sql.text.iLike(x.emailAddress.name, p.likeSearch)).thenByDescending(x => x.dateUpdated);
|
|
68
|
+
} else {
|
|
69
|
+
q = q.orderByDescending(x => x.dateUpdated);
|
|
64
70
|
}
|
|
65
71
|
return q.include(x => [x.emailAddress, x.lastEmail]).toPagedList({
|
|
66
72
|
start,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["DISingleton","_webAtomsCoreDistDiDISingleton","default","_webAtomsCoreDistDiInject","Inject","_servicesEntityService","EntityService","_modelModel","AppFile","Mailbox","MailboxContact","UserPushSubscription","_commonSql","Sql","_commonEventsCommonEvents","CommonEvents","_webAtomsCoreDistServicesFetchBuilder","FetchBuilder","_commonApiPath","apiPath","execute","MailService","mailbox","mailboxID","mb","entityService","query","where","p","x","include","emailAddress","firstOrDefault","notify","emailAddressID","list","search","start","size","version","showBlocked","cancelToken","q","blocked","
|
|
1
|
+
{"version":3,"names":["DISingleton","_webAtomsCoreDistDiDISingleton","default","_webAtomsCoreDistDiInject","Inject","_servicesEntityService","EntityService","_modelModel","AppFile","Mailbox","MailboxContact","UserPushSubscription","_commonSql","Sql","_commonEventsCommonEvents","CommonEvents","_webAtomsCoreDistServicesFetchBuilder","FetchBuilder","_commonApiPath","apiPath","execute","MailService","mailbox","mailboxID","mb","entityService","query","where","p","x","include","emailAddress","firstOrDefault","notify","emailAddressID","list","search","start","size","version","showBlocked","cancelToken","q","blocked","likeSearch","text","iLike","lastEmail","textBody","subject","name","senderName","orderByDescending","thenByDescending","dateUpdated","toPagedList","raw","email","mimeFileID","originalFileID","get","emailID","responseAsText","file","appFileID","url","send","lines","split","line","trim","substring","iterator","recipients","emailAddressText","cloner","attachments","copy","save","onEmailScheduled","dispatchEvent","deleteAttachment","create","$deleted","onFileDeleted","__decorate","_export"],"sources":["../../../../../src/web/page/mails/service/MailService.ts"],"sourcesContent":[null],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -35,16 +35,20 @@ export default class MailService {
|
|
|
35
35
|
cancelToken
|
|
36
36
|
}) {
|
|
37
37
|
let q = this.entityService.query(MailboxContact)
|
|
38
|
-
.where({ mailboxID, showBlocked }, (p) => (x) => x.mailboxID === p.mailboxID && x.blocked === p.showBlocked)
|
|
39
|
-
.orderByDescending((x) => x.dateUpdated);
|
|
38
|
+
.where({ mailboxID, showBlocked }, (p) => (x) => x.mailboxID === p.mailboxID && x.blocked === p.showBlocked);
|
|
40
39
|
if (search) {
|
|
41
|
-
const likeSearch =
|
|
40
|
+
const likeSearch = `${search}%`;
|
|
42
41
|
q = q.where({ search, likeSearch }, (p) => (x) => x.emailAddress.emailAddress === p.search
|
|
43
42
|
|| Sql.text.iLike(x.lastEmail.textBody, p.likeSearch)
|
|
44
43
|
|| Sql.text.iLike(x.lastEmail.subject, p.likeSearch)
|
|
45
44
|
|| Sql.text.iLike(x.emailAddress.name, p.likeSearch)
|
|
46
45
|
|| Sql.text.iLike(x.lastEmail.senderName, p.likeSearch)
|
|
47
46
|
);
|
|
47
|
+
q = q.orderByDescending({ search, likeSearch }, (p) => (x) => x.emailAddress.emailAddress === p.search
|
|
48
|
+
|| Sql.text.iLike(x.emailAddress.name, p.likeSearch)
|
|
49
|
+
).thenByDescending((x) => x.dateUpdated);
|
|
50
|
+
} else {
|
|
51
|
+
q = q.orderByDescending((x) => x.dateUpdated);
|
|
48
52
|
}
|
|
49
53
|
return q
|
|
50
54
|
.include((x) => [ x.emailAddress, x.lastEmail ])
|