harperdb 4.3.24 → 4.4.0-beta.1
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/README.md +12 -3
- package/application-template/config.yaml +2 -5
- package/bin/harperdb.js +103 -74
- package/bin/lite.js +121 -22
- package/config/yaml/defaultConfig.yaml +11 -43
- package/config/yaml/defaultNatsConfig.yaml +36 -0
- package/index.js +3 -12
- package/json/hdbConnectorOptions.json +14 -14
- package/json/interNodeConnectorOptions.json +15 -15
- package/json/systemSchema.json +260 -307
- package/launchServiceScripts/launchInstallNATSServer.js +4 -4
- package/launchServiceScripts/launchNatsIngestService.js +121 -22
- package/launchServiceScripts/launchNatsReplyService.js +121 -22
- package/launchServiceScripts/launchUpdateNodes4-0-0.js +121 -22
- package/logs/README.md +1 -1
- package/npm-shrinkwrap.json +7545 -7228
- package/package.json +130 -131
- package/resources/DatabaseTransaction.d.ts +1 -0
- package/resources/ErrorResource.d.ts +26 -0
- package/resources/RecordEncoder.d.ts +3 -1
- package/resources/Resource.d.ts +8 -1
- package/resources/ResourceInterface.d.ts +7 -3
- package/resources/Resources.d.ts +5 -4
- package/resources/Table.d.ts +50 -19
- package/resources/auditStore.d.ts +45 -1
- package/resources/databases.d.ts +54 -17
- package/resources/search.d.ts +6 -0
- package/resources/transactionBroadcast.d.ts +2 -1
- package/server/Server.d.ts +1 -1
- package/server/jobs/jobProcess.js +121 -22
- package/server/serverHelpers/Headers.d.ts +9 -1
- package/server/threads/threadServer.js +121 -22
- package/utility/scripts/restartHdb.js +121 -22
- package/application-template/routes/index.js +0 -14
- package/studio/build-local/asset-manifest.json +0 -53
- package/studio/build-local/index.html +0 -1
- package/studio/build-local/static/css/main.6c0f1b63.css +0 -13
- package/studio/build-local/static/js/110.ca4244a6.chunk.js +0 -2
- package/studio/build-local/static/js/110.ca4244a6.chunk.js.LICENSE.txt +0 -1
- package/studio/build-local/static/js/228.302d7db9.chunk.js +0 -1
- package/studio/build-local/static/js/287.21477cf9.chunk.js +0 -1
- package/studio/build-local/static/js/409.17daa4fe.chunk.js +0 -2
- package/studio/build-local/static/js/409.17daa4fe.chunk.js.LICENSE.txt +0 -8
- package/studio/build-local/static/js/424.ad87c8fd.chunk.js +0 -1
- package/studio/build-local/static/js/446.5237e847.chunk.js +0 -2
- package/studio/build-local/static/js/446.5237e847.chunk.js.LICENSE.txt +0 -13
- package/studio/build-local/static/js/662.92e32ffc.chunk.js +0 -1
- package/studio/build-local/static/js/718.74e9355d.chunk.js +0 -1
- package/studio/build-local/static/js/723.c58acced.chunk.js +0 -2
- package/studio/build-local/static/js/723.c58acced.chunk.js.LICENSE.txt +0 -5
- package/studio/build-local/static/js/731.8a941eb3.chunk.js +0 -1
- package/studio/build-local/static/js/807.510f66df.chunk.js +0 -2
- package/studio/build-local/static/js/807.510f66df.chunk.js.LICENSE.txt +0 -5
- package/studio/build-local/static/js/926.88d6f9ce.chunk.js +0 -1
- package/studio/build-local/static/js/browse-csvupload.453237f3.chunk.js +0 -1
- package/studio/build-local/static/js/browse-datatable.b9ef2d28.chunk.js +0 -1
- package/studio/build-local/static/js/browse-entitymanager.50827a5a.chunk.js +0 -1
- package/studio/build-local/static/js/browse-jsonviewer.a2534004.chunk.js +0 -1
- package/studio/build-local/static/js/custom-functions.dd7e182c.chunk.js +0 -1
- package/studio/build-local/static/js/instance-charts.34d15f02.chunk.js +0 -1
- package/studio/build-local/static/js/instance-cluster.5bce430c.chunk.js +0 -1
- package/studio/build-local/static/js/instance-config.70c17b53.chunk.js +0 -1
- package/studio/build-local/static/js/instance-query.4f6eec62.chunk.js +0 -1
- package/studio/build-local/static/js/instance-roles.507a4ed0.chunk.js +0 -1
- package/studio/build-local/static/js/instance-status.ce9d7f64.chunk.js +0 -1
- package/studio/build-local/static/js/instance-users-datatable.190640fd.chunk.js +0 -1
- package/studio/build-local/static/js/instance-users-edit.d2444479.chunk.js +0 -1
- package/studio/build-local/static/js/instance-users.eabfbbde.chunk.js +0 -1
- package/studio/build-local/static/js/instance.a163623f.chunk.js +0 -1
- package/studio/build-local/static/js/instances.6b88a87c.chunk.js +0 -1
- package/studio/build-local/static/js/main.7106edfd.js +0 -2
- package/studio/build-local/static/js/main.7106edfd.js.LICENSE.txt +0 -72
- package/studio/build-local/static/js/offline-app.7371216b.chunk.js +0 -1
- package/studio/build-local/static/js/online-app.db436eec.chunk.js +0 -1
- package/studio/build-local/static/js/organization-billing.b2f260f0.chunk.js +0 -1
- package/studio/build-local/static/js/organization-users.b6171b18.chunk.js +0 -1
- package/studio/build-local/static/js/organization.7800f16a.chunk.js +0 -1
- package/studio/build-local/static/js/organizations.8bb505f2.chunk.js +0 -1
- package/studio/build-local/static/js/profile.292bdd86.chunk.js +0 -1
- package/studio/build-local/static/js/resetPassword.8fdfba77.chunk.js +0 -1
- package/studio/build-local/static/js/roles-jsonviewer.c11f1816.chunk.js +0 -1
- package/studio/build-local/static/js/signIn.b11bdc50.chunk.js +0 -1
- package/studio/build-local/static/js/signUp.564d4e0b.chunk.js +0 -1
- package/studio/build-local/static/js/structure-reloader.b6de4091.chunk.js +0 -1
- package/studio/build-local/static/js/topnav.4fd41d60.chunk.js +0 -1
- package/studio/build-local/static/js/updatePassword.e23019c7.chunk.js +0 -1
package/json/systemSchema.json
CHANGED
|
@@ -1,308 +1,261 @@
|
|
|
1
1
|
{
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
"hash_attribute": "id",
|
|
263
|
-
"name": "hdb_raw_analytics",
|
|
264
|
-
"schema": "system",
|
|
265
|
-
"audit": false,
|
|
266
|
-
"attributes":[
|
|
267
|
-
{
|
|
268
|
-
"attribute":"id"
|
|
269
|
-
},
|
|
270
|
-
{
|
|
271
|
-
"attribute":"time"
|
|
272
|
-
},
|
|
273
|
-
{
|
|
274
|
-
"attribute": "metrics"
|
|
275
|
-
}
|
|
276
|
-
]
|
|
277
|
-
},
|
|
278
|
-
"hdb_temp":{
|
|
279
|
-
"hash_attribute": "id",
|
|
280
|
-
"name": "hdb_temp",
|
|
281
|
-
"schema": "system",
|
|
282
|
-
"attributes":[
|
|
283
|
-
{
|
|
284
|
-
"attribute":"id"
|
|
285
|
-
}
|
|
286
|
-
]
|
|
287
|
-
},
|
|
288
|
-
"hdb_durable_session":{
|
|
289
|
-
"hash_attribute": "id",
|
|
290
|
-
"name": "hdb_durable_session",
|
|
291
|
-
"schema": "system",
|
|
292
|
-
"attributes":[
|
|
293
|
-
{
|
|
294
|
-
"attribute":"id"
|
|
295
|
-
}
|
|
296
|
-
]
|
|
297
|
-
},
|
|
298
|
-
"hdb_session_will":{
|
|
299
|
-
"hash_attribute": "id",
|
|
300
|
-
"name": "hdb_session_will",
|
|
301
|
-
"schema": "system",
|
|
302
|
-
"attributes":[
|
|
303
|
-
{
|
|
304
|
-
"attribute":"id"
|
|
305
|
-
}
|
|
306
|
-
]
|
|
307
|
-
}
|
|
308
|
-
}
|
|
2
|
+
"hdb_user": {
|
|
3
|
+
"hash_attribute": "username",
|
|
4
|
+
"name": "hdb_user",
|
|
5
|
+
"schema": "system",
|
|
6
|
+
"residence": ["*"],
|
|
7
|
+
"attributes": [
|
|
8
|
+
{
|
|
9
|
+
"attribute": "username"
|
|
10
|
+
},
|
|
11
|
+
{
|
|
12
|
+
"attribute": "password"
|
|
13
|
+
},
|
|
14
|
+
{
|
|
15
|
+
"attribute": "role"
|
|
16
|
+
},
|
|
17
|
+
{
|
|
18
|
+
"attribute": "active"
|
|
19
|
+
},
|
|
20
|
+
{
|
|
21
|
+
"attribute": "hash"
|
|
22
|
+
},
|
|
23
|
+
{
|
|
24
|
+
"attribute": "refresh_token"
|
|
25
|
+
},
|
|
26
|
+
{
|
|
27
|
+
"attribute": "__createdtime__"
|
|
28
|
+
},
|
|
29
|
+
{
|
|
30
|
+
"attribute": "__updatedtime__"
|
|
31
|
+
}
|
|
32
|
+
]
|
|
33
|
+
},
|
|
34
|
+
"hdb_role": {
|
|
35
|
+
"hash_attribute": "id",
|
|
36
|
+
"name": "hdb_role",
|
|
37
|
+
"schema": "system",
|
|
38
|
+
"attributes": [
|
|
39
|
+
{
|
|
40
|
+
"attribute": "id"
|
|
41
|
+
},
|
|
42
|
+
{
|
|
43
|
+
"attribute": "role"
|
|
44
|
+
},
|
|
45
|
+
{
|
|
46
|
+
"attribute": "permission"
|
|
47
|
+
},
|
|
48
|
+
{
|
|
49
|
+
"attribute": "__createdtime__"
|
|
50
|
+
},
|
|
51
|
+
{
|
|
52
|
+
"attribute": "__updatedtime__"
|
|
53
|
+
}
|
|
54
|
+
],
|
|
55
|
+
"residence": ["*"]
|
|
56
|
+
},
|
|
57
|
+
"hdb_job": {
|
|
58
|
+
"hash_attribute": "id",
|
|
59
|
+
"name": "hdb_job",
|
|
60
|
+
"schema": "system",
|
|
61
|
+
"attributes": [
|
|
62
|
+
{
|
|
63
|
+
"attribute": "id"
|
|
64
|
+
},
|
|
65
|
+
{
|
|
66
|
+
"attribute": "user"
|
|
67
|
+
},
|
|
68
|
+
{
|
|
69
|
+
"attribute": "type"
|
|
70
|
+
},
|
|
71
|
+
{
|
|
72
|
+
"attribute": "status"
|
|
73
|
+
},
|
|
74
|
+
{
|
|
75
|
+
"attribute": "start_datetime"
|
|
76
|
+
},
|
|
77
|
+
{
|
|
78
|
+
"attribute": "end_datetime"
|
|
79
|
+
},
|
|
80
|
+
{
|
|
81
|
+
"attribute": "message"
|
|
82
|
+
},
|
|
83
|
+
{
|
|
84
|
+
"attribute": "created_datetime"
|
|
85
|
+
},
|
|
86
|
+
{
|
|
87
|
+
"attribute": "request"
|
|
88
|
+
},
|
|
89
|
+
{
|
|
90
|
+
"attribute": "__createdtime__"
|
|
91
|
+
},
|
|
92
|
+
{
|
|
93
|
+
"attribute": "__updatedtime__"
|
|
94
|
+
}
|
|
95
|
+
]
|
|
96
|
+
},
|
|
97
|
+
"hdb_license": {
|
|
98
|
+
"hash_attribute": "license_key",
|
|
99
|
+
"name": "hdb_license",
|
|
100
|
+
"schema": "system",
|
|
101
|
+
"attributes": [
|
|
102
|
+
{
|
|
103
|
+
"attribute": "license_key"
|
|
104
|
+
},
|
|
105
|
+
{
|
|
106
|
+
"attribute": "company"
|
|
107
|
+
},
|
|
108
|
+
{
|
|
109
|
+
"attribute": "__createdtime__"
|
|
110
|
+
},
|
|
111
|
+
{
|
|
112
|
+
"attribute": "__updatedtime__"
|
|
113
|
+
}
|
|
114
|
+
]
|
|
115
|
+
},
|
|
116
|
+
"hdb_info": {
|
|
117
|
+
"hash_attribute": "info_id",
|
|
118
|
+
"name": "hdb_info",
|
|
119
|
+
"schema": "system",
|
|
120
|
+
"attributes": [
|
|
121
|
+
{
|
|
122
|
+
"attribute": "info_id"
|
|
123
|
+
},
|
|
124
|
+
{
|
|
125
|
+
"attribute": "data_version_num"
|
|
126
|
+
},
|
|
127
|
+
{
|
|
128
|
+
"attribute": "hdb_version_num"
|
|
129
|
+
},
|
|
130
|
+
{
|
|
131
|
+
"attribute": "__createdtime__"
|
|
132
|
+
},
|
|
133
|
+
{
|
|
134
|
+
"attribute": "__updatedtime__"
|
|
135
|
+
}
|
|
136
|
+
]
|
|
137
|
+
},
|
|
138
|
+
"hdb_nodes": {
|
|
139
|
+
"hash_attribute": "name",
|
|
140
|
+
"name": "hdb_nodes",
|
|
141
|
+
"schema": "system",
|
|
142
|
+
"attributes": [
|
|
143
|
+
{
|
|
144
|
+
"attribute": "name"
|
|
145
|
+
},
|
|
146
|
+
{
|
|
147
|
+
"attribute": "subscriptions"
|
|
148
|
+
},
|
|
149
|
+
{
|
|
150
|
+
"attribute": "system_info"
|
|
151
|
+
},
|
|
152
|
+
{
|
|
153
|
+
"attribute": "url"
|
|
154
|
+
},
|
|
155
|
+
{
|
|
156
|
+
"attribute": "routes"
|
|
157
|
+
}
|
|
158
|
+
]
|
|
159
|
+
},
|
|
160
|
+
"hdb_certificate": {
|
|
161
|
+
"hash_attribute": "name",
|
|
162
|
+
"name": "hdb_certificate",
|
|
163
|
+
"schema": "system",
|
|
164
|
+
"attributes": [
|
|
165
|
+
{
|
|
166
|
+
"attribute": "name"
|
|
167
|
+
},
|
|
168
|
+
{
|
|
169
|
+
"attribute": "uses"
|
|
170
|
+
},
|
|
171
|
+
{
|
|
172
|
+
"attribute": "certificate"
|
|
173
|
+
},
|
|
174
|
+
{
|
|
175
|
+
"attribute": "is_authority"
|
|
176
|
+
},
|
|
177
|
+
{
|
|
178
|
+
"attribute": "private_key_name"
|
|
179
|
+
},
|
|
180
|
+
{
|
|
181
|
+
"attribute": "details"
|
|
182
|
+
},
|
|
183
|
+
{
|
|
184
|
+
"attribute": "is_self_signed"
|
|
185
|
+
},
|
|
186
|
+
{
|
|
187
|
+
"attribute": "__updatedtime__"
|
|
188
|
+
}
|
|
189
|
+
]
|
|
190
|
+
},
|
|
191
|
+
"hdb_analytics": {
|
|
192
|
+
"hash_attribute": "id",
|
|
193
|
+
"name": "hdb_analytics",
|
|
194
|
+
"schema": "system",
|
|
195
|
+
"audit": false,
|
|
196
|
+
"attributes": [
|
|
197
|
+
{
|
|
198
|
+
"attribute": "id"
|
|
199
|
+
},
|
|
200
|
+
{
|
|
201
|
+
"name": "metric"
|
|
202
|
+
},
|
|
203
|
+
{
|
|
204
|
+
"name": "path"
|
|
205
|
+
},
|
|
206
|
+
{
|
|
207
|
+
"name": "method"
|
|
208
|
+
},
|
|
209
|
+
{
|
|
210
|
+
"name": "type"
|
|
211
|
+
}
|
|
212
|
+
]
|
|
213
|
+
},
|
|
214
|
+
"hdb_raw_analytics": {
|
|
215
|
+
"hash_attribute": "id",
|
|
216
|
+
"name": "hdb_raw_analytics",
|
|
217
|
+
"schema": "system",
|
|
218
|
+
"audit": false,
|
|
219
|
+
"attributes": [
|
|
220
|
+
{
|
|
221
|
+
"attribute": "id"
|
|
222
|
+
},
|
|
223
|
+
{
|
|
224
|
+
"attribute": "time"
|
|
225
|
+
},
|
|
226
|
+
{
|
|
227
|
+
"attribute": "metrics"
|
|
228
|
+
}
|
|
229
|
+
]
|
|
230
|
+
},
|
|
231
|
+
"hdb_temp": {
|
|
232
|
+
"hash_attribute": "id",
|
|
233
|
+
"name": "hdb_temp",
|
|
234
|
+
"schema": "system",
|
|
235
|
+
"attributes": [
|
|
236
|
+
{
|
|
237
|
+
"attribute": "id"
|
|
238
|
+
}
|
|
239
|
+
]
|
|
240
|
+
},
|
|
241
|
+
"hdb_durable_session": {
|
|
242
|
+
"hash_attribute": "id",
|
|
243
|
+
"name": "hdb_durable_session",
|
|
244
|
+
"schema": "system",
|
|
245
|
+
"attributes": [
|
|
246
|
+
{
|
|
247
|
+
"attribute": "id"
|
|
248
|
+
}
|
|
249
|
+
]
|
|
250
|
+
},
|
|
251
|
+
"hdb_session_will": {
|
|
252
|
+
"hash_attribute": "id",
|
|
253
|
+
"name": "hdb_session_will",
|
|
254
|
+
"schema": "system",
|
|
255
|
+
"attributes": [
|
|
256
|
+
{
|
|
257
|
+
"attribute": "id"
|
|
258
|
+
}
|
|
259
|
+
]
|
|
260
|
+
}
|
|
261
|
+
}
|