rez_core 2.1.16 → 2.1.18
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/module/enterprise/controller/organization.controller.d.ts +1 -3
- package/dist/module/enterprise/controller/organization.controller.js +3 -6
- package/dist/module/enterprise/controller/organization.controller.js.map +1 -1
- package/dist/module/enterprise/repository/school.repository.d.ts +1 -1
- package/dist/module/enterprise/repository/school.repository.js +75 -109
- package/dist/module/enterprise/repository/school.repository.js.map +1 -1
- package/dist/module/enterprise/service/organization.service.d.ts +1 -1
- package/dist/module/enterprise/service/organization.service.js +2 -2
- package/dist/module/enterprise/service/organization.service.js.map +1 -1
- package/dist/module/filter/repository/saved-filter.repository.d.ts +1 -1
- package/dist/module/filter/repository/saved-filter.repository.js +6 -5
- package/dist/module/filter/repository/saved-filter.repository.js.map +1 -1
- package/dist/module/filter/service/saved-filter.service.d.ts +1 -1
- package/dist/module/filter/service/saved-filter.service.js +13 -2
- package/dist/module/filter/service/saved-filter.service.js.map +1 -1
- package/dist/module/layout_preference/service/layout_preference.service.js +0 -1
- package/dist/module/layout_preference/service/layout_preference.service.js.map +1 -1
- package/dist/module/meta/controller/entity.controller.js +5 -6
- package/dist/module/meta/controller/entity.controller.js.map +1 -1
- package/dist/module/meta/service/entity-service-impl.service.js +1 -1
- package/dist/module/meta/service/entity-service-impl.service.js.map +1 -1
- package/dist/module/meta/service/section-master.service.js +0 -1
- package/dist/module/meta/service/section-master.service.js.map +1 -1
- package/dist/module/module/repository/menu.repository.js +9 -8
- package/dist/module/module/repository/menu.repository.js.map +1 -1
- package/dist/module/user/controller/login.controller.js +0 -4
- package/dist/module/user/controller/login.controller.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/dist/utils/service/encryptUtil.service.js +1 -1
- package/package.json +1 -1
- package/src/module/enterprise/controller/organization.controller.ts +2 -5
- package/src/module/enterprise/repository/school.repository.ts +94 -136
- package/src/module/enterprise/service/organization.service.ts +2 -2
- package/src/module/filter/repository/saved-filter.repository.ts +12 -10
- package/src/module/filter/service/saved-filter.service.ts +14 -12
- package/src/module/layout_preference/service/layout_preference.service.ts +0 -2
- package/src/module/meta/controller/entity.controller.ts +5 -15
- package/src/module/meta/service/entity-service-impl.service.ts +1 -1
- package/src/module/meta/service/section-master.service.ts +0 -1
- package/src/module/module/repository/menu.repository.ts +38 -32
- package/src/module/user/controller/login.controller.ts +0 -10
- package/src/utils/service/encryptUtil.service.ts +1 -1
|
@@ -8,7 +8,5 @@ export declare class OrganizationController {
|
|
|
8
8
|
getOrganizationDropdown(req: Request & {
|
|
9
9
|
user: any;
|
|
10
10
|
}): Promise<import("../entity/organization.entity").OrganizationData[]>;
|
|
11
|
-
getOrganizationHierarchy(
|
|
12
|
-
user: any;
|
|
13
|
-
}): Promise<unknown[]>;
|
|
11
|
+
getOrganizationHierarchy(): Promise<any[]>;
|
|
14
12
|
}
|
|
@@ -26,10 +26,8 @@ let OrganizationController = class OrganizationController {
|
|
|
26
26
|
const userData = req.user.userData;
|
|
27
27
|
return this.orgService.findById(userData?.organization_id);
|
|
28
28
|
}
|
|
29
|
-
async getOrganizationHierarchy(
|
|
30
|
-
|
|
31
|
-
const appcode = req.user.userData?.appcode;
|
|
32
|
-
return await this.orgService.getOrganizationHierarchy(userId, appcode);
|
|
29
|
+
async getOrganizationHierarchy() {
|
|
30
|
+
return await this.orgService.getOrganizationHierarchy();
|
|
33
31
|
}
|
|
34
32
|
};
|
|
35
33
|
exports.OrganizationController = OrganizationController;
|
|
@@ -44,9 +42,8 @@ __decorate([
|
|
|
44
42
|
__decorate([
|
|
45
43
|
(0, common_1.UseGuards)(jwt_guard_1.JwtAuthGuard),
|
|
46
44
|
(0, common_1.Get)('hierarchy'),
|
|
47
|
-
__param(0, (0, common_1.Req)()),
|
|
48
45
|
__metadata("design:type", Function),
|
|
49
|
-
__metadata("design:paramtypes", [
|
|
46
|
+
__metadata("design:paramtypes", []),
|
|
50
47
|
__metadata("design:returntype", Promise)
|
|
51
48
|
], OrganizationController.prototype, "getOrganizationHierarchy", null);
|
|
52
49
|
exports.OrganizationController = OrganizationController = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"organization.controller.js","sourceRoot":"","sources":["../../../../src/module/enterprise/controller/organization.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAyE;AACzE,0EAAsE;AAEtE,2DAAgE;AAChE,kEAAmE;AAI5D,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IACjC,YACmB,UAA+B,EACR,WAAwB;QAD/C,eAAU,GAAV,UAAU,CAAqB;QACR,gBAAW,GAAX,WAAW,CAAa;IAC/D,CAAC;IAIE,AAAN,KAAK,CAAC,uBAAuB,CAAQ,GAA4B;QAC/D,MAAM,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC;QAGnC,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;IAC7D,CAAC;IAIK,AAAN,KAAK,CAAC,wBAAwB
|
|
1
|
+
{"version":3,"file":"organization.controller.js","sourceRoot":"","sources":["../../../../src/module/enterprise/controller/organization.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAyE;AACzE,0EAAsE;AAEtE,2DAAgE;AAChE,kEAAmE;AAI5D,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IACjC,YACmB,UAA+B,EACR,WAAwB;QAD/C,eAAU,GAAV,UAAU,CAAqB;QACR,gBAAW,GAAX,WAAW,CAAa;IAC/D,CAAC;IAIE,AAAN,KAAK,CAAC,uBAAuB,CAAQ,GAA4B;QAC/D,MAAM,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC;QAGnC,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;IAC7D,CAAC;IAIK,AAAN,KAAK,CAAC,wBAAwB;QAC5B,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,wBAAwB,EAAE,CAAC;IAC1D,CAAC;CACF,CAAA;AApBY,wDAAsB;AAQ3B;IAFL,IAAA,kBAAS,EAAC,wBAAY,CAAC;IACvB,IAAA,YAAG,EAAC,UAAU,CAAC;IACe,WAAA,IAAA,YAAG,GAAE,CAAA;;;;qEAKnC;AAIK;IAFL,IAAA,kBAAS,EAAC,wBAAY,CAAC;IACvB,IAAA,YAAG,EAAC,WAAW,CAAC;;;;sEAGhB;iCAnBU,sBAAsB;IADlC,IAAA,mBAAU,EAAC,cAAc,CAAC;IAItB,WAAA,IAAA,eAAM,EAAC,aAAa,CAAC,CAAA;qCADO,0CAAmB;QACK,0BAAW;GAHvD,sBAAsB,CAoBlC"}
|
|
@@ -6,5 +6,5 @@ export declare class SchoolRepository {
|
|
|
6
6
|
constructor(schoolRepo: Repository<SchoolData>, dataSource: DataSource);
|
|
7
7
|
findAllByOrgId(brdId: number): Promise<SchoolData[]>;
|
|
8
8
|
findAllByBrandId(brdId: number): Promise<SchoolData[]>;
|
|
9
|
-
getUserContextDropdown(
|
|
9
|
+
getUserContextDropdown(): Promise<any[]>;
|
|
10
10
|
}
|
|
@@ -17,7 +17,6 @@ const common_1 = require("@nestjs/common");
|
|
|
17
17
|
const typeorm_1 = require("@nestjs/typeorm");
|
|
18
18
|
const typeorm_2 = require("typeorm");
|
|
19
19
|
const school_entity_1 = require("../entity/school.entity");
|
|
20
|
-
const user_role_mapping_entity_1 = require("../../user/entity/user-role-mapping.entity");
|
|
21
20
|
let SchoolRepository = class SchoolRepository {
|
|
22
21
|
constructor(schoolRepo, dataSource) {
|
|
23
22
|
this.schoolRepo = schoolRepo;
|
|
@@ -33,120 +32,87 @@ let SchoolRepository = class SchoolRepository {
|
|
|
33
32
|
where: { brand_id: brdId },
|
|
34
33
|
});
|
|
35
34
|
}
|
|
36
|
-
async getUserContextDropdown(
|
|
37
|
-
const
|
|
38
|
-
|
|
39
|
-
.
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
35
|
+
async getUserContextDropdown() {
|
|
36
|
+
const data = await this.dataSource
|
|
37
|
+
.createQueryBuilder()
|
|
38
|
+
.select([
|
|
39
|
+
'org.id AS org_id',
|
|
40
|
+
'org.name AS org_name',
|
|
41
|
+
'org.address AS org_address',
|
|
42
|
+
'br.id AS brand_id',
|
|
43
|
+
'br.entity_type AS brand_entity_type',
|
|
44
|
+
'br.name AS brand_name',
|
|
45
|
+
'br.status AS brand_status',
|
|
46
|
+
'br.parent_type AS brand_parent_type',
|
|
47
|
+
'br.parent_id AS brand_parent_id',
|
|
48
|
+
'br.code AS brand_code',
|
|
49
|
+
'br.created_by AS brand_created_by',
|
|
50
|
+
'br.created_date AS brand_created_date',
|
|
51
|
+
'br.modified_by AS brand_modified_by',
|
|
52
|
+
'br.modified_date AS brand_modified_date',
|
|
53
|
+
'br.enterprise_id AS brand_enterprise_id',
|
|
54
|
+
'br.organization_id AS brand_organization_id',
|
|
55
|
+
'br.appcode AS brand_appcode',
|
|
56
|
+
'br.level_id AS brand_level_id',
|
|
57
|
+
'br.level_type AS brand_level_type',
|
|
58
|
+
'br.type AS brand_type',
|
|
59
|
+
'sch.id AS school_id',
|
|
60
|
+
'sch.entity_type AS school_entity_type',
|
|
61
|
+
'sch.name AS school_name',
|
|
62
|
+
'sch.status AS school_status',
|
|
63
|
+
'sch.parent_type AS school_parent_type',
|
|
64
|
+
'sch.parent_id AS school_parent_id',
|
|
65
|
+
'sch.code AS school_code',
|
|
66
|
+
'sch.created_by AS school_created_by',
|
|
67
|
+
'sch.created_date AS school_created_date',
|
|
68
|
+
'sch.modified_by AS school_modified_by',
|
|
69
|
+
'sch.modified_date AS school_modified_date',
|
|
70
|
+
'sch.enterprise_id AS school_enterprise_id',
|
|
71
|
+
'sch.organization_id AS school_organization_id',
|
|
72
|
+
'sch.appcode AS school_appcode',
|
|
73
|
+
'sch.level_id AS school_level_id',
|
|
74
|
+
'sch.level_type AS school_level_type',
|
|
75
|
+
'sch.type AS school_type',
|
|
76
|
+
])
|
|
77
|
+
.from('cr_school', 'sch')
|
|
78
|
+
.innerJoin('cr_brand', 'br', 'sch.brand_id = br.id')
|
|
79
|
+
.innerJoin('cr_organization', 'org', 'br.organization_id = org.id')
|
|
80
|
+
.orderBy('org.id, br.id, sch.id')
|
|
43
81
|
.getRawMany();
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
'sch.location AS school_location',
|
|
56
|
-
])
|
|
57
|
-
.from('cr_school', 'sch')
|
|
58
|
-
.innerJoin('cr_brand', 'br', 'sch.brand_id = br.id')
|
|
59
|
-
.innerJoin('cr_organization', 'org', 'br.organization_id = org.id')
|
|
60
|
-
.where('org.id = :orgId', { orgId: hasOrgAccess[0].urm_level_id })
|
|
61
|
-
.getRawMany();
|
|
62
|
-
const result = {};
|
|
63
|
-
for (const row of schools) {
|
|
64
|
-
const { org_id, org_name, org_address, brand_id, brand_name, school_id, school_name, school_location, } = row;
|
|
65
|
-
if (!result[org_id]) {
|
|
66
|
-
result[org_id] = {
|
|
67
|
-
org_id,
|
|
68
|
-
org_name,
|
|
69
|
-
org_address,
|
|
70
|
-
type: 'Organization',
|
|
71
|
-
brands: {},
|
|
72
|
-
};
|
|
73
|
-
}
|
|
74
|
-
if (!result[org_id].brands[brand_id]) {
|
|
75
|
-
result[org_id].brands[brand_id] = {
|
|
76
|
-
brand_id,
|
|
77
|
-
brand_name,
|
|
78
|
-
type: 'Brand',
|
|
79
|
-
schools: [],
|
|
80
|
-
};
|
|
81
|
-
}
|
|
82
|
-
result[org_id].brands[brand_id].schools.push({
|
|
83
|
-
school_id,
|
|
84
|
-
school_name,
|
|
85
|
-
school_location,
|
|
86
|
-
type: 'School',
|
|
87
|
-
});
|
|
82
|
+
const result = {};
|
|
83
|
+
for (const row of data) {
|
|
84
|
+
const { org_id, org_name, org_address, brand_id, ...brandFields } = row;
|
|
85
|
+
const { school_id, ...schoolFields } = row;
|
|
86
|
+
if (!result[org_id]) {
|
|
87
|
+
result[org_id] = {
|
|
88
|
+
org_id,
|
|
89
|
+
org_name,
|
|
90
|
+
org_address,
|
|
91
|
+
brands: {},
|
|
92
|
+
};
|
|
88
93
|
}
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
const brnMappings = await this.dataSource
|
|
96
|
-
.createQueryBuilder()
|
|
97
|
-
.select([
|
|
98
|
-
'brand.id AS brand_id',
|
|
99
|
-
'brand.name AS brand_name',
|
|
100
|
-
'school.id AS school_id',
|
|
101
|
-
'school.name AS school_name',
|
|
102
|
-
'school.location AS school_location',
|
|
103
|
-
])
|
|
104
|
-
.from('cr_user_role_mapping', 'urm')
|
|
105
|
-
.innerJoin('cr_brand', 'brand', 'brand.id = urm.level_id')
|
|
106
|
-
.innerJoin('cr_school', 'school', 'school.brand_id = brand.id')
|
|
107
|
-
.where('urm.user_id = :userId', { userId })
|
|
108
|
-
.andWhere('urm.appcode = :appCode', { appCode })
|
|
109
|
-
.andWhere('urm.level_type = :levelType', { levelType: 'BRN' })
|
|
110
|
-
.getRawMany();
|
|
111
|
-
const schMappings = await this.dataSource
|
|
112
|
-
.createQueryBuilder()
|
|
113
|
-
.select([
|
|
114
|
-
'brand.id AS brand_id',
|
|
115
|
-
'brand.name AS brand_name',
|
|
116
|
-
'school.id AS school_id',
|
|
117
|
-
'school.name AS school_name',
|
|
118
|
-
])
|
|
119
|
-
.from('cr_user_role_mapping', 'urm')
|
|
120
|
-
.innerJoin('cr_school', 'school', 'school.id = urm.level_id')
|
|
121
|
-
.innerJoin('cr_brand', 'brand', 'brand.id = school.brand_id')
|
|
122
|
-
.where('urm.user_id = :userId', { userId })
|
|
123
|
-
.andWhere('urm.appcode = :appCode', { appCode })
|
|
124
|
-
.andWhere('urm.level_type = :levelType', { levelType: 'SCH' })
|
|
125
|
-
.getRawMany();
|
|
126
|
-
const allMappings = [...brnMappings, ...schMappings];
|
|
127
|
-
const result = {};
|
|
128
|
-
for (const row of allMappings) {
|
|
129
|
-
const { brand_id, brand_name, school_id, school_name, school_location, } = row;
|
|
130
|
-
if (!result[brand_id]) {
|
|
131
|
-
result[brand_id] = {
|
|
132
|
-
brand_id,
|
|
133
|
-
brand_name,
|
|
134
|
-
type: 'Brand',
|
|
135
|
-
schools: [],
|
|
136
|
-
};
|
|
94
|
+
if (!result[org_id].brands[brand_id]) {
|
|
95
|
+
const brandInfo = {};
|
|
96
|
+
for (const key in row) {
|
|
97
|
+
if (key.startsWith('brand_')) {
|
|
98
|
+
brandInfo[key.replace('brand_', '')] = row[key];
|
|
99
|
+
}
|
|
137
100
|
}
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
});
|
|
101
|
+
brandInfo.schools = [];
|
|
102
|
+
result[org_id].brands[brand_id] = brandInfo;
|
|
103
|
+
}
|
|
104
|
+
const schoolInfo = {};
|
|
105
|
+
for (const key in row) {
|
|
106
|
+
if (key.startsWith('school_')) {
|
|
107
|
+
schoolInfo[key.replace('school_', '')] = row[key];
|
|
146
108
|
}
|
|
147
109
|
}
|
|
148
|
-
|
|
110
|
+
result[org_id].brands[brand_id].schools.push(schoolInfo);
|
|
149
111
|
}
|
|
112
|
+
return Object.values(result).map((org) => ({
|
|
113
|
+
...org,
|
|
114
|
+
brands: Object.values(org.brands),
|
|
115
|
+
}));
|
|
150
116
|
}
|
|
151
117
|
};
|
|
152
118
|
exports.SchoolRepository = SchoolRepository;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"school.repository.js","sourceRoot":"","sources":["../../../../src/module/enterprise/repository/school.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAAmD;AACnD,qCAAiD;AACjD,2DAAqD;
|
|
1
|
+
{"version":3,"file":"school.repository.js","sourceRoot":"","sources":["../../../../src/module/enterprise/repository/school.repository.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,5 +17,5 @@ export declare class OrganizationService {
|
|
|
17
17
|
findById(id: number | undefined): Promise<OrganizationData[]>;
|
|
18
18
|
update(id: number, organizationDto: Partial<OrganizationData>, manager?: EntityManager): Promise<OrganizationData | null>;
|
|
19
19
|
remove(id: number, manager?: EntityManager): Promise<void>;
|
|
20
|
-
getOrganizationHierarchy(
|
|
20
|
+
getOrganizationHierarchy(): Promise<any[]>;
|
|
21
21
|
}
|
|
@@ -67,8 +67,8 @@ let OrganizationService = class OrganizationService {
|
|
|
67
67
|
: this.organizationRepository;
|
|
68
68
|
await repo.delete(id);
|
|
69
69
|
}
|
|
70
|
-
async getOrganizationHierarchy(
|
|
71
|
-
return await this.schoolRepository.getUserContextDropdown(
|
|
70
|
+
async getOrganizationHierarchy() {
|
|
71
|
+
return await this.schoolRepository.getUserContextDropdown();
|
|
72
72
|
}
|
|
73
73
|
};
|
|
74
74
|
exports.OrganizationService = OrganizationService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"organization.service.js","sourceRoot":"","sources":["../../../../src/module/enterprise/service/organization.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAoD;AACpD,6CAAmD;AACnD,qCAAoD;AACpD,uEAAiE;AACjE,0FAA6E;AAC7E,kEAAmE;AAEnE,qEAAiE;AACjE,uEAAmE;AAG5D,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC9B,YAEmB,sBAAoD,EACpD,eAAgC,EAChC,gBAAkC,EAClC,KAAwB,EACD,WAAwB;QAJ/C,2BAAsB,GAAtB,sBAAsB,CAA8B;QACpD,oBAAe,GAAf,eAAe,CAAiB;QAChC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,UAAK,GAAL,KAAK,CAAmB;QACD,gBAAW,GAAX,WAAW,CAAa;IAC/D,CAAC;IAEJ,KAAK,CAAC,MAAM,CACV,eAA0C,EAC1C,OAAuB;QAEvB,MAAM,IAAI,GAAG,OAAO;YAClB,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,sCAAgB,CAAC;YACzC,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC;QAEhC,eAAe,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QACrD,eAAe,CAAC,MAAM,GAAG,QAAQ,CAAC;QAClC,eAAe,CAAC,YAAY,GAAG,IAAI,IAAI,EAAE,CAAC;QAC1C,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;QAClD,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,OAAuB;QACnC,MAAM,IAAI,GAAG,OAAO;YAClB,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,sCAAgB,CAAC;YACzC,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC;QAEhC,OAAO,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,OAAO,CACX,EAAU,EACV,OAAuB;QAEvB,MAAM,IAAI,GAAG,OAAO;YAClB,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,sCAAgB,CAAC;YACzC,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC;QAEhC,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,EAAsB;QACnC,OAAO,MAAM,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IACnE,CAAC;IAED,KAAK,CAAC,MAAM,CACV,EAAU,EACV,eAA0C,EAC1C,OAAuB;QAEvB,MAAM,IAAI,GAAG,OAAO;YAClB,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,sCAAgB,CAAC;YACzC,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC;QAEhC,MAAM,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,eAAe,CAAC,CAAC;QACvC,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,EAAU,EAAE,OAAuB;QAC9C,MAAM,IAAI,GAAG,OAAO;YAClB,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,sCAAgB,CAAC;YACzC,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC;QAEhC,MAAM,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACxB,CAAC;IAED,KAAK,CAAC,wBAAwB
|
|
1
|
+
{"version":3,"file":"organization.service.js","sourceRoot":"","sources":["../../../../src/module/enterprise/service/organization.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ export declare class SavedFilterRepositoryService {
|
|
|
5
5
|
private readonly savedFilterMasterRepo;
|
|
6
6
|
private readonly savedFilterDetailRepo;
|
|
7
7
|
constructor(savedFilterMasterRepo: Repository<SavedFilterMaster>, savedFilterDetailRepo: Repository<SavedFilterDetail>);
|
|
8
|
-
isFilterNameExists(name
|
|
8
|
+
isFilterNameExists({ name, organization_id, id, level_type, level_id, }: any): Promise<boolean>;
|
|
9
9
|
getDetailsByCode(code: string): Promise<SavedFilterDetail[]>;
|
|
10
10
|
deleteDetailsByCode(code: string): Promise<void>;
|
|
11
11
|
saveDetails(details: Partial<SavedFilterDetail>[]): Promise<void>;
|
|
@@ -23,14 +23,15 @@ let SavedFilterRepositoryService = class SavedFilterRepositoryService {
|
|
|
23
23
|
this.savedFilterMasterRepo = savedFilterMasterRepo;
|
|
24
24
|
this.savedFilterDetailRepo = savedFilterDetailRepo;
|
|
25
25
|
}
|
|
26
|
-
async isFilterNameExists(name,
|
|
26
|
+
async isFilterNameExists({ name, organization_id, id, level_type, level_id, }) {
|
|
27
27
|
const where = {
|
|
28
28
|
name,
|
|
29
|
-
organization_id:
|
|
30
|
-
|
|
29
|
+
organization_id: organization_id,
|
|
30
|
+
level_type: level_type,
|
|
31
|
+
level_id: level_id,
|
|
31
32
|
};
|
|
32
|
-
if (
|
|
33
|
-
where.id = (0, typeorm_2.Not)(
|
|
33
|
+
if (id) {
|
|
34
|
+
where.id = (0, typeorm_2.Not)(id);
|
|
34
35
|
}
|
|
35
36
|
const existing = await this.savedFilterMasterRepo.findOne({ where });
|
|
36
37
|
return !!existing;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"saved-filter.repository.js","sourceRoot":"","sources":["../../../../src/module/filter/repository/saved-filter.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAAmD;AACnD,qCAA0C;AAC1C,qFAAyE;AACzE,qFAAyE;AAGlE,IAAM,4BAA4B,GAAlC,MAAM,4BAA4B;IACvC,YAEmB,qBAAoD,EAEpD,qBAAoD;QAFpD,0BAAqB,GAArB,qBAAqB,CAA+B;QAEpD,0BAAqB,GAArB,qBAAqB,CAA+B;IACpE,CAAC;IAEJ,KAAK,CAAC,kBAAkB,
|
|
1
|
+
{"version":3,"file":"saved-filter.repository.js","sourceRoot":"","sources":["../../../../src/module/filter/repository/saved-filter.repository.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ import { SavedFilterRepositoryService } from '../repository/saved-filter.reposit
|
|
|
6
6
|
export declare class SavedFilterService extends EntityServiceImpl {
|
|
7
7
|
private readonly savedFilterRepo;
|
|
8
8
|
constructor(savedFilterRepo: SavedFilterRepositoryService);
|
|
9
|
-
createEntity(entityData: any, loggedInUser: UserData
|
|
9
|
+
createEntity(entityData: any, loggedInUser: UserData): Promise<BaseEntity>;
|
|
10
10
|
updateEntity(entityData: BaseEntity, loggedInUser: UserData | null): Promise<BaseEntity>;
|
|
11
11
|
getDetailsByCode(code: string): Promise<SavedFilterDetail[]>;
|
|
12
12
|
getFilterById(id: number): Promise<{
|
|
@@ -21,7 +21,13 @@ let SavedFilterService = class SavedFilterService extends entity_service_impl_se
|
|
|
21
21
|
}
|
|
22
22
|
async createEntity(entityData, loggedInUser) {
|
|
23
23
|
const master = entityData;
|
|
24
|
-
const exists = await this.savedFilterRepo.isFilterNameExists(
|
|
24
|
+
const exists = await this.savedFilterRepo.isFilterNameExists({
|
|
25
|
+
name: master.name,
|
|
26
|
+
organization_id: loggedInUser.organization_id,
|
|
27
|
+
id: master.id,
|
|
28
|
+
level_type: loggedInUser?.level_type,
|
|
29
|
+
level_id: loggedInUser?.level_id,
|
|
30
|
+
});
|
|
25
31
|
if (exists) {
|
|
26
32
|
throw new common_1.BadRequestException('Saved filter name already exists.');
|
|
27
33
|
}
|
|
@@ -46,7 +52,12 @@ let SavedFilterService = class SavedFilterService extends entity_service_impl_se
|
|
|
46
52
|
if (!existing) {
|
|
47
53
|
throw new common_1.BadRequestException('Saved filter not found.');
|
|
48
54
|
}
|
|
49
|
-
const nameExists = await this.savedFilterRepo.isFilterNameExists(
|
|
55
|
+
const nameExists = await this.savedFilterRepo.isFilterNameExists({
|
|
56
|
+
name: master.name,
|
|
57
|
+
organization_id: master.organization_id,
|
|
58
|
+
enterprise_id: master.enterprise_id,
|
|
59
|
+
id: master.id,
|
|
60
|
+
});
|
|
50
61
|
if (nameExists) {
|
|
51
62
|
throw new common_1.BadRequestException('Saved filter name already exists.');
|
|
52
63
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"saved-filter.service.js","sourceRoot":"","sources":["../../../../src/module/filter/service/saved-filter.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAiE;AACjE,gGAAmF;AAKnF,uEAA4E;AAC5E,mFAAqF;AAG9E,IAAM,kBAAkB,GAAxB,MAAM,kBAAmB,SAAQ,+CAAiB;IACvD,YAA6B,eAA6C;QACxE,KAAK,EAAE,CAAC;QADmB,oBAAe,GAAf,eAAe,CAA8B;IAE1E,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,UAAe,EACf,
|
|
1
|
+
{"version":3,"file":"saved-filter.service.js","sourceRoot":"","sources":["../../../../src/module/filter/service/saved-filter.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,7 +26,6 @@ let LayoutPreferenceService = class LayoutPreferenceService extends entity_servi
|
|
|
26
26
|
if (userId === undefined) {
|
|
27
27
|
throw new Error('User ID is required to create layout preference.');
|
|
28
28
|
}
|
|
29
|
-
console.log('userId', userId);
|
|
30
29
|
const existingLayoutPreference = await this.layoutPreferenceRepository.findByEntityUserId(mapped_entity_type, userId);
|
|
31
30
|
if (existingLayoutPreference) {
|
|
32
31
|
return await super.updateEntity({ ...entityData, id: existingLayoutPreference.id }, loggedInUser);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"layout_preference.service.js","sourceRoot":"","sources":["../../../../src/module/layout_preference/service/layout_preference.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAE5C,gGAAwF;AAExF,6FAAwF;AACxF,qCAAqC;AAG9B,IAAM,uBAAuB,GAA7B,MAAM,uBAAwB,SAAQ,+CAAiB;IAC5D,YACU,0BAAsD,EAC7C,UAAsB;QAEvC,KAAK,EAAE,CAAC;QAHA,+BAA0B,GAA1B,0BAA0B,CAA4B;QAC7C,eAAU,GAAV,UAAU,CAAY;IAGzC,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,UAAsB,EAAE,YAA6B;QACtE,MAAM,EAAE,kBAAkB,EAAE,GAAG,UAAiB,CAAC;QACjD,MAAM,MAAM,GAAG,YAAY,EAAE,EAAE,CAAC;QAEhC,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;QACtE,CAAC;QAED,
|
|
1
|
+
{"version":3,"file":"layout_preference.service.js","sourceRoot":"","sources":["../../../../src/module/layout_preference/service/layout_preference.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,9 +39,8 @@ let EntityController = class EntityController {
|
|
|
39
39
|
}
|
|
40
40
|
async create(entityData, entityType, res, req) {
|
|
41
41
|
try {
|
|
42
|
-
let requestedUser = req.user.userData;
|
|
43
|
-
let appcode = requestedUser.appcode;
|
|
44
42
|
let loggedInUser = req.user.userData;
|
|
43
|
+
let appcode = req.user.userData.appcode;
|
|
45
44
|
if (!entityType) {
|
|
46
45
|
return res.status(common_1.HttpStatus.BAD_REQUEST).json({
|
|
47
46
|
success: false,
|
|
@@ -53,11 +52,11 @@ let EntityController = class EntityController {
|
|
|
53
52
|
if (!entityService) {
|
|
54
53
|
return res.status(common_1.HttpStatus.INTERNAL_SERVER_ERROR).json({
|
|
55
54
|
success: false,
|
|
56
|
-
error: `No service found for
|
|
55
|
+
error: `No service found for Entity Type ${entityType}`,
|
|
57
56
|
});
|
|
58
57
|
}
|
|
59
58
|
const createdEntity = await entityService.createEntity(entityData, loggedInUser, null, appcode);
|
|
60
|
-
if (!createdEntity
|
|
59
|
+
if (!createdEntity) {
|
|
61
60
|
return res.status(common_1.HttpStatus.BAD_REQUEST).json({
|
|
62
61
|
success: false,
|
|
63
62
|
error: createdEntity?.error || 'Entity creation failed',
|
|
@@ -65,7 +64,7 @@ let EntityController = class EntityController {
|
|
|
65
64
|
}
|
|
66
65
|
return res.status(common_1.HttpStatus.OK).json({
|
|
67
66
|
success: true,
|
|
68
|
-
data: createdEntity
|
|
67
|
+
data: createdEntity,
|
|
69
68
|
});
|
|
70
69
|
}
|
|
71
70
|
catch (error) {
|
|
@@ -100,7 +99,7 @@ let EntityController = class EntityController {
|
|
|
100
99
|
});
|
|
101
100
|
}
|
|
102
101
|
const updatedEntity = await entityService.updateEntity(entityData, loggedInUser);
|
|
103
|
-
if (!updatedEntity
|
|
102
|
+
if (!updatedEntity) {
|
|
104
103
|
return response.status(common_1.HttpStatus.BAD_REQUEST).json({
|
|
105
104
|
success: false,
|
|
106
105
|
error: updatedEntity?.error || 'Entity creation failed',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity.controller.js","sourceRoot":"","sources":["../../../../src/module/meta/controller/entity.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAewB;AACxB,wFAA2E;AAC3E,gGAAoF;AAEpF,4EAAuE;AACvE,qEAA0D;AAC1D,2DAA2D;AAC3D,yBAAyB;AACzB,6BAA6B;AAOtB,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAC3B,YACU,aAAgC,EAChC,gBAAkC,EAClC,mBAAwC;QAFxC,kBAAa,GAAb,aAAa,CAAmB;QAChC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,wBAAmB,GAAnB,mBAAmB,CAAqB;IAC/C,CAAC;IAIE,AAAN,KAAK,CAAC,OAAO,CACE,EAAU,EACD,UAAmB;QAEzC,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,4BAAmB,CAC3B,2CAA2C,CAC5C,CAAC;QACJ,CAAC;QACD,MAAM,YAAY,GAChB,MAAM,IAAI,CAAC,mBAAmB,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QAE3D,MAAM,aAAa,GACjB,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CACjC,YAAY,CAAC,cAAc,CAC5B,CAAC;QAEJ,IAAI,aAAa,EAAE,CAAC;YAClB,OAAO,MAAM,aAAa,CAAC,aAAa,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;QAC3D,CAAC;IACH,CAAC;
|
|
1
|
+
{"version":3,"file":"entity.controller.js","sourceRoot":"","sources":["../../../../src/module/meta/controller/entity.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,7 +32,7 @@ let EntityServiceImpl = class EntityServiceImpl {
|
|
|
32
32
|
const validationErrors = await this.entityValidationService.validateEntityData(entityData, entityMaster, loggedInUser);
|
|
33
33
|
if (validationErrors.length > 0) {
|
|
34
34
|
throw new common_1.BadRequestException({
|
|
35
|
-
|
|
35
|
+
message: 'Validation failed',
|
|
36
36
|
errors: validationErrors,
|
|
37
37
|
});
|
|
38
38
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity-service-impl.service.js","sourceRoot":"","sources":["../../../../src/module/meta/service/entity-service-impl.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,2CAAyE;AAEzE,mEAA8D;AAC9D,gGAAoF;AAEpF,oFAA4E;AAE5E,+DAA0D;AAE1D,sEAA8D;AAC9D,yBAAyB;AACzB,6BAA6B;AAC7B,sFAA0E;AAE1E,iEAA4D;AAC5D,+EAAyE;AACzE,uEAA4E;AAC5E,2EAAsE;AAG/D,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAW5B,KAAK,CAAC,YAAY,CAChB,UAAsB,EACtB,YAA6B,EAC7B,OAA8B,EAC9B,OAAgB;QAEhB,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC;YAC5B,MAAM,IAAI,4BAAmB,CAAC,uBAAuB,CAAC,CAAC;QACzD,CAAC;QACD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,aAAa,CAC/D,UAAU,CAAC,WAAW,CACvB,CAAC;QAEF,MAAM,gBAAgB,GACpB,MAAM,IAAI,CAAC,uBAAuB,CAAC,kBAAkB,CACnD,UAAU,EACV,YAAY,EACZ,YAAY,CACb,CAAC;QACJ,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAChC,MAAM,IAAI,4BAAmB,CAAC;gBAC5B,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"entity-service-impl.service.js","sourceRoot":"","sources":["../../../../src/module/meta/service/entity-service-impl.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,7 +30,6 @@ let SectionMasterService = class SectionMasterService extends entity_service_imp
|
|
|
30
30
|
const stepsData = [];
|
|
31
31
|
if (layoutJson?.form?.children && Array.isArray(layoutJson.form.children)) {
|
|
32
32
|
const firstChild = layoutJson.form.children[0];
|
|
33
|
-
console.log('First Child:', firstChild);
|
|
34
33
|
if (firstChild.type === 'wizard' && Array.isArray(firstChild.steps)) {
|
|
35
34
|
console.log('Wizard Steps:', firstChild.steps);
|
|
36
35
|
let i = 0;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"section-master.service.js","sourceRoot":"","sources":["../../../../src/module/meta/service/section-master.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,+EAAkE;AAO3D,IAAM,oBAAoB,GAA1B,MAAM,oBAAqB,SAAQ,+CAAiB;IACzD;QACE,KAAK,EAAE,CAAC;IACV,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,UAAsB,EACtB,YAA6B,EAC7B,OAAuB;QAEvB,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,aAAa,CAC/D,UAAU,CAAC,WAAW,CACvB,CAAC;QACF,UAAU,CAAC,SAAS,GAAG,YAAY,CAAC,EAAE,CAAC;QACvC,UAAU,CAAC,WAAW,GAAG,YAAY,CAAC,WAAW,CAAC;QAElD,MAAM,WAAW,GAAG,MAAM,KAAK,CAAC,YAAY,CAC1C,UAAU,EACV,YAAY,EACZ,OAAO,CACR,CAAC;QACF,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,UAAsB,EACtB,gBAAiC;QAEjC,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,WAAW,CAAC,UAAe;QACzB,MAAM,SAAS,GAUT,EAAE,CAAC;QAET,IAAI,UAAU,EAAE,IAAI,EAAE,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC1E,MAAM,UAAU,GAAG,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"section-master.service.js","sourceRoot":"","sources":["../../../../src/module/meta/service/section-master.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,+EAAkE;AAO3D,IAAM,oBAAoB,GAA1B,MAAM,oBAAqB,SAAQ,+CAAiB;IACzD;QACE,KAAK,EAAE,CAAC;IACV,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,UAAsB,EACtB,YAA6B,EAC7B,OAAuB;QAEvB,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,aAAa,CAC/D,UAAU,CAAC,WAAW,CACvB,CAAC;QACF,UAAU,CAAC,SAAS,GAAG,YAAY,CAAC,EAAE,CAAC;QACvC,UAAU,CAAC,WAAW,GAAG,YAAY,CAAC,WAAW,CAAC;QAElD,MAAM,WAAW,GAAG,MAAM,KAAK,CAAC,YAAY,CAC1C,UAAU,EACV,YAAY,EACZ,OAAO,CACR,CAAC;QACF,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,UAAsB,EACtB,gBAAiC;QAEjC,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,WAAW,CAAC,UAAe;QACzB,MAAM,SAAS,GAUT,EAAE,CAAC;QAET,IAAI,UAAU,EAAE,IAAI,EAAE,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC1E,MAAM,UAAU,GAAG,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;YAE/C,IAAI,UAAU,CAAC,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;gBACpE,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC;gBAC/C,IAAI,CAAC,GAAG,CAAC,CAAC;gBACV,KAAK,MAAM,IAAI,IAAI,UAAU,CAAC,KAAK,EAAE,CAAC;oBACpC,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;wBACzB,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;wBAE/C,SAAS,CAAC,IAAI,CAAC;4BACb,QAAQ,EAAE,IAAI,CAAC,IAAI;4BACnB,MAAM,EAAE,IAAI,CAAC,EAAE;4BACf,SAAS,EAAE,IAAI,CAAC,KAAK;4BACrB,YAAY,EAAE,EAAE,CAAC;4BACjB,WAAW,EAAE,MAAM;yBACpB,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,aAAa,CAAC,WAAkB;QAK9B,MAAM,eAAe,GAAkD,EAAE,CAAC;QAE1E,SAAS,QAAQ,CAAC,MAAa;YAC7B,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;gBAC3B,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;oBAC/B,eAAe,CAAC,IAAI,CAAC;wBACnB,IAAI,EAAE,KAAK,CAAC,IAAI,IAAI,cAAc;wBAClC,KAAK,EAAE,KAAK,CAAC,KAAK,IAAI,eAAe;wBACrC,EAAE,EAAE,KAAK,CAAC,EAAE,IAAI,YAAY;qBAC7B,CAAC,CAAC;gBACL,CAAC;gBACD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;oBAChC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;gBACzB,CAAC;YACH,CAAC;QACH,CAAC;QAED,QAAQ,CAAC,WAAW,CAAC,CAAC;QAEtB,OAAO,eAAe,CAAC;IACzB,CAAC;CACF,CAAA;AA9FY,oDAAoB;+BAApB,oBAAoB;IADhC,IAAA,mBAAU,GAAE;;GACA,oBAAoB,CA8FhC"}
|