@budibase/server 1.0.48 → 1.0.49-alpha.3

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.
Files changed (289) hide show
  1. package/builder/assets/{index.e083dcaf.js → index.21e57eb4.js} +234 -231
  2. package/builder/assets/index.83c0944f.css +1 -0
  3. package/builder/assets/{vendor.f9faf6ab.js → vendor.d526bfe8.js} +12 -12
  4. package/builder/index.html +3 -3
  5. package/coverage/clover.xml +2338 -2028
  6. package/coverage/coverage-final.json +100 -95
  7. package/coverage/lcov-report/api/controllers/analytics.js.html +1 -1
  8. package/coverage/lcov-report/api/controllers/apikeys.js.html +1 -1
  9. package/coverage/lcov-report/api/controllers/application.js.html +210 -126
  10. package/coverage/lcov-report/api/controllers/auth.js.html +18 -6
  11. package/coverage/lcov-report/api/controllers/automation.js.html +21 -21
  12. package/coverage/lcov-report/api/controllers/backup.js.html +1 -1
  13. package/coverage/lcov-report/api/controllers/cloud.js.html +1 -1
  14. package/coverage/lcov-report/api/controllers/component.js.html +4 -4
  15. package/coverage/lcov-report/api/controllers/datasource.js.html +72 -36
  16. package/coverage/lcov-report/api/controllers/dev.js.html +1 -1
  17. package/coverage/lcov-report/api/controllers/index.html +53 -53
  18. package/coverage/lcov-report/api/controllers/integration.js.html +1 -1
  19. package/coverage/lcov-report/api/controllers/layout.js.html +6 -6
  20. package/coverage/lcov-report/api/controllers/metadata.js.html +1 -1
  21. package/coverage/lcov-report/api/controllers/migrations.js.html +119 -0
  22. package/coverage/lcov-report/api/controllers/permission.js.html +15 -15
  23. package/coverage/lcov-report/api/controllers/query/index.html +1 -1
  24. package/coverage/lcov-report/api/controllers/query/index.js.html +19 -19
  25. package/coverage/lcov-report/api/controllers/query/validation.js.html +6 -6
  26. package/coverage/lcov-report/api/controllers/role.js.html +9 -9
  27. package/coverage/lcov-report/api/controllers/routing.js.html +1 -1
  28. package/coverage/lcov-report/api/controllers/row/external.js.html +16 -16
  29. package/coverage/lcov-report/api/controllers/row/index.html +48 -33
  30. package/coverage/lcov-report/api/controllers/row/index.js.html +26 -26
  31. package/coverage/lcov-report/api/controllers/row/internal.js.html +95 -158
  32. package/coverage/lcov-report/api/controllers/row/internalSearch.js.html +41 -17
  33. package/coverage/lcov-report/api/controllers/row/staticFormula.js.html +551 -0
  34. package/coverage/lcov-report/api/controllers/row/utils.js.html +39 -57
  35. package/coverage/lcov-report/api/controllers/screen.js.html +7 -7
  36. package/coverage/lcov-report/api/controllers/script.js.html +4 -4
  37. package/coverage/lcov-report/api/controllers/table/bulkFormula.js.html +629 -0
  38. package/coverage/lcov-report/api/controllers/table/external.js.html +12 -12
  39. package/coverage/lcov-report/api/controllers/table/index.html +46 -31
  40. package/coverage/lcov-report/api/controllers/table/index.js.html +53 -77
  41. package/coverage/lcov-report/api/controllers/table/internal.js.html +59 -35
  42. package/coverage/lcov-report/api/controllers/table/utils.js.html +217 -73
  43. package/coverage/lcov-report/api/controllers/templates.js.html +1 -1
  44. package/coverage/lcov-report/api/controllers/user.js.html +30 -24
  45. package/coverage/lcov-report/api/controllers/view/exporters.js.html +4 -4
  46. package/coverage/lcov-report/api/controllers/view/index.html +1 -1
  47. package/coverage/lcov-report/api/controllers/view/index.js.html +14 -14
  48. package/coverage/lcov-report/api/controllers/view/utils.js.html +11 -11
  49. package/coverage/lcov-report/api/controllers/view/viewBuilder.js.html +7 -7
  50. package/coverage/lcov-report/api/controllers/webhook.js.html +15 -15
  51. package/coverage/lcov-report/api/index.html +1 -1
  52. package/coverage/lcov-report/api/index.js.html +8 -8
  53. package/coverage/lcov-report/api/routes/analytics.js.html +1 -1
  54. package/coverage/lcov-report/api/routes/apikeys.js.html +1 -1
  55. package/coverage/lcov-report/api/routes/application.js.html +1 -1
  56. package/coverage/lcov-report/api/routes/auth.js.html +1 -1
  57. package/coverage/lcov-report/api/routes/automation.js.html +1 -1
  58. package/coverage/lcov-report/api/routes/backup.js.html +1 -1
  59. package/coverage/lcov-report/api/routes/cloud.js.html +1 -1
  60. package/coverage/lcov-report/api/routes/component.js.html +1 -1
  61. package/coverage/lcov-report/api/routes/datasource.js.html +1 -1
  62. package/coverage/lcov-report/api/routes/deploy.js.html +1 -1
  63. package/coverage/lcov-report/api/routes/dev.js.html +1 -1
  64. package/coverage/lcov-report/api/routes/index.html +18 -18
  65. package/coverage/lcov-report/api/routes/index.js.html +3 -3
  66. package/coverage/lcov-report/api/routes/integration.js.html +1 -1
  67. package/coverage/lcov-report/api/routes/layout.js.html +1 -1
  68. package/coverage/lcov-report/api/routes/metadata.js.html +1 -1
  69. package/coverage/lcov-report/api/routes/{hosting.js.html → migrations.js.html} +17 -14
  70. package/coverage/lcov-report/api/routes/permission.js.html +1 -1
  71. package/coverage/lcov-report/api/routes/query.js.html +1 -1
  72. package/coverage/lcov-report/api/routes/role.js.html +1 -1
  73. package/coverage/lcov-report/api/routes/routing.js.html +1 -1
  74. package/coverage/lcov-report/api/routes/row.js.html +1 -1
  75. package/coverage/lcov-report/api/routes/screen.js.html +1 -1
  76. package/coverage/lcov-report/api/routes/script.js.html +1 -1
  77. package/coverage/lcov-report/api/routes/static.js.html +17 -2
  78. package/coverage/lcov-report/api/routes/table.js.html +1 -1
  79. package/coverage/lcov-report/api/routes/templates.js.html +1 -1
  80. package/coverage/lcov-report/api/routes/user.js.html +1 -1
  81. package/coverage/lcov-report/api/routes/view.js.html +1 -1
  82. package/coverage/lcov-report/api/routes/webhook.js.html +1 -1
  83. package/coverage/lcov-report/automations/actions.js.html +24 -24
  84. package/coverage/lcov-report/automations/automationUtils.js.html +5 -5
  85. package/coverage/lcov-report/automations/bullboard.js.html +16 -16
  86. package/coverage/lcov-report/automations/index.html +1 -1
  87. package/coverage/lcov-report/automations/index.js.html +1 -1
  88. package/coverage/lcov-report/automations/steps/bash.js.html +6 -6
  89. package/coverage/lcov-report/automations/steps/createRow.js.html +13 -19
  90. package/coverage/lcov-report/automations/steps/delay.js.html +4 -4
  91. package/coverage/lcov-report/automations/steps/deleteRow.js.html +11 -20
  92. package/coverage/lcov-report/automations/steps/discord.js.html +7 -7
  93. package/coverage/lcov-report/automations/steps/executeQuery.js.html +6 -6
  94. package/coverage/lcov-report/automations/steps/executeScript.js.html +6 -6
  95. package/coverage/lcov-report/automations/steps/filter.js.html +7 -7
  96. package/coverage/lcov-report/automations/steps/index.html +13 -13
  97. package/coverage/lcov-report/automations/steps/integromat.js.html +5 -5
  98. package/coverage/lcov-report/automations/steps/outgoingWebhook.js.html +8 -8
  99. package/coverage/lcov-report/automations/steps/queryRows.js.html +10 -10
  100. package/coverage/lcov-report/automations/steps/sendSmtpEmail.js.html +5 -5
  101. package/coverage/lcov-report/automations/steps/serverLog.js.html +3 -3
  102. package/coverage/lcov-report/automations/steps/slack.js.html +5 -5
  103. package/coverage/lcov-report/automations/steps/updateRow.js.html +6 -6
  104. package/coverage/lcov-report/automations/steps/utils.js.html +3 -3
  105. package/coverage/lcov-report/automations/steps/zapier.js.html +5 -5
  106. package/coverage/lcov-report/automations/triggerInfo/app.js.html +2 -2
  107. package/coverage/lcov-report/automations/triggerInfo/cron.js.html +2 -2
  108. package/coverage/lcov-report/automations/triggerInfo/index.html +1 -1
  109. package/coverage/lcov-report/automations/triggerInfo/index.js.html +8 -8
  110. package/coverage/lcov-report/automations/triggerInfo/rowDeleted.js.html +2 -2
  111. package/coverage/lcov-report/automations/triggerInfo/rowSaved.js.html +2 -2
  112. package/coverage/lcov-report/automations/triggerInfo/rowUpdated.js.html +2 -2
  113. package/coverage/lcov-report/automations/triggerInfo/webhook.js.html +2 -2
  114. package/coverage/lcov-report/automations/triggers.js.html +18 -18
  115. package/coverage/lcov-report/automations/utils.js.html +32 -32
  116. package/coverage/lcov-report/constants/index.html +5 -5
  117. package/coverage/lcov-report/constants/index.js.html +53 -26
  118. package/coverage/lcov-report/constants/layouts.js.html +5 -5
  119. package/coverage/lcov-report/constants/screens.js.html +4 -4
  120. package/coverage/lcov-report/db/client.js.html +18 -18
  121. package/coverage/lcov-report/db/inMemoryView.js.html +7 -7
  122. package/coverage/lcov-report/db/index.html +15 -15
  123. package/coverage/lcov-report/db/index.js.html +3 -3
  124. package/coverage/lcov-report/db/linkedRows/LinkController.js.html +18 -18
  125. package/coverage/lcov-report/db/linkedRows/index.html +10 -10
  126. package/coverage/lcov-report/db/linkedRows/index.js.html +38 -41
  127. package/coverage/lcov-report/db/linkedRows/linkUtils.js.html +15 -15
  128. package/coverage/lcov-report/db/newid.js.html +4 -4
  129. package/coverage/lcov-report/db/utils.js.html +86 -86
  130. package/coverage/lcov-report/events/AutomationEmitter.js.html +1 -1
  131. package/coverage/lcov-report/events/index.html +1 -1
  132. package/coverage/lcov-report/events/index.js.html +5 -5
  133. package/coverage/lcov-report/events/utils.js.html +3 -3
  134. package/coverage/lcov-report/index.html +114 -99
  135. package/coverage/lcov-report/integrations/tests/TestConfiguration.js.html +1 -1
  136. package/coverage/lcov-report/integrations/tests/index.html +1 -1
  137. package/coverage/lcov-report/middleware/appInfo.js.html +1 -1
  138. package/coverage/lcov-report/middleware/authorized.js.html +166 -64
  139. package/coverage/lcov-report/middleware/builder.js.html +8 -8
  140. package/coverage/lcov-report/middleware/currentapp.js.html +29 -29
  141. package/coverage/lcov-report/middleware/index.html +30 -30
  142. package/coverage/lcov-report/middleware/joi-validator.js.html +3 -3
  143. package/coverage/lcov-report/middleware/resourceId.js.html +1 -1
  144. package/coverage/lcov-report/middleware/selfhost.js.html +1 -1
  145. package/coverage/lcov-report/middleware/usageQuota.js.html +270 -42
  146. package/coverage/lcov-report/middleware/utils.js.html +2 -2
  147. package/coverage/lcov-report/threads/automation.js.html +1 -1
  148. package/coverage/lcov-report/threads/index.html +15 -15
  149. package/coverage/lcov-report/threads/index.js.html +10 -10
  150. package/coverage/lcov-report/threads/query.js.html +23 -8
  151. package/coverage/lcov-report/threads/utils.js.html +14 -14
  152. package/coverage/lcov-report/utilities/bcrypt.js.html +1 -1
  153. package/coverage/lcov-report/utilities/budibaseDir.js.html +7 -7
  154. package/coverage/lcov-report/utilities/centralPath.js.html +4 -4
  155. package/coverage/lcov-report/utilities/csvParser.js.html +6 -6
  156. package/coverage/lcov-report/utilities/global.js.html +26 -26
  157. package/coverage/lcov-report/utilities/index.html +19 -19
  158. package/coverage/lcov-report/utilities/index.js.html +25 -25
  159. package/coverage/lcov-report/utilities/queue/inMemoryQueue.js.html +8 -8
  160. package/coverage/lcov-report/utilities/queue/index.html +1 -1
  161. package/coverage/lcov-report/utilities/routing/index.html +1 -1
  162. package/coverage/lcov-report/utilities/routing/index.js.html +1 -1
  163. package/coverage/lcov-report/utilities/rowProcessor/index.html +27 -27
  164. package/coverage/lcov-report/utilities/rowProcessor/index.js.html +115 -79
  165. package/coverage/lcov-report/utilities/rowProcessor/utils.js.html +75 -27
  166. package/coverage/lcov-report/utilities/scriptRunner.js.html +5 -5
  167. package/coverage/lcov-report/utilities/security.js.html +8 -8
  168. package/coverage/lcov-report/utilities/statusCodes.js.html +1 -1
  169. package/coverage/lcov-report/utilities/usageQuota/index.html +141 -0
  170. package/coverage/lcov-report/utilities/usageQuota/index.js.html +356 -0
  171. package/coverage/lcov-report/utilities/usageQuota/rows.js.html +302 -0
  172. package/coverage/lcov-report/{api/controllers/hosting.js.html → utilities/usageQuota/usageQuoteReset.js.html} +36 -48
  173. package/coverage/lcov-report/utilities/users.js.html +5 -5
  174. package/coverage/lcov-report/utilities/workerRequests.js.html +39 -108
  175. package/coverage/lcov.info +3656 -3057
  176. package/dist/api/controllers/application.js +61 -34
  177. package/dist/api/controllers/auth.js +4 -0
  178. package/dist/api/controllers/datasource.js +11 -0
  179. package/dist/api/controllers/migrations.js +21 -0
  180. package/dist/api/controllers/row/internal.js +30 -53
  181. package/dist/api/controllers/row/internalSearch.js +12 -4
  182. package/dist/api/controllers/row/staticFormula.js +147 -0
  183. package/dist/api/controllers/row/utils.js +6 -8
  184. package/dist/api/controllers/static/index.js +59 -10
  185. package/dist/api/controllers/table/bulkFormula.js +160 -0
  186. package/dist/api/controllers/table/index.js +12 -9
  187. package/dist/api/controllers/table/internal.js +9 -0
  188. package/dist/api/controllers/table/utils.js +41 -12
  189. package/dist/api/controllers/user.js +2 -0
  190. package/dist/api/routes/index.js +2 -2
  191. package/dist/api/routes/migrations.js +9 -0
  192. package/dist/api/routes/static.js +2 -1
  193. package/dist/app.js +35 -5
  194. package/dist/automations/steps/createRow.js +2 -4
  195. package/dist/automations/steps/deleteRow.js +1 -4
  196. package/dist/constants/index.js +7 -0
  197. package/dist/db/linkedRows/index.js +4 -5
  198. package/dist/definitions/datasource.js +1 -0
  199. package/dist/environment.js +2 -0
  200. package/dist/integrations/base/sql.js +13 -6
  201. package/dist/integrations/googlesheets.js +340 -0
  202. package/dist/integrations/index.js +3 -0
  203. package/dist/integrations/utils.js +57 -9
  204. package/dist/middleware/authorized.js +55 -30
  205. package/dist/middleware/usageQuota.js +80 -13
  206. package/dist/migrations/functions/appUrls.js +46 -0
  207. package/dist/migrations/functions/quotas1.js +50 -0
  208. package/dist/migrations/functions/usageQuotas/index.js +20 -0
  209. package/dist/migrations/functions/usageQuotas/syncApps.js +32 -0
  210. package/dist/migrations/functions/usageQuotas/syncRows.js +35 -0
  211. package/dist/migrations/functions/userEmailViewCasing.js +24 -0
  212. package/dist/migrations/index.js +62 -0
  213. package/dist/package.json +8 -5
  214. package/dist/tests/utilities/TestConfiguration.js +13 -6
  215. package/dist/threads/query.js +4 -0
  216. package/dist/tsconfig.tsbuildinfo +1 -1
  217. package/dist/utilities/rowProcessor/index.js +18 -11
  218. package/dist/utilities/rowProcessor/utils.js +14 -4
  219. package/dist/utilities/{usageQuota.js → usageQuota/index.js} +44 -31
  220. package/dist/utilities/usageQuota/rows.js +77 -0
  221. package/dist/utilities/usageQuota/usageQuoteReset.js +16 -0
  222. package/dist/utilities/workerRequests.js +0 -20
  223. package/nodemon.json +1 -1
  224. package/package.json +9 -6
  225. package/src/api/controllers/application.js +52 -24
  226. package/src/api/controllers/auth.js +4 -0
  227. package/src/api/controllers/datasource.js +12 -0
  228. package/src/api/controllers/migrations.js +13 -0
  229. package/src/api/controllers/row/internal.js +29 -50
  230. package/src/api/controllers/row/internalSearch.js +12 -4
  231. package/src/api/controllers/row/staticFormula.js +157 -0
  232. package/src/api/controllers/row/utils.js +6 -12
  233. package/src/api/controllers/static/index.js +63 -10
  234. package/src/api/controllers/table/bulkFormula.js +183 -0
  235. package/src/api/controllers/table/index.js +16 -24
  236. package/src/api/controllers/table/internal.js +9 -1
  237. package/src/api/controllers/table/utils.js +57 -9
  238. package/src/api/controllers/user.js +2 -0
  239. package/src/api/routes/index.js +2 -2
  240. package/src/api/routes/migrations.js +14 -0
  241. package/src/api/routes/static.js +5 -0
  242. package/src/api/routes/tests/application.spec.js +2 -2
  243. package/src/api/routes/tests/auth.spec.js +1 -2
  244. package/src/api/routes/tests/static.spec.js +98 -0
  245. package/src/app.ts +18 -5
  246. package/src/automations/steps/createRow.js +2 -4
  247. package/src/automations/steps/deleteRow.js +1 -4
  248. package/src/constants/index.js +9 -0
  249. package/src/db/linkedRows/index.js +4 -5
  250. package/src/definitions/common.ts +3 -0
  251. package/src/definitions/datasource.ts +3 -0
  252. package/src/environment.js +2 -0
  253. package/src/integrations/base/sql.ts +14 -7
  254. package/src/integrations/googlesheets.ts +353 -0
  255. package/src/integrations/index.ts +3 -0
  256. package/src/integrations/tests/sql.spec.js +16 -0
  257. package/src/integrations/utils.ts +71 -11
  258. package/src/middleware/authorized.js +64 -30
  259. package/src/middleware/tests/authorized.spec.js +6 -4
  260. package/src/middleware/tests/usageQuota.spec.js +18 -24
  261. package/src/middleware/usageQuota.js +91 -15
  262. package/src/migrations/functions/appUrls.ts +34 -0
  263. package/src/migrations/functions/quotas1.ts +20 -0
  264. package/src/migrations/functions/tests/appUrls.spec.js +29 -0
  265. package/src/migrations/functions/tests/quotas1.spec.js +27 -0
  266. package/src/migrations/functions/tests/userEmailViewCasing.spec.js +25 -0
  267. package/src/migrations/functions/usageQuotas/index.ts +8 -0
  268. package/src/migrations/functions/usageQuotas/syncApps.ts +18 -0
  269. package/src/migrations/functions/usageQuotas/syncRows.ts +21 -0
  270. package/src/migrations/functions/usageQuotas/tests/syncApps.spec.js +37 -0
  271. package/src/migrations/functions/usageQuotas/tests/syncRows.spec.js +43 -0
  272. package/src/migrations/functions/userEmailViewCasing.ts +13 -0
  273. package/src/migrations/index.ts +56 -0
  274. package/src/tests/utilities/TestConfiguration.js +14 -6
  275. package/src/threads/query.js +5 -0
  276. package/src/utilities/rowProcessor/index.js +24 -12
  277. package/src/utilities/rowProcessor/utils.js +23 -7
  278. package/src/utilities/tests/usageQuota/usageQuota.spec.js +72 -0
  279. package/src/utilities/usageQuota/index.js +92 -0
  280. package/src/utilities/usageQuota/rows.js +74 -0
  281. package/src/utilities/usageQuota/usageQuoteReset.js +18 -0
  282. package/src/utilities/workerRequests.js +0 -23
  283. package/builder/assets/index.39e01193.css +0 -1
  284. package/dist/api/controllers/hosting.js +0 -30
  285. package/dist/api/routes/hosting.js +0 -11
  286. package/src/api/controllers/hosting.js +0 -22
  287. package/src/api/routes/hosting.js +0 -13
  288. package/src/api/routes/tests/hosting.spec.js +0 -36
  289. package/src/utilities/usageQuota.js +0 -73
package/coverage/lcov-report/api/controllers/application.js.html CHANGED
@@ -23,30 +23,30 @@
23
23
  <div class='clearfix'>
24
24
 
25
25
  <div class='fl pad1y space-right2'>
26
- <span class="strong">78.02% </span>
26
+ <span class="strong">79.51% </span>
27
27
  <span class="quiet">Statements</span>
28
- <span class='fraction'>142/182</span>
28
+ <span class='fraction'>163/205</span>
29
29
  </div>
30
30
 
31
31
 
32
32
  <div class='fl pad1y space-right2'>
33
- <span class="strong">56.94% </span>
33
+ <span class="strong">55.12% </span>
34
34
  <span class="quiet">Branches</span>
35
- <span class='fraction'>41/72</span>
35
+ <span class='fraction'>43/78</span>
36
36
  </div>
37
37
 
38
38
 
39
39
  <div class='fl pad1y space-right2'>
40
- <span class="strong">85% </span>
40
+ <span class="strong">88.46% </span>
41
41
  <span class="quiet">Functions</span>
42
- <span class='fraction'>17/20</span>
42
+ <span class='fraction'>23/26</span>
43
43
  </div>
44
44
 
45
45
 
46
46
  <div class='fl pad1y space-right2'>
47
- <span class="strong">78.88% </span>
47
+ <span class="strong">79.89% </span>
48
48
  <span class="quiet">Lines</span>
49
- <span class='fraction'>142/180</span>
49
+ <span class='fraction'>159/199</span>
50
50
  </div>
51
51
 
52
52
 
@@ -471,19 +471,47 @@
471
471
  <a name='L412'></a><a href='#L412'>412</a>
472
472
  <a name='L413'></a><a href='#L413'>413</a>
473
473
  <a name='L414'></a><a href='#L414'>414</a>
474
- <a name='L415'></a><a href='#L415'>415</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">33x</span>
475
- <span class="cline-any cline-yes">33x</span>
476
- <span class="cline-any cline-yes">33x</span>
474
+ <a name='L415'></a><a href='#L415'>415</a>
475
+ <a name='L416'></a><a href='#L416'>416</a>
476
+ <a name='L417'></a><a href='#L417'>417</a>
477
+ <a name='L418'></a><a href='#L418'>418</a>
478
+ <a name='L419'></a><a href='#L419'>419</a>
479
+ <a name='L420'></a><a href='#L420'>420</a>
480
+ <a name='L421'></a><a href='#L421'>421</a>
481
+ <a name='L422'></a><a href='#L422'>422</a>
482
+ <a name='L423'></a><a href='#L423'>423</a>
483
+ <a name='L424'></a><a href='#L424'>424</a>
484
+ <a name='L425'></a><a href='#L425'>425</a>
485
+ <a name='L426'></a><a href='#L426'>426</a>
486
+ <a name='L427'></a><a href='#L427'>427</a>
487
+ <a name='L428'></a><a href='#L428'>428</a>
488
+ <a name='L429'></a><a href='#L429'>429</a>
489
+ <a name='L430'></a><a href='#L430'>430</a>
490
+ <a name='L431'></a><a href='#L431'>431</a>
491
+ <a name='L432'></a><a href='#L432'>432</a>
492
+ <a name='L433'></a><a href='#L433'>433</a>
493
+ <a name='L434'></a><a href='#L434'>434</a>
494
+ <a name='L435'></a><a href='#L435'>435</a>
495
+ <a name='L436'></a><a href='#L436'>436</a>
496
+ <a name='L437'></a><a href='#L437'>437</a>
497
+ <a name='L438'></a><a href='#L438'>438</a>
498
+ <a name='L439'></a><a href='#L439'>439</a>
499
+ <a name='L440'></a><a href='#L440'>440</a>
500
+ <a name='L441'></a><a href='#L441'>441</a>
501
+ <a name='L442'></a><a href='#L442'>442</a>
502
+ <a name='L443'></a><a href='#L443'>443</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">38x</span>
503
+ <span class="cline-any cline-yes">38x</span>
504
+ <span class="cline-any cline-yes">38x</span>
477
505
  <span class="cline-any cline-neutral">&nbsp;</span>
478
506
  <span class="cline-any cline-neutral">&nbsp;</span>
479
507
  <span class="cline-any cline-neutral">&nbsp;</span>
480
508
  <span class="cline-any cline-neutral">&nbsp;</span>
481
- <span class="cline-any cline-yes">33x</span>
509
+ <span class="cline-any cline-yes">38x</span>
482
510
  <span class="cline-any cline-neutral">&nbsp;</span>
483
511
  <span class="cline-any cline-neutral">&nbsp;</span>
484
512
  <span class="cline-any cline-neutral">&nbsp;</span>
485
513
  <span class="cline-any cline-neutral">&nbsp;</span>
486
- <span class="cline-any cline-yes">33x</span>
514
+ <span class="cline-any cline-yes">38x</span>
487
515
  <span class="cline-any cline-neutral">&nbsp;</span>
488
516
  <span class="cline-any cline-neutral">&nbsp;</span>
489
517
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -491,98 +519,108 @@
491
519
  <span class="cline-any cline-neutral">&nbsp;</span>
492
520
  <span class="cline-any cline-neutral">&nbsp;</span>
493
521
  <span class="cline-any cline-neutral">&nbsp;</span>
494
- <span class="cline-any cline-yes">33x</span>
522
+ <span class="cline-any cline-yes">38x</span>
495
523
  <span class="cline-any cline-neutral">&nbsp;</span>
496
524
  <span class="cline-any cline-neutral">&nbsp;</span>
497
525
  <span class="cline-any cline-neutral">&nbsp;</span>
498
- <span class="cline-any cline-yes">33x</span>
499
- <span class="cline-any cline-yes">33x</span>
500
- <span class="cline-any cline-yes">33x</span>
501
- <span class="cline-any cline-yes">33x</span>
526
+ <span class="cline-any cline-yes">38x</span>
527
+ <span class="cline-any cline-yes">38x</span>
528
+ <span class="cline-any cline-yes">38x</span>
529
+ <span class="cline-any cline-yes">38x</span>
502
530
  <span class="cline-any cline-neutral">&nbsp;</span>
503
531
  <span class="cline-any cline-neutral">&nbsp;</span>
504
532
  <span class="cline-any cline-neutral">&nbsp;</span>
505
533
  <span class="cline-any cline-neutral">&nbsp;</span>
506
534
  <span class="cline-any cline-neutral">&nbsp;</span>
507
- <span class="cline-any cline-yes">33x</span>
508
- <span class="cline-any cline-yes">33x</span>
535
+ <span class="cline-any cline-yes">38x</span>
536
+ <span class="cline-any cline-yes">38x</span>
537
+ <span class="cline-any cline-yes">38x</span>
538
+ <span class="cline-any cline-yes">38x</span>
539
+ <span class="cline-any cline-yes">38x</span>
509
540
  <span class="cline-any cline-neutral">&nbsp;</span>
510
541
  <span class="cline-any cline-neutral">&nbsp;</span>
511
542
  <span class="cline-any cline-neutral">&nbsp;</span>
512
- <span class="cline-any cline-yes">33x</span>
513
- <span class="cline-any cline-yes">33x</span>
514
- <span class="cline-any cline-yes">33x</span>
515
543
  <span class="cline-any cline-neutral">&nbsp;</span>
544
+ <span class="cline-any cline-yes">38x</span>
545
+ <span class="cline-any cline-yes">38x</span>
546
+ <span class="cline-any cline-yes">38x</span>
547
+ <span class="cline-any cline-yes">38x</span>
548
+ <span class="cline-any cline-yes">38x</span>
516
549
  <span class="cline-any cline-neutral">&nbsp;</span>
550
+ <span class="cline-any cline-yes">38x</span>
517
551
  <span class="cline-any cline-neutral">&nbsp;</span>
518
552
  <span class="cline-any cline-neutral">&nbsp;</span>
519
- <span class="cline-any cline-yes">33x</span>
520
- <span class="cline-any cline-yes">33x</span>
521
- <span class="cline-any cline-yes">33x</span>
522
- <span class="cline-any cline-yes">33x</span>
523
- <span class="cline-any cline-yes">33x</span>
524
553
  <span class="cline-any cline-neutral">&nbsp;</span>
525
- <span class="cline-any cline-yes">33x</span>
554
+ <span class="cline-any cline-yes">205x</span>
526
555
  <span class="cline-any cline-neutral">&nbsp;</span>
527
556
  <span class="cline-any cline-neutral">&nbsp;</span>
528
557
  <span class="cline-any cline-neutral">&nbsp;</span>
529
- <span class="cline-any cline-yes">195x</span>
530
558
  <span class="cline-any cline-neutral">&nbsp;</span>
531
559
  <span class="cline-any cline-neutral">&nbsp;</span>
560
+ <span class="cline-any cline-yes">410x</span>
532
561
  <span class="cline-any cline-neutral">&nbsp;</span>
533
562
  <span class="cline-any cline-neutral">&nbsp;</span>
534
563
  <span class="cline-any cline-neutral">&nbsp;</span>
535
- <span class="cline-any cline-yes">390x</span>
564
+ <span class="cline-any cline-yes">205x</span>
536
565
  <span class="cline-any cline-neutral">&nbsp;</span>
537
566
  <span class="cline-any cline-neutral">&nbsp;</span>
538
567
  <span class="cline-any cline-neutral">&nbsp;</span>
539
- <span class="cline-any cline-yes">195x</span>
540
568
  <span class="cline-any cline-neutral">&nbsp;</span>
541
569
  <span class="cline-any cline-neutral">&nbsp;</span>
570
+ <span class="cline-any cline-yes">12x</span>
542
571
  <span class="cline-any cline-neutral">&nbsp;</span>
543
572
  <span class="cline-any cline-neutral">&nbsp;</span>
544
573
  <span class="cline-any cline-neutral">&nbsp;</span>
545
- <span class="cline-any cline-yes">12x</span>
574
+ <span class="cline-any cline-yes">203x</span>
546
575
  <span class="cline-any cline-neutral">&nbsp;</span>
547
576
  <span class="cline-any cline-neutral">&nbsp;</span>
548
577
  <span class="cline-any cline-neutral">&nbsp;</span>
549
- <span class="cline-any cline-yes">193x</span>
550
578
  <span class="cline-any cline-neutral">&nbsp;</span>
579
+ <span class="cline-any cline-yes">38x</span>
551
580
  <span class="cline-any cline-neutral">&nbsp;</span>
552
581
  <span class="cline-any cline-neutral">&nbsp;</span>
582
+ <span class="cline-any cline-yes">198x</span>
553
583
  <span class="cline-any cline-neutral">&nbsp;</span>
584
+ <span class="cline-any cline-no">&nbsp;</span>
585
+ <span class="cline-any cline-yes">198x</span>
554
586
  <span class="cline-any cline-neutral">&nbsp;</span>
587
+ <span class="cline-any cline-yes">198x</span>
555
588
  <span class="cline-any cline-neutral">&nbsp;</span>
556
- <span class="cline-any cline-yes">190x</span>
557
- <span class="cline-any cline-no">&nbsp;</span>
558
- <span class="cline-any cline-yes">190x</span>
559
- <span class="cline-any cline-yes">187x</span>
589
+ <span class="cline-any cline-yes">198x</span>
590
+ <span class="cline-any cline-yes">198x</span>
560
591
  <span class="cline-any cline-neutral">&nbsp;</span>
561
- <span class="cline-any cline-yes">190x</span>
562
- <span class="cline-any cline-yes">187x</span>
592
+ <span class="cline-any cline-yes">198x</span>
563
593
  <span class="cline-any cline-neutral">&nbsp;</span>
564
- <span class="cline-any cline-yes">190x</span>
565
- <span class="cline-any cline-yes">15x</span>
566
594
  <span class="cline-any cline-neutral">&nbsp;</span>
567
- <span class="cline-any cline-yes">175x</span>
568
- <span class="cline-any cline-yes">175x</span>
595
+ <span class="cline-any cline-yes">38x</span>
596
+ <span class="cline-any cline-yes">197x</span>
597
+ <span class="cline-any cline-yes">2x</span>
569
598
  <span class="cline-any cline-neutral">&nbsp;</span>
599
+ <span class="cline-any cline-yes">733x</span>
600
+ <span class="cline-any cline-no">&nbsp;</span>
570
601
  <span class="cline-any cline-neutral">&nbsp;</span>
571
602
  <span class="cline-any cline-neutral">&nbsp;</span>
572
603
  <span class="cline-any cline-neutral">&nbsp;</span>
604
+ <span class="cline-any cline-yes">38x</span>
573
605
  <span class="cline-any cline-neutral">&nbsp;</span>
606
+ <span class="cline-any cline-yes">197x</span>
574
607
  <span class="cline-any cline-no">&nbsp;</span>
575
608
  <span class="cline-any cline-neutral">&nbsp;</span>
576
- <span class="cline-any cline-yes">175x</span>
609
+ <span class="cline-any cline-yes">197x</span>
610
+ <span class="cline-any cline-yes">2x</span>
577
611
  <span class="cline-any cline-neutral">&nbsp;</span>
612
+ <span class="cline-any cline-yes">733x</span>
613
+ <span class="cline-any cline-no">&nbsp;</span>
578
614
  <span class="cline-any cline-neutral">&nbsp;</span>
579
615
  <span class="cline-any cline-neutral">&nbsp;</span>
580
- <span class="cline-any cline-yes">185x</span>
581
- <span class="cline-any cline-yes">185x</span>
582
- <span class="cline-any cline-yes">185x</span>
583
616
  <span class="cline-any cline-neutral">&nbsp;</span>
584
- <span class="cline-any cline-yes">185x</span>
585
- <span class="cline-any cline-yes">185x</span>
617
+ <span class="cline-any cline-neutral">&nbsp;</span>
618
+ <span class="cline-any cline-yes">195x</span>
619
+ <span class="cline-any cline-yes">195x</span>
620
+ <span class="cline-any cline-yes">195x</span>
621
+ <span class="cline-any cline-neutral">&nbsp;</span>
622
+ <span class="cline-any cline-yes">195x</span>
623
+ <span class="cline-any cline-yes">195x</span>
586
624
  <span class="cline-any cline-neutral">&nbsp;</span>
587
625
  <span class="cline-any cline-neutral">&nbsp;</span>
588
626
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -591,18 +629,18 @@
591
629
  <span class="cline-any cline-neutral">&nbsp;</span>
592
630
  <span class="cline-any cline-neutral">&nbsp;</span>
593
631
  <span class="cline-any cline-neutral">&nbsp;</span>
594
- <span class="cline-any cline-yes">185x</span>
595
- <span class="cline-any cline-yes">185x</span>
596
- <span class="cline-any cline-yes">185x</span>
632
+ <span class="cline-any cline-yes">195x</span>
633
+ <span class="cline-any cline-yes">195x</span>
634
+ <span class="cline-any cline-yes">195x</span>
597
635
  <span class="cline-any cline-neutral">&nbsp;</span>
598
636
  <span class="cline-any cline-neutral">&nbsp;</span>
599
637
  <span class="cline-any cline-neutral">&nbsp;</span>
600
- <span class="cline-any cline-yes">185x</span>
638
+ <span class="cline-any cline-yes">195x</span>
601
639
  <span class="cline-any cline-no">&nbsp;</span>
602
640
  <span class="cline-any cline-no">&nbsp;</span>
603
641
  <span class="cline-any cline-no">&nbsp;</span>
604
642
  <span class="cline-any cline-neutral">&nbsp;</span>
605
- <span class="cline-any cline-yes">185x</span>
643
+ <span class="cline-any cline-yes">195x</span>
606
644
  <span class="cline-any cline-neutral">&nbsp;</span>
607
645
  <span class="cline-any cline-neutral">&nbsp;</span>
608
646
  <span class="cline-any cline-no">&nbsp;</span>
@@ -610,13 +648,13 @@
610
648
  <span class="cline-any cline-neutral">&nbsp;</span>
611
649
  <span class="cline-any cline-neutral">&nbsp;</span>
612
650
  <span class="cline-any cline-neutral">&nbsp;</span>
613
- <span class="cline-any cline-yes">185x</span>
651
+ <span class="cline-any cline-yes">195x</span>
614
652
  <span class="cline-any cline-neutral">&nbsp;</span>
615
653
  <span class="cline-any cline-neutral">&nbsp;</span>
616
- <span class="cline-any cline-yes">185x</span>
654
+ <span class="cline-any cline-yes">195x</span>
617
655
  <span class="cline-any cline-neutral">&nbsp;</span>
618
656
  <span class="cline-any cline-neutral">&nbsp;</span>
619
- <span class="cline-any cline-yes">33x</span>
657
+ <span class="cline-any cline-yes">38x</span>
620
658
  <span class="cline-any cline-yes">10x</span>
621
659
  <span class="cline-any cline-yes">10x</span>
622
660
  <span class="cline-any cline-yes">10x</span>
@@ -641,7 +679,7 @@
641
679
  <span class="cline-any cline-yes">10x</span>
642
680
  <span class="cline-any cline-neutral">&nbsp;</span>
643
681
  <span class="cline-any cline-neutral">&nbsp;</span>
644
- <span class="cline-any cline-yes">33x</span>
682
+ <span class="cline-any cline-yes">38x</span>
645
683
  <span class="cline-any cline-yes">1x</span>
646
684
  <span class="cline-any cline-yes">1x</span>
647
685
  <span class="cline-any cline-yes">1x</span>
@@ -657,20 +695,20 @@
657
695
  <span class="cline-any cline-neutral">&nbsp;</span>
658
696
  <span class="cline-any cline-neutral">&nbsp;</span>
659
697
  <span class="cline-any cline-neutral">&nbsp;</span>
660
- <span class="cline-any cline-yes">33x</span>
661
- <span class="cline-any cline-yes">194x</span>
662
- <span class="cline-any cline-yes">194x</span>
663
- <span class="cline-any cline-yes">194x</span>
664
- <span class="cline-any cline-yes">194x</span>
698
+ <span class="cline-any cline-yes">38x</span>
699
+ <span class="cline-any cline-yes">204x</span>
700
+ <span class="cline-any cline-yes">204x</span>
701
+ <span class="cline-any cline-yes">204x</span>
702
+ <span class="cline-any cline-yes">204x</span>
665
703
  <span class="cline-any cline-neutral">&nbsp;</span>
666
704
  <span class="cline-any cline-neutral">&nbsp;</span>
667
- <span class="cline-any cline-yes">194x</span>
668
- <span class="cline-any cline-yes">192x</span>
669
- <span class="cline-any cline-yes">192x</span>
670
- <span class="cline-any cline-yes">192x</span>
705
+ <span class="cline-any cline-yes">204x</span>
706
+ <span class="cline-any cline-yes">202x</span>
707
+ <span class="cline-any cline-yes">202x</span>
708
+ <span class="cline-any cline-yes">202x</span>
671
709
  <span class="cline-any cline-neutral">&nbsp;</span>
672
710
  <span class="cline-any cline-neutral">&nbsp;</span>
673
- <span class="cline-any cline-yes">194x</span>
711
+ <span class="cline-any cline-yes">204x</span>
674
712
  <span class="cline-any cline-neutral">&nbsp;</span>
675
713
  <span class="cline-any cline-neutral">&nbsp;</span>
676
714
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -678,30 +716,35 @@
678
716
  <span class="cline-any cline-neutral">&nbsp;</span>
679
717
  <span class="cline-any cline-neutral">&nbsp;</span>
680
718
  <span class="cline-any cline-neutral">&nbsp;</span>
681
- <span class="cline-any cline-yes">33x</span>
682
- <span class="cline-any cline-yes">185x</span>
683
- <span class="cline-any cline-yes">185x</span>
719
+ <span class="cline-any cline-yes">38x</span>
720
+ <span class="cline-any cline-yes">195x</span>
721
+ <span class="cline-any cline-yes">195x</span>
722
+ <span class="cline-any cline-yes">195x</span>
723
+ <span class="cline-any cline-yes">195x</span>
724
+ <span class="cline-any cline-yes">195x</span>
684
725
  <span class="cline-any cline-neutral">&nbsp;</span>
726
+ <span class="cline-any cline-yes">195x</span>
727
+ <span class="cline-any cline-yes">195x</span>
685
728
  <span class="cline-any cline-neutral">&nbsp;</span>
686
729
  <span class="cline-any cline-neutral">&nbsp;</span>
687
730
  <span class="cline-any cline-neutral">&nbsp;</span>
688
- <span class="cline-any cline-yes">185x</span>
731
+ <span class="cline-any cline-neutral">&nbsp;</span>
732
+ <span class="cline-any cline-yes">195x</span>
689
733
  <span class="cline-any cline-no">&nbsp;</span>
690
734
  <span class="cline-any cline-neutral">&nbsp;</span>
691
- <span class="cline-any cline-yes">185x</span>
692
- <span class="cline-any cline-yes">185x</span>
735
+ <span class="cline-any cline-yes">195x</span>
736
+ <span class="cline-any cline-yes">195x</span>
693
737
  <span class="cline-any cline-neutral">&nbsp;</span>
694
- <span class="cline-any cline-yes">185x</span>
695
- <span class="cline-any cline-yes">185x</span>
738
+ <span class="cline-any cline-yes">195x</span>
696
739
  <span class="cline-any cline-neutral">&nbsp;</span>
697
- <span class="cline-any cline-yes">185x</span>
740
+ <span class="cline-any cline-yes">195x</span>
698
741
  <span class="cline-any cline-neutral">&nbsp;</span>
699
- <span class="cline-any cline-yes">185x</span>
742
+ <span class="cline-any cline-yes">195x</span>
700
743
  <span class="cline-any cline-no">&nbsp;</span>
701
744
  <span class="cline-any cline-neutral">&nbsp;</span>
702
745
  <span class="cline-any cline-neutral">&nbsp;</span>
703
746
  <span class="cline-any cline-neutral">&nbsp;</span>
704
- <span class="cline-any cline-yes">185x</span>
747
+ <span class="cline-any cline-yes">195x</span>
705
748
  <span class="cline-any cline-neutral">&nbsp;</span>
706
749
  <span class="cline-any cline-neutral">&nbsp;</span>
707
750
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -716,32 +759,46 @@
716
759
  <span class="cline-any cline-neutral">&nbsp;</span>
717
760
  <span class="cline-any cline-neutral">&nbsp;</span>
718
761
  <span class="cline-any cline-neutral">&nbsp;</span>
719
- <span class="cline-any cline-yes">185x</span>
720
- <span class="cline-any cline-yes">185x</span>
762
+ <span class="cline-any cline-yes">195x</span>
763
+ <span class="cline-any cline-yes">195x</span>
721
764
  <span class="cline-any cline-neutral">&nbsp;</span>
722
765
  <span class="cline-any cline-neutral">&nbsp;</span>
723
766
  <span class="cline-any cline-neutral">&nbsp;</span>
724
- <span class="cline-any cline-yes">185x</span>
725
- <span class="cline-any cline-yes">185x</span>
767
+ <span class="cline-any cline-yes">195x</span>
768
+ <span class="cline-any cline-yes">195x</span>
769
+ <span class="cline-any cline-neutral">&nbsp;</span>
726
770
  <span class="cline-any cline-neutral">&nbsp;</span>
727
771
  <span class="cline-any cline-neutral">&nbsp;</span>
728
772
  <span class="cline-any cline-neutral">&nbsp;</span>
729
773
  <span class="cline-any cline-neutral">&nbsp;</span>
730
774
  <span class="cline-any cline-neutral">&nbsp;</span>
731
775
  <span class="cline-any cline-neutral">&nbsp;</span>
776
+ <span class="cline-any cline-yes">195x</span>
777
+ <span class="cline-any cline-yes">195x</span>
778
+ <span class="cline-any cline-yes">195x</span>
732
779
  <span class="cline-any cline-neutral">&nbsp;</span>
733
- <span class="cline-any cline-yes">185x</span>
734
- <span class="cline-any cline-yes">185x</span>
735
- <span class="cline-any cline-yes">185x</span>
736
780
  <span class="cline-any cline-neutral">&nbsp;</span>
737
781
  <span class="cline-any cline-neutral">&nbsp;</span>
738
- <span class="cline-any cline-yes">33x</span>
782
+ <span class="cline-any cline-neutral">&nbsp;</span>
783
+ <span class="cline-any cline-yes">38x</span>
784
+ <span class="cline-any cline-yes">2x</span>
785
+ <span class="cline-any cline-neutral">&nbsp;</span>
786
+ <span class="cline-any cline-yes">2x</span>
787
+ <span class="cline-any cline-yes">2x</span>
788
+ <span class="cline-any cline-yes">2x</span>
789
+ <span class="cline-any cline-neutral">&nbsp;</span>
790
+ <span class="cline-any cline-yes">2x</span>
791
+ <span class="cline-any cline-yes">2x</span>
792
+ <span class="cline-any cline-yes">2x</span>
793
+ <span class="cline-any cline-yes">2x</span>
794
+ <span class="cline-any cline-neutral">&nbsp;</span>
795
+ <span class="cline-any cline-neutral">&nbsp;</span>
739
796
  <span class="cline-any cline-yes">2x</span>
740
797
  <span class="cline-any cline-yes">2x</span>
741
798
  <span class="cline-any cline-yes">2x</span>
742
799
  <span class="cline-any cline-neutral">&nbsp;</span>
743
800
  <span class="cline-any cline-neutral">&nbsp;</span>
744
- <span class="cline-any cline-yes">33x</span>
801
+ <span class="cline-any cline-yes">38x</span>
745
802
  <span class="cline-any cline-neutral">&nbsp;</span>
746
803
  <span class="cline-any cline-yes">2x</span>
747
804
  <span class="cline-any cline-yes">2x</span>
@@ -763,7 +820,7 @@
763
820
  <span class="cline-any cline-yes">2x</span>
764
821
  <span class="cline-any cline-neutral">&nbsp;</span>
765
822
  <span class="cline-any cline-neutral">&nbsp;</span>
766
- <span class="cline-any cline-yes">33x</span>
823
+ <span class="cline-any cline-yes">38x</span>
767
824
  <span class="cline-any cline-neutral">&nbsp;</span>
768
825
  <span class="cline-any cline-yes">1x</span>
769
826
  <span class="cline-any cline-yes">1x</span>
@@ -786,7 +843,7 @@
786
843
  <span class="cline-any cline-yes">1x</span>
787
844
  <span class="cline-any cline-neutral">&nbsp;</span>
788
845
  <span class="cline-any cline-neutral">&nbsp;</span>
789
- <span class="cline-any cline-yes">33x</span>
846
+ <span class="cline-any cline-yes">38x</span>
790
847
  <span class="cline-any cline-yes">11x</span>
791
848
  <span class="cline-any cline-neutral">&nbsp;</span>
792
849
  <span class="cline-any cline-yes">11x</span>
@@ -805,7 +862,7 @@
805
862
  <span class="cline-any cline-yes">11x</span>
806
863
  <span class="cline-any cline-neutral">&nbsp;</span>
807
864
  <span class="cline-any cline-neutral">&nbsp;</span>
808
- <span class="cline-any cline-yes">33x</span>
865
+ <span class="cline-any cline-yes">38x</span>
809
866
  <span class="cline-any cline-no">&nbsp;</span>
810
867
  <span class="cline-any cline-no">&nbsp;</span>
811
868
  <span class="cline-any cline-no">&nbsp;</span>
@@ -854,8 +911,7 @@
854
911
  <span class="cline-any cline-neutral">&nbsp;</span>
855
912
  <span class="cline-any cline-neutral">&nbsp;</span>
856
913
  <span class="cline-any cline-neutral">&nbsp;</span>
857
- <span class="cline-any cline-yes">33x</span>
858
- <span class="cline-any cline-yes">5x</span>
914
+ <span class="cline-any cline-yes">38x</span>
859
915
  <span class="cline-any cline-yes">5x</span>
860
916
  <span class="cline-any cline-yes">5x</span>
861
917
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -874,16 +930,16 @@
874
930
  <span class="cline-any cline-yes">5x</span>
875
931
  <span class="cline-any cline-neutral">&nbsp;</span>
876
932
  <span class="cline-any cline-neutral">&nbsp;</span>
877
- <span class="cline-any cline-yes">33x</span>
878
- <span class="cline-any cline-yes">185x</span>
933
+ <span class="cline-any cline-yes">38x</span>
934
+ <span class="cline-any cline-yes">195x</span>
879
935
  <span class="cline-any cline-neutral">&nbsp;</span>
880
- <span class="cline-any cline-yes">185x</span>
881
- <span class="cline-any cline-yes">185x</span>
882
- <span class="cline-any cline-yes">370x</span>
883
- <span class="cline-any cline-yes">370x</span>
936
+ <span class="cline-any cline-yes">195x</span>
937
+ <span class="cline-any cline-yes">195x</span>
938
+ <span class="cline-any cline-yes">390x</span>
939
+ <span class="cline-any cline-yes">390x</span>
884
940
  <span class="cline-any cline-neutral">&nbsp;</span>
885
941
  <span class="cline-any cline-neutral">&nbsp;</span>
886
- <span class="cline-any cline-yes">185x</span>
942
+ <span class="cline-any cline-yes">195x</span>
887
943
  <span class="cline-any cline-neutral">&nbsp;</span>
888
944
  <span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">const CouchDB = require("../../db")
889
945
  const env = require("../../environment")
@@ -920,10 +976,7 @@ const {
920
976
  Replication,
921
977
  } = require("@budibase/backend-core/db")
922
978
  const { USERS_TABLE_SCHEMA } = require("../../constants")
923
- const {
924
- getDeployedApps,
925
- removeAppFromUserRoles,
926
- } = require("../../utilities/workerRequests")
979
+ const { removeAppFromUserRoles } = require("../../utilities/workerRequests")
927
980
  const { clientLibraryPath, stringToReadStream } = require("../../utilities")
928
981
  const { getAllLocks } = require("../../utilities/redis")
929
982
  const {
@@ -965,29 +1018,42 @@ function getUserRoleId(ctx) {
965
1018
  : ctx.user.role._id
966
1019
  }
967
1020
  &nbsp;
968
- async function getAppUrlIfNotInUse(ctx) {
1021
+ exports.getAppUrl = ctx =&gt; {
1022
+ // construct the url
969
1023
  let url
970
1024
  <span class="missing-if-branch" title="if path not taken" >I</span>if (ctx.request.body.url) {
1025
+ // if the url is provided, use that
971
1026
  <span class="cstat-no" title="statement not covered" > url = encodeURI(ctx.request.body.url)</span>
972
1027
  } else if (ctx.request.body.name) {
1028
+ // otherwise use the name
973
1029
  url = encodeURI(`${ctx.request.body.name}`)
974
1030
  }
975
1031
  if (url) {
976
1032
  url = `/${url.replace(URL_REGEX_SLASH, "")}`.toLowerCase()
977
1033
  }
978
- if (!env.SELF_HOSTED) {
979
- return url
1034
+ return url
1035
+ }
1036
+ &nbsp;
1037
+ const checkAppUrl = (ctx, apps, url, currentAppId) =&gt; {
1038
+ if (currentAppId) {
1039
+ apps = apps.filter(app =&gt; app.appId !== currentAppId)
980
1040
  }
981
- const deployedApps = await getDeployedApps()
982
- <span class="missing-if-branch" title="if path not taken" >I</span>if (
983
- url &amp;&amp;
984
- deployedApps[url] != null &amp;&amp;
985
- <span class="branch-2 cbranch-no" title="branch not covered" > ctx.params != null </span>&amp;&amp;
986
- <span class="branch-3 cbranch-no" title="branch not covered" > deployedApps[url].appId !== ctx.params.appId</span>
987
- ) {
988
- <span class="cstat-no" title="statement not covered" > ctx.throw(400, "App name/URL is already in use.")</span>
1041
+ <span class="missing-if-branch" title="if path not taken" >I</span>if (apps.some(app =&gt; app.url === url)) {
1042
+ <span class="cstat-no" title="statement not covered" > ctx.throw(400, "App URL is already in use.")</span>
1043
+ }
1044
+ }
1045
+ &nbsp;
1046
+ const checkAppName = (ctx, apps, name, currentAppId) =&gt; {
1047
+ // TODO: Replace with Joi
1048
+ <span class="missing-if-branch" title="if path not taken" >I</span>if (!name) {
1049
+ <span class="cstat-no" title="statement not covered" > ctx.throw(400, "Name is required")</span>
1050
+ }
1051
+ if (currentAppId) {
1052
+ apps = apps.filter(app =&gt; app.appId !== currentAppId)
1053
+ }
1054
+ <span class="missing-if-branch" title="if path not taken" >I</span>if (apps.some(app =&gt; app.name === name)) {
1055
+ <span class="cstat-no" title="statement not covered" > ctx.throw(400, "App name is already in use.")</span>
989
1056
  }
990
- return url
991
1057
  }
992
1058
  &nbsp;
993
1059
  async function createInstance(template) {
@@ -1093,6 +1159,12 @@ exports.fetchAppPackage = async ctx =&gt; {
1093
1159
  }
1094
1160
  &nbsp;
1095
1161
  exports.create = async ctx =&gt; {
1162
+ const apps = await getAllApps(CouchDB, { dev: true })
1163
+ const name = ctx.request.body.name
1164
+ checkAppName(ctx, apps, name)
1165
+ const url = exports.getAppUrl(ctx)
1166
+ checkAppUrl(ctx, apps, url)
1167
+ &nbsp;
1096
1168
  const { useTemplate, templateKey, templateString } = ctx.request.body
1097
1169
  const instanceConfig = {
1098
1170
  useTemplate,
@@ -1105,7 +1177,6 @@ exports.create = async ctx =&gt; {
1105
1177
  const instance = await createInstance(instanceConfig)
1106
1178
  const appId = instance._id
1107
1179
  &nbsp;
1108
- const url = await getAppUrlIfNotInUse(ctx)
1109
1180
  const db = new CouchDB(appId)
1110
1181
  let _rev
1111
1182
  try {
@@ -1122,7 +1193,7 @@ exports.create = async ctx =&gt; {
1122
1193
  type: "app",
1123
1194
  version: packageJson.version,
1124
1195
  componentLibraries: ["@budibase/standard-components"],
1125
- name: ctx.request.body.name,
1196
+ name: name,
1126
1197
  url: url,
1127
1198
  template: ctx.request.body.template,
1128
1199
  instance: instance,
@@ -1149,8 +1220,22 @@ exports.create = async ctx =&gt; {
1149
1220
  ctx.body = newApplication
1150
1221
  }
1151
1222
  &nbsp;
1223
+ // This endpoint currently operates as a PATCH rather than a PUT
1224
+ // Thus name and url fields are handled only if present
1152
1225
  exports.update = async ctx =&gt; {
1153
- const data = await updateAppPackage(ctx, ctx.request.body, ctx.params.appId)
1226
+ const apps = await getAllApps(CouchDB, { dev: true })
1227
+ // validation
1228
+ const name = ctx.request.body.name
1229
+ if (name) {
1230
+ checkAppName(ctx, apps, name, ctx.params.appId)
1231
+ }
1232
+ const url = await exports.getAppUrl(ctx)
1233
+ if (url) {
1234
+ checkAppUrl(ctx, apps, url, ctx.params.appId)
1235
+ ctx.request.body.url = url
1236
+ }
1237
+ &nbsp;
1238
+ const data = await updateAppPackage(ctx.request.body, ctx.params.appId)
1154
1239
  ctx.status = 200
1155
1240
  ctx.body = data
1156
1241
  }
@@ -1172,7 +1257,7 @@ exports.updateClient = async ctx =&gt; {
1172
1257
  version: packageJson.version,
1173
1258
  revertableVersion: currentVersion,
1174
1259
  }
1175
- const data = await updateAppPackage(ctx, appPackageUpdates, ctx.params.appId)
1260
+ const data = await updateAppPackage(appPackageUpdates, ctx.params.appId)
1176
1261
  ctx.status = 200
1177
1262
  ctx.body = data
1178
1263
  }
@@ -1195,7 +1280,7 @@ exports.revertClient = async ctx =&gt; {
1195
1280
  version: application.revertableVersion,
1196
1281
  revertableVersion: null,
1197
1282
  }
1198
- const data = await updateAppPackage(ctx, appPackageUpdates, ctx.params.appId)
1283
+ const data = await updateAppPackage(appPackageUpdates, ctx.params.appId)
1199
1284
  ctx.status = 200
1200
1285
  ctx.body = data
1201
1286
  }
@@ -1268,12 +1353,11 @@ exports.sync = <span class="fstat-no" title="function not covered" >as</span>ync
1268
1353
  }
1269
1354
  }
1270
1355
  &nbsp;
1271
- const updateAppPackage = async (ctx, appPackage, appId) =&gt; {
1272
- const url = await getAppUrlIfNotInUse(ctx)
1356
+ const updateAppPackage = async (appPackage, appId) =&gt; {
1273
1357
  const db = new CouchDB(appId)
1274
1358
  const application = await db.get(DocumentTypes.APP_METADATA)
1275
1359
  &nbsp;
1276
- const newAppPackage = { ...application, ...appPackage, url }
1360
+ const newAppPackage = { ...application, ...appPackage }
1277
1361
  if (appPackage._rev !== application._rev) {
1278
1362
  newAppPackage._rev = application._rev
1279
1363
  }
@@ -1306,7 +1390,7 @@ const createEmptyAppPackage = async (ctx, app) =&gt; {
1306
1390
  <div class='footer quiet pad2 space-top1 center small'>
1307
1391
  Code coverage generated by
1308
1392
  <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
1309
- at Mon Jan 31 2022 13:42:59 GMT+0000 (Coordinated Universal Time)
1393
+ at Mon Jan 31 2022 17:55:41 GMT+0000 (Coordinated Universal Time)
1310
1394
  </div>
1311
1395
  </div>
1312
1396
  <script src="../../prettify.js"></script>