@things-factory/setting-base 4.3.47 → 4.3.62
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.
|
@@ -20,7 +20,6 @@ const shell_1 = require("@things-factory/shell");
|
|
|
20
20
|
const auth_base_1 = require("@things-factory/auth-base");
|
|
21
21
|
const setting_1 = require("./setting");
|
|
22
22
|
const setting_type_1 = require("./setting-type");
|
|
23
|
-
const auth_base_2 = require("@things-factory/auth-base");
|
|
24
23
|
const partner_setting_1 = require("../partner-setting/partner-setting");
|
|
25
24
|
let SettingQuery = class SettingQuery {
|
|
26
25
|
async setting(name, partnerDomainId, context) {
|
|
@@ -46,25 +45,25 @@ let SettingQuery = class SettingQuery {
|
|
|
46
45
|
const [items, total] = await queryBuilder.getManyAndCount();
|
|
47
46
|
return { items, total };
|
|
48
47
|
}
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
}
|
|
48
|
+
// @FieldResolver(type => Domain)
|
|
49
|
+
// async value(@Root() setting: Setting, @Ctx() context: any) {
|
|
50
|
+
// const { user, domain } = context.state
|
|
51
|
+
// const userDomains: Domain[] = user.domains
|
|
52
|
+
// let value: string = setting.value
|
|
53
|
+
// const partner: Partner = await getRepository(Partner).findOne({
|
|
54
|
+
// where: { domain, partnerDomain: In(userDomains.map((userDomain: Domain) => userDomain.id)) },
|
|
55
|
+
// relations: ['partnerDomain']
|
|
56
|
+
// })
|
|
57
|
+
// if (partner?.partnerDomain) {
|
|
58
|
+
// const partnerSetting: PartnerSetting = await getRepository(PartnerSetting).findOne({
|
|
59
|
+
// setting,
|
|
60
|
+
// domain,
|
|
61
|
+
// partnerDomain: partner.partnerDomain
|
|
62
|
+
// })
|
|
63
|
+
// if (partnerSetting) value = partnerSetting.value
|
|
64
|
+
// }
|
|
65
|
+
// return value
|
|
66
|
+
// }
|
|
68
67
|
async domain(setting) {
|
|
69
68
|
return await (0, typeorm_1.getRepository)(shell_1.Domain).findOne(setting.domainId);
|
|
70
69
|
}
|
|
@@ -94,14 +93,6 @@ __decorate([
|
|
|
94
93
|
__metadata("design:paramtypes", [typeof (_a = typeof shell_1.ListParam !== "undefined" && shell_1.ListParam) === "function" ? _a : Object, Object]),
|
|
95
94
|
__metadata("design:returntype", Promise)
|
|
96
95
|
], SettingQuery.prototype, "settings", null);
|
|
97
|
-
__decorate([
|
|
98
|
-
(0, type_graphql_1.FieldResolver)(type => shell_1.Domain),
|
|
99
|
-
__param(0, (0, type_graphql_1.Root)()),
|
|
100
|
-
__param(1, (0, type_graphql_1.Ctx)()),
|
|
101
|
-
__metadata("design:type", Function),
|
|
102
|
-
__metadata("design:paramtypes", [setting_1.Setting, Object]),
|
|
103
|
-
__metadata("design:returntype", Promise)
|
|
104
|
-
], SettingQuery.prototype, "value", null);
|
|
105
96
|
__decorate([
|
|
106
97
|
(0, type_graphql_1.FieldResolver)(type => shell_1.Domain),
|
|
107
98
|
__param(0, (0, type_graphql_1.Root)()),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setting-query.js","sourceRoot":"","sources":["../../../server/service/setting/setting-query.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA8F;AAC9F,qCAA2C;AAC3C,iDAAqE;AACrE,yDAAgD;AAChD,uCAAmC;AACnC,iDAA4C;
|
|
1
|
+
{"version":3,"file":"setting-query.js","sourceRoot":"","sources":["../../../server/service/setting/setting-query.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/setting-base",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.62",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -27,5 +27,5 @@
|
|
|
27
27
|
"@things-factory/auth-base": "^4.3.47",
|
|
28
28
|
"@things-factory/code-base": "^4.3.47"
|
|
29
29
|
},
|
|
30
|
-
"gitHead": "
|
|
30
|
+
"gitHead": "013096f8c0dd7bda146fd9370bf0de70da0e7bf2"
|
|
31
31
|
}
|
|
@@ -44,27 +44,27 @@ export class SettingQuery {
|
|
|
44
44
|
return { items, total }
|
|
45
45
|
}
|
|
46
46
|
|
|
47
|
-
@FieldResolver(type => Domain)
|
|
48
|
-
async value(@Root() setting: Setting, @Ctx() context: any) {
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
47
|
+
// @FieldResolver(type => Domain)
|
|
48
|
+
// async value(@Root() setting: Setting, @Ctx() context: any) {
|
|
49
|
+
// const { user, domain } = context.state
|
|
50
|
+
// const userDomains: Domain[] = user.domains
|
|
51
|
+
// let value: string = setting.value
|
|
52
52
|
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
53
|
+
// const partner: Partner = await getRepository(Partner).findOne({
|
|
54
|
+
// where: { domain, partnerDomain: In(userDomains.map((userDomain: Domain) => userDomain.id)) },
|
|
55
|
+
// relations: ['partnerDomain']
|
|
56
|
+
// })
|
|
57
|
+
// if (partner?.partnerDomain) {
|
|
58
|
+
// const partnerSetting: PartnerSetting = await getRepository(PartnerSetting).findOne({
|
|
59
|
+
// setting,
|
|
60
|
+
// domain,
|
|
61
|
+
// partnerDomain: partner.partnerDomain
|
|
62
|
+
// })
|
|
63
|
+
// if (partnerSetting) value = partnerSetting.value
|
|
64
|
+
// }
|
|
65
65
|
|
|
66
|
-
|
|
67
|
-
}
|
|
66
|
+
// return value
|
|
67
|
+
// }
|
|
68
68
|
|
|
69
69
|
@FieldResolver(type => Domain)
|
|
70
70
|
async domain(@Root() setting: Setting) {
|