@terreno/admin-frontend 57.3.0 → 57.4.0

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 (334) hide show
  1. package/.ai/guidelines/core.md +5 -1
  2. package/README.md +4 -2
  3. package/dist/AdminConflictSheet.d.ts +16 -0
  4. package/dist/AdminConflictSheet.js +52 -0
  5. package/dist/AdminConflictSheet.js.map +1 -0
  6. package/dist/AdminHome.js +2 -1
  7. package/dist/AdminHome.js.map +1 -1
  8. package/dist/AdminMigrations.d.ts +3 -0
  9. package/dist/AdminMigrations.js +19 -0
  10. package/dist/AdminMigrations.js.map +1 -0
  11. package/dist/AdminMigrationsView.d.ts +10 -0
  12. package/dist/AdminMigrationsView.js +94 -0
  13. package/dist/AdminMigrationsView.js.map +1 -0
  14. package/dist/AdminModelForm.js +190 -44
  15. package/dist/AdminModelForm.js.map +1 -1
  16. package/dist/AdminModelTable.js +315 -27
  17. package/dist/AdminModelTable.js.map +1 -1
  18. package/dist/AdminObjectPicker.js +30 -6
  19. package/dist/AdminObjectPicker.js.map +1 -1
  20. package/dist/AdminProvider.d.ts +6 -2
  21. package/dist/AdminProvider.js +29 -7
  22. package/dist/AdminProvider.js.map +1 -1
  23. package/dist/AdminScreenRouter.d.ts +1 -1
  24. package/dist/AdminScreenRouter.js +4 -0
  25. package/dist/AdminScreenRouter.js.map +1 -1
  26. package/dist/AdminShell.d.ts +7 -3
  27. package/dist/AdminShell.js +53 -24
  28. package/dist/AdminShell.js.map +1 -1
  29. package/dist/AdminVersionConfig.js +21 -2
  30. package/dist/AdminVersionConfig.js.map +1 -1
  31. package/dist/AnnouncementEditor.d.ts +45 -0
  32. package/dist/AnnouncementEditor.js +370 -0
  33. package/dist/AnnouncementEditor.js.map +1 -0
  34. package/dist/AnnouncementList.d.ts +15 -0
  35. package/dist/AnnouncementList.js +97 -0
  36. package/dist/AnnouncementList.js.map +1 -0
  37. package/dist/AnnouncementOverview.d.ts +46 -0
  38. package/dist/AnnouncementOverview.js +101 -0
  39. package/dist/AnnouncementOverview.js.map +1 -0
  40. package/dist/AnnouncementOverviewScreenWidget.d.ts +4 -0
  41. package/dist/AnnouncementOverviewScreenWidget.js +28 -0
  42. package/dist/AnnouncementOverviewScreenWidget.js.map +1 -0
  43. package/dist/ConsentFormEditor.js +20 -3
  44. package/dist/ConsentFormEditor.js.map +1 -1
  45. package/dist/DocumentStorageBrowser.js +3 -87
  46. package/dist/DocumentStorageBrowser.js.map +1 -1
  47. package/dist/adminApiQueryParams.d.ts +5 -0
  48. package/dist/adminApiQueryParams.js +25 -0
  49. package/dist/adminApiQueryParams.js.map +1 -0
  50. package/dist/adminConflictSheetStack.d.ts +17 -0
  51. package/dist/adminConflictSheetStack.js +64 -0
  52. package/dist/adminConflictSheetStack.js.map +1 -0
  53. package/dist/adminContext.d.ts +3 -0
  54. package/dist/adminContext.js +6 -0
  55. package/dist/adminContext.js.map +1 -0
  56. package/dist/adminModelListQueryParams.d.ts +3 -2
  57. package/dist/adminModelListQueryParams.js +74 -27
  58. package/dist/adminModelListQueryParams.js.map +1 -1
  59. package/dist/adminRequest.d.ts +51 -0
  60. package/dist/adminRequest.js +161 -0
  61. package/dist/adminRequest.js.map +1 -0
  62. package/dist/adminRpc.d.ts +7 -0
  63. package/dist/adminRpc.js +21 -0
  64. package/dist/adminRpc.js.map +1 -0
  65. package/dist/adminShellNav.d.ts +17 -1
  66. package/dist/adminShellNav.js +41 -9
  67. package/dist/adminShellNav.js.map +1 -1
  68. package/dist/adminWindowRefresh.d.ts +31 -0
  69. package/dist/adminWindowRefresh.js +48 -0
  70. package/dist/adminWindowRefresh.js.map +1 -0
  71. package/dist/adminWindowedTable.d.ts +13 -0
  72. package/dist/adminWindowedTable.js +33 -0
  73. package/dist/adminWindowedTable.js.map +1 -0
  74. package/dist/comms/commsDashboardParams.d.ts +0 -4
  75. package/dist/comms/commsDashboardParams.js +1 -1
  76. package/dist/comms/commsDashboardParams.js.map +1 -1
  77. package/dist/comms/commsMessagePayload.d.ts +2 -1
  78. package/dist/comms/useCommsDashboardApi.d.ts +3 -3
  79. package/dist/comms/useCommsDashboardApi.js +41 -0
  80. package/dist/comms/useCommsDashboardApi.js.map +1 -1
  81. package/dist/index.d.ts +24 -2
  82. package/dist/index.js +23 -1
  83. package/dist/index.js.map +1 -1
  84. package/dist/isAuditLogModel.d.ts +2 -0
  85. package/dist/isAuditLogModel.js +8 -0
  86. package/dist/isAuditLogModel.js.map +1 -0
  87. package/dist/jobs/JobsDashboardScreen.d.ts +10 -0
  88. package/dist/jobs/JobsDashboardScreen.js +155 -0
  89. package/dist/jobs/JobsDashboardScreen.js.map +1 -0
  90. package/dist/jobs/JobsDashboardScreenWidget.d.ts +4 -0
  91. package/dist/jobs/JobsDashboardScreenWidget.js +11 -0
  92. package/dist/jobs/JobsDashboardScreenWidget.js.map +1 -0
  93. package/dist/jobs/JobsHomeWidget.d.ts +4 -0
  94. package/dist/jobs/JobsHomeWidget.js +21 -0
  95. package/dist/jobs/JobsHomeWidget.js.map +1 -0
  96. package/dist/jobs/JobsJobDetail.d.ts +8 -0
  97. package/dist/jobs/JobsJobDetail.js +78 -0
  98. package/dist/jobs/JobsJobDetail.js.map +1 -0
  99. package/dist/jobs/JobsStatusBadge.d.ts +5 -0
  100. package/dist/jobs/JobsStatusBadge.js +16 -0
  101. package/dist/jobs/JobsStatusBadge.js.map +1 -0
  102. package/dist/jobs/jobPayload.d.ts +62 -0
  103. package/dist/jobs/jobPayload.js +54 -0
  104. package/dist/jobs/jobPayload.js.map +1 -0
  105. package/dist/jobs/jobsDashboardParams.d.ts +11 -0
  106. package/dist/jobs/jobsDashboardParams.js +70 -0
  107. package/dist/jobs/jobsDashboardParams.js.map +1 -0
  108. package/dist/jobs/useJobsDashboardApi.d.ts +60 -0
  109. package/dist/jobs/useJobsDashboardApi.js +88 -0
  110. package/dist/jobs/useJobsDashboardApi.js.map +1 -0
  111. package/dist/jobs/useJobsDashboardUrlFilters.d.ts +5 -0
  112. package/dist/jobs/useJobsDashboardUrlFilters.js +16 -0
  113. package/dist/jobs/useJobsDashboardUrlFilters.js.map +1 -0
  114. package/dist/orgs/OrgDirectoryScreen.d.ts +16 -0
  115. package/dist/orgs/OrgDirectoryScreen.js +81 -0
  116. package/dist/orgs/OrgDirectoryScreen.js.map +1 -0
  117. package/dist/orgs/OrgMembersScreen.d.ts +9 -0
  118. package/dist/orgs/OrgMembersScreen.js +115 -0
  119. package/dist/orgs/OrgMembersScreen.js.map +1 -0
  120. package/dist/orgs/OrgSettingsScreen.d.ts +9 -0
  121. package/dist/orgs/OrgSettingsScreen.js +80 -0
  122. package/dist/orgs/OrgSettingsScreen.js.map +1 -0
  123. package/dist/orgs/OrgSwitcher.d.ts +8 -0
  124. package/dist/orgs/OrgSwitcher.js +58 -0
  125. package/dist/orgs/OrgSwitcher.js.map +1 -0
  126. package/dist/orgs/adminModelEndpoints.d.ts +18 -0
  127. package/dist/orgs/adminModelEndpoints.js +73 -0
  128. package/dist/orgs/adminModelEndpoints.js.map +1 -0
  129. package/dist/orgs/normalizeListData.d.ts +9 -0
  130. package/dist/orgs/normalizeListData.js +8 -0
  131. package/dist/orgs/normalizeListData.js.map +1 -0
  132. package/dist/orgs/organizationSettings.d.ts +17 -0
  133. package/dist/orgs/organizationSettings.js +6 -0
  134. package/dist/orgs/organizationSettings.js.map +1 -0
  135. package/dist/orgs/shouldSkipOrgScopedAdminQuery.d.ts +4 -0
  136. package/dist/orgs/shouldSkipOrgScopedAdminQuery.js +2 -0
  137. package/dist/orgs/shouldSkipOrgScopedAdminQuery.js.map +1 -0
  138. package/dist/orgs/sortOrganizations.d.ts +6 -0
  139. package/dist/orgs/sortOrganizations.js +9 -0
  140. package/dist/orgs/sortOrganizations.js.map +1 -0
  141. package/dist/orgs/useOrgContext.d.ts +20 -0
  142. package/dist/orgs/useOrgContext.js +57 -0
  143. package/dist/orgs/useOrgContext.js.map +1 -0
  144. package/dist/orgs/useOrganizationsApi.d.ts +14 -0
  145. package/dist/orgs/useOrganizationsApi.js +103 -0
  146. package/dist/orgs/useOrganizationsApi.js.map +1 -0
  147. package/dist/pdfUtils.d.ts +0 -2
  148. package/dist/pdfUtils.js +2 -2
  149. package/dist/pdfUtils.js.map +1 -1
  150. package/dist/types.d.ts +100 -4
  151. package/dist/types.js.map +1 -1
  152. package/dist/useAdminApi.js +7 -61
  153. package/dist/useAdminApi.js.map +1 -1
  154. package/dist/useAdminBackgroundTask.d.ts +1 -1
  155. package/dist/useAdminBackgroundTask.js +18 -3
  156. package/dist/useAdminBackgroundTask.js.map +1 -1
  157. package/dist/useAdminConfig.js +16 -1
  158. package/dist/useAdminConfig.js.map +1 -1
  159. package/dist/useAdminMigrations.d.ts +40 -0
  160. package/dist/useAdminMigrations.js +43 -0
  161. package/dist/useAdminMigrations.js.map +1 -0
  162. package/dist/useAdminRoles.d.ts +1 -0
  163. package/dist/useAdminRoles.js +34 -0
  164. package/dist/useAdminRoles.js.map +1 -1
  165. package/dist/useAdminRpc.d.ts +28 -0
  166. package/dist/useAdminRpc.js +128 -0
  167. package/dist/useAdminRpc.js.map +1 -0
  168. package/dist/useAdminScripts.js +51 -0
  169. package/dist/useAdminScripts.js.map +1 -1
  170. package/dist/useConfigurationApi.js +23 -0
  171. package/dist/useConfigurationApi.js.map +1 -1
  172. package/dist/useConsentHistory.js +9 -1
  173. package/dist/useConsentHistory.js.map +1 -1
  174. package/dist/useDocumentStorageApi.js +72 -0
  175. package/dist/useDocumentStorageApi.js.map +1 -1
  176. package/dist/widgets/AIRequestsScreenWidget.js +17 -7
  177. package/dist/widgets/AIRequestsScreenWidget.js.map +1 -1
  178. package/dist/widgets/ModelsGridWidget.js +10 -3
  179. package/dist/widgets/ModelsGridWidget.js.map +1 -1
  180. package/dist/widgets/RecentActivityWidget.js +11 -4
  181. package/dist/widgets/RecentActivityWidget.js.map +1 -1
  182. package/dist/widgets/builtInWidgets.js +5 -9
  183. package/dist/widgets/builtInWidgets.js.map +1 -1
  184. package/dist/widgets/homeWidgetUtils.d.ts +0 -1
  185. package/dist/widgets/homeWidgetUtils.js +0 -8
  186. package/dist/widgets/homeWidgetUtils.js.map +1 -1
  187. package/package.json +6 -4
  188. package/src/AdminActionMenu.test.tsx +167 -0
  189. package/src/AdminBreadcrumbs.test.tsx +21 -1
  190. package/src/AdminConflictSheet.test.tsx +173 -0
  191. package/src/AdminConflictSheet.tsx +102 -0
  192. package/src/AdminHome.test.tsx +10 -11
  193. package/src/AdminHome.tsx +2 -4
  194. package/src/AdminMigrations.tsx +45 -0
  195. package/src/AdminMigrationsView.tsx +225 -0
  196. package/src/{AdminModelForm.test.tsx → AdminModelForm.isolated.tsx} +461 -154
  197. package/src/AdminModelForm.orgSkip.test.tsx +81 -0
  198. package/src/AdminModelForm.tsx +227 -56
  199. package/src/AdminModelForm.updateDepth.test.tsx +427 -0
  200. package/src/AdminModelList.test.tsx +12 -2
  201. package/src/AdminModelTable.test.tsx +560 -57
  202. package/src/AdminModelTable.tsx +430 -73
  203. package/src/AdminModelTable.windowed.test.tsx +897 -0
  204. package/src/AdminObjectPicker.tsx +32 -6
  205. package/src/AdminPrimitiveArrayField.test.tsx +178 -0
  206. package/src/AdminProvider.test.tsx +213 -3
  207. package/src/AdminProvider.tsx +39 -7
  208. package/src/AdminRolesList.test.tsx +197 -0
  209. package/src/AdminScreenRouter.test.tsx +393 -36
  210. package/src/AdminScreenRouter.tsx +6 -1
  211. package/src/AdminScriptList.test.tsx +180 -0
  212. package/src/AdminShell.test.tsx +595 -1
  213. package/src/AdminShell.tsx +110 -22
  214. package/src/AdminVersionConfig.tsx +31 -3
  215. package/src/AnnouncementEditor.test.tsx +603 -0
  216. package/src/AnnouncementEditor.tsx +673 -0
  217. package/src/AnnouncementList.test.tsx +198 -0
  218. package/src/AnnouncementList.tsx +214 -0
  219. package/src/AnnouncementOverview.test.tsx +325 -0
  220. package/src/AnnouncementOverview.tsx +325 -0
  221. package/src/AnnouncementOverviewScreenWidget.test.tsx +69 -0
  222. package/src/AnnouncementOverviewScreenWidget.tsx +51 -0
  223. package/src/CheckboxListEditor.test.tsx +8 -1
  224. package/src/ConsentFormEditor.test.tsx +28 -29
  225. package/src/ConsentFormEditor.tsx +27 -3
  226. package/src/ConsentFormList.test.tsx +12 -11
  227. package/src/ConsentResponseViewer.test.tsx +10 -11
  228. package/src/DocumentStorageBrowser.tsx +2 -139
  229. package/src/adminApiQueryParams.ts +33 -0
  230. package/src/adminConflictSheetStack.ts +87 -0
  231. package/src/adminContext.ts +8 -0
  232. package/src/adminModelListQueryParams.test.ts +60 -1
  233. package/src/adminModelListQueryParams.ts +89 -30
  234. package/src/adminRequest.test.ts +216 -0
  235. package/src/adminRequest.ts +213 -0
  236. package/src/adminRpc.test.ts +18 -0
  237. package/src/adminRpc.ts +31 -0
  238. package/src/adminScriptsHarness.test.ts +21 -0
  239. package/src/adminShellNav.test.ts +72 -6
  240. package/src/adminShellNav.ts +55 -10
  241. package/src/adminWindowRefresh.test.ts +65 -0
  242. package/src/adminWindowRefresh.ts +76 -0
  243. package/src/adminWindowedTable.test.ts +90 -0
  244. package/src/adminWindowedTable.ts +55 -0
  245. package/src/comms/CommsDashboardScreen.test.tsx +2 -2
  246. package/src/comms/commsDashboardParams.ts +1 -1
  247. package/src/comms/commsMessagePayload.ts +1 -1
  248. package/src/comms/useCommsDashboardApi.tsx +57 -4
  249. package/src/index.tsx +79 -1
  250. package/src/isAuditLogModel.test.ts +14 -0
  251. package/src/isAuditLogModel.ts +11 -0
  252. package/src/isolated/AIRequestsScreenWidget.isolated.tsx +84 -0
  253. package/src/isolated/AdminFieldRenderer.isolated.tsx +160 -0
  254. package/src/isolated/AdminFilterDrawer.isolated.tsx +215 -2
  255. package/src/isolated/AdminFilterDrawerMobile.isolated.tsx +172 -0
  256. package/src/isolated/AdminHomeWidgets.isolated.tsx +73 -0
  257. package/src/isolated/AdminObjectPicker.isolated.tsx +7 -0
  258. package/src/isolated/AdminScriptList.isolated.tsx +124 -0
  259. package/src/isolated/AdminScriptRunModal.isolated.tsx +274 -4
  260. package/src/isolated/DocumentStorageBrowser.isolated.tsx +13 -0
  261. package/src/isolated/RecentActivityWidget.isolated.tsx +138 -0
  262. package/src/isolated/adminWidgets.isolated.tsx +190 -0
  263. package/src/isolated/generateConsentHistoryPdf.isolated.ts +251 -0
  264. package/src/isolated/generateConsentPdfMobile.isolated.ts +87 -0
  265. package/src/isolated/generateConsentPdfsMobile.isolated.ts +129 -0
  266. package/src/isolated/hooks.isolated.tsx +245 -3
  267. package/src/isolated/rpcDualRun.isolated.tsx +449 -0
  268. package/src/isolated/useAdminScripts.isolated.tsx +156 -0
  269. package/src/isolated/useJobsDashboardApi.isolated.tsx +60 -0
  270. package/src/jobs/JobsDashboardScreen.test.tsx +310 -0
  271. package/src/jobs/JobsDashboardScreen.tsx +461 -0
  272. package/src/jobs/JobsDashboardScreenWidget.test.tsx +83 -0
  273. package/src/jobs/JobsDashboardScreenWidget.tsx +20 -0
  274. package/src/jobs/JobsHomeWidget.test.tsx +92 -0
  275. package/src/jobs/JobsHomeWidget.tsx +53 -0
  276. package/src/jobs/JobsJobDetail.test.tsx +253 -0
  277. package/src/jobs/JobsJobDetail.tsx +278 -0
  278. package/src/jobs/JobsStatusBadge.tsx +16 -0
  279. package/src/jobs/jobPayload.ts +114 -0
  280. package/src/jobs/jobsDashboardParams.test.ts +80 -0
  281. package/src/jobs/jobsDashboardParams.ts +84 -0
  282. package/src/jobs/useJobsDashboardApi.test.tsx +152 -0
  283. package/src/jobs/useJobsDashboardApi.tsx +132 -0
  284. package/src/jobs/useJobsDashboardUrlFilters.test.tsx +31 -0
  285. package/src/jobs/useJobsDashboardUrlFilters.tsx +31 -0
  286. package/src/orgs/OrgDirectoryScreen.test.tsx +184 -0
  287. package/src/orgs/OrgDirectoryScreen.tsx +200 -0
  288. package/src/orgs/OrgManagementScreens.test.tsx +270 -0
  289. package/src/orgs/OrgMembersScreen.tsx +254 -0
  290. package/src/orgs/OrgSettingsScreen.tsx +145 -0
  291. package/src/orgs/OrgSwitcher.test.tsx +145 -0
  292. package/src/orgs/OrgSwitcher.tsx +101 -0
  293. package/src/orgs/adminModelEndpoints.test.ts +156 -0
  294. package/src/orgs/adminModelEndpoints.ts +96 -0
  295. package/src/orgs/normalizeListData.test.ts +17 -0
  296. package/src/orgs/normalizeListData.ts +13 -0
  297. package/src/orgs/orgSwitcherOscillation.test.tsx +107 -0
  298. package/src/orgs/organizationSettings.test.ts +11 -0
  299. package/src/orgs/organizationSettings.ts +22 -0
  300. package/src/orgs/shouldSkipOrgScopedAdminQuery.test.ts +22 -0
  301. package/src/orgs/shouldSkipOrgScopedAdminQuery.ts +7 -0
  302. package/src/orgs/sortOrganizations.test.ts +13 -0
  303. package/src/orgs/sortOrganizations.ts +14 -0
  304. package/src/orgs/useOrgContext.test.tsx +94 -0
  305. package/src/orgs/useOrgContext.tsx +90 -0
  306. package/src/orgs/useOrganizationsApi.test.tsx +165 -0
  307. package/src/orgs/useOrganizationsApi.ts +118 -0
  308. package/src/pdfUtils.test.ts +37 -0
  309. package/src/pdfUtils.ts +2 -2
  310. package/src/testing/useAdminApiDouble.ts +70 -0
  311. package/src/types.ts +92 -4
  312. package/src/useAdminApi.test.ts +88 -0
  313. package/src/useAdminApi.ts +7 -65
  314. package/src/useAdminBackgroundTask.ts +20 -4
  315. package/src/useAdminConfig.ts +20 -2
  316. package/src/useAdminMigrations.test.tsx +75 -0
  317. package/src/useAdminMigrations.ts +77 -0
  318. package/src/useAdminRoles.test.ts +28 -0
  319. package/src/useAdminRoles.ts +40 -0
  320. package/src/useAdminRpc.test.tsx +250 -0
  321. package/src/useAdminRpc.ts +173 -0
  322. package/src/useAdminScripts.ts +67 -0
  323. package/src/useConfigurationApi.ts +24 -0
  324. package/src/useConsentHistory.ts +15 -2
  325. package/src/useDocumentStorageApi.ts +77 -0
  326. package/src/widgets/AIRequestsScreenWidget.test.tsx +154 -0
  327. package/src/widgets/AIRequestsScreenWidget.tsx +21 -7
  328. package/src/widgets/ModelsGridWidget.test.tsx +91 -0
  329. package/src/widgets/ModelsGridWidget.tsx +11 -1
  330. package/src/widgets/RecentActivityWidget.tsx +10 -3
  331. package/src/widgets/builtInFieldWidgets.test.tsx +166 -0
  332. package/src/widgets/builtInWidgets.ts +6 -0
  333. package/src/widgets/homeWidgetUtils.ts +0 -9
  334. package/src/widgets/pluginWidgets.test.tsx +10 -1
@@ -2,7 +2,9 @@ import { jsx as _jsx } from "react/jsx-runtime";
2
2
  import { AIRequestExplorer } from "@terreno/ui";
3
3
  import { useCallback, useMemo, useState } from "react";
4
4
  import { AdminScreenPage } from "../AdminScreenPage";
5
+ import { withQueryString } from "../adminRpc";
5
6
  import { asDynamicHookApi } from "../dynamicHookApi";
7
+ import { useAdminRpc, useAdminRpcQuery } from "../useAdminRpc";
6
8
  const EXPLORER_LIMIT = 20;
7
9
  const AI_REQUESTS_ENDPOINT_KEY = "adminAiRequestsExplorer";
8
10
  export const AIRequestsScreenWidget = ({ api, routeBase }) => {
@@ -11,6 +13,19 @@ export const AIRequestsScreenWidget = ({ api, routeBase }) => {
11
13
  const [requestTypeFilter, setRequestTypeFilter] = useState([]);
12
14
  const [startDate, setStartDate] = useState("");
13
15
  const [endDate, setEndDate] = useState("");
16
+ const explorerParams = {
17
+ endDate: endDate || undefined,
18
+ limit: EXPLORER_LIMIT,
19
+ page,
20
+ requestType: requestTypeFilter.length > 0 ? requestTypeFilter.join(",") : undefined,
21
+ startDate: startDate || undefined,
22
+ };
23
+ const rpc = useAdminRpc();
24
+ const fetchState = useAdminRpcQuery({
25
+ rpc,
26
+ skip: !rpc,
27
+ url: withQueryString({ params: explorerParams, url: "/aiRequestsExplorer" }),
28
+ });
14
29
  const enhancedApi = useMemo(() => api.injectEndpoints({
15
30
  endpoints: (build) => ({
16
31
  [AI_REQUESTS_ENDPOINT_KEY]: build.query({
@@ -24,13 +39,8 @@ export const AIRequestsScreenWidget = ({ api, routeBase }) => {
24
39
  overrideExisting: true,
25
40
  }), [api]);
26
41
  const useExplorerQuery = asDynamicHookApi(enhancedApi).useAdminAiRequestsExplorerQuery;
27
- const { data, isLoading } = useExplorerQuery({
28
- endDate: endDate || undefined,
29
- limit: EXPLORER_LIMIT,
30
- page,
31
- requestType: requestTypeFilter.length > 0 ? requestTypeFilter.join(",") : undefined,
32
- startDate: startDate || undefined,
33
- });
42
+ const rtk = useExplorerQuery(explorerParams, { skip: Boolean(rpc) });
43
+ const { data, isLoading } = rpc ? fetchState : rtk;
34
44
  const handlePageChange = useCallback((nextPage) => {
35
45
  setPage(nextPage);
36
46
  }, []);
@@ -1 +1 @@
1
- {"version":3,"file":"AIRequestsScreenWidget.js","sourceRoot":"","sources":["../../src/widgets/AIRequestsScreenWidget.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"AIRequestsScreenWidget.js","sourceRoot":"","sources":["../../src/widgets/AIRequestsScreenWidget.tsx"],"names":[],"mappings":"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"}
@@ -2,14 +2,21 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
2
2
  import { Box, Card, Heading, IconButton, Spinner, Text } from "@terreno/ui";
3
3
  import { router } from "expo-router";
4
4
  import { useCallback } from "react";
5
+ import { shouldSkipOrgScopedAdminQuery } from "../orgs/shouldSkipOrgScopedAdminQuery";
6
+ import { useOptionalOrgContext } from "../orgs/useOrgContext";
5
7
  import { useAdminApi } from "../useAdminApi";
6
8
  const ModelGridCard = ({ api, model, routeBase }) => {
7
- var _a;
9
+ var _a, _b;
10
+ const organizationId = (_a = useOptionalOrgContext()) === null || _a === void 0 ? void 0 : _a.organizationId;
11
+ const skipOrgScopedQuery = shouldSkipOrgScopedAdminQuery({
12
+ organizationId,
13
+ organizationScoped: model.organizationScoped,
14
+ });
8
15
  const { useListQuery } = useAdminApi(api, model.routePath, model.name);
9
- const { data, isLoading } = useListQuery({ limit: 1, page: 1 }, { skip: !model.routePath });
16
+ const { data, isLoading } = useListQuery({ limit: 1, page: 1 }, { skip: !model.routePath || skipOrgScopedQuery });
10
17
  const total = data === null || data === void 0 ? void 0 : data.total;
11
18
  const fieldCount = Object.keys(model.fields).length;
12
- const createEnabled = ((_a = model.permissions) === null || _a === void 0 ? void 0 : _a.create) !== false;
19
+ const createEnabled = ((_b = model.permissions) === null || _b === void 0 ? void 0 : _b.create) !== false;
13
20
  const onOpen = useCallback(() => {
14
21
  const prefix = routeBase.endsWith("/") ? routeBase.slice(0, -1) : routeBase;
15
22
  const href = `${prefix}/${model.name}`;
@@ -1 +1 @@
1
- {"version":3,"file":"ModelsGridWidget.js","sourceRoot":"","sources":["../../src/widgets/ModelsGridWidget.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ModelsGridWidget.js","sourceRoot":"","sources":["../../src/widgets/ModelsGridWidget.tsx"],"names":[],"mappings":"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"}
@@ -1,17 +1,24 @@
1
1
  import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
2
2
  import { Box, Card, Heading, printDateAndTime, Spinner, Text } from "@terreno/ui";
3
3
  import { useMemo } from "react";
4
+ import { shouldSkipOrgScopedAdminQuery } from "../orgs/shouldSkipOrgScopedAdminQuery";
5
+ import { useOptionalOrgContext } from "../orgs/useOrgContext";
4
6
  import { useAdminApi } from "../useAdminApi";
5
7
  export const RecentActivityWidget = ({ api, auditModel }) => {
6
- var _a, _b;
7
- const { useListQuery } = useAdminApi(api, (_a = auditModel === null || auditModel === void 0 ? void 0 : auditModel.routePath) !== null && _a !== void 0 ? _a : "", (_b = auditModel === null || auditModel === void 0 ? void 0 : auditModel.name) !== null && _b !== void 0 ? _b : "");
8
- const { data, isLoading, isError } = useListQuery({ limit: 8, page: 1, sort: "-createdAt" }, { skip: !(auditModel === null || auditModel === void 0 ? void 0 : auditModel.routePath) });
8
+ var _a, _b, _c, _d;
9
+ const organizationId = (_a = useOptionalOrgContext()) === null || _a === void 0 ? void 0 : _a.organizationId;
10
+ const skipOrgScopedQuery = shouldSkipOrgScopedAdminQuery({
11
+ organizationId,
12
+ organizationScoped: auditModel === null || auditModel === void 0 ? void 0 : auditModel.organizationScoped,
13
+ });
14
+ const { useListQuery } = useAdminApi(api, (_b = auditModel === null || auditModel === void 0 ? void 0 : auditModel.routePath) !== null && _b !== void 0 ? _b : "", (_c = auditModel === null || auditModel === void 0 ? void 0 : auditModel.name) !== null && _c !== void 0 ? _c : "");
15
+ const { data, isLoading, isError } = useListQuery({ limit: 8, page: 1, sort: (_d = auditModel === null || auditModel === void 0 ? void 0 : auditModel.defaultSort) !== null && _d !== void 0 ? _d : "-created" }, { skip: !(auditModel === null || auditModel === void 0 ? void 0 : auditModel.routePath) || skipOrgScopedQuery });
9
16
  const rows = useMemo(() => {
10
17
  const body = data;
11
18
  return Array.isArray(body === null || body === void 0 ? void 0 : body.data) ? body.data : [];
12
19
  }, [data]);
13
20
  if (!auditModel) {
14
- return (_jsxs(Card, { padding: 4, testID: "admin-home-widget-recentActivity", children: [_jsx(Heading, { size: "sm", children: "Recent activity" }), _jsx(Box, { marginTop: 2, children: _jsx(Text, { color: "secondaryDark", size: "sm", children: "Register an AdminAuditLog model to show recent mutations here." }) })] }));
21
+ return (_jsxs(Card, { padding: 4, testID: "admin-home-widget-recentActivity", children: [_jsx(Heading, { size: "sm", children: "Recent activity" }), _jsx(Box, { marginTop: 2, children: _jsx(Text, { color: "secondaryDark", size: "sm", children: "Register AuditApp (or an AdminAuditLog model) to show recent mutations here." }) })] }));
15
22
  }
16
23
  return (_jsxs(Card, { padding: 4, testID: "admin-home-widget-recentActivity", children: [_jsx(Heading, { size: "sm", children: "Recent activity" }), isLoading ? (_jsx(Box, { alignItems: "center", marginTop: 3, padding: 2, children: _jsx(Spinner, {}) })) : null, isError ? (_jsx(Box, { marginTop: 2, children: _jsx(Text, { color: "error", size: "sm", children: "Could not load audit entries." }) })) : null, !isLoading && !isError && rows.length === 0 ? (_jsx(Box, { marginTop: 2, children: _jsx(Text, { color: "secondaryDark", size: "sm", children: "No audit entries yet." }) })) : null, !isLoading && !isError && rows.length > 0 ? (_jsx(Box, { gap: 2, marginTop: 2, children: rows.map((row) => {
17
24
  var _a, _b, _c, _d, _e, _f, _g;
@@ -1 +1 @@
1
- {"version":3,"file":"RecentActivityWidget.js","sourceRoot":"","sources":["../../src/widgets/RecentActivityWidget.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAC,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,EAAE,OAAO,EAAE,IAAI,EAAC,MAAM,aAAa,CAAC;AAChF,OAAc,EAAC,OAAO,EAAC,MAAM,OAAO,CAAC;AAErC,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAE3C,MAAM,CAAC,MAAM,oBAAoB,GAAmC,CAAC,EAAC,GAAG,EAAE,UAAU,EAAC,EAAE,EAAE;;IACxF,MAAM,EAAC,YAAY,EAAC,GAAG,WAAW,CAAC,GAAG,EAAE,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,SAAS,mCAAI,EAAE,EAAE,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,IAAI,mCAAI,EAAE,CAAC,CAAC;IAC7F,MAAM,EAAC,IAAI,EAAE,SAAS,EAAE,OAAO,EAAC,GAAG,YAAY,CAC7C,EAAC,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,YAAY,EAAC,EACvC,EAAC,IAAI,EAAE,CAAC,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,SAAS,CAAA,EAAC,CAC/B,CAAC;IAEF,MAAM,IAAI,GAAG,OAAO,CAAC,GAAsC,EAAE;QAC3D,MAAM,IAAI,GAAG,IAA8D,CAAC;QAC5E,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;IACpD,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IAEX,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,OAAO,CACL,MAAC,IAAI,IAAC,OAAO,EAAE,CAAC,EAAE,MAAM,EAAC,kCAAkC,aACzD,KAAC,OAAO,IAAC,IAAI,EAAC,IAAI,gCAA0B,EAC5C,KAAC,GAAG,IAAC,SAAS,EAAE,CAAC,YACf,KAAC,IAAI,IAAC,KAAK,EAAC,eAAe,EAAC,IAAI,EAAC,IAAI,+EAE9B,GACH,IACD,CACR,CAAC;IACJ,CAAC;IAED,OAAO,CACL,MAAC,IAAI,IAAC,OAAO,EAAE,CAAC,EAAE,MAAM,EAAC,kCAAkC,aACzD,KAAC,OAAO,IAAC,IAAI,EAAC,IAAI,gCAA0B,EAC3C,SAAS,CAAC,CAAC,CAAC,CACX,KAAC,GAAG,IAAC,UAAU,EAAC,QAAQ,EAAC,SAAS,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,YAC/C,KAAC,OAAO,KAAG,GACP,CACP,CAAC,CAAC,CAAC,IAAI,EACP,OAAO,CAAC,CAAC,CAAC,CACT,KAAC,GAAG,IAAC,SAAS,EAAE,CAAC,YACf,KAAC,IAAI,IAAC,KAAK,EAAC,OAAO,EAAC,IAAI,EAAC,IAAI,8CAEtB,GACH,CACP,CAAC,CAAC,CAAC,IAAI,EACP,CAAC,SAAS,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAC7C,KAAC,GAAG,IAAC,SAAS,EAAE,CAAC,YACf,KAAC,IAAI,IAAC,KAAK,EAAC,eAAe,EAAC,IAAI,EAAC,IAAI,sCAE9B,GACH,CACP,CAAC,CAAC,CAAC,IAAI,EACP,CAAC,SAAS,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAC3C,KAAC,GAAG,IAAC,GAAG,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,YACtB,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;;oBAChB,MAAM,EAAE,GAAG,MAAM,CAAC,MAAA,MAAA,GAAG,CAAC,GAAG,mCAAI,GAAG,CAAC,EAAE,mCAAI,EAAE,CAAC,CAAC;oBAC3C,MAAM,IAAI,GAAG,MAAM,CAAC,MAAA,GAAG,CAAC,IAAI,mCAAI,EAAE,CAAC,CAAC;oBACpC,MAAM,SAAS,GAAG,MAAM,CAAC,MAAA,GAAG,CAAC,SAAS,mCAAI,EAAE,CAAC,CAAC;oBAC9C,MAAM,KAAK,GAAG,MAAM,CAAC,MAAA,MAAA,GAAG,CAAC,WAAW,mCAAI,GAAG,CAAC,QAAQ,mCAAI,EAAE,CAAC,CAAC;oBAC5D,MAAM,OAAO,GAAG,MAAA,GAAG,CAAC,SAAS,mCAAI,GAAG,CAAC,OAAO,CAAC;oBAC7C,MAAM,IAAI,GACR,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,gBAAgB,CAAC,OAAO,EAAE,EAAC,YAAY,EAAE,OAAO,EAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;oBACxF,OAAO,CACL,MAAC,GAAG,IAAC,MAAM,EAAC,SAAS,EAAgC,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAC,IAAI,aAC5E,MAAC,IAAI,IAAC,IAAI,EAAC,IAAI,aACb,KAAC,IAAI,IAAC,IAAI,kBAAE,IAAI,GAAQ,OAAE,SAAS,EAClC,KAAK,CAAC,CAAC,CAAC,MAAM,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,IACtB,EACN,IAAI,CAAC,CAAC,CAAC,CACN,KAAC,IAAI,IAAC,KAAK,EAAC,eAAe,EAAC,IAAI,EAAC,IAAI,YAClC,IAAI,GACA,CACR,CAAC,CAAC,CAAC,IAAI,KATiB,EAAE,IAAI,GAAG,IAAI,IAAI,KAAK,EAAE,CAU7C,CACP,CAAC;gBACJ,CAAC,CAAC,GACE,CACP,CAAC,CAAC,CAAC,IAAI,IACH,CACR,CAAC;AACJ,CAAC,CAAC"}
1
+ {"version":3,"file":"RecentActivityWidget.js","sourceRoot":"","sources":["../../src/widgets/RecentActivityWidget.tsx"],"names":[],"mappings":"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"}
@@ -1,4 +1,7 @@
1
+ import { ANNOUNCEMENTS_ADMIN_WIDGETS } from "../AnnouncementOverviewScreenWidget";
1
2
  import { COMMS_ADMIN_WIDGETS } from "../comms/CommsDashboardScreenWidget";
3
+ import { JOBS_ADMIN_WIDGETS } from "../jobs/JobsDashboardScreenWidget";
4
+ import { JOBS_HOME_WIDGETS } from "../jobs/JobsHomeWidget";
2
5
  import { AI_ADMIN_WIDGETS } from "./AIRequestsScreenWidget";
3
6
  import { MarkdownFieldWidget, TextareaFieldWidget } from "./builtInFieldWidgets";
4
7
  import { CONSENT_ADMIN_WIDGETS } from "./consentWidgets";
@@ -9,15 +12,8 @@ import { RecentActivityWidget } from "./RecentActivityWidget";
9
12
  import { ScriptRunnerWidget } from "./ScriptRunnerWidget";
10
13
  import { VersionConfigScreenWidget } from "./VersionConfigScreenWidget";
11
14
  import { VersionConfigWidget } from "./VersionConfigWidget";
12
- export const BUILT_IN_HOME_WIDGETS = {
13
- "feature-flags-overrides": FeatureFlagsOverridesWidget,
14
- modelStats: ModelsGridWidget,
15
- modelsGrid: ModelsGridWidget,
16
- recentActivity: RecentActivityWidget,
17
- scriptRunner: ScriptRunnerWidget,
18
- versionConfig: VersionConfigWidget,
19
- };
20
- export const BUILT_IN_SCREEN_WIDGETS = Object.assign(Object.assign(Object.assign(Object.assign({}, AI_ADMIN_WIDGETS), COMMS_ADMIN_WIDGETS), DOCUMENT_STORAGE_ADMIN_WIDGETS), { "version-config": VersionConfigScreenWidget });
15
+ export const BUILT_IN_HOME_WIDGETS = Object.assign(Object.assign({ "feature-flags-overrides": FeatureFlagsOverridesWidget }, JOBS_HOME_WIDGETS), { modelStats: ModelsGridWidget, modelsGrid: ModelsGridWidget, recentActivity: RecentActivityWidget, scriptRunner: ScriptRunnerWidget, versionConfig: VersionConfigWidget });
16
+ export const BUILT_IN_SCREEN_WIDGETS = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, AI_ADMIN_WIDGETS), ANNOUNCEMENTS_ADMIN_WIDGETS), COMMS_ADMIN_WIDGETS), DOCUMENT_STORAGE_ADMIN_WIDGETS), JOBS_ADMIN_WIDGETS), { "version-config": VersionConfigScreenWidget });
21
17
  export const BUILT_IN_FIELD_WIDGETS = Object.assign(Object.assign({}, CONSENT_ADMIN_WIDGETS), { markdown: MarkdownFieldWidget, textarea: TextareaFieldWidget });
22
18
  export const BUILT_IN_WIDGET_REGISTRY = {
23
19
  fields: BUILT_IN_FIELD_WIDGETS,
@@ -1 +1 @@
1
- {"version":3,"file":"builtInWidgets.js","sourceRoot":"","sources":["../../src/widgets/builtInWidgets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,mBAAmB,EAAC,MAAM,qCAAqC,CAAC;AAOxE,OAAO,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAC,mBAAmB,EAAE,mBAAmB,EAAC,MAAM,uBAAuB,CAAC;AAC/E,OAAO,EAAC,qBAAqB,EAAC,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAC,8BAA8B,EAAC,MAAM,yBAAyB,CAAC;AACvE,OAAO,EAAC,2BAA2B,EAAC,MAAM,+BAA+B,CAAC;AAC1E,OAAO,EAAC,gBAAgB,EAAC,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAC,oBAAoB,EAAC,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAC,kBAAkB,EAAC,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAC,yBAAyB,EAAC,MAAM,6BAA6B,CAAC;AACtE,OAAO,EAAC,mBAAmB,EAAC,MAAM,uBAAuB,CAAC;AAE1D,MAAM,CAAC,MAAM,qBAAqB,GAAwC;IACxE,yBAAyB,EAAE,2BAA2B;IACtD,UAAU,EAAE,gBAAgB;IAC5B,UAAU,EAAE,gBAAgB;IAC5B,cAAc,EAAE,oBAAoB;IACpC,YAAY,EAAE,kBAAkB;IAChC,aAAa,EAAE,mBAAmB;CACnC,CAAC;AAEF,MAAM,CAAC,MAAM,uBAAuB,+DAC/B,gBAAgB,GAChB,mBAAmB,GACnB,8BAA8B,KACjC,gBAAgB,EAAE,yBAAyB,GAC5C,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,mCAC9B,qBAAqB,KACxB,QAAQ,EAAE,mBAAmB,EAC7B,QAAQ,EAAE,mBAAmB,GAC9B,CAAC;AAEF,MAAM,CAAC,MAAM,wBAAwB,GAAwB;IAC3D,MAAM,EAAE,sBAAsB;IAC9B,IAAI,EAAE,qBAAqB;IAC3B,OAAO,EAAE,uBAAuB;CACjC,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CACjC,WAA0C,EACrB,EAAE,CAAC,CAAC;IACzB,MAAM,kCAAM,sBAAsB,GAAK,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,MAAM,CAAC;IAC3D,IAAI,kCAAM,qBAAqB,GAAK,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,IAAI,CAAC;IACtD,OAAO,kCAAM,uBAAuB,GAAK,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,OAAO,CAAC;CAC/D,CAAC,CAAC"}
1
+ {"version":3,"file":"builtInWidgets.js","sourceRoot":"","sources":["../../src/widgets/builtInWidgets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,2BAA2B,EAAC,MAAM,qCAAqC,CAAC;AAChF,OAAO,EAAC,mBAAmB,EAAC,MAAM,qCAAqC,CAAC;AACxE,OAAO,EAAC,kBAAkB,EAAC,MAAM,mCAAmC,CAAC;AACrE,OAAO,EAAC,iBAAiB,EAAC,MAAM,wBAAwB,CAAC;AAOzD,OAAO,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAC,mBAAmB,EAAE,mBAAmB,EAAC,MAAM,uBAAuB,CAAC;AAC/E,OAAO,EAAC,qBAAqB,EAAC,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAC,8BAA8B,EAAC,MAAM,yBAAyB,CAAC;AACvE,OAAO,EAAC,2BAA2B,EAAC,MAAM,+BAA+B,CAAC;AAC1E,OAAO,EAAC,gBAAgB,EAAC,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAC,oBAAoB,EAAC,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAC,kBAAkB,EAAC,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAC,yBAAyB,EAAC,MAAM,6BAA6B,CAAC;AACtE,OAAO,EAAC,mBAAmB,EAAC,MAAM,uBAAuB,CAAC;AAE1D,MAAM,CAAC,MAAM,qBAAqB,iCAChC,yBAAyB,EAAE,2BAA2B,IACnD,iBAAiB,KACpB,UAAU,EAAE,gBAAgB,EAC5B,UAAU,EAAE,gBAAgB,EAC5B,cAAc,EAAE,oBAAoB,EACpC,YAAY,EAAE,kBAAkB,EAChC,aAAa,EAAE,mBAAmB,GACnC,CAAC;AAEF,MAAM,CAAC,MAAM,uBAAuB,2FAC/B,gBAAgB,GAChB,2BAA2B,GAC3B,mBAAmB,GACnB,8BAA8B,GAC9B,kBAAkB,KACrB,gBAAgB,EAAE,yBAAyB,GAC5C,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,mCAC9B,qBAAqB,KACxB,QAAQ,EAAE,mBAAmB,EAC7B,QAAQ,EAAE,mBAAmB,GAC9B,CAAC;AAEF,MAAM,CAAC,MAAM,wBAAwB,GAAwB;IAC3D,MAAM,EAAE,sBAAsB;IAC9B,IAAI,EAAE,qBAAqB;IAC3B,OAAO,EAAE,uBAAuB;CACjC,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CACjC,WAA0C,EACrB,EAAE,CAAC,CAAC;IACzB,MAAM,kCAAM,sBAAsB,GAAK,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,MAAM,CAAC;IAC3D,IAAI,kCAAM,qBAAqB,GAAK,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,IAAI,CAAC;IACtD,OAAO,kCAAM,uBAAuB,GAAK,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,OAAO,CAAC;CAC/D,CAAC,CAAC"}
@@ -1,3 +1,2 @@
1
- export declare const BUILTIN_HOME_WIDGET_IDS: Set<string>;
2
1
  export declare const normalizeWidgetIds: (ids: string[] | undefined) => string[];
3
2
  export declare const normalizeSidebarWidgets: (ids: string[] | undefined) => string[];
@@ -1,11 +1,3 @@
1
- export const BUILTIN_HOME_WIDGET_IDS = new Set([
2
- "modelStats",
3
- "modelsGrid",
4
- "feature-flags-overrides",
5
- "versionConfig",
6
- "scriptRunner",
7
- "recentActivity",
8
- ]);
9
1
  export const normalizeWidgetIds = (ids) => {
10
2
  if (!(ids === null || ids === void 0 ? void 0 : ids.length)) {
11
3
  return [];
@@ -1 +1 @@
1
- {"version":3,"file":"homeWidgetUtils.js","sourceRoot":"","sources":["../../src/widgets/homeWidgetUtils.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,uBAAuB,GAAG,IAAI,GAAG,CAAC;IAC7C,YAAY;IACZ,YAAY;IACZ,yBAAyB;IACzB,eAAe;IACf,cAAc;IACd,gBAAgB;CACjB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,GAAyB,EAAY,EAAE;IACxE,IAAI,CAAC,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,MAAM,CAAA,EAAE,CAAC;QACjB,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,GAAG,GAAa,EAAE,CAAC;IACzB,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC;QACrB,MAAM,UAAU,GAAG,EAAE,KAAK,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3D,IAAI,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;YACzB,SAAS;QACX,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACrB,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACvB,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,GAAyB,EAAY,EAAE;IAC7E,MAAM,UAAU,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC;IAC3C,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;QACvB,OAAO,UAAU,CAAC;IACpB,CAAC;IACD,MAAM,IAAI,GAAG,gBAAgB,CAAC;IAC9B,MAAM,OAAO,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,KAAK,IAAI,CAAC,CAAC;IACvD,IAAI,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QAC9B,OAAO,CAAC,GAAG,OAAO,EAAE,IAAI,CAAC,CAAC;IAC5B,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC"}
1
+ {"version":3,"file":"homeWidgetUtils.js","sourceRoot":"","sources":["../../src/widgets/homeWidgetUtils.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,GAAyB,EAAY,EAAE;IACxE,IAAI,CAAC,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,MAAM,CAAA,EAAE,CAAC;QACjB,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,GAAG,GAAa,EAAE,CAAC;IACzB,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC;QACrB,MAAM,UAAU,GAAG,EAAE,KAAK,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3D,IAAI,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;YACzB,SAAS;QACX,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACrB,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACvB,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,GAAyB,EAAY,EAAE;IAC7E,MAAM,UAAU,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC;IAC3C,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;QACvB,OAAO,UAAU,CAAC;IACpB,CAAC;IACD,MAAM,IAAI,GAAG,gBAAgB,CAAC;IAC9B,MAAM,OAAO,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,KAAK,IAAI,CAAC,CAAC;IACvD,IAAI,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QAC9B,OAAO,CAAC,GAAG,OAAO,EAAE,IAAI,CAAC,CAAC;IAC5B,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC"}
package/package.json CHANGED
@@ -3,11 +3,12 @@
3
3
  "url": "https://github.com/FlourishHealth/terreno/issues"
4
4
  },
5
5
  "dependencies": {
6
- "@terreno/ui": "57.3.0",
6
+ "@terreno/ui": "57.4.0",
7
7
  "expo-router": "~57.0.14",
8
8
  "jspdf": "^4.2.0",
9
9
  "lodash": "^4.18.1",
10
10
  "luxon": "^3.7.2",
11
+ "qs": "^6.15.0",
11
12
  "react-native": "0.86.2",
12
13
  "react-native-safe-area-context": "~5.7.0"
13
14
  },
@@ -18,6 +19,7 @@
18
19
  "@testing-library/react-native": "^13.2.0",
19
20
  "@types/lodash": "^4.17.17",
20
21
  "@types/luxon": "^3.7.1",
22
+ "@types/qs": "^6.14.0",
21
23
  "@types/react": "~19.2.14",
22
24
  "react": "19.2.3",
23
25
  "react-redux": "^9.2.0",
@@ -64,11 +66,11 @@
64
66
  "lint": "biome check .",
65
67
  "lint:fix": "biome check --write .",
66
68
  "lint:unsafefix": "biome check --write --unsafe .",
67
- "test": "bun test && for f in ./src/isolated/*.isolated.tsx ./src/isolated/*.isolated.ts; do bun test \"$f\" || exit 1; done",
68
- "test:agent": "for f in ./src/*.test.ts ./src/*.test.tsx ./src/**/*.test.ts ./src/**/*.test.tsx ./src/isolated/*.isolated.tsx ./src/isolated/*.isolated.ts; do if [ -f \"$f\" ]; then AGENT=1 bun test --only-failures \"$f\" || exit 1; fi; done",
69
+ "test": "bash scripts/run-tests.sh",
70
+ "test:agent": "AGENT=1 bash scripts/run-tests.sh agent",
69
71
  "test:ci": "bun run test",
70
72
  "test:coverage": "bun run ../scripts/check-coverage.ts"
71
73
  },
72
74
  "types": "dist/index.d.ts",
73
- "version": "57.3.0"
75
+ "version": "57.4.0"
74
76
  }
@@ -1,10 +1,16 @@
1
1
  import {beforeEach, describe, expect, it, mock} from "bun:test";
2
2
  import {act} from "@testing-library/react-native";
3
+ import {assert} from "chai";
3
4
  import React from "react";
4
5
  import type {ReactTestInstance} from "react-test-renderer";
5
6
  import {renderWithTheme} from "../../ui/src/test-utils";
6
7
  import {AdminActionMenu} from "./AdminActionMenu";
7
8
 
9
+ const findSelect = (root: {
10
+ findAll: (fn: (node: ReactTestInstance) => boolean) => ReactTestInstance[];
11
+ }): ReactTestInstance | undefined =>
12
+ root.findAll((node: ReactTestInstance) => node.props?.testID === "admin-action-menu")[0];
13
+
8
14
  describe("AdminActionMenu", () => {
9
15
  beforeEach(() => {
10
16
  mock.restore();
@@ -75,4 +81,165 @@ describe("AdminActionMenu", () => {
75
81
  );
76
82
  expect(toJSON()).toBeNull();
77
83
  });
84
+
85
+ it("runs actions without confirmation even when onRunAction rejects", async () => {
86
+ const onRunAction = mock(() => Promise.reject(new Error("network")));
87
+ const {UNSAFE_root} = renderWithTheme(
88
+ <AdminActionMenu
89
+ actions={[{id: "archive", label: "Archive"}]}
90
+ onRunAction={onRunAction}
91
+ selectedCount={3}
92
+ />
93
+ );
94
+
95
+ const select = findSelect(UNSAFE_root);
96
+ await act(async () => {
97
+ select?.props?.onChange("archive");
98
+ await new Promise((resolve) => setTimeout(resolve, 0));
99
+ });
100
+ expect(onRunAction).toHaveBeenCalledWith("archive");
101
+ assert.equal(select?.props?.value, "__none__");
102
+ });
103
+
104
+ it("closes the confirm modal after a successful bulk action", async () => {
105
+ const onRunAction = mock(async () => undefined);
106
+ const {UNSAFE_root} = renderWithTheme(
107
+ <AdminActionMenu
108
+ actions={[{confirm: "Archive selected rows?", id: "archive", label: "Archive"}]}
109
+ onRunAction={onRunAction}
110
+ selectedCount={2}
111
+ />
112
+ );
113
+
114
+ const select = findSelect(UNSAFE_root);
115
+ await act(async () => {
116
+ select?.props?.onChange("archive");
117
+ });
118
+ const confirm = UNSAFE_root.findAll(
119
+ (node: ReactTestInstance) => node.props?.testID === "admin-action-confirm-archive"
120
+ )[0];
121
+ assert.isTrue(confirm?.props?.visible);
122
+
123
+ await act(async () => {
124
+ await confirm?.props?.primaryButtonOnClick();
125
+ });
126
+ expect(onRunAction).toHaveBeenCalledWith("archive");
127
+ const openConfirms = UNSAFE_root.findAll(
128
+ (node: ReactTestInstance) =>
129
+ node.props?.testID === "admin-action-confirm-archive" && node.props?.visible === true
130
+ );
131
+ assert.equal(openConfirms.length, 0);
132
+ });
133
+
134
+ it("disables the menu when nothing is selected or the parent disables it", () => {
135
+ const disabled = renderWithTheme(
136
+ <AdminActionMenu
137
+ actions={[{id: "archive", label: "Archive"}]}
138
+ disabled
139
+ onRunAction={mock(() => {})}
140
+ selectedCount={4}
141
+ />
142
+ );
143
+ assert.isTrue(findSelect(disabled.UNSAFE_root)?.props?.disabled);
144
+
145
+ const emptySelection = renderWithTheme(
146
+ <AdminActionMenu
147
+ actions={[{id: "archive", label: "Archive"}]}
148
+ onRunAction={mock(() => {})}
149
+ selectedCount={0}
150
+ />
151
+ );
152
+ assert.isTrue(findSelect(emptySelection.UNSAFE_root)?.props?.disabled);
153
+ });
154
+
155
+ it("dismisses the confirm modal from cancel without running the action", async () => {
156
+ const onRunAction = mock(async () => undefined);
157
+ const {UNSAFE_root} = renderWithTheme(
158
+ <AdminActionMenu
159
+ actions={[{confirm: "Delete selected rows?", id: "delete", label: "Delete"}]}
160
+ onRunAction={onRunAction}
161
+ selectedCount={1}
162
+ />
163
+ );
164
+
165
+ const select = findSelect(UNSAFE_root);
166
+ await act(async () => {
167
+ select?.props?.onChange("delete");
168
+ });
169
+ const confirm = UNSAFE_root.findAll(
170
+ (node: ReactTestInstance) => node.props?.testID === "admin-action-confirm-delete"
171
+ )[0];
172
+ await act(async () => {
173
+ confirm?.props?.secondaryButtonOnClick?.();
174
+ });
175
+ expect(onRunAction).not.toHaveBeenCalled();
176
+ const openConfirms = UNSAFE_root.findAll(
177
+ (node: ReactTestInstance) =>
178
+ node.props?.testID === "admin-action-confirm-delete" && node.props?.visible === true
179
+ );
180
+ assert.equal(openConfirms.length, 0);
181
+ });
182
+ it("runs an immediate action and ignores empty or unknown selections", async () => {
183
+ const onRunAction = mock(() => Promise.resolve());
184
+ const {UNSAFE_root} = renderWithTheme(
185
+ <AdminActionMenu
186
+ actions={[{id: "activate", label: "Activate"}]}
187
+ onRunAction={onRunAction}
188
+ selectedCount={1}
189
+ />
190
+ );
191
+ const select = UNSAFE_root.findAll(
192
+ (node: ReactTestInstance) => node.props?.testID === "admin-action-menu"
193
+ )[0];
194
+
195
+ await act(async () => {
196
+ select.props.onChange("__none__");
197
+ select.props.onChange("missing");
198
+ select.props.onChange("activate");
199
+ await Promise.resolve();
200
+ });
201
+ expect(onRunAction).toHaveBeenCalledTimes(1);
202
+ expect(onRunAction).toHaveBeenCalledWith("activate");
203
+ });
204
+
205
+ it("closes a confirmation after success and supports cancel and dismiss", async () => {
206
+ const onRunAction = mock(() => Promise.resolve());
207
+ const {UNSAFE_root} = renderWithTheme(
208
+ <AdminActionMenu
209
+ actions={[{confirm: "Continue?", id: "activate", label: "Activate"}]}
210
+ onRunAction={onRunAction}
211
+ selectedCount={1}
212
+ />
213
+ );
214
+ const select = UNSAFE_root.findAll(
215
+ (node: ReactTestInstance) => node.props?.testID === "admin-action-menu"
216
+ )[0];
217
+ await act(async () => {
218
+ select.props.onChange("activate");
219
+ });
220
+ let modal = UNSAFE_root.findAll(
221
+ (node: ReactTestInstance) => node.props?.testID === "admin-action-confirm-activate"
222
+ )[0];
223
+ await act(async () => {
224
+ await modal.props.primaryButtonOnClick();
225
+ });
226
+ expect(onRunAction).toHaveBeenCalledWith("activate");
227
+ expect(
228
+ UNSAFE_root.findAll(
229
+ (node: ReactTestInstance) => node.props?.testID === "admin-action-confirm-activate"
230
+ )
231
+ ).toHaveLength(0);
232
+
233
+ await act(async () => {
234
+ select.props.onChange("activate");
235
+ });
236
+ modal = UNSAFE_root.findAll(
237
+ (node: ReactTestInstance) => node.props?.testID === "admin-action-confirm-activate"
238
+ )[0];
239
+ await act(async () => {
240
+ modal.props.secondaryButtonOnClick();
241
+ modal.props.onDismiss();
242
+ });
243
+ expect(onRunAction).toHaveBeenCalledTimes(1);
244
+ });
78
245
  });
@@ -1,9 +1,12 @@
1
1
  import {describe, expect, it, mock} from "bun:test";
2
+ import {act, fireEvent} from "@testing-library/react-native";
3
+ import {assert} from "chai";
2
4
  import React from "react";
3
5
  import {renderWithTheme} from "../../ui/src/test-utils";
4
6
 
7
+ const routerPush = mock(() => undefined);
5
8
  mock.module("expo-router", () => ({
6
- router: {push: () => {}},
9
+ router: {push: routerPush},
7
10
  }));
8
11
 
9
12
  import {AdminBreadcrumbs} from "./AdminBreadcrumbs";
@@ -24,4 +27,21 @@ describe("AdminBreadcrumbs", () => {
24
27
  );
25
28
  expect(getByHintText("Navigate to Admin")).toBeTruthy();
26
29
  });
30
+
31
+ it("returns null when there are no segments", () => {
32
+ const {toJSON} = renderWithTheme(<AdminBreadcrumbs segments={[]} />);
33
+ assert.isNull(toJSON());
34
+ });
35
+
36
+ it("navigates when a linked segment is pressed", async () => {
37
+ routerPush.mockClear();
38
+ const {getByTestId} = renderWithTheme(
39
+ <AdminBreadcrumbs segments={[{href: "/admin", label: "Admin"}, {label: "Todos"}]} />
40
+ );
41
+ await act(async () => {
42
+ fireEvent.press(getByTestId("admin-breadcrumb-link-0-clickable"));
43
+ });
44
+ assert.equal(routerPush.mock.calls.length, 1);
45
+ assert.equal(routerPush.mock.calls[0]?.[0], "/admin");
46
+ });
27
47
  });
@@ -0,0 +1,173 @@
1
+ import {beforeEach, describe, it, mock} from "bun:test";
2
+ import {act, fireEvent} from "@testing-library/react-native";
3
+ import {assert} from "chai";
4
+ import React, {useState} from "react";
5
+ import {renderWithTheme} from "../../ui/src/test-utils";
6
+
7
+ import {AdminConflictSheet} from "./AdminConflictSheet";
8
+ import {resetAdminConflictSheetStackForTests} from "./adminConflictSheetStack";
9
+
10
+ const createConflict = ({
11
+ collection = "todos",
12
+ entityId = "todo-1",
13
+ mutationId = "mutation-1",
14
+ }: {
15
+ collection?: string;
16
+ entityId?: string;
17
+ mutationId?: string;
18
+ } = {}) => ({
19
+ collection,
20
+ entityId,
21
+ localData: JSON.stringify({title: "My Todo"}),
22
+ mutationId,
23
+ serverData: JSON.stringify({title: "Server Todo"}),
24
+ });
25
+
26
+ describe("AdminConflictSheet", () => {
27
+ beforeEach(() => {
28
+ resetAdminConflictSheetStackForTests();
29
+ });
30
+
31
+ it("renders only the topmost sheet when a form stacks over its changelist", async () => {
32
+ const view = renderWithTheme(
33
+ <>
34
+ <AdminConflictSheet
35
+ collection="todos"
36
+ conflicts={[createConflict()]}
37
+ loadedIds={["todo-1"]}
38
+ resolve={() => {}}
39
+ />
40
+ <AdminConflictSheet
41
+ collection="todos"
42
+ conflicts={[createConflict()]}
43
+ loadedIds={["todo-1"]}
44
+ resolve={() => {}}
45
+ />
46
+ </>
47
+ );
48
+
49
+ assert.isDefined(await view.findByTestId("conflict-item-todo-1"));
50
+ assert.lengthOf(view.queryAllByTestId("conflict-item-todo-1"), 1);
51
+ });
52
+
53
+ it("shows only admin-loaded conflicts and forwards both resolution strategies", async () => {
54
+ const resolve = mock((_args: {mutationId: string; strategy: "keepMine" | "useServer"}) => {});
55
+ const view = renderWithTheme(
56
+ <AdminConflictSheet
57
+ collection="todos"
58
+ conflicts={[
59
+ createConflict(),
60
+ createConflict({entityId: "todo-2", mutationId: "mutation-2"}),
61
+ createConflict({collection: "users", entityId: "user-1", mutationId: "mutation-3"}),
62
+ ]}
63
+ loadedIds={["todo-1"]}
64
+ resolve={resolve}
65
+ />
66
+ );
67
+
68
+ assert.isDefined(await view.findByTestId("conflict-item-todo-1"));
69
+ assert.isNull(view.queryByTestId("conflict-item-todo-2"));
70
+ assert.isNull(view.queryByTestId("conflict-item-user-1"));
71
+
72
+ await act(async () => {
73
+ fireEvent.press(view.getByTestId("conflict-keep-mine-button-mutation-1"));
74
+ await new Promise((resolveDelay) => setTimeout(resolveDelay, 600));
75
+ });
76
+ await act(async () => {
77
+ fireEvent.press(view.getByTestId("conflict-use-server-button-mutation-1"));
78
+ await new Promise((resolveDelay) => setTimeout(resolveDelay, 600));
79
+ });
80
+ assert.deepEqual(
81
+ resolve.mock.calls.map(([args]) => args),
82
+ [
83
+ {mutationId: "mutation-1", strategy: "keepMine"},
84
+ {mutationId: "mutation-1", strategy: "useServer"},
85
+ ]
86
+ );
87
+ });
88
+
89
+ it("stays hidden when no conflicted id is loaded in the admin window", () => {
90
+ const view = renderWithTheme(
91
+ <AdminConflictSheet
92
+ collection="todos"
93
+ conflicts={[createConflict()]}
94
+ loadedIds={[]}
95
+ resolve={() => {}}
96
+ />
97
+ );
98
+
99
+ assert.isNull(view.queryByTestId("admin-conflict-sheet"));
100
+ });
101
+
102
+ it("does not spin renders when conflicts clear after keep all", async () => {
103
+ const resolve = mock((_args: {mutationId: string; strategy: "keepMine" | "useServer"}) => {});
104
+ let renderCount = 0;
105
+
106
+ const Harness: React.FC = () => {
107
+ const [conflicts, setConflicts] = useState([createConflict()]);
108
+ renderCount += 1;
109
+ if (renderCount > 40) {
110
+ throw new Error("Maximum update depth exceeded");
111
+ }
112
+
113
+ return (
114
+ <AdminConflictSheet
115
+ collection="todos"
116
+ conflicts={conflicts}
117
+ loadedIds={["todo-1"]}
118
+ resolve={(args) => {
119
+ resolve(args);
120
+ setConflicts([]);
121
+ }}
122
+ />
123
+ );
124
+ };
125
+
126
+ const view = renderWithTheme(<Harness />);
127
+ assert.isDefined(await view.findByTestId("conflict-item-todo-1"));
128
+
129
+ await act(async () => {
130
+ fireEvent.press(view.getByTestId("conflict-keep-mine-button-mutation-1"));
131
+ await new Promise((resolveDelay) => setTimeout(resolveDelay, 0));
132
+ });
133
+
134
+ assert.isNull(view.queryByTestId("admin-conflict-sheet"));
135
+ assert.isAtMost(renderCount, 25);
136
+ assert.equal(resolve.mock.calls.length, 1);
137
+ assert.deepEqual(resolve.mock.calls[0]?.[0], {
138
+ mutationId: "mutation-1",
139
+ strategy: "keepMine",
140
+ });
141
+ });
142
+
143
+ it("reopens after a new conflict episode once the prior batch was dismissed", async () => {
144
+ const view = renderWithTheme(
145
+ <AdminConflictSheet
146
+ collection="todos"
147
+ conflicts={[createConflict()]}
148
+ loadedIds={["todo-1"]}
149
+ resolve={() => {}}
150
+ />
151
+ );
152
+
153
+ assert.isDefined(await view.findByTestId("conflict-item-todo-1"));
154
+
155
+ await act(async () => {
156
+ fireEvent.press(view.getByLabelText("Close modal"));
157
+ await new Promise((resolveDelay) => setTimeout(resolveDelay, 0));
158
+ });
159
+
160
+ assert.isNull(view.queryByTestId("conflict-item-todo-1"));
161
+
162
+ view.rerender(
163
+ <AdminConflictSheet
164
+ collection="todos"
165
+ conflicts={[createConflict({mutationId: "mutation-2"})]}
166
+ loadedIds={["todo-1"]}
167
+ resolve={() => {}}
168
+ />
169
+ );
170
+
171
+ assert.isDefined(await view.findByTestId("conflict-item-todo-1"));
172
+ });
173
+ });