@orchestrator-ui/orchestrator-ui-components 0.2.6 → 0.3.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 (121) hide show
  1. package/.turbo/turbo-build.log +6 -6
  2. package/.turbo/turbo-lint.log +0 -6
  3. package/.turbo/turbo-test.log +9 -8
  4. package/CHANGELOG.md +12 -0
  5. package/dist/index.d.ts +1005 -123
  6. package/dist/index.js +33996 -6348
  7. package/package.json +14 -12
  8. package/src/api/index.ts +55 -3
  9. package/src/components/WfoDiff/WfoDiff.tsx +119 -0
  10. package/src/components/WfoDiff/index.ts +1 -0
  11. package/src/components/WfoDiff/unidiff.d.ts +1 -0
  12. package/src/components/WfoForms/AutoFieldLoader.tsx +5 -1
  13. package/src/components/WfoForms/CreateForm.tsx +1 -1
  14. package/src/components/WfoForms/UserInputForm.tsx +75 -43
  15. package/src/components/WfoForms/UserInputFormWizard.tsx +11 -4
  16. package/src/components/WfoForms/formFields/AcceptField.tsx +8 -5
  17. package/src/components/WfoForms/formFields/BoolField.tsx +1 -1
  18. package/src/components/WfoForms/formFields/ImsNodeIdField.tsx +2 -2
  19. package/src/components/WfoForms/formFields/ImsPortIdField.tsx +238 -0
  20. package/src/components/WfoForms/formFields/ImsPortIdFieldStyling.ts +17 -0
  21. package/src/components/WfoForms/formFields/IpPrefixTableField.tsx +1 -1
  22. package/src/components/WfoForms/formFields/ListAddField.tsx +1 -1
  23. package/src/components/WfoForms/formFields/ListDelField.tsx +1 -1
  24. package/src/components/WfoForms/formFields/OptGroupField.tsx +1 -1
  25. package/src/components/WfoForms/formFields/SubscriptionField.tsx +2 -1
  26. package/src/components/WfoForms/formFields/SummaryField.tsx +103 -0
  27. package/src/components/WfoForms/formFields/SummaryFieldStyling.ts +46 -0
  28. package/src/components/WfoForms/formFields/VlanField.tsx +10 -10
  29. package/src/components/WfoForms/formFields/index.ts +2 -0
  30. package/src/components/WfoForms/formFields/surf/types.ts +26 -0
  31. package/src/components/WfoForms/formFields/utils.spec.ts +1 -0
  32. package/src/components/WfoJsonCodeBlock/index.ts +1 -0
  33. package/src/components/WfoPageTemplate/WfoPageHeader/WfoPageHeader.tsx +4 -3
  34. package/src/components/WfoPageTemplate/WfoSidebar/WfoSidebar.tsx +14 -14
  35. package/src/components/WfoPageTemplate/WfoSidebar/WfoStartCreateWorkflowButtonComboBox.tsx +15 -9
  36. package/src/components/WfoPageTemplate/paths.ts +3 -2
  37. package/src/components/{WfoProcessesList → WfoProcessList}/WfoProcessList.tsx +18 -14
  38. package/src/components/WfoProcessList/index.ts +1 -0
  39. package/src/components/{WfoProcessesList → WfoProcessList}/processListObjectMappers.ts +4 -2
  40. package/src/components/WfoSearchBar/WfoSearchField.tsx +27 -37
  41. package/src/components/{WfoSettingsPage → WfoSettings}/WfoEngineStatusButton.tsx +7 -4
  42. package/src/components/{WfoSettingsPage → WfoSettings}/WfoFlushSettings.tsx +13 -12
  43. package/src/components/WfoSettings/WfoModifySettings.tsx +38 -0
  44. package/src/components/WfoSettings/WfoSettings.tsx +40 -0
  45. package/src/components/{WfoSettingsPage → WfoSettings}/WfoStatus.tsx +21 -14
  46. package/src/components/WfoStartPage/WfoListStartPage.tsx +3 -3
  47. package/src/components/WfoStartTaskButtonComboBox/WfoStartTaskButtonComboBox.tsx +14 -8
  48. package/src/components/WfoSubscription/WfoProcessesTimeline.tsx +11 -18
  49. package/src/components/WfoSubscription/WfoSubscription.tsx +1 -1
  50. package/src/components/WfoSubscription/WfoSubscriptionActions.tsx +41 -33
  51. package/src/components/WfoSubscription/WfoSubscriptionDetailTree.tsx +32 -22
  52. package/src/components/WfoSubscription/WfoSubscriptionProductBlock.tsx +94 -90
  53. package/src/components/WfoSubscription/WfoTargetTypeIcon.tsx +26 -0
  54. package/src/components/WfoSubscription/utils/utils.spec.ts +24 -0
  55. package/src/components/WfoSubscription/utils/utils.ts +16 -0
  56. package/src/components/WfoSubscriptionsList/WfoSubscriptionsList.tsx +17 -37
  57. package/src/components/WfoTable/WfoTableWithFilter/WfoTableWithFilter.tsx +20 -19
  58. package/src/components/WfoTable/WfoTableWithFilter/updateQueryString.spec.ts +95 -0
  59. package/src/components/WfoTable/WfoTableWithFilter/updateQueryString.ts +60 -0
  60. package/src/components/WfoTable/utils/tableUtils.ts +3 -3
  61. package/src/components/WfoTextAnchor/WfoTextAnchor.stories.tsx +18 -0
  62. package/src/components/WfoTextAnchor/WfoTextAnchor.tsx +22 -0
  63. package/src/components/WfoTextAnchor/index.ts +1 -0
  64. package/src/components/WfoTextAnchor/styles.ts +17 -0
  65. package/src/components/WfoTimeline/styles.ts +10 -4
  66. package/src/components/WfoWorkflowSteps/WfoStep/WfoStep.tsx +39 -24
  67. package/src/components/WfoWorkflowSteps/WfoStep/WfoStepForm.tsx +48 -0
  68. package/src/components/WfoWorkflowSteps/WfoStepList/WfoStepList.tsx +14 -11
  69. package/src/components/WfoWorkflowSteps/WfoWorkflowStepList/WfoStepListHeader.tsx +22 -23
  70. package/src/components/WfoWorkflowSteps/WfoWorkflowStepList/WfoWorkflowStepList.tsx +97 -17
  71. package/src/components/WfoWorkflowSteps/stepListUtils.ts +1 -28
  72. package/src/components/confirmationDialog/WfoConfirmationDialog.tsx +3 -3
  73. package/src/components/index.ts +6 -1
  74. package/src/contexts/ConfirmationDialogProvider.tsx +2 -2
  75. package/src/contexts/TreeContext.tsx +5 -0
  76. package/src/graphqlQueries/index.ts +1 -0
  77. package/src/graphqlQueries/processDetailQuery.ts +8 -0
  78. package/src/graphqlQueries/processListQuery.ts +7 -6
  79. package/src/graphqlQueries/processStepsQuery.ts +22 -0
  80. package/src/graphqlQueries/productBlocksQuery.ts +9 -5
  81. package/src/graphqlQueries/productsQuery.ts +7 -3
  82. package/src/graphqlQueries/relatedSubscriptionsQuery.ts +2 -2
  83. package/src/graphqlQueries/resourceTypesQuery.ts +8 -4
  84. package/src/graphqlQueries/subscriptionDetailQuery.ts +1 -0
  85. package/src/graphqlQueries/subscriptionsListQuery.ts +5 -3
  86. package/src/graphqlQueries/workflows/workflowsQuery.ts +8 -4
  87. package/src/graphqlQueries/workflows/workflowsQueryForDropdownList.ts +2 -2
  88. package/src/hooks/DataFetchHooks.ts +9 -4
  89. package/src/hooks/index.ts +3 -0
  90. package/src/hooks/useCheckEngineStatus.ts +30 -0
  91. package/src/hooks/useDataDisplayParams.ts +3 -3
  92. package/src/hooks/useEngineStatusQuery.ts +9 -7
  93. package/src/hooks/useMutateProcess.ts +96 -0
  94. package/src/messages/{en-US.json → en-GB.json} +85 -37
  95. package/src/messages/getTranslationMessages.spec.ts +25 -40
  96. package/src/messages/index.ts +1 -1
  97. package/src/messages/nl-NL.json +95 -48
  98. package/src/messages/useGetTranslationMessages.ts +51 -0
  99. package/src/pages/metadata/WfoProductBlocksPage.tsx +12 -10
  100. package/src/pages/metadata/WfoProductsPage.tsx +24 -25
  101. package/src/pages/metadata/WfoResourceTypesPage.tsx +12 -10
  102. package/src/pages/metadata/WfoWorkflowsPage.tsx +12 -10
  103. package/src/pages/processes/WfoProcessDetail.tsx +96 -79
  104. package/src/pages/processes/WfoProcessDetailPage.tsx +5 -3
  105. package/src/pages/{workflow/WfoStartWorkflowPage.tsx → processes/WfoStartProcessPage.tsx} +102 -51
  106. package/src/pages/processes/index.ts +1 -3
  107. package/src/pages/settings/WfoSettingsPage.tsx +30 -0
  108. package/src/pages/settings/index.ts +1 -0
  109. package/src/pages/tasks/WfoTaskListPage.tsx +35 -9
  110. package/src/pages/{processes/WfoProcessListPage.tsx → workflow/WfoWorkflowListPage.tsx} +22 -23
  111. package/src/pages/workflow/getWorkflowListTabTypeFromString.ts +19 -0
  112. package/src/pages/workflow/index.ts +1 -1
  113. package/src/pages/{processes → workflow}/tabConfig.ts +6 -6
  114. package/src/types/types.ts +33 -3
  115. package/src/utils/getDefaultTableConfig.ts +1 -1
  116. package/src/components/WfoSettingsPage/WfoModifySettings.tsx +0 -33
  117. package/src/components/WfoSettingsPage/WfoSettings.tsx +0 -40
  118. package/src/hooks/ProcessesHooks/useDeleteProcess.ts +0 -37
  119. package/src/messages/getTranslationMessages.ts +0 -26
  120. package/src/pages/processes/getProcessListTabTypeFromString.ts +0 -19
  121. /package/src/components/{WfoSettingsPage → WfoSettings}/index.ts +0 -0
@@ -1,15 +1,26 @@
1
1
  {
2
2
  "main": {
3
+ "metadata": "Metadata",
4
+ "metadataProducts": "Products",
5
+ "metadataProductblocks": "Product blocks",
6
+ "metadataResourceTypes": "Resource types",
7
+ "metadataWorkflows": "Workflows",
8
+ "mobileTitle": "Hoofdmenu",
9
+ "settings": "Settings",
10
+ "start": "Start",
11
+ "subscriptions": "Subscriptions",
12
+ "tasks": "Taken",
3
13
  "title": "Voorbeeld Orchestrator UI",
4
- "mobileTitle": "Hoofd menu"
14
+ "welcome": "Welkom",
15
+ "workflows": "Workflows"
5
16
  },
6
17
  "common": {
7
- "addToFavorites": "Favoriet",
8
18
  "product": "Produkt",
9
19
  "deselect": "Deselecteer",
10
20
  "close": "Sluiten",
21
+ "editColumns": "Wijzig kolommen",
11
22
  "newSubscription": "Nieuwe subscription",
12
- "newTask": "Nieuwe taak",
23
+ "newTask": "Nieuwe task",
13
24
  "noFailedTasks": "Geen gefaalde taken!",
14
25
  "search": "Zoeken"
15
26
  },
@@ -26,6 +37,9 @@
26
37
  "start_workflow_title": "Start workflow"
27
38
  },
28
39
  "errors": {
40
+ "invalidQueryParts": "De query bevat ongeldige onderdelen",
41
+ "notAllowedWhenEngineIsNotRunningMessage": "Deze actie is niet toegestaan als de Workflow Engine niet is gestart.",
42
+ "notAllowedWhenEngineIsNotRunningTitle": "Workflow Engine is niet gestart.",
29
43
  "retrieve_stored_settings": "Er ging iets fout tijdens het laden van de instellingen. Hersteld naar standaard waardes",
30
44
  "retrieve_stored_settings_title": "Fout tijdens het ophalen van instellingen."
31
45
  },
@@ -34,16 +48,12 @@
34
48
  "cancel": "Annuleren",
35
49
  "submit": "Verstuur",
36
50
  "previous": "Vorige",
37
- "runProcess": "Start workflow",
38
- "cancelProcess": "Annuleren"
39
- },
40
- "fields": {
41
- "bfd": {
42
- "description": "Bidirectional Forwarding Detection",
43
- "title": "BFD"
44
- },
45
- "esi_service_ports_add": "Endpoint Toevoegen",
46
- "esi_service_ports_del": "Endpoint Verwijderen"
51
+ "startTask": "Start taak",
52
+ "previousQuestion": "Weet je zeker dat je deze pagina wilt verlaten? Ingevulde velden worden niet opgeslagen",
53
+ "startWorkflow": "Start workflow",
54
+ "resumeTask": "Hervat task",
55
+ "resumeWorkflow": "Hervat workflow",
56
+ "inputFieldsHaveValidationErrors": "{nrOfValidationErrors} input veldn(en) hebben validatie errors"
47
57
  },
48
58
  "widgets": {
49
59
  "organisation": {
@@ -53,7 +63,7 @@
53
63
  "placeholder": "Naam placeholder"
54
64
  },
55
65
  "node_select": {
56
- "nodes_loading": "Nodes laden",
66
+ "nodes_loading": "Nodes laden...",
57
67
  "select_node": "Selecteer node",
58
68
  "no_nodes_placeholder": "Geen nodes"
59
69
  },
@@ -78,11 +88,18 @@
78
88
  "invalidVlan": "Invalid VLAN - Voer een range of geldige [2-4094] VLAN integers in, bijvoorbeeld: '2, 5-6, 1048-1052'",
79
89
  "untaggedPortInUse": "Deze service port is al in gebruik en kan niet worden gekozen",
80
90
  "taggedOnly": "VLAN is alleen relevant SN7, MSP of SN8 SP in tagged mode, niet voor link_member of untagged ports.",
81
- "loadingIms": "VLAN informatie aan het laden uit IMS"
91
+ "loadingIms": "VLAN informatie aan het laden uit IMS..."
82
92
  },
83
93
  "subscription": {
84
94
  "placeholder": "Kies een subscription",
85
95
  "loading": "Subscriptions ophalen..."
96
+ },
97
+ "nodePort": {
98
+ "loadingNodes": "Node subscriptions laden...",
99
+ "loadingPorts": "IMS poorten laden...",
100
+ "selectNode": "Selecteer node",
101
+ "selectPort": "Selecteer poort",
102
+ "selectNodeFirst": "Selecteer eerst een node"
86
103
  }
87
104
  }
88
105
  },
@@ -113,13 +130,13 @@
113
130
  "resourceTypes": "Resource types",
114
131
  "dependingProductBlocks": "Onderliggende product blocks",
115
132
  "createdAt": "Aangemaakt",
116
- "endDate": "Eind datum",
133
+ "endDate": "Einddatum",
117
134
  "parentIds": "Parents"
118
135
  },
119
136
  "resourceTypes": {
120
137
  "type": "Resource type",
121
138
  "description": "Resource type beschrijving",
122
- "resourceId": "Resource Id",
139
+ "resourceId": "Resource ID",
123
140
  "usedInProductBlocks": "Gebruikt in product blocks"
124
141
  },
125
142
  "workflows": {
@@ -131,35 +148,35 @@
131
148
  }
132
149
  },
133
150
  "processes": {
134
- "tabs": {
135
- "active": "Actief",
136
- "completed": "Voltooid"
137
- },
138
151
  "index": {
139
152
  "workflowName": "Workflow naam",
140
- "step": "Laatste stap",
153
+ "step": "Huidige stap",
141
154
  "status": "Status",
142
155
  "product": "Product",
143
156
  "customer": "Klant",
144
- "customerAbbreviation": "Klant afkorting",
157
+ "customerAbbreviation": "Klantafkorting",
145
158
  "subscriptions": "Subscriptions",
146
159
  "createdBy": "Gecreëerd door",
147
160
  "assignee": "Assignee",
148
- "processId": "PID",
161
+ "processId": "Proces ID",
149
162
  "started": "Gestart",
150
163
  "lastModified": "Aangepast op",
151
- "workflowTarget": "Doel",
152
- "productTag": "Tag"
164
+ "workflowTarget": "Target",
165
+ "productTag": "Product tag"
153
166
  },
154
167
  "detail": {
155
168
  "retry": "Probeer opnieuw",
156
169
  "resume": "Ga verder",
157
170
  "abort": "Stop",
158
171
  "delete": "Verwijder",
159
- "deleteQuestion": "Weet je zeker dat je de taak {workflowName} wilt verwijderen?",
172
+ "deleteQuestion": "Weet je zeker dat je de {workflowName} taak wilt verwijderen?",
173
+ "abortTaskQuestion": "Weet je zeker dat je de {workflowName} taak wilt stoppen?",
174
+ "abortWorkflowQuestion": "Weet je zeker dat je de {workflowName} workflow wilt stoppen?",
175
+ "retryTaskQuestion": "Weet je zeker dat je de {workflowName} taak opnieuw wilt proberen?",
176
+ "retryWorkflowQuestion": "Weet je zeker dat je de {workflowName} workflow opnieuw wilt proberen?",
160
177
  "status": "Status",
161
178
  "startedBy": "Gestart door",
162
- "lastStep": "Laatste stap",
179
+ "lastStep": "Huidige stap",
163
180
  "startedOn": "Gestart op",
164
181
  "lastUpdate": "Laatste update",
165
182
  "relatedSubscriptions": "Gerelateerde subscriptions",
@@ -168,45 +185,59 @@
168
185
  },
169
186
  "steps": {
170
187
  "steps": "Workflow stappen",
171
- "showDelta": "Toon subscription verschil",
172
- "viewOptions": "Scherm options",
188
+ "showDelta": "Toon subscription delta",
189
+ "hideDelta": "Verberg subscription delta",
190
+ "viewOptions": "Opties",
173
191
  "expandAll": "klap alles uit",
174
192
  "collapseAll": "klap alles in",
175
193
  "duration": "Looptijd",
176
194
  "userInput": "Invoer gebruiker",
177
- "submitFormLabel": "Vul de inputvelden en verstuur het formulier om de workflow te starten"
195
+ "submitTaskFormLabel": "Verstuur het formulier om deze workflow te starten",
196
+ "submitWorkflowFormLabel": "Verstuur het formulier om deze task te starten"
197
+ },
198
+ "delta": {
199
+ "title": "Subscription delta"
200
+ }
201
+ },
202
+ "workflows": {
203
+ "tabs": {
204
+ "active": "Actief",
205
+ "completed": "Voltooid"
206
+ },
207
+ "index": {
208
+ "title": "Workflows"
178
209
  }
179
210
  },
180
211
  "subscriptions": {
181
212
  "tabs": {
182
213
  "active": "Actief",
183
- "terminated": "Beeindigd",
184
- "transient": "Tijdelijk",
214
+ "terminated": "Beëindigd",
215
+ "transient": "In uitvoering",
185
216
  "all": "Alles"
186
217
  },
187
218
  "index": {
188
219
  "id": "ID",
189
220
  "description": "Beschrijving",
190
221
  "status": "Status",
191
- "insync": "In Sync",
222
+ "insync": "In sync",
192
223
  "product": "Produkt",
193
224
  "tag": "Tag",
194
- "startDate": "Start datum",
195
- "endDate": "Eind Datum",
196
- "note": "Notitite"
225
+ "startDate": "Startdatum",
226
+ "endDate": "Einddatum",
227
+ "note": "Notitie"
197
228
  },
198
229
  "detail": {
199
230
  "tabs": {
200
231
  "general": "Algemeen",
201
232
  "serviceConfiguration": "Service configuratie",
202
- "processes": "Processen",
203
- "relatedSubscriptions": "Geralateerde subscripties"
233
+ "workflows": "Workflows",
234
+ "relatedSubscriptions": "Gerelateerde subscriptions"
204
235
  },
205
236
  "loadingStatus": "Laden",
206
237
  "actions": {
207
238
  "create": "Create workflow",
208
239
  "modify": "Modify workflow",
209
- "system": "System workflow",
240
+ "tasks": "Taken",
210
241
  "terminate": "Terminate workflow",
211
242
  "actions": "Acties",
212
243
  "subscription": {
@@ -238,33 +269,49 @@
238
269
  "status": "Status",
239
270
  "id": "ID",
240
271
  "blockTitleSubscriptionDetails": "Subscription details",
241
- "blockTitleFixedInputs": "Fixed Inputs",
242
- "blockTitleProductInfo": "Produkt Info",
272
+ "blockTitleFixedInputs": "Fixed inputs",
273
+ "blockTitleProductInfo": "Produktinfo",
243
274
  "subscriptionId": "Subscription ID",
244
275
  "description": "Beschrijving",
245
- "startDate": "Start datum",
276
+ "startDate": "Startdatum",
246
277
  "insync": "In sync",
247
278
  "customer": "Klant",
248
279
  "customerUuid": "Klant UUID",
249
280
  "name": "Naam",
250
- "productType": "Produkt type",
281
+ "productType": "Produkttype",
251
282
  "tag": "Tag",
252
283
  "created": "Aangemaakt",
253
- "endDate": "Eind datum",
284
+ "endDate": "Einddatum",
254
285
  "note": "Notitie",
255
286
  "noRelatedSubscriptions": "Geen gerelateerde subscriptions gevonden",
256
- "hideTerminatedRelatedSubscriptions": "Verberg terminated related subscriptions",
287
+ "hideTerminatedRelatedSubscriptions": "Verberg beëindigde subscriptions",
257
288
  "processDetail": {
258
289
  "id": "ID",
259
290
  "status": "Status",
260
291
  "startedAt": "Started at",
261
292
  "startedBy": "Started by"
262
- }
293
+ },
294
+ "showAll": "Toon alles",
295
+ "hideAll": "Verberg alles"
263
296
  }
264
297
  },
265
298
  "tasks": {
266
299
  "page": {
267
- "rerunAll": "Alles opnieuw uitvoeren"
300
+ "taskName": "Taak",
301
+ "rerunAll": "Alles opnieuw uitvoeren",
302
+ "rerunAllQuestion": "Weet u zeker dat u alle gefaalde taken opnieuw wilt uitvoeren?"
303
+ }
304
+ },
305
+ "settings": {
306
+ "page": {
307
+ "engineStatus": "Workflow engine status",
308
+ "flushButton": "Flush",
309
+ "flushCacheSettingsTitle": "Flush cache instellingen",
310
+ "modifyEngine": "Wijzig engine status",
311
+ "pauseEngine": "Pauseer workflow engine",
312
+ "runningProcesses": "Lopende processen",
313
+ "selectSettings": "Kies cache",
314
+ "startEngine": "Start workflow engine"
268
315
  }
269
316
  }
270
317
  }
@@ -0,0 +1,51 @@
1
+ import { useContext } from 'react';
2
+
3
+ import { AbstractIntlMessages } from 'next-intl';
4
+
5
+ import { OrchestratorConfigContext } from '@/contexts';
6
+ import { useQueryWithFetch } from '@/hooks';
7
+ import { Locale } from '@/types';
8
+
9
+ import enGB from './en-GB.json';
10
+ import nlNL from './nl-NL.json';
11
+
12
+ export type TranslationMessagesMap = Map<Locale, AbstractIntlMessages>;
13
+
14
+ type BackendTranslationsResponse = {
15
+ forms: {
16
+ fields: Record<string, string>;
17
+ };
18
+ };
19
+
20
+ export const useGetTranslationMessages = (locale: string | undefined) => {
21
+ const { orchestratorApiBaseUrl } = useContext(OrchestratorConfigContext);
22
+ const translationsUrl = `${orchestratorApiBaseUrl}/translations/${locale}`;
23
+ const { isLoading, data } = useQueryWithFetch<
24
+ BackendTranslationsResponse,
25
+ Record<never, never>
26
+ >(translationsUrl, {}, 'backendTranslations');
27
+
28
+ const backendMessages = isLoading ? {} : data?.forms?.fields || {};
29
+
30
+ const getLocalMessages = () => {
31
+ switch (locale) {
32
+ case Locale.enGB:
33
+ return enGB;
34
+ case Locale.nlNL:
35
+ return nlNL;
36
+
37
+ default:
38
+ return enGB;
39
+ }
40
+ };
41
+
42
+ const localMessages = getLocalMessages();
43
+
44
+ return {
45
+ ...localMessages,
46
+ pydanticForms: {
47
+ ...localMessages.pydanticForms,
48
+ backendTranslations: backendMessages,
49
+ },
50
+ };
51
+ };
@@ -18,8 +18,8 @@ import {
18
18
  } from '../../components';
19
19
  import {
20
20
  getDataSortHandler,
21
- getEsQueryStringHandler,
22
21
  getPageChangeHandler,
22
+ getQueryStringHandler,
23
23
  } from '../../components';
24
24
  import type { WfoDataSorting, WfoTableColumns } from '../../components';
25
25
  import type { StoredTableConfig } from '../../components';
@@ -178,12 +178,14 @@ export const WfoProductBlocksPage = () => {
178
178
  },
179
179
  };
180
180
 
181
+ const { pageSize, pageIndex, sortBy, queryString } = dataDisplayParams;
181
182
  const { data, isFetching } = useQueryWithGraphql(
182
183
  GET_PRODUCTS_BLOCKS_GRAPHQL_QUERY,
183
184
  {
184
- first: dataDisplayParams.pageSize,
185
- after: dataDisplayParams.pageIndex * dataDisplayParams.pageSize,
186
- sortBy: dataDisplayParams.sortBy,
185
+ first: pageSize,
186
+ after: pageIndex * pageSize,
187
+ sortBy: sortBy,
188
+ query: queryString,
187
189
  },
188
190
  'productBlocks',
189
191
  );
@@ -193,16 +195,16 @@ export const WfoProductBlocksPage = () => {
193
195
  }
194
196
 
195
197
  const dataSorting: WfoDataSorting<ProductBlockDefinition> = {
196
- field: dataDisplayParams.sortBy?.field ?? PRODUCT_BLOCK_FIELD_NAME,
197
- sortOrder: dataDisplayParams.sortBy?.order ?? SortOrder.ASC,
198
+ field: sortBy?.field ?? PRODUCT_BLOCK_FIELD_NAME,
199
+ sortOrder: sortBy?.order ?? SortOrder.ASC,
198
200
  };
199
201
 
200
202
  const { totalItems, sortFields, filterFields } =
201
203
  data.productBlocks.pageInfo;
202
204
 
203
205
  const pagination: Pagination = {
204
- pageSize: dataDisplayParams.pageSize,
205
- pageIndex: dataDisplayParams.pageIndex,
206
+ pageSize: pageSize,
207
+ pageIndex: pageIndex,
206
208
  pageSizeOptions: DEFAULT_PAGE_SIZES,
207
209
  totalItemCount: totalItems ? totalItems : 0,
208
210
  };
@@ -224,12 +226,12 @@ export const WfoProductBlocksPage = () => {
224
226
  onUpdatePage={getPageChangeHandler<ProductBlockDefinition>(
225
227
  setDataDisplayParam,
226
228
  )}
227
- onUpdateEsQueryString={getEsQueryStringHandler<ProductBlockDefinition>(
229
+ onUpdateQueryString={getQueryStringHandler<ProductBlockDefinition>(
228
230
  setDataDisplayParam,
229
231
  )}
230
232
  pagination={pagination}
231
233
  isLoading={isFetching}
232
- esQueryString={dataDisplayParams.esQueryString}
234
+ queryString={queryString}
233
235
  localStorageKey={
234
236
  METADATA_PRODUCT_BLOCKS_TABLE_LOCAL_STORAGE_KEY
235
237
  }
@@ -4,36 +4,33 @@ import { useTranslations } from 'next-intl';
4
4
 
5
5
  import type { Pagination } from '@elastic/eui/src/components';
6
6
 
7
+ import type { WfoDataSorting, WfoTableColumns } from '@/components';
7
8
  import {
8
9
  DEFAULT_PAGE_SIZE,
9
10
  DEFAULT_PAGE_SIZES,
10
11
  METADATA_PRODUCT_TABLE_LOCAL_STORAGE_KEY,
12
+ StoredTableConfig,
13
+ WfoDateTime,
11
14
  WfoLoading,
12
- } from '../../components';
13
- import type { WfoDataSorting, WfoTableColumns } from '../../components';
14
- import {
15
15
  WfoProductBlockBadge,
16
16
  WfoProductStatusBadge,
17
17
  WfoTableWithFilter,
18
- } from '../../components';
19
- import {
20
18
  getDataSortHandler,
21
- getEsQueryStringHandler,
22
19
  getPageChangeHandler,
23
- } from '../../components';
24
- import { StoredTableConfig } from '../../components';
25
- import { WfoDateTime } from '../../components/WfoDateTime/WfoDateTime';
26
- import { WfoFirstPartUUID } from '../../components/WfoTable/WfoFirstPartUUID';
27
- import { mapSortableAndFilterableValuesToTableColumnConfig } from '../../components/WfoTable/utils/mapSortableAndFilterableValuesToTableColumnConfig';
28
- import { GET_PRODUCTS_GRAPHQL_QUERY } from '../../graphqlQueries';
20
+ getQueryStringHandler,
21
+ } from '@/components';
22
+ import { WfoFirstPartUUID } from '@/components/WfoTable/WfoFirstPartUUID';
23
+ import { mapSortableAndFilterableValuesToTableColumnConfig } from '@/components/WfoTable/utils/mapSortableAndFilterableValuesToTableColumnConfig';
24
+ import { GET_PRODUCTS_GRAPHQL_QUERY } from '@/graphqlQueries';
29
25
  import {
30
26
  useDataDisplayParams,
31
27
  useQueryWithGraphql,
32
28
  useStoredTableConfig,
33
- } from '../../hooks';
34
- import type { ProductDefinition } from '../../types';
35
- import { BadgeType, SortOrder } from '../../types';
36
- import { parseDateToLocaleDateTimeString, parseIsoString } from '../../utils';
29
+ } from '@/hooks';
30
+ import type { ProductDefinition } from '@/types';
31
+ import { BadgeType, SortOrder } from '@/types';
32
+ import { parseDateToLocaleDateTimeString, parseIsoString } from '@/utils';
33
+
37
34
  import { WfoMetadataPageLayout } from './WfoMetadataPageLayout';
38
35
 
39
36
  const PRODUCT_FIELD_PRODUCT_ID: keyof ProductDefinition = 'productId';
@@ -155,12 +152,14 @@ export const WfoProductsPage = () => {
155
152
  },
156
153
  };
157
154
 
155
+ const { pageSize, pageIndex, sortBy, queryString } = dataDisplayParams;
158
156
  const { data, isFetching } = useQueryWithGraphql(
159
157
  GET_PRODUCTS_GRAPHQL_QUERY,
160
158
  {
161
- first: dataDisplayParams.pageSize,
162
- after: dataDisplayParams.pageIndex * dataDisplayParams.pageSize,
163
- sortBy: dataDisplayParams.sortBy,
159
+ first: pageSize,
160
+ after: pageIndex * pageSize,
161
+ sortBy: sortBy,
162
+ query: queryString || undefined,
164
163
  },
165
164
  'products',
166
165
  );
@@ -172,15 +171,15 @@ export const WfoProductsPage = () => {
172
171
  const { totalItems, sortFields, filterFields } = data.products.pageInfo;
173
172
 
174
173
  const pagination: Pagination = {
175
- pageSize: dataDisplayParams.pageSize,
176
- pageIndex: dataDisplayParams.pageIndex,
174
+ pageSize: pageSize,
175
+ pageIndex: pageIndex,
177
176
  pageSizeOptions: DEFAULT_PAGE_SIZES,
178
177
  totalItemCount: totalItems ? totalItems : 0,
179
178
  };
180
179
 
181
180
  const dataSorting: WfoDataSorting<ProductDefinition> = {
182
- field: dataDisplayParams.sortBy?.field ?? PRODUCT_FIELD_NAME,
183
- sortOrder: dataDisplayParams.sortBy?.order ?? SortOrder.ASC,
181
+ field: sortBy?.field ?? PRODUCT_FIELD_NAME,
182
+ sortOrder: sortBy?.order ?? SortOrder.ASC,
184
183
  };
185
184
 
186
185
  return (
@@ -200,12 +199,12 @@ export const WfoProductsPage = () => {
200
199
  onUpdatePage={getPageChangeHandler<ProductDefinition>(
201
200
  setDataDisplayParam,
202
201
  )}
203
- onUpdateEsQueryString={getEsQueryStringHandler<ProductDefinition>(
202
+ onUpdateQueryString={getQueryStringHandler<ProductDefinition>(
204
203
  setDataDisplayParam,
205
204
  )}
206
205
  pagination={pagination}
207
206
  isLoading={isFetching}
208
- esQueryString={dataDisplayParams.esQueryString}
207
+ queryString={queryString}
209
208
  localStorageKey={METADATA_PRODUCT_TABLE_LOCAL_STORAGE_KEY}
210
209
  />
211
210
  </WfoMetadataPageLayout>
@@ -16,8 +16,8 @@ import type { WfoDataSorting, WfoTableColumns } from '../../components';
16
16
  import { WfoTableWithFilter } from '../../components';
17
17
  import {
18
18
  getDataSortHandler,
19
- getEsQueryStringHandler,
20
19
  getPageChangeHandler,
20
+ getQueryStringHandler,
21
21
  } from '../../components';
22
22
  import type { StoredTableConfig } from '../../components';
23
23
  import { WfoFirstPartUUID } from '../../components/WfoTable/WfoFirstPartUUID';
@@ -124,12 +124,14 @@ export const WfoResourceTypesPage = () => {
124
124
  },
125
125
  };
126
126
 
127
+ const { pageSize, pageIndex, sortBy, queryString } = dataDisplayParams;
127
128
  const { data, isFetching } = useQueryWithGraphql(
128
129
  GET_RESOURCE_TYPES_GRAPHQL_QUERY,
129
130
  {
130
- first: dataDisplayParams.pageSize,
131
- after: dataDisplayParams.pageIndex * dataDisplayParams.pageSize,
132
- sortBy: dataDisplayParams.sortBy,
131
+ first: pageSize,
132
+ after: pageIndex * pageSize,
133
+ sortBy: sortBy,
134
+ query: queryString,
133
135
  },
134
136
  'resourceTypes',
135
137
  );
@@ -139,16 +141,16 @@ export const WfoResourceTypesPage = () => {
139
141
  }
140
142
 
141
143
  const dataSorting: WfoDataSorting<ResourceTypeDefinition> = {
142
- field: dataDisplayParams.sortBy?.field ?? RESOURCE_TYPE_FIELD_TYPE,
143
- sortOrder: dataDisplayParams.sortBy?.order ?? SortOrder.ASC,
144
+ field: sortBy?.field ?? RESOURCE_TYPE_FIELD_TYPE,
145
+ sortOrder: sortBy?.order ?? SortOrder.ASC,
144
146
  };
145
147
 
146
148
  const { totalItems, sortFields, filterFields } =
147
149
  data.resourceTypes.pageInfo;
148
150
 
149
151
  const pagination: Pagination = {
150
- pageSize: dataDisplayParams.pageSize,
151
- pageIndex: dataDisplayParams.pageIndex,
152
+ pageSize: pageSize,
153
+ pageIndex: pageIndex,
152
154
  pageSizeOptions: DEFAULT_PAGE_SIZES,
153
155
  totalItemCount: totalItems ? totalItems : 0,
154
156
  };
@@ -170,12 +172,12 @@ export const WfoResourceTypesPage = () => {
170
172
  onUpdatePage={getPageChangeHandler<ResourceTypeDefinition>(
171
173
  setDataDisplayParam,
172
174
  )}
173
- onUpdateEsQueryString={getEsQueryStringHandler<ResourceTypeDefinition>(
175
+ onUpdateQueryString={getQueryStringHandler<ResourceTypeDefinition>(
174
176
  setDataDisplayParam,
175
177
  )}
176
178
  pagination={pagination}
177
179
  isLoading={isFetching}
178
- esQueryString={dataDisplayParams.esQueryString}
180
+ queryString={queryString}
179
181
  localStorageKey={
180
182
  METADATA_RESOURCE_TYPES_TABLE_LOCAL_STORAGE_KEY
181
183
  }
@@ -15,8 +15,8 @@ import {
15
15
  import { WfoTableWithFilter } from '../../components';
16
16
  import {
17
17
  getDataSortHandler,
18
- getEsQueryStringHandler,
19
18
  getPageChangeHandler,
19
+ getQueryStringHandler,
20
20
  } from '../../components';
21
21
  import type { WfoDataSorting, WfoTableColumns } from '../../components';
22
22
  import { StoredTableConfig } from '../../components';
@@ -136,12 +136,14 @@ export const WfoWorkflowsPage = () => {
136
136
  },
137
137
  };
138
138
 
139
+ const { pageSize, pageIndex, sortBy, queryString } = dataDisplayParams;
139
140
  const { data, isFetching } = useQueryWithGraphql(
140
141
  GET_WORKFLOWS_GRAPHQL_QUERY,
141
142
  {
142
- first: dataDisplayParams.pageSize,
143
- after: dataDisplayParams.pageIndex * dataDisplayParams.pageSize,
144
- sortBy: graphQlWorkflowListMapper(dataDisplayParams.sortBy),
143
+ first: pageSize,
144
+ after: pageIndex * pageSize,
145
+ sortBy: graphQlWorkflowListMapper(sortBy),
146
+ query: queryString,
145
147
  },
146
148
  'workflows',
147
149
  );
@@ -151,15 +153,15 @@ export const WfoWorkflowsPage = () => {
151
153
  }
152
154
 
153
155
  const dataSorting: WfoDataSorting<WorkflowListItem> = {
154
- field: dataDisplayParams.sortBy?.field ?? 'name',
155
- sortOrder: dataDisplayParams.sortBy?.order ?? SortOrder.ASC,
156
+ field: sortBy?.field ?? 'name',
157
+ sortOrder: sortBy?.order ?? SortOrder.ASC,
156
158
  };
157
159
 
158
160
  const { totalItems, sortFields, filterFields } = data.workflows.pageInfo;
159
161
 
160
162
  const pagination: Pagination = {
161
- pageSize: dataDisplayParams.pageSize,
162
- pageIndex: dataDisplayParams.pageIndex,
163
+ pageSize: pageSize,
164
+ pageIndex: pageIndex,
163
165
  pageSizeOptions: DEFAULT_PAGE_SIZES,
164
166
  totalItemCount: totalItems ? totalItems : 0,
165
167
  };
@@ -181,12 +183,12 @@ export const WfoWorkflowsPage = () => {
181
183
  onUpdatePage={getPageChangeHandler<WorkflowListItem>(
182
184
  setDataDisplayParam,
183
185
  )}
184
- onUpdateEsQueryString={getEsQueryStringHandler<WorkflowListItem>(
186
+ onUpdateQueryString={getQueryStringHandler<WorkflowListItem>(
185
187
  setDataDisplayParam,
186
188
  )}
187
189
  pagination={pagination}
188
190
  isLoading={isFetching}
189
- esQueryString={dataDisplayParams.esQueryString}
191
+ queryString={queryString}
190
192
  localStorageKey={METADATA_WORKFLOWS_TABLE_LOCAL_STORAGE_KEY}
191
193
  />
192
194
  </WfoMetadataPageLayout>