@terreno/ui 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 (212) hide show
  1. package/dist/AnnouncementBanner.d.ts +12 -0
  2. package/dist/AnnouncementBanner.js +61 -0
  3. package/dist/AnnouncementBanner.js.map +1 -0
  4. package/dist/AnnouncementNavigator.d.ts +11 -0
  5. package/dist/AnnouncementNavigator.js +189 -0
  6. package/dist/AnnouncementNavigator.js.map +1 -0
  7. package/dist/AnnouncementScreen.d.ts +12 -0
  8. package/dist/AnnouncementScreen.js +28 -0
  9. package/dist/AnnouncementScreen.js.map +1 -0
  10. package/dist/AreaChart.d.ts +5 -0
  11. package/dist/AreaChart.js +69 -0
  12. package/dist/AreaChart.js.map +1 -0
  13. package/dist/BarChart.d.ts +5 -0
  14. package/dist/BarChart.js +89 -0
  15. package/dist/BarChart.js.map +1 -0
  16. package/dist/Button.js +17 -3
  17. package/dist/Button.js.map +1 -1
  18. package/dist/Common.d.ts +96 -0
  19. package/dist/Common.js.map +1 -1
  20. package/dist/DashboardGrid.d.ts +4 -0
  21. package/dist/DashboardGrid.js +38 -0
  22. package/dist/DashboardGrid.js.map +1 -0
  23. package/dist/DataTable.js +83 -11
  24. package/dist/DataTable.js.map +1 -1
  25. package/dist/DonutChart.d.ts +5 -0
  26. package/dist/DonutChart.js +84 -0
  27. package/dist/DonutChart.js.map +1 -0
  28. package/dist/Filter.js +12 -2
  29. package/dist/Filter.js.map +1 -1
  30. package/dist/GPTChat.d.ts +7 -1
  31. package/dist/GPTChat.js +28 -15
  32. package/dist/GPTChat.js.map +1 -1
  33. package/dist/LineChart.d.ts +5 -0
  34. package/dist/LineChart.js +68 -0
  35. package/dist/LineChart.js.map +1 -0
  36. package/dist/MarkdownEmbed.d.ts +6 -0
  37. package/dist/MarkdownEmbed.js +17 -0
  38. package/dist/MarkdownEmbed.js.map +1 -0
  39. package/dist/MarkdownView.js +38 -3
  40. package/dist/MarkdownView.js.map +1 -1
  41. package/dist/Modal.js +12 -10
  42. package/dist/Modal.js.map +1 -1
  43. package/dist/ModalSheet.d.ts +5 -1
  44. package/dist/ModalSheet.js +31 -13
  45. package/dist/ModalSheet.js.map +1 -1
  46. package/dist/MultiselectField.js +4 -9
  47. package/dist/MultiselectField.js.map +1 -1
  48. package/dist/NotificationBell.d.ts +16 -0
  49. package/dist/NotificationBell.js +15 -0
  50. package/dist/NotificationBell.js.map +1 -0
  51. package/dist/NotificationInbox.d.ts +21 -0
  52. package/dist/NotificationInbox.js +41 -0
  53. package/dist/NotificationInbox.js.map +1 -0
  54. package/dist/NotificationPreferences.d.ts +14 -0
  55. package/dist/NotificationPreferences.js +32 -0
  56. package/dist/NotificationPreferences.js.map +1 -0
  57. package/dist/TextField.js +83 -6
  58. package/dist/TextField.js.map +1 -1
  59. package/dist/announcementBuildVersion.d.ts +6 -0
  60. package/dist/announcementBuildVersion.js +21 -0
  61. package/dist/announcementBuildVersion.js.map +1 -0
  62. package/dist/announcementFrequency.d.ts +42 -0
  63. package/dist/announcementFrequency.js +163 -0
  64. package/dist/announcementFrequency.js.map +1 -0
  65. package/dist/announcementPlatform.d.ts +2 -0
  66. package/dist/announcementPlatform.js +11 -0
  67. package/dist/announcementPlatform.js.map +1 -0
  68. package/dist/charts/ChartFrame.d.ts +12 -0
  69. package/dist/charts/ChartFrame.js +13 -0
  70. package/dist/charts/ChartFrame.js.map +1 -0
  71. package/dist/charts/bars.d.ts +18 -0
  72. package/dist/charts/bars.js +29 -0
  73. package/dist/charts/bars.js.map +1 -0
  74. package/dist/charts/layout.d.ts +47 -0
  75. package/dist/charts/layout.js +56 -0
  76. package/dist/charts/layout.js.map +1 -0
  77. package/dist/charts/paths.d.ts +31 -0
  78. package/dist/charts/paths.js +52 -0
  79. package/dist/charts/paths.js.map +1 -0
  80. package/dist/charts/scales.d.ts +6 -0
  81. package/dist/charts/scales.js +43 -0
  82. package/dist/charts/scales.js.map +1 -0
  83. package/dist/charts/theme.d.ts +9 -0
  84. package/dist/charts/theme.js +15 -0
  85. package/dist/charts/theme.js.map +1 -0
  86. package/dist/charts/types/chartTypes.d.ts +17 -0
  87. package/dist/charts/types/chartTypes.js +2 -0
  88. package/dist/charts/types/chartTypes.js.map +1 -0
  89. package/dist/dashboardGridLayout.d.ts +22 -0
  90. package/dist/dashboardGridLayout.js +33 -0
  91. package/dist/dashboardGridLayout.js.map +1 -0
  92. package/dist/dataTableFilters.d.ts +33 -0
  93. package/dist/dataTableFilters.js +221 -0
  94. package/dist/dataTableFilters.js.map +1 -0
  95. package/dist/dataTableListQuery.d.ts +42 -0
  96. package/dist/dataTableListQuery.js +161 -0
  97. package/dist/dataTableListQuery.js.map +1 -0
  98. package/dist/index.d.ts +18 -1
  99. package/dist/index.js +11 -1
  100. package/dist/index.js.map +1 -1
  101. package/dist/lazyBoundaries/heavyOptionalExports.d.ts +12 -0
  102. package/dist/lazyBoundaries/heavyOptionalExports.js +8 -0
  103. package/dist/lazyBoundaries/heavyOptionalExports.js.map +1 -1
  104. package/dist/markdownEmbeds.d.ts +6 -0
  105. package/dist/markdownEmbeds.js +59 -0
  106. package/dist/markdownEmbeds.js.map +1 -0
  107. package/dist/testing/resolveTestId.js +2 -1
  108. package/dist/testing/resolveTestId.js.map +1 -1
  109. package/dist/testing/types.d.ts +3 -0
  110. package/dist/textFieldOscillationGuard.d.ts +25 -0
  111. package/dist/textFieldOscillationGuard.js +41 -0
  112. package/dist/textFieldOscillationGuard.js.map +1 -0
  113. package/dist/useAcknowledgeAnnouncement.d.ts +71 -0
  114. package/dist/useAcknowledgeAnnouncement.js +94 -0
  115. package/dist/useAcknowledgeAnnouncement.js.map +1 -0
  116. package/dist/useAnnouncements.d.ts +73 -0
  117. package/dist/useAnnouncements.js +66 -0
  118. package/dist/useAnnouncements.js.map +1 -0
  119. package/package.json +7 -18
  120. package/src/AnnouncementBanner.test.tsx +267 -0
  121. package/src/AnnouncementBanner.tsx +128 -0
  122. package/src/AnnouncementNavigator.test.tsx +759 -0
  123. package/src/AnnouncementNavigator.tsx +287 -0
  124. package/src/AnnouncementScreen.test.tsx +97 -0
  125. package/src/AnnouncementScreen.tsx +70 -0
  126. package/src/AreaChart.test.tsx +68 -0
  127. package/src/AreaChart.tsx +194 -0
  128. package/src/BarChart.test.tsx +96 -0
  129. package/src/BarChart.tsx +208 -0
  130. package/src/Button.test.tsx +66 -0
  131. package/src/Button.tsx +17 -2
  132. package/src/Common.ts +95 -0
  133. package/src/ConsentNavigator.test.tsx +55 -0
  134. package/src/DashboardGrid.test.tsx +75 -0
  135. package/src/DashboardGrid.tsx +69 -0
  136. package/src/DataTable.test.tsx +296 -1
  137. package/src/DataTable.tsx +210 -18
  138. package/src/DonutChart.test.tsx +121 -0
  139. package/src/DonutChart.tsx +160 -0
  140. package/src/EmojiSelector.test.tsx +51 -0
  141. package/src/Field.test.tsx +18 -0
  142. package/src/Filter.test.tsx +25 -0
  143. package/src/Filter.tsx +38 -7
  144. package/src/GPTChat.test.tsx +107 -0
  145. package/src/GPTChat.tsx +176 -86
  146. package/src/LineChart.test.tsx +166 -0
  147. package/src/LineChart.tsx +190 -0
  148. package/src/MarkdownEmbed.test.tsx +34 -0
  149. package/src/MarkdownEmbed.tsx +43 -0
  150. package/src/MarkdownView.test.tsx +59 -2
  151. package/src/MarkdownView.tsx +51 -3
  152. package/src/Modal.test.tsx +107 -14
  153. package/src/Modal.tsx +20 -8
  154. package/src/ModalSheet.test.tsx +121 -9
  155. package/src/ModalSheet.tsx +46 -11
  156. package/src/MultiselectField.test.tsx +21 -0
  157. package/src/MultiselectField.tsx +11 -13
  158. package/src/NotificationBell.test.tsx +91 -0
  159. package/src/NotificationBell.tsx +77 -0
  160. package/src/NotificationInbox.test.tsx +130 -0
  161. package/src/NotificationInbox.tsx +144 -0
  162. package/src/NotificationPreferences.test.tsx +25 -0
  163. package/src/NotificationPreferences.tsx +75 -0
  164. package/src/RootImportRegression.test.tsx +20 -0
  165. package/src/TextField.test.tsx +421 -0
  166. package/src/TextField.tsx +121 -4
  167. package/src/__snapshots__/Field.test.tsx.snap +22 -0
  168. package/src/__snapshots__/ModalSheet.test.tsx.snap +4 -1
  169. package/src/__snapshots__/TextArea.test.tsx.snap +5 -5
  170. package/src/__snapshots__/TextField.test.tsx.snap +5 -5
  171. package/src/announcementBuildVersion.test.ts +43 -0
  172. package/src/announcementBuildVersion.ts +21 -0
  173. package/src/announcementFrequency.test.ts +245 -0
  174. package/src/announcementFrequency.ts +246 -0
  175. package/src/announcementPlatform.test.ts +27 -0
  176. package/src/announcementPlatform.ts +13 -0
  177. package/src/charts/ChartFrame.tsx +67 -0
  178. package/src/charts/bars.test.ts +56 -0
  179. package/src/charts/bars.ts +53 -0
  180. package/src/charts/layout.test.ts +80 -0
  181. package/src/charts/layout.ts +99 -0
  182. package/src/charts/paths.test.ts +79 -0
  183. package/src/charts/paths.ts +100 -0
  184. package/src/charts/scales.test.ts +59 -0
  185. package/src/charts/scales.ts +60 -0
  186. package/src/charts/theme.test.ts +22 -0
  187. package/src/charts/theme.ts +24 -0
  188. package/src/charts/types/chartTypes.ts +19 -0
  189. package/src/dashboardGridLayout.test.ts +90 -0
  190. package/src/dashboardGridLayout.ts +60 -0
  191. package/src/dataTableFilters.test.tsx +552 -0
  192. package/src/dataTableFilters.tsx +441 -0
  193. package/src/dataTableListQuery.test.ts +220 -0
  194. package/src/dataTableListQuery.ts +201 -0
  195. package/src/index.tsx +21 -1
  196. package/src/lazyBoundaries/heavyOptionalExports.tsx +28 -0
  197. package/src/login/__snapshots__/LoginScreen.test.tsx.snap +22 -0
  198. package/src/markdownEmbeds.test.ts +53 -0
  199. package/src/markdownEmbeds.ts +62 -0
  200. package/src/pdfHtmlTemplate.test.ts +119 -0
  201. package/src/signUp/__snapshots__/SignUpScreen.test.tsx.snap +22 -0
  202. package/src/testing/resolveTestId.test.ts +3 -0
  203. package/src/testing/resolveTestId.ts +1 -0
  204. package/src/testing/types.ts +3 -0
  205. package/src/textFieldOscillationGuard.test.ts +63 -0
  206. package/src/textFieldOscillationGuard.ts +89 -0
  207. package/src/types/react-native-markdown-display.d.ts +6 -0
  208. package/src/types/react-native-swiper-flatlist.d.ts +5 -5
  209. package/src/useAcknowledgeAnnouncement.test.ts +223 -0
  210. package/src/useAcknowledgeAnnouncement.ts +166 -0
  211. package/src/useAnnouncements.test.ts +226 -0
  212. package/src/useAnnouncements.ts +150 -0
@@ -0,0 +1,226 @@
1
+ import {afterEach, describe, expect, it, mock} from "bun:test";
2
+ import {renderHook} from "@testing-library/react-native";
3
+ import {assert} from "chai";
4
+
5
+ const constantsState = {
6
+ expoConfig: {
7
+ extra: {
8
+ buildNumber: undefined as number | string | undefined,
9
+ },
10
+ },
11
+ };
12
+
13
+ mock.module("expo-constants", () => ({
14
+ default: constantsState,
15
+ }));
16
+
17
+ import {useAnnouncements} from "./useAnnouncements";
18
+
19
+ type AnnouncementsApi = Parameters<typeof useAnnouncements>[0];
20
+
21
+ interface MockQueryDef {
22
+ query: (args?: {page?: number; limit?: number}) => string;
23
+ }
24
+
25
+ interface MockInjectOpts {
26
+ endpoints: (build: {query: (def: MockQueryDef) => string}) => Record<string, unknown>;
27
+ }
28
+
29
+ describe("useAnnouncements", () => {
30
+ afterEach(() => {
31
+ constantsState.expoConfig.extra.buildNumber = undefined;
32
+ });
33
+
34
+ const buildApi = ({
35
+ feedData,
36
+ pendingData,
37
+ feedError,
38
+ pendingError,
39
+ }: {
40
+ feedData?: unknown;
41
+ pendingData?: unknown;
42
+ feedError?: unknown;
43
+ pendingError?: unknown;
44
+ }) => {
45
+ const refetchPending = mock(() => Promise.resolve());
46
+ const refetchFeed = mock(() => Promise.resolve());
47
+ const useGetPendingAnnouncementsQuery = mock(() => ({
48
+ data: pendingData,
49
+ error: pendingError,
50
+ isLoading: false,
51
+ refetch: refetchPending,
52
+ }));
53
+ const useGetAnnouncementFeedQuery = mock(() => ({
54
+ data: feedData,
55
+ error: feedError,
56
+ isLoading: false,
57
+ refetch: refetchFeed,
58
+ }));
59
+ const api = {
60
+ enhanceEndpoints: mock(() => ({
61
+ injectEndpoints: mock((opts: MockInjectOpts) => {
62
+ const build = {
63
+ query: mock((def: MockQueryDef) => {
64
+ const pendingUrl = def.query();
65
+ const feedUrl = def.query({limit: 5, page: 2});
66
+ expect(
67
+ pendingUrl.includes("/announcements/pending") ||
68
+ feedUrl.includes("/announcements/feed")
69
+ ).toBe(true);
70
+ return "query";
71
+ }),
72
+ };
73
+ opts.endpoints(build);
74
+ return {useGetAnnouncementFeedQuery, useGetPendingAnnouncementsQuery};
75
+ }),
76
+ })),
77
+ };
78
+ return {api, refetchFeed, refetchPending};
79
+ };
80
+
81
+ it("unwraps pending and feed payloads", () => {
82
+ const {api} = buildApi({
83
+ feedData: {
84
+ data: [
85
+ {
86
+ body: "Body",
87
+ id: "feed-1",
88
+ priority: 0,
89
+ requiresAcknowledgement: false,
90
+ title: "Feed",
91
+ version: 1,
92
+ },
93
+ ],
94
+ },
95
+ pendingData: {data: {current: null, remainingCount: 0}},
96
+ });
97
+ const {result} = renderHook(() => useAnnouncements(api as unknown as AnnouncementsApi, "/api"));
98
+ expect(result.current.pending?.remainingCount).toBe(0);
99
+ expect(result.current.feed).toHaveLength(1);
100
+ expect(result.current.feed[0]?.id).toBe("feed-1");
101
+ });
102
+
103
+ it("surfaces pending errors without treating feed errors as blocking", () => {
104
+ const {api} = buildApi({
105
+ feedError: new Error("feed failed"),
106
+ pendingError: new Error("pending failed"),
107
+ });
108
+ const {result} = renderHook(() => useAnnouncements(api as unknown as AnnouncementsApi));
109
+ expect(result.current.error).toEqual(new Error("pending failed"));
110
+ expect(result.current.feedError).toEqual(new Error("feed failed"));
111
+ });
112
+
113
+ it("keeps feed errors separate from pending errors", () => {
114
+ const {api} = buildApi({
115
+ feedError: new Error("feed failed"),
116
+ pendingData: {data: {current: null, remainingCount: 0}},
117
+ });
118
+ const {result} = renderHook(() => useAnnouncements(api as unknown as AnnouncementsApi));
119
+ expect(result.current.error).toBeUndefined();
120
+ expect(result.current.feedError).toEqual(new Error("feed failed"));
121
+ });
122
+
123
+ it("caches enhanced api per base url", () => {
124
+ let injectCount = 0;
125
+ const api = {
126
+ enhanceEndpoints: () => ({
127
+ injectEndpoints: () => {
128
+ injectCount += 1;
129
+ return {
130
+ useGetAnnouncementFeedQuery: () => ({
131
+ data: [],
132
+ error: undefined,
133
+ isLoading: false,
134
+ refetch: () => Promise.resolve(),
135
+ }),
136
+ useGetPendingAnnouncementsQuery: () => ({
137
+ data: undefined,
138
+ error: undefined,
139
+ isLoading: false,
140
+ refetch: () => Promise.resolve(),
141
+ }),
142
+ };
143
+ },
144
+ }),
145
+ };
146
+ const {rerender} = renderHook(() =>
147
+ useAnnouncements(api as unknown as AnnouncementsApi, "/api")
148
+ );
149
+ rerender(undefined);
150
+ expect(injectCount).toBe(1);
151
+ });
152
+
153
+ it("includes platform and version query params when build number is valid", () => {
154
+ constantsState.expoConfig.extra.buildNumber = 42;
155
+ const capturedUrls: string[] = [];
156
+ const api = {
157
+ enhanceEndpoints: () => ({
158
+ injectEndpoints: (opts: MockInjectOpts) => {
159
+ const build = {
160
+ query: (def: MockQueryDef) => {
161
+ capturedUrls.push(def.query());
162
+ capturedUrls.push(def.query({limit: 5, page: 2}));
163
+ return "query";
164
+ },
165
+ };
166
+ opts.endpoints(build);
167
+ return {
168
+ useGetAnnouncementFeedQuery: () => ({
169
+ data: [],
170
+ error: undefined,
171
+ isLoading: false,
172
+ refetch: () => Promise.resolve(),
173
+ }),
174
+ useGetPendingAnnouncementsQuery: () => ({
175
+ data: undefined,
176
+ error: undefined,
177
+ isLoading: false,
178
+ refetch: () => Promise.resolve(),
179
+ }),
180
+ };
181
+ },
182
+ }),
183
+ };
184
+
185
+ renderHook(() => useAnnouncements(api as unknown as AnnouncementsApi, "/api"));
186
+
187
+ assert.ok(capturedUrls.some((url) => url.includes("platform=ios")));
188
+ assert.ok(capturedUrls.some((url) => url.includes("version=42")));
189
+ });
190
+
191
+ it("omits version when build number is invalid", () => {
192
+ constantsState.expoConfig.extra.buildNumber = "invalid";
193
+ const capturedUrls: string[] = [];
194
+ const api = {
195
+ enhanceEndpoints: () => ({
196
+ injectEndpoints: (opts: MockInjectOpts) => {
197
+ const build = {
198
+ query: (def: MockQueryDef) => {
199
+ capturedUrls.push(def.query());
200
+ return "query";
201
+ },
202
+ };
203
+ opts.endpoints(build);
204
+ return {
205
+ useGetAnnouncementFeedQuery: () => ({
206
+ data: [],
207
+ error: undefined,
208
+ isLoading: false,
209
+ refetch: () => Promise.resolve(),
210
+ }),
211
+ useGetPendingAnnouncementsQuery: () => ({
212
+ data: undefined,
213
+ error: undefined,
214
+ isLoading: false,
215
+ refetch: () => Promise.resolve(),
216
+ }),
217
+ };
218
+ },
219
+ }),
220
+ };
221
+
222
+ renderHook(() => useAnnouncements(api as unknown as AnnouncementsApi, "/api"));
223
+
224
+ assert.ok(capturedUrls.every((url) => !url.includes("version=")));
225
+ });
226
+ });
@@ -0,0 +1,150 @@
1
+ import {getAnnouncementBuildVersion} from "./announcementBuildVersion";
2
+ import {getAnnouncementPlatform} from "./announcementPlatform";
3
+
4
+ export type AnnouncementDisplayMode = "banner" | "feed" | "modal";
5
+
6
+ export interface AnnouncementPublic {
7
+ id: string;
8
+ title: string;
9
+ body: string;
10
+ version: number;
11
+ priority: number;
12
+ displayMode?: AnnouncementDisplayMode;
13
+ requiresAcknowledgement: boolean;
14
+ primaryAction?: {
15
+ label: string;
16
+ url: string;
17
+ };
18
+ publishedAt?: string;
19
+ }
20
+
21
+ export interface PendingAnnouncementsResponse {
22
+ current: AnnouncementPublic | null;
23
+ remainingCount: number;
24
+ }
25
+
26
+ interface AnnouncementsResponse<T> {
27
+ data?: T;
28
+ }
29
+
30
+ interface AnnouncementsQueryBuilder {
31
+ query: (options: {
32
+ providesTags?: string[];
33
+ query: (args?: {page?: number; limit?: number}) => string;
34
+ }) => unknown;
35
+ }
36
+
37
+ interface AnnouncementsHookState<T> {
38
+ data?: T | AnnouncementsResponse<T>;
39
+ error: unknown;
40
+ isLoading: boolean;
41
+ refetch: () => void | Promise<void>;
42
+ }
43
+
44
+ interface AnnouncementsEnhancedApi {
45
+ useGetPendingAnnouncementsQuery: () => AnnouncementsHookState<PendingAnnouncementsResponse>;
46
+ useGetAnnouncementFeedQuery: (args?: {
47
+ page?: number;
48
+ limit?: number;
49
+ }) => AnnouncementsHookState<AnnouncementPublic[]>;
50
+ }
51
+
52
+ interface AnnouncementsApiWithTags {
53
+ injectEndpoints: (options: {
54
+ endpoints: (build: AnnouncementsQueryBuilder) => {
55
+ getAnnouncementFeed: unknown;
56
+ getPendingAnnouncements: unknown;
57
+ };
58
+ overrideExisting: boolean;
59
+ }) => AnnouncementsEnhancedApi;
60
+ }
61
+
62
+ interface AnnouncementsApi {
63
+ enhanceEndpoints: (options: {addTagTypes: string[]}) => AnnouncementsApiWithTags;
64
+ }
65
+
66
+ const enhancedApiCache = new WeakMap<AnnouncementsApi, Map<string, AnnouncementsEnhancedApi>>();
67
+
68
+ const buildAnnouncementQuerySuffix = (): string => {
69
+ const platform = getAnnouncementPlatform();
70
+ const version = getAnnouncementBuildVersion();
71
+ const versionParam = version === undefined ? "" : `&version=${version}`;
72
+ return `platform=${platform}${versionParam}`;
73
+ };
74
+
75
+ const getEnhancedApi = (api: AnnouncementsApi, base: string): AnnouncementsEnhancedApi => {
76
+ let byBase = enhancedApiCache.get(api);
77
+ if (!byBase) {
78
+ byBase = new Map();
79
+ enhancedApiCache.set(api, byBase);
80
+ }
81
+ const cached = byBase.get(base);
82
+ if (cached) {
83
+ return cached;
84
+ }
85
+ const apiWithTags = api.enhanceEndpoints({
86
+ addTagTypes: ["PendingAnnouncements", "AnnouncementFeed"],
87
+ });
88
+ const enhanced = apiWithTags.injectEndpoints({
89
+ endpoints: (build) => ({
90
+ getAnnouncementFeed: build.query({
91
+ providesTags: ["AnnouncementFeed"],
92
+ query: (args?: {page?: number; limit?: number}) => {
93
+ const page = args?.page ?? 1;
94
+ const limit = args?.limit ?? 20;
95
+ return `${base}/announcements/feed?page=${page}&limit=${limit}&${buildAnnouncementQuerySuffix()}`;
96
+ },
97
+ }),
98
+ getPendingAnnouncements: build.query({
99
+ providesTags: ["PendingAnnouncements"],
100
+ query: () => {
101
+ return `${base}/announcements/pending?${buildAnnouncementQuerySuffix()}`;
102
+ },
103
+ }),
104
+ }),
105
+ overrideExisting: false,
106
+ });
107
+ byBase.set(base, enhanced);
108
+ return enhanced;
109
+ };
110
+
111
+ export const useAnnouncements = (
112
+ api: AnnouncementsApi,
113
+ baseUrl?: string,
114
+ feedOptions?: {page?: number; limit?: number}
115
+ ) => {
116
+ const base = baseUrl || "";
117
+ const enhancedApi = getEnhancedApi(api, base);
118
+ const {
119
+ data: pendingData,
120
+ isLoading: isPendingLoading,
121
+ error: pendingError,
122
+ refetch: refetchPending,
123
+ } = enhancedApi.useGetPendingAnnouncementsQuery();
124
+ const {
125
+ data: feedData,
126
+ isLoading: isFeedLoading,
127
+ error: feedError,
128
+ refetch: refetchFeed,
129
+ } = enhancedApi.useGetAnnouncementFeedQuery(feedOptions);
130
+
131
+ const pendingPayload =
132
+ (pendingData as AnnouncementsResponse<PendingAnnouncementsResponse> | undefined)?.data ??
133
+ (pendingData as PendingAnnouncementsResponse | undefined);
134
+ const feedPayload =
135
+ (feedData as AnnouncementsResponse<AnnouncementPublic[]> | undefined)?.data ??
136
+ (feedData as AnnouncementPublic[] | undefined) ??
137
+ [];
138
+
139
+ return {
140
+ error: pendingError,
141
+ feed: feedPayload,
142
+ feedError,
143
+ isFeedLoading,
144
+ isLoading: isPendingLoading,
145
+ isPendingLoading,
146
+ pending: pendingPayload,
147
+ refetch: refetchPending,
148
+ refetchFeed,
149
+ };
150
+ };