@oneuptime/common 12.0.1 → 12.0.2

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 (205) hide show
  1. package/Models/DatabaseModels/Host.ts +12 -4
  2. package/Models/DatabaseModels/KubernetesContainer.ts +5 -4
  3. package/Models/DatabaseModels/KubernetesResource.ts +8 -7
  4. package/Models/DatabaseModels/PodmanResource.ts +6 -6
  5. package/Models/DatabaseModels/ServiceLevelObjective.ts +91 -0
  6. package/Models/DatabaseModels/StatusPage.ts +95 -0
  7. package/Server/API/TeamMemberAPI.ts +85 -0
  8. package/Server/Infrastructure/Postgres/SchemaMigrations/1785900000000-AddSloMonitorLabelRule.ts +84 -0
  9. package/Server/Infrastructure/Postgres/SchemaMigrations/1785915638551-IncreaseHostIpAddressesLength.ts +40 -0
  10. package/Server/Infrastructure/Postgres/SchemaMigrations/1785930000000-WidenInventoryResourceNameColumns.ts +131 -0
  11. package/Server/Infrastructure/Postgres/SchemaMigrations/1785930709405-AddStatusPageReportPeriod.ts +25 -0
  12. package/Server/Infrastructure/Postgres/SchemaMigrations/Index.ts +8 -0
  13. package/Server/Middleware/ProjectAuthorization.ts +66 -4
  14. package/Server/Services/BillingService.ts +600 -51
  15. package/Server/Services/CephClusterService.ts +47 -5
  16. package/Server/Services/CephResourceService.ts +43 -4
  17. package/Server/Services/CloudResourceService.ts +47 -5
  18. package/Server/Services/DatabaseService.ts +87 -6
  19. package/Server/Services/DockerHostService.ts +47 -5
  20. package/Server/Services/DockerResourceService.ts +62 -8
  21. package/Server/Services/DockerSwarmClusterService.ts +48 -5
  22. package/Server/Services/DockerSwarmResourceService.ts +53 -4
  23. package/Server/Services/HostService.ts +48 -5
  24. package/Server/Services/IoTDeviceService.ts +1 -17
  25. package/Server/Services/IoTFleetService.ts +47 -5
  26. package/Server/Services/KubernetesClusterService.ts +48 -5
  27. package/Server/Services/KubernetesContainerService.ts +50 -9
  28. package/Server/Services/KubernetesResourceService.ts +53 -7
  29. package/Server/Services/LabelService.ts +106 -1
  30. package/Server/Services/MonitorService.ts +57 -0
  31. package/Server/Services/PodmanHostService.ts +47 -5
  32. package/Server/Services/PodmanResourceService.ts +62 -8
  33. package/Server/Services/ProjectService.ts +165 -35
  34. package/Server/Services/ProxmoxClusterService.ts +47 -5
  35. package/Server/Services/ProxmoxResourceService.ts +43 -4
  36. package/Server/Services/RumApplicationService.ts +48 -5
  37. package/Server/Services/ServerlessFunctionService.ts +48 -5
  38. package/Server/Services/ServiceLevelObjectiveMonitorRuleEngineService.ts +426 -0
  39. package/Server/Services/ServiceLevelObjectiveService.ts +39 -0
  40. package/Server/Services/StatusPageService.ts +95 -36
  41. package/Server/Services/StatusPageSubscriberNotificationTemplateService.ts +18 -1
  42. package/Server/Services/StatusPageSubscriberService.ts +3 -0
  43. package/Server/Types/Database/JSONColumnQuery.ts +621 -0
  44. package/Server/Types/Database/Permissions/PublicPermission.ts +9 -2
  45. package/Server/Types/Database/QueryHelper.ts +17 -32
  46. package/Server/Utils/Database/TruncateColumnValue.ts +84 -0
  47. package/Tests/App/Dashboard/UsersTableGroupsByPerson.test.tsx +448 -0
  48. package/Tests/Server/API/BaseAPIApiKeyAuth.test.ts +704 -0
  49. package/Tests/Server/API/TeamMemberRemoveUserFromProjectAPI.test.ts +303 -0
  50. package/Tests/Server/Middleware/MasterAdminAuthorization.test.ts +350 -0
  51. package/Tests/Server/Middleware/ProjectAuthorizationApiKeyHeader.test.ts +362 -0
  52. package/Tests/Server/Middleware/ProjectAuthorizationApiKeyMiddleware.test.ts +687 -0
  53. package/Tests/Server/Services/BillingService.test.ts +78 -3
  54. package/Tests/Server/Services/BillingServiceChangePlanCancel.test.ts +645 -0
  55. package/Tests/Server/Services/BillingServiceTrialPlanChange.test.ts +1005 -0
  56. package/Tests/Server/Services/HookFreeWriteLengthClamp.test.ts +503 -0
  57. package/Tests/Server/Services/HostIpAddressesColumnWidth.test.ts +198 -0
  58. package/Tests/Server/Services/HostServiceUpdateLastSeen.test.ts +510 -0
  59. package/Tests/Server/Services/InventoryResourceNameColumnWidth.test.ts +500 -0
  60. package/Tests/Server/Services/InventoryUpsertSchemaParity.test.ts +586 -0
  61. package/Tests/Server/Services/InventoryUpsertTruncationGuard.test.ts +1242 -0
  62. package/Tests/Server/Services/ProjectServiceChangePlan.test.ts +650 -0
  63. package/Tests/Server/Services/ProjectServiceExtendTrial.test.ts +1 -0
  64. package/Tests/Server/Services/ResourceUpdateLastSeenLivenessFallback.test.ts +387 -0
  65. package/Tests/Server/Services/ServiceLevelObjectiveMonitorRuleEngineService.test.ts +770 -0
  66. package/Tests/Server/Services/ServiceLevelObjectiveService.test.ts +130 -0
  67. package/Tests/Server/Services/SloMonitorLabelRuleHooks.test.ts +352 -0
  68. package/Tests/Server/Services/StatusPageSubscriberReport.test.ts +29 -13
  69. package/Tests/Server/TestingUtils/Services/BillingServiceHelper.ts +69 -8
  70. package/Tests/Server/Types/Database/JSONColumnQuery.test.ts +593 -0
  71. package/Tests/Server/Types/Database/Permissions/PublicPermission.test.ts +495 -0
  72. package/Tests/Server/Types/Database/QueryUtil.test.ts +113 -0
  73. package/Tests/Server/Utils/Database/TruncateColumnValue.test.ts +179 -0
  74. package/Tests/Types/Events/Recurring.test.ts +157 -0
  75. package/Tests/UI/Components/ModelTable/ModelTableGroupsProjectUsers.test.tsx +375 -0
  76. package/Tests/UI/Components/ModelTable/useCustomFieldColumns.test.tsx +196 -0
  77. package/Tests/UI/Utils/ProjectUsersModelAPI.test.ts +739 -0
  78. package/Tests/UI/Utils/TeamMembersByUser.test.ts +633 -0
  79. package/Tests/Utils/StatusPage/ReportPeriod.test.ts +218 -0
  80. package/Tests/Utils/Telemetry/HostIpAddresses.test.ts +291 -0
  81. package/Types/CustomField/CustomFieldDefinition.ts +24 -0
  82. package/Types/Date.ts +112 -0
  83. package/Types/Events/Recurring.ts +99 -1
  84. package/Types/StatusPage/StatusPageReport.ts +11 -0
  85. package/Types/StatusPage/StatusPageReportPeriodType.ts +21 -0
  86. package/UI/Components/ModelTable/CustomFieldColumns.tsx +2 -6
  87. package/UI/Components/ModelTable/useCustomFieldColumns.ts +21 -2
  88. package/UI/Utils/ModelAPI/ProjectUsersModelAPI.ts +305 -0
  89. package/UI/Utils/TeamMembersByUser.ts +302 -0
  90. package/Utils/StatusPage/ReportPeriod.ts +236 -0
  91. package/Utils/Telemetry/HostIpAddresses.ts +98 -0
  92. package/build/dist/Models/DatabaseModels/Host.js +12 -4
  93. package/build/dist/Models/DatabaseModels/Host.js.map +1 -1
  94. package/build/dist/Models/DatabaseModels/KubernetesContainer.js +4 -4
  95. package/build/dist/Models/DatabaseModels/KubernetesContainer.js.map +1 -1
  96. package/build/dist/Models/DatabaseModels/KubernetesResource.js +7 -7
  97. package/build/dist/Models/DatabaseModels/KubernetesResource.js.map +1 -1
  98. package/build/dist/Models/DatabaseModels/PodmanResource.js +6 -6
  99. package/build/dist/Models/DatabaseModels/PodmanResource.js.map +1 -1
  100. package/build/dist/Models/DatabaseModels/ServiceLevelObjective.js +87 -0
  101. package/build/dist/Models/DatabaseModels/ServiceLevelObjective.js.map +1 -1
  102. package/build/dist/Models/DatabaseModels/StatusPage.js +98 -0
  103. package/build/dist/Models/DatabaseModels/StatusPage.js.map +1 -1
  104. package/build/dist/Server/API/TeamMemberAPI.js +57 -2
  105. package/build/dist/Server/API/TeamMemberAPI.js.map +1 -1
  106. package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1785900000000-AddSloMonitorLabelRule.js +45 -0
  107. package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1785900000000-AddSloMonitorLabelRule.js.map +1 -0
  108. package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1785915638551-IncreaseHostIpAddressesLength.js +31 -0
  109. package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1785915638551-IncreaseHostIpAddressesLength.js.map +1 -0
  110. package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1785930000000-WidenInventoryResourceNameColumns.js +90 -0
  111. package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1785930000000-WidenInventoryResourceNameColumns.js.map +1 -0
  112. package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1785930709405-AddStatusPageReportPeriod.js +14 -0
  113. package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1785930709405-AddStatusPageReportPeriod.js.map +1 -0
  114. package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/Index.js +8 -0
  115. package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/Index.js.map +1 -1
  116. package/build/dist/Server/Middleware/ProjectAuthorization.js +59 -4
  117. package/build/dist/Server/Middleware/ProjectAuthorization.js.map +1 -1
  118. package/build/dist/Server/Services/BillingService.js +466 -36
  119. package/build/dist/Server/Services/BillingService.js.map +1 -1
  120. package/build/dist/Server/Services/CephClusterService.js +42 -5
  121. package/build/dist/Server/Services/CephClusterService.js.map +1 -1
  122. package/build/dist/Server/Services/CephResourceService.js +28 -3
  123. package/build/dist/Server/Services/CephResourceService.js.map +1 -1
  124. package/build/dist/Server/Services/CloudResourceService.js +42 -5
  125. package/build/dist/Server/Services/CloudResourceService.js.map +1 -1
  126. package/build/dist/Server/Services/DatabaseService.js +69 -2
  127. package/build/dist/Server/Services/DatabaseService.js.map +1 -1
  128. package/build/dist/Server/Services/DockerHostService.js +42 -5
  129. package/build/dist/Server/Services/DockerHostService.js.map +1 -1
  130. package/build/dist/Server/Services/DockerResourceService.js +34 -4
  131. package/build/dist/Server/Services/DockerResourceService.js.map +1 -1
  132. package/build/dist/Server/Services/DockerSwarmClusterService.js +43 -5
  133. package/build/dist/Server/Services/DockerSwarmClusterService.js.map +1 -1
  134. package/build/dist/Server/Services/DockerSwarmResourceService.js +28 -3
  135. package/build/dist/Server/Services/DockerSwarmResourceService.js.map +1 -1
  136. package/build/dist/Server/Services/HostService.js +43 -5
  137. package/build/dist/Server/Services/HostService.js.map +1 -1
  138. package/build/dist/Server/Services/IoTDeviceService.js +1 -8
  139. package/build/dist/Server/Services/IoTDeviceService.js.map +1 -1
  140. package/build/dist/Server/Services/IoTFleetService.js +42 -5
  141. package/build/dist/Server/Services/IoTFleetService.js.map +1 -1
  142. package/build/dist/Server/Services/KubernetesClusterService.js +43 -5
  143. package/build/dist/Server/Services/KubernetesClusterService.js.map +1 -1
  144. package/build/dist/Server/Services/KubernetesContainerService.js +29 -3
  145. package/build/dist/Server/Services/KubernetesContainerService.js.map +1 -1
  146. package/build/dist/Server/Services/KubernetesResourceService.js +32 -4
  147. package/build/dist/Server/Services/KubernetesResourceService.js.map +1 -1
  148. package/build/dist/Server/Services/LabelService.js +92 -0
  149. package/build/dist/Server/Services/LabelService.js.map +1 -1
  150. package/build/dist/Server/Services/MonitorService.js +47 -0
  151. package/build/dist/Server/Services/MonitorService.js.map +1 -1
  152. package/build/dist/Server/Services/PodmanHostService.js +42 -5
  153. package/build/dist/Server/Services/PodmanHostService.js.map +1 -1
  154. package/build/dist/Server/Services/PodmanResourceService.js +34 -4
  155. package/build/dist/Server/Services/PodmanResourceService.js.map +1 -1
  156. package/build/dist/Server/Services/ProjectService.js +135 -21
  157. package/build/dist/Server/Services/ProjectService.js.map +1 -1
  158. package/build/dist/Server/Services/ProxmoxClusterService.js +42 -5
  159. package/build/dist/Server/Services/ProxmoxClusterService.js.map +1 -1
  160. package/build/dist/Server/Services/ProxmoxResourceService.js +28 -3
  161. package/build/dist/Server/Services/ProxmoxResourceService.js.map +1 -1
  162. package/build/dist/Server/Services/RumApplicationService.js +43 -5
  163. package/build/dist/Server/Services/RumApplicationService.js.map +1 -1
  164. package/build/dist/Server/Services/ServerlessFunctionService.js +43 -5
  165. package/build/dist/Server/Services/ServerlessFunctionService.js.map +1 -1
  166. package/build/dist/Server/Services/ServiceLevelObjectiveMonitorRuleEngineService.js +347 -0
  167. package/build/dist/Server/Services/ServiceLevelObjectiveMonitorRuleEngineService.js.map +1 -0
  168. package/build/dist/Server/Services/ServiceLevelObjectiveService.js +33 -1
  169. package/build/dist/Server/Services/ServiceLevelObjectiveService.js.map +1 -1
  170. package/build/dist/Server/Services/StatusPageService.js +69 -46
  171. package/build/dist/Server/Services/StatusPageService.js.map +1 -1
  172. package/build/dist/Server/Services/StatusPageSubscriberNotificationTemplateService.js +17 -1
  173. package/build/dist/Server/Services/StatusPageSubscriberNotificationTemplateService.js.map +1 -1
  174. package/build/dist/Server/Services/StatusPageSubscriberService.js +3 -0
  175. package/build/dist/Server/Services/StatusPageSubscriberService.js.map +1 -1
  176. package/build/dist/Server/Types/Database/JSONColumnQuery.js +402 -0
  177. package/build/dist/Server/Types/Database/JSONColumnQuery.js.map +1 -0
  178. package/build/dist/Server/Types/Database/Permissions/PublicPermission.js +9 -2
  179. package/build/dist/Server/Types/Database/Permissions/PublicPermission.js.map +1 -1
  180. package/build/dist/Server/Types/Database/QueryHelper.js +17 -27
  181. package/build/dist/Server/Types/Database/QueryHelper.js.map +1 -1
  182. package/build/dist/Server/Utils/Database/TruncateColumnValue.js +32 -0
  183. package/build/dist/Server/Utils/Database/TruncateColumnValue.js.map +1 -0
  184. package/build/dist/Types/CustomField/CustomFieldDefinition.js +2 -0
  185. package/build/dist/Types/CustomField/CustomFieldDefinition.js.map +1 -0
  186. package/build/dist/Types/Date.js +68 -0
  187. package/build/dist/Types/Date.js.map +1 -1
  188. package/build/dist/Types/Events/Recurring.js +63 -0
  189. package/build/dist/Types/Events/Recurring.js.map +1 -1
  190. package/build/dist/Types/StatusPage/StatusPageReportPeriodType.js +22 -0
  191. package/build/dist/Types/StatusPage/StatusPageReportPeriodType.js.map +1 -0
  192. package/build/dist/UI/Components/ModelTable/CustomFieldColumns.js.map +1 -1
  193. package/build/dist/UI/Components/ModelTable/useCustomFieldColumns.js +18 -2
  194. package/build/dist/UI/Components/ModelTable/useCustomFieldColumns.js.map +1 -1
  195. package/build/dist/UI/Utils/ModelAPI/ProjectUsersModelAPI.js +213 -0
  196. package/build/dist/UI/Utils/ModelAPI/ProjectUsersModelAPI.js.map +1 -0
  197. package/build/dist/UI/Utils/TeamMembersByUser.js +195 -0
  198. package/build/dist/UI/Utils/TeamMembersByUser.js.map +1 -0
  199. package/build/dist/Utils/StatusPage/ReportPeriod.js +131 -0
  200. package/build/dist/Utils/StatusPage/ReportPeriod.js.map +1 -0
  201. package/build/dist/Utils/Telemetry/HostIpAddresses.js +82 -0
  202. package/build/dist/Utils/Telemetry/HostIpAddresses.js.map +1 -0
  203. package/jest.config.json +2 -0
  204. package/package.json +1 -1
  205. package/tsconfig.json +12 -1
@@ -0,0 +1,22 @@
1
+ /*
2
+ * What stretch of time a scheduled status page report covers.
3
+ *
4
+ * The report used to only ever cover "the last N days counted back from the
5
+ * moment the email went out", which can never line up with a calendar month -
6
+ * a monthly report sent on 1 Aug covered 2 Jul - 1 Aug rather than the July
7
+ * everyone reading it expects, and consecutive reports silently overlapped or
8
+ * left gaps whenever the day count did not match the send frequency.
9
+ */
10
+ var StatusPageReportPeriodType;
11
+ (function (StatusPageReportPeriodType) {
12
+ // The window ends when the email is sent and runs back `reportDataInDays`.
13
+ StatusPageReportPeriodType["Rolling"] = "Rolling";
14
+ /*
15
+ * The last whole calendar period before the email is sent, sized by the send
16
+ * frequency: a report sent monthly covers 1 Jul 00:00 - 31 Jul 23:59:59.999
17
+ * in the status page's report timezone.
18
+ */
19
+ StatusPageReportPeriodType["PreviousCalendarPeriod"] = "Previous Calendar Period";
20
+ })(StatusPageReportPeriodType || (StatusPageReportPeriodType = {}));
21
+ export default StatusPageReportPeriodType;
22
+ //# sourceMappingURL=StatusPageReportPeriodType.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"StatusPageReportPeriodType.js","sourceRoot":"","sources":["../../../../Types/StatusPage/StatusPageReportPeriodType.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,IAAK,0BASJ;AATD,WAAK,0BAA0B;IAC7B,2EAA2E;IAC3E,iDAAmB,CAAA;IACnB;;;;OAIG;IACH,iFAAmD,CAAA;AACrD,CAAC,EATI,0BAA0B,KAA1B,0BAA0B,QAS9B;AAED,eAAe,0BAA0B,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"CustomFieldColumns.js","sourceRoot":"","sources":["../../../../../UI/Components/ModelTable/CustomFieldColumns.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"CustomFieldColumns.js","sourceRoot":"","sources":["../../../../../UI/Components/ModelTable/CustomFieldColumns.tsx"],"names":[],"mappings":"AAEA,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAC3C,OAAO,kBAAkB,MAAM,gCAAgC,CAAC;AAGhE,OAAO,eAAe,MAAM,4CAA4C,CAAC;AAEzE,OAAO,EAEL,+BAA+B,GAChC,MAAM,sDAAsD,CAAC;AAE9D,OAAO,KAAuB,MAAM,OAAO,CAAC;AAqC5C,MAAM,CAAC,MAAM,qBAAqB,GAAW,cAAc,CAAC;AAM5D;;;;GAIG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAiC,CAChE,KAAgC,EACE,EAAE;IACpC,OAAO,+BAA+B,CAAC,KAAK,CAAC,CAAC;AAChD,CAAC,CAAC;AAMF;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAsC,CAC1E,KAAoC,EACN,EAAE;IAChC,MAAM,WAAW,GAAiC,EAAE,CAAC;IACrD,MAAM,SAAS,GAAgB,IAAI,GAAG,EAAE,CAAC;IAEzC,KAAK,MAAM,IAAI,IAAI,KAAK,IAAI,EAAE,EAAE,CAAC;QAC/B,MAAM,IAAI,GAAa,IAAmB,aAAnB,IAAI,uBAAJ,IAAI,CAAkB,MAAM,CAAC,CAAC;QAErD,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzD,SAAS;QACX,CAAC;QAED,MAAM,WAAW,GAAW,IAAI,CAAC,IAAI,EAAE,CAAC;QAExC,IAAI,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC;YAC/B,SAAS;QACX,CAAC;QAED,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAE3B,MAAM,WAAW,GAAa,IAAmB,CAAC,aAAa,CAAC,CAAC;QACjE,MAAM,eAAe,GAAa,IAAmB,CAAC,iBAAiB,CAAC,CAAC;QACzE,MAAM,eAAe,GAAa,IAAmB,CAAC,iBAAiB,CAAC,CAAC;QAEzE,WAAW,CAAC,IAAI,CAAC;YACf,IAAI,EAAE,WAAW;YACjB,WAAW,EAAE,OAAO,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS;YACtE,eAAe,EACb,OAAO,eAAe,KAAK,QAAQ;gBACjC,CAAC,CAAE,eAAmC;gBACtC,CAAC,CAAC,SAAS;YACf,eAAe,EACb,OAAO,eAAe,KAAK,QAAQ,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,SAAS;SACpE,CAAC,CAAC;IACL,CAAC;IAED,OAAO,WAAW,CAAC,IAAI,CACrB,CAAC,CAAwB,EAAE,CAAwB,EAAE,EAAE;QACrD,OAAO,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACtC,CAAC,CACF,CAAC;AACJ,CAAC,CAAC;AAOF,MAAM,CAAC,MAAM,mBAAmB,GAAgC,CAC9D,IAAa,EACb,IAAY,EACH,EAAE;IACX,MAAM,YAAY,GAAa,IAA+B,aAA/B,IAAI,uBAAJ,IAAI,CACjC,qBAAqB,CACtB,CAAC;IAEF,IAAI,CAAC,YAAY,IAAI,OAAO,YAAY,KAAK,QAAQ,EAAE,CAAC;QACtD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,OAAQ,YAA2B,CAAC,IAAI,CAAC,CAAC;AAC5C,CAAC,CAAC;AAQF,MAAM,KAAK,GAAkB,CAAC,IAI7B,EAAgB,EAAE;IACjB,OAAO,CACL,oBAAC,kBAAkB,IAAC,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,GAAI,CAC5E,CAAC;AACJ,CAAC,CAAC;AAQF,MAAM,CAAC,MAAM,sBAAsB,GAAmC,CAAC,IAItE,EAAgB,EAAE;;IACjB,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;IACnC,MAAM,cAAc,GAAW,MAAA,IAAI,CAAC,cAAc,mCAAI,GAAG,CAAC;IAE1D,MAAM,KAAK,GAAiB,CAC1B,8BAAM,SAAS,EAAC,eAAe,IAAE,cAAc,CAAQ,CACxD,CAAC;IAEF,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,EAAE,EAAE,CAAC;QAC1D,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,UAAU,CAAC,eAAe,KAAK,eAAe,CAAC,OAAO,EAAE,CAAC;QAC3D;;;WAGG;QACH,MAAM,MAAM,GAAY,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,MAAM,CAAC;QAE3D,OAAO,CACL,8BACE,SAAS,EACP,MAAM;gBACJ,CAAC,CAAC,kIAAkI;gBACpI,CAAC,CAAC,+HAA+H,IAGpI,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CACjB,CACR,CAAC;IACJ,CAAC;IAED,IAAI,UAAU,CAAC,eAAe,KAAK,eAAe,CAAC,mBAAmB,EAAE,CAAC;QACvE;;;WAGG;QACH,MAAM,MAAM,GAAmB,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QAEtE,MAAM,MAAM,GAAkB,MAAM;aACjC,MAAM,CAAC,CAAC,KAAc,EAAE,EAAE;YACzB,OAAO,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;QAC/D,CAAC,CAAC;aACD,GAAG,CAAC,CAAC,KAAc,EAAE,EAAE;YACtB,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;QACvB,CAAC,CAAC,CAAC;QAEL,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACxB,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,iBAAiB,GACrB,oBAAoB,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;QAEnD,OAAO,CACL,6BAAK,SAAS,EAAC,wBAAwB,IACpC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAa,EAAE,KAAa,EAAE,EAAE;YAC3C,MAAM,MAAM,GACV,iBAAiB,CAAC,IAAI,CACpB,CAAC,gBAA2C,EAAE,EAAE;gBAC9C,OAAO,gBAAgB,CAAC,KAAK,KAAK,KAAK,CAAC;YAC1C,CAAC,CACF,CAAC;YAEJ,OAAO,KAAK,CAAC;gBACX,KAAK;gBACL,GAAG,EAAE,GAAG,KAAK,IAAI,KAAK,EAAE;gBACxB,KAAK,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK;aACrB,CAAC,CAAC;QACL,CAAC,CAAC,CACE,CACP,CAAC;IACJ,CAAC;IAED,IAAI,UAAU,CAAC,eAAe,KAAK,eAAe,CAAC,QAAQ,EAAE,CAAC;QAC5D,MAAM,KAAK,GAAW,MAAM,CAAC,KAAK,CAAC,CAAC;QACpC,MAAM,MAAM,GAA0C,oBAAoB,CACxE,UAAU,CAAC,eAAe,CAC3B,CAAC,IAAI,CAAC,CAAC,gBAA2C,EAAE,EAAE;YACrD,OAAO,gBAAgB,CAAC,KAAK,KAAK,KAAK,CAAC;QAC1C,CAAC,CAAC,CAAC;QAEH,OAAO,KAAK,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,EAAE,CAAC,CAAC;IAC5D,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,kCAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAQ,CAAC;IACzC,CAAC;IAED,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,kCAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAQ,CAAC;IAC9C,CAAC;IAED,OAAO,kCAAO,MAAM,CAAC,KAAK,CAAC,CAAQ,CAAC;AACtC,CAAC,CAAC;AASF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAkC,CAElE,IAGD,EAAuB,EAAE;IACxB,MAAM,QAAQ,GAAY,IAAI,CAAC,iBAAiB,KAAK,KAAK,CAAC;IAE3D,OAAO,CAAC,IAAI,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,GAAG,CACjC,CAAC,UAAiC,EAAsB,EAAE;QACxD,OAAO;YACL,EAAE,EAAE,GAAG,qBAAqB,IAAI,UAAU,CAAC,IAAI,EAAE;YACjD,KAAK,EAAE;gBACL,CAAC,qBAAqB,CAAC,EAAE,IAAI;aACC;YAChC,gBAAgB,EAAE,UAAU,CAAC,IAAI;YACjC,KAAK,EAAE,UAAU,CAAC,IAAI;YACtB,WAAW,EAAE,UAAU,CAAC,WAAW;YACnC,IAAI,EAAE,SAAS,CAAC,OAAO;YACvB;;;eAGG;YACH,WAAW,EAAE,IAAI;YACjB,iBAAiB,EAAE,QAAQ;YAC3B,cAAc,EAAE,CAAC,IAAgB,EAAU,EAAE;gBAC3C,MAAM,KAAK,GAAY,mBAAmB,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;gBAElE,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;oBAC1C,OAAO,EAAE,CAAC;gBACZ,CAAC;gBAED,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;oBACzB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC1B,CAAC;gBAED,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;oBAC9B,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;gBAC/B,CAAC;gBAED,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;YACvB,CAAC;YACD,UAAU,EAAE,CAAC,IAAgB,EAAgB,EAAE;gBAC7C,OAAO,sBAAsB,CAAC;oBAC5B,KAAK,EAAE,mBAAmB,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,CAAC;oBACjD,UAAU,EAAE,UAAU;iBACvB,CAAC,CAAC;YACL,CAAC;SACF,CAAC;IACJ,CAAC,CACF,CAAC;AACJ,CAAC,CAAC"}
@@ -8,14 +8,30 @@ const useCustomFieldColumns = (data) => {
8
8
  var _a;
9
9
  const { customFieldsModelType } = data;
10
10
  const [definitions, setDefinitions] = useState([]);
11
- const [isLoading, setIsLoading] = useState(false);
12
- const [error, setError] = useState("");
13
11
  const projectId = (_a = data.projectId) !== null && _a !== void 0 ? _a : ProjectUtil.getCurrentProjectId();
12
+ /*
13
+ * Starts true whenever a request is actually going to happen, rather than
14
+ * false-until-the-effect-runs.
15
+ *
16
+ * Columns did not care — they only ever appear — but a caller that has to
17
+ * distinguish "no custom fields" from "not yet" does. The facet bar is one:
18
+ * on the first render it must know that a chip restored from a shared link
19
+ * may still be on its way, or it drops the link's filter before the request
20
+ * has even been sent.
21
+ */
22
+ const [isLoading, setIsLoading] = useState(Boolean(data.customFieldsModelType && projectId));
23
+ const [error, setError] = useState("");
14
24
  const projectIdString = (projectId === null || projectId === void 0 ? void 0 : projectId.toString()) || "";
15
25
  const modelName = (customFieldsModelType === null || customFieldsModelType === void 0 ? void 0 : customFieldsModelType.name) || "";
16
26
  useEffect(() => {
17
27
  if (!customFieldsModelType || !projectId) {
18
28
  setDefinitions([]);
29
+ /*
30
+ * Nothing to wait for. Said explicitly because the initial state is now
31
+ * "loading" whenever a request is expected, and a model type that goes
32
+ * away between renders would otherwise leave it stuck there.
33
+ */
34
+ setIsLoading(false);
19
35
  return;
20
36
  }
21
37
  let isCancelled = false;
@@ -1 +1 @@
1
- {"version":3,"file":"useCustomFieldColumns.js","sourceRoot":"","sources":["../../../../../UI/Components/ModelTable/useCustomFieldColumns.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"useCustomFieldColumns.js","sourceRoot":"","sources":["../../../../../UI/Components/ModelTable/useCustomFieldColumns.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,213 @@
1
+ import ModelAPI from "./ModelAPI";
2
+ import TeamMembersByUser from "../TeamMembersByUser";
3
+ import API from "../API/API";
4
+ import { APP_API_URL } from "../../Config";
5
+ import TeamMember from "../../../Models/DatabaseModels/TeamMember";
6
+ import HTTPErrorResponse from "../../../Types/API/HTTPErrorResponse";
7
+ import URL from "../../../Types/API/URL";
8
+ import Includes from "../../../Types/BaseDatabase/Includes";
9
+ import { LIMIT_PER_PROJECT } from "../../../Types/Database/LimitMax";
10
+ /*
11
+ * A drop-in ModelAPI for tables that list TeamMember but mean to list *people*
12
+ * - the project's Users table being the one that does.
13
+ *
14
+ * TeamMember rows are (user, team) pairs, so the plain API pages over
15
+ * memberships: a user on three teams occupies three rows and reads as three
16
+ * different people with the same name. This API pages over users instead. It
17
+ * reads the project's memberships, folds them into one row per user (see
18
+ * TeamMembersByUser), and then applies the table's skip/limit to *that* list,
19
+ * so `count` is a number of people and every page boundary falls between two
20
+ * people rather than between two of one person's teams.
21
+ *
22
+ * Paging cannot be pushed to the server here: the list endpoint has no DISTINCT
23
+ * or GROUP BY, so there is no way to ask it for the Nth user. Reading the whole
24
+ * membership list up front is what the project user pickers already do.
25
+ *
26
+ * Deleting is redefined to match what a row now means - see deleteItem.
27
+ */
28
+ export default class ProjectUsersModelAPI extends ModelAPI {
29
+ static async getList(data) {
30
+ if (!(new data.modelType() instanceof TeamMember)) {
31
+ // Not the model this API exists for. Behave like the plain one.
32
+ return ModelAPI.getList(data);
33
+ }
34
+ const query = data.query;
35
+ const sort = data.sort;
36
+ const memberships = await this.readAllMemberships({
37
+ query: query,
38
+ select: this.getMembershipSelect(data.select),
39
+ sort: sort,
40
+ requestOptions: data.requestOptions,
41
+ });
42
+ let rows = TeamMembersByUser.groupByUser(memberships);
43
+ /*
44
+ * An explicit sort was already applied by the server and grouping kept it.
45
+ * Without one the server's order is arbitrary, and an arbitrary order that
46
+ * is then sliced into pages is worse here than elsewhere - so fall back to
47
+ * something a reader of a people directory expects, and that pages the same
48
+ * way every time.
49
+ */
50
+ if (Object.keys(sort || {}).length === 0) {
51
+ rows = TeamMembersByUser.sortRowsByUserName(rows);
52
+ }
53
+ const pageRows = rows.slice(data.skip, data.skip + data.limit);
54
+ await this.fillInTeamsHiddenByFilters({
55
+ query: query,
56
+ pageRows: pageRows,
57
+ requestOptions: data.requestOptions,
58
+ });
59
+ return {
60
+ data: pageRows,
61
+ count: rows.length,
62
+ skip: data.skip,
63
+ limit: data.limit,
64
+ };
65
+ }
66
+ /**
67
+ * Removes the user on this row from the project - every one of their team
68
+ * memberships, not just the one whose id the row happens to carry.
69
+ *
70
+ * A grouped row stands for a person, so deleting one membership would leave
71
+ * the row on screen (still a member, via their other teams) and look like the
72
+ * delete silently failed. Removing a user from a single team is done from
73
+ * that user's own Teams tab, where a row is a membership again.
74
+ *
75
+ * This goes through one `remove-user-from-project` request rather than a
76
+ * DELETE per membership, and that is load-bearing rather than an
77
+ * optimisation. The server refuses to remove the last accepted member of the
78
+ * Owners team, and it refuses per request - so a loop deletes every other
79
+ * membership first and only then reports a failure, leaving the person
80
+ * stripped of the teams the caller was just told they had not lost. The
81
+ * endpoint runs that check across the whole set before deleting anything.
82
+ */
83
+ static async deleteItem(data) {
84
+ if (!(new data.modelType() instanceof TeamMember)) {
85
+ return ModelAPI.deleteItem(data);
86
+ }
87
+ const rowMembership = await ModelAPI.getItem({
88
+ modelType: TeamMember,
89
+ id: data.id,
90
+ select: {
91
+ _id: true,
92
+ userId: true,
93
+ },
94
+ requestOptions: data.requestOptions,
95
+ });
96
+ const userId = rowMembership === null || rowMembership === void 0 ? void 0 : rowMembership.userId;
97
+ if (!userId) {
98
+ /*
99
+ * The row is gone, or came back without the user it stands for. Fall back
100
+ * to the single delete the table asked for rather than guessing.
101
+ */
102
+ return ModelAPI.deleteItem(data);
103
+ }
104
+ const url = URL.fromString(APP_API_URL.toString())
105
+ .addRoute(new TeamMember().getCrudApiPath())
106
+ .addRoute("/remove-user-from-project");
107
+ const result = await API.post({
108
+ url: url,
109
+ data: {
110
+ userId: userId.toString(),
111
+ },
112
+ headers: ModelAPI.getCommonHeaders(data.requestOptions),
113
+ });
114
+ if (result instanceof HTTPErrorResponse) {
115
+ throw result;
116
+ }
117
+ }
118
+ /**
119
+ * Every membership matching the query, across as many requests as it takes.
120
+ *
121
+ * A single read would be capped at LIMIT_PER_PROJECT, and a capped read is
122
+ * indistinguishable here from a complete one: the grouped list would simply
123
+ * be missing whichever people fell outside the window, `count` would report
124
+ * the truncated total as authoritative, and nothing on screen would say so.
125
+ * Paging until a short page comes back keeps the grouping honest.
126
+ */
127
+ static async readAllMemberships(data) {
128
+ const memberships = [];
129
+ /*
130
+ * A backstop, not an expected bound: every page after the first means a
131
+ * project with more than 10,000 memberships. Reaching it would mean
132
+ * something is paging without making progress.
133
+ */
134
+ const maxPages = 10;
135
+ for (let page = 0; page < maxPages; page++) {
136
+ const result = await ModelAPI.getList({
137
+ modelType: TeamMember,
138
+ query: data.query,
139
+ limit: LIMIT_PER_PROJECT,
140
+ skip: page * LIMIT_PER_PROJECT,
141
+ select: data.select,
142
+ sort: data.sort,
143
+ requestOptions: data.requestOptions,
144
+ });
145
+ memberships.push(...result.data);
146
+ if (result.data.length < LIMIT_PER_PROJECT) {
147
+ // A short page is the last page.
148
+ break;
149
+ }
150
+ }
151
+ return memberships;
152
+ }
153
+ /**
154
+ * The table's own select plus the fields grouping needs. Columns ask for what
155
+ * they render; grouping also needs to know which user and which team each
156
+ * membership belongs to, and whether it was accepted.
157
+ */
158
+ static getMembershipSelect(select) {
159
+ const teamSelect = typeof (select === null || select === void 0 ? void 0 : select.team) === "object" && select.team !== null
160
+ ? Object.assign({}, select.team) : {};
161
+ const userSelect = typeof (select === null || select === void 0 ? void 0 : select.user) === "object" && select.user !== null
162
+ ? Object.assign({}, select.user) : {};
163
+ return Object.assign(Object.assign({}, select), { _id: true, userId: true, teamId: true, hasAcceptedInvitation: true, user: Object.assign(Object.assign({}, userSelect), { _id: true }), team: Object.assign(Object.assign({}, teamSelect), { _id: true, name: true }) });
164
+ }
165
+ /**
166
+ * When the table is filtered, the memberships that were read are only the
167
+ * matching ones - filter by a team and every user's Teams column would show
168
+ * that one team and nothing else, which is exactly the "which teams is this
169
+ * person on?" question the grouped row exists to answer.
170
+ *
171
+ * So for the users actually on this page (at most one page's worth), re-read
172
+ * their memberships unfiltered and merge the full team list back in.
173
+ */
174
+ static async fillInTeamsHiddenByFilters(data) {
175
+ const projectId = data.query["projectId"];
176
+ const isFiltered = Object.keys(data.query).some((key) => {
177
+ return key !== "projectId";
178
+ });
179
+ if (!isFiltered || !projectId || data.pageRows.length === 0) {
180
+ return;
181
+ }
182
+ const userIds = data.pageRows
183
+ .map((row) => {
184
+ return TeamMembersByUser.getGroupKey(row) || "";
185
+ })
186
+ .filter((userId) => {
187
+ return Boolean(userId);
188
+ });
189
+ if (userIds.length === 0) {
190
+ return;
191
+ }
192
+ const allMemberships = await this.readAllMemberships({
193
+ query: {
194
+ projectId: projectId,
195
+ userId: new Includes(userIds),
196
+ },
197
+ select: {
198
+ _id: true,
199
+ userId: true,
200
+ teamId: true,
201
+ hasAcceptedInvitation: true,
202
+ team: {
203
+ _id: true,
204
+ name: true,
205
+ },
206
+ },
207
+ sort: {},
208
+ requestOptions: data.requestOptions,
209
+ });
210
+ TeamMembersByUser.mergeAllTeamsIntoRows(data.pageRows, allMemberships);
211
+ }
212
+ }
213
+ //# sourceMappingURL=ProjectUsersModelAPI.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"ProjectUsersModelAPI.js","sourceRoot":"","sources":["../../../../../UI/Utils/ModelAPI/ProjectUsersModelAPI.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,195 @@
1
+ export default class TeamMembersByUser {
2
+ /**
3
+ * The identity a membership is grouped under. Null when the row carries no
4
+ * user at all - those rows are never merged, because merging them would put
5
+ * unrelated memberships on one line.
6
+ */
7
+ static getGroupKey(teamMember) {
8
+ var _a, _b, _c;
9
+ const userId = ((_a = teamMember.userId) === null || _a === void 0 ? void 0 : _a.toString()) || ((_c = (_b = teamMember.user) === null || _b === void 0 ? void 0 : _b._id) === null || _c === void 0 ? void 0 : _c.toString()) || "";
10
+ return userId || null;
11
+ }
12
+ /**
13
+ * The name this row sorts and reads under. Falls back to the email so a user
14
+ * who was invited but has not set a name yet still lands somewhere sensible.
15
+ */
16
+ static getDisplayName(teamMember) {
17
+ var _a, _b, _c, _d;
18
+ return (((_b = (_a = teamMember.user) === null || _a === void 0 ? void 0 : _a.name) === null || _b === void 0 ? void 0 : _b.toString()) ||
19
+ ((_d = (_c = teamMember.user) === null || _c === void 0 ? void 0 : _c.email) === null || _d === void 0 ? void 0 : _d.toString()) ||
20
+ "");
21
+ }
22
+ /**
23
+ * One row per user, in the order each user was first seen. The input order is
24
+ * whatever the server sorted by, so first-seen order keeps that sort intact.
25
+ *
26
+ * The returned rows are the same TeamMember instances that came in (the first
27
+ * membership seen for each user), mutated with the aggregate fields.
28
+ */
29
+ static groupByUser(teamMembers) {
30
+ const rowsByGroupKey = new Map();
31
+ const rows = [];
32
+ /*
33
+ * Which teams are already on a row, keyed the same way for every
34
+ * membership. Tracked here rather than re-derived from `teamsForUser`
35
+ * because a membership identifies its team by `teamId` while the team
36
+ * object it carries identifies itself by `_id`, and either one can be
37
+ * missing from a given select.
38
+ */
39
+ const teamKeysByRow = new Map();
40
+ /*
41
+ * Every membership id folded into each row, so the row can be given a
42
+ * stable identity below.
43
+ */
44
+ const membershipIdsByRow = new Map();
45
+ for (const teamMember of teamMembers) {
46
+ const groupKey = this.getGroupKey(teamMember);
47
+ const existingRow = groupKey
48
+ ? rowsByGroupKey.get(groupKey)
49
+ : undefined;
50
+ if (existingRow) {
51
+ this.addMembershipToRow(existingRow, teamMember, teamKeysByRow.get(existingRow), Boolean(teamMember.hasAcceptedInvitation));
52
+ this.rememberMembershipId(membershipIdsByRow.get(existingRow), teamMember);
53
+ continue;
54
+ }
55
+ const row = teamMember;
56
+ const teamKeys = new Set();
57
+ const membershipIds = [];
58
+ /*
59
+ * The row *is* this membership, so read its acceptance before the reset
60
+ * below overwrites it.
61
+ */
62
+ const hasAcceptedInvitation = Boolean(teamMember.hasAcceptedInvitation);
63
+ row.teamsForUser = [];
64
+ row.teamCountForUser = 0;
65
+ row.pendingTeamCountForUser = 0;
66
+ /*
67
+ * Reset before folding the row's own membership back in: on a grouped row
68
+ * this field means "is a member of this project", which is true as soon as
69
+ * any one of the memberships has been accepted.
70
+ */
71
+ row.hasAcceptedInvitation = false;
72
+ teamKeysByRow.set(row, teamKeys);
73
+ membershipIdsByRow.set(row, membershipIds);
74
+ this.addMembershipToRow(row, teamMember, teamKeys, hasAcceptedInvitation);
75
+ this.rememberMembershipId(membershipIds, teamMember);
76
+ if (groupKey) {
77
+ rowsByGroupKey.set(groupKey, row);
78
+ }
79
+ rows.push(row);
80
+ }
81
+ for (const row of rows) {
82
+ this.finalizeRow(row, membershipIdsByRow.get(row) || []);
83
+ }
84
+ return rows;
85
+ }
86
+ /**
87
+ * Replaces the team aggregate on each row with the one derived from
88
+ * `allTeamMembers`.
89
+ *
90
+ * Needed because the rows on screen may have been built from a *filtered*
91
+ * membership list - filter the table by one team and grouping only ever sees
92
+ * that team, so the Teams column would claim each user belongs to exactly the
93
+ * team that was filtered for. The caller re-reads the unfiltered memberships
94
+ * for the users on the current page and merges them back in here.
95
+ *
96
+ * Rows with no matching membership in `allTeamMembers` are left untouched.
97
+ */
98
+ static mergeAllTeamsIntoRows(rows, allTeamMembers) {
99
+ const groupedRows = this.groupByUser(allTeamMembers);
100
+ const groupedRowsByKey = new Map();
101
+ for (const groupedRow of groupedRows) {
102
+ const groupKey = this.getGroupKey(groupedRow);
103
+ if (groupKey) {
104
+ groupedRowsByKey.set(groupKey, groupedRow);
105
+ }
106
+ }
107
+ for (const row of rows) {
108
+ const groupKey = this.getGroupKey(row);
109
+ const groupedRow = groupKey
110
+ ? groupedRowsByKey.get(groupKey)
111
+ : undefined;
112
+ if (!groupedRow) {
113
+ continue;
114
+ }
115
+ row.teamsForUser = groupedRow.teamsForUser;
116
+ row.teamCountForUser = groupedRow.teamCountForUser;
117
+ row.pendingTeamCountForUser = groupedRow.pendingTeamCountForUser;
118
+ row.hasAcceptedInvitation = Boolean(groupedRow.hasAcceptedInvitation);
119
+ }
120
+ return rows;
121
+ }
122
+ /**
123
+ * Alphabetical by display name, case-insensitively. Rows with no name at all
124
+ * sort last so the list does not open on a run of blanks.
125
+ *
126
+ * Returns a new array; the input is left alone.
127
+ */
128
+ static sortRowsByUserName(rows) {
129
+ return [...rows].sort((a, b) => {
130
+ const nameA = this.getDisplayName(a).toLowerCase();
131
+ const nameB = this.getDisplayName(b).toLowerCase();
132
+ if (!nameA && !nameB) {
133
+ return 0;
134
+ }
135
+ if (!nameA) {
136
+ return 1;
137
+ }
138
+ if (!nameB) {
139
+ return -1;
140
+ }
141
+ return nameA.localeCompare(nameB);
142
+ });
143
+ }
144
+ static addMembershipToRow(row, teamMember, teamKeys, hasAcceptedInvitation) {
145
+ var _a, _b, _c;
146
+ if (hasAcceptedInvitation) {
147
+ row.hasAcceptedInvitation = true;
148
+ }
149
+ else {
150
+ row.pendingTeamCountForUser = row.pendingTeamCountForUser + 1;
151
+ }
152
+ const team = teamMember.team;
153
+ if (!team) {
154
+ return;
155
+ }
156
+ const teamKey = ((_a = teamMember.teamId) === null || _a === void 0 ? void 0 : _a.toString()) ||
157
+ ((_b = team._id) === null || _b === void 0 ? void 0 : _b.toString()) ||
158
+ ((_c = team.name) === null || _c === void 0 ? void 0 : _c.toString()) ||
159
+ "";
160
+ if (!teamKey || teamKeys.has(teamKey)) {
161
+ return;
162
+ }
163
+ teamKeys.add(teamKey);
164
+ row.teamsForUser.push(team);
165
+ }
166
+ static rememberMembershipId(membershipIds, teamMember) {
167
+ var _a;
168
+ const membershipId = ((_a = teamMember._id) === null || _a === void 0 ? void 0 : _a.toString()) || "";
169
+ if (membershipId) {
170
+ membershipIds.push(membershipId);
171
+ }
172
+ }
173
+ static finalizeRow(row, membershipIds) {
174
+ row.teamsForUser.sort((a, b) => {
175
+ var _a, _b;
176
+ return (((_a = a.name) === null || _a === void 0 ? void 0 : _a.toString()) || "")
177
+ .toLowerCase()
178
+ .localeCompare((((_b = b.name) === null || _b === void 0 ? void 0 : _b.toString()) || "").toLowerCase());
179
+ });
180
+ row.teamCountForUser = row.teamsForUser.length;
181
+ /*
182
+ * The row's id has to identify the *person*, not "whichever of their
183
+ * memberships was returned first". The table matches a selected row to an
184
+ * on-screen row by _id, and it fetches the on-screen page and the
185
+ * select-all set with two different sorts - so a first-seen id makes the
186
+ * same person carry different ids in the two results, and every
187
+ * multi-team user's checkbox silently fails to tick. The lowest membership
188
+ * id is stable under any ordering the server returns.
189
+ */
190
+ if (membershipIds.length > 1) {
191
+ row._id = [...membershipIds].sort()[0];
192
+ }
193
+ }
194
+ }
195
+ //# sourceMappingURL=TeamMembersByUser.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"TeamMembersByUser.js","sourceRoot":"","sources":["../../../../UI/Utils/TeamMembersByUser.ts"],"names":[],"mappings":"AA6BA,MAAM,CAAC,OAAO,OAAO,iBAAiB;IACpC;;;;OAIG;IACI,MAAM,CAAC,WAAW,CAAC,UAAsB;;QAC9C,MAAM,MAAM,GACV,CAAA,MAAA,UAAU,CAAC,MAAM,0CAAE,QAAQ,EAAE,MAAI,MAAA,MAAA,UAAU,CAAC,IAAI,0CAAE,GAAG,0CAAE,QAAQ,EAAE,CAAA,IAAI,EAAE,CAAC;QAE1E,OAAO,MAAM,IAAI,IAAI,CAAC;IACxB,CAAC;IAED;;;OAGG;IACI,MAAM,CAAC,cAAc,CAAC,UAAsB;;QACjD,OAAO,CACL,CAAA,MAAA,MAAA,UAAU,CAAC,IAAI,0CAAE,IAAI,0CAAE,QAAQ,EAAE;aACjC,MAAA,MAAA,UAAU,CAAC,IAAI,0CAAE,KAAK,0CAAE,QAAQ,EAAE,CAAA;YAClC,EAAE,CACH,CAAC;IACJ,CAAC;IAED;;;;;;OAMG;IACI,MAAM,CAAC,WAAW,CACvB,WAA8B;QAE9B,MAAM,cAAc,GAAgC,IAAI,GAAG,EAGxD,CAAC;QACJ,MAAM,IAAI,GAA0B,EAAE,CAAC;QAEvC;;;;;;WAMG;QACH,MAAM,aAAa,GAAqC,IAAI,GAAG,EAG5D,CAAC;QAEJ;;;WAGG;QACH,MAAM,kBAAkB,GAAuC,IAAI,GAAG,EAGnE,CAAC;QAEJ,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;YACrC,MAAM,QAAQ,GAAkB,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;YAE7D,MAAM,WAAW,GAA+B,QAAQ;gBACtD,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC;gBAC9B,CAAC,CAAC,SAAS,CAAC;YAEd,IAAI,WAAW,EAAE,CAAC;gBAChB,IAAI,CAAC,kBAAkB,CACrB,WAAW,EACX,UAAU,EACV,aAAa,CAAC,GAAG,CAAC,WAAW,CAAE,EAC/B,OAAO,CAAC,UAAU,CAAC,qBAAqB,CAAC,CAC1C,CAAC;gBACF,IAAI,CAAC,oBAAoB,CACvB,kBAAkB,CAAC,GAAG,CAAC,WAAW,CAAE,EACpC,UAAU,CACX,CAAC;gBACF,SAAS;YACX,CAAC;YAED,MAAM,GAAG,GAAmB,UAA4B,CAAC;YACzD,MAAM,QAAQ,GAAgB,IAAI,GAAG,EAAU,CAAC;YAChD,MAAM,aAAa,GAAkB,EAAE,CAAC;YAExC;;;eAGG;YACH,MAAM,qBAAqB,GAAY,OAAO,CAC5C,UAAU,CAAC,qBAAqB,CACjC,CAAC;YAEF,GAAG,CAAC,YAAY,GAAG,EAAE,CAAC;YACtB,GAAG,CAAC,gBAAgB,GAAG,CAAC,CAAC;YACzB,GAAG,CAAC,uBAAuB,GAAG,CAAC,CAAC;YAEhC;;;;eAIG;YACH,GAAG,CAAC,qBAAqB,GAAG,KAAK,CAAC;YAElC,aAAa,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;YACjC,kBAAkB,CAAC,GAAG,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;YAC3C,IAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,UAAU,EAAE,QAAQ,EAAE,qBAAqB,CAAC,CAAC;YAC1E,IAAI,CAAC,oBAAoB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;YAErD,IAAI,QAAQ,EAAE,CAAC;gBACb,cAAc,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;YACpC,CAAC;YAED,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACjB,CAAC;QAED,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,kBAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;QAC3D,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;;;;;;;OAWG;IACI,MAAM,CAAC,qBAAqB,CACjC,IAA2B,EAC3B,cAAiC;QAEjC,MAAM,WAAW,GAA0B,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;QAE5E,MAAM,gBAAgB,GAAgC,IAAI,GAAG,EAG1D,CAAC;QAEJ,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;YACrC,MAAM,QAAQ,GAAkB,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;YAE7D,IAAI,QAAQ,EAAE,CAAC;gBACb,gBAAgB,CAAC,GAAG,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;YAC7C,CAAC;QACH,CAAC;QAED,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,QAAQ,GAAkB,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;YACtD,MAAM,UAAU,GAA+B,QAAQ;gBACrD,CAAC,CAAC,gBAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC;gBAChC,CAAC,CAAC,SAAS,CAAC;YAEd,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,SAAS;YACX,CAAC;YAED,GAAG,CAAC,YAAY,GAAG,UAAU,CAAC,YAAY,CAAC;YAC3C,GAAG,CAAC,gBAAgB,GAAG,UAAU,CAAC,gBAAgB,CAAC;YACnD,GAAG,CAAC,uBAAuB,GAAG,UAAU,CAAC,uBAAuB,CAAC;YACjE,GAAG,CAAC,qBAAqB,GAAG,OAAO,CAAC,UAAU,CAAC,qBAAqB,CAAC,CAAC;QACxE,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;OAKG;IACI,MAAM,CAAC,kBAAkB,CAC9B,IAA2B;QAE3B,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAiB,EAAE,CAAiB,EAAE,EAAE;YAC7D,MAAM,KAAK,GAAW,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;YAC3D,MAAM,KAAK,GAAW,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;YAE3D,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,EAAE,CAAC;gBACrB,OAAO,CAAC,CAAC;YACX,CAAC;YAED,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,OAAO,CAAC,CAAC;YACX,CAAC;YAED,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,OAAO,CAAC,CAAC,CAAC;YACZ,CAAC;YAED,OAAO,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,MAAM,CAAC,kBAAkB,CAC/B,GAAmB,EACnB,UAAsB,EACtB,QAAqB,EACrB,qBAA8B;;QAE9B,IAAI,qBAAqB,EAAE,CAAC;YAC1B,GAAG,CAAC,qBAAqB,GAAG,IAAI,CAAC;QACnC,CAAC;aAAM,CAAC;YACN,GAAG,CAAC,uBAAuB,GAAG,GAAG,CAAC,uBAAuB,GAAG,CAAC,CAAC;QAChE,CAAC;QAED,MAAM,IAAI,GAAqB,UAAU,CAAC,IAAI,CAAC;QAE/C,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO;QACT,CAAC;QAED,MAAM,OAAO,GACX,CAAA,MAAA,UAAU,CAAC,MAAM,0CAAE,QAAQ,EAAE;aAC7B,MAAA,IAAI,CAAC,GAAG,0CAAE,QAAQ,EAAE,CAAA;aACpB,MAAA,IAAI,CAAC,IAAI,0CAAE,QAAQ,EAAE,CAAA;YACrB,EAAE,CAAC;QAEL,IAAI,CAAC,OAAO,IAAI,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;YACtC,OAAO;QACT,CAAC;QAED,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACtB,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC;IAEO,MAAM,CAAC,oBAAoB,CACjC,aAA4B,EAC5B,UAAsB;;QAEtB,MAAM,YAAY,GAAW,CAAA,MAAA,UAAU,CAAC,GAAG,0CAAE,QAAQ,EAAE,KAAI,EAAE,CAAC;QAE9D,IAAI,YAAY,EAAE,CAAC;YACjB,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACnC,CAAC;IACH,CAAC;IAEO,MAAM,CAAC,WAAW,CACxB,GAAmB,EACnB,aAA4B;QAE5B,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAO,EAAE,CAAO,EAAE,EAAE;;YACzC,OAAO,CAAC,CAAA,MAAA,CAAC,CAAC,IAAI,0CAAE,QAAQ,EAAE,KAAI,EAAE,CAAC;iBAC9B,WAAW,EAAE;iBACb,aAAa,CAAC,CAAC,CAAA,MAAA,CAAC,CAAC,IAAI,0CAAE,QAAQ,EAAE,KAAI,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;QAC7D,CAAC,CAAC,CAAC;QAEH,GAAG,CAAC,gBAAgB,GAAG,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC;QAE/C;;;;;;;;WAQG;QACH,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC7B,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,aAAa,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAE,CAAC;QAC1C,CAAC;IACH,CAAC;CACF"}