Skip to content

Commit a1075f2

Browse files
authored
Merge pull request #1009
* fix(29734): fix the generation of id nodes * fix(29734): fix bug with the discovery of connected nodes * fix(29734): reorganise error handling * test(29734): add tests * test(29734): add tests * test(29734): add tests * test(29734): add tests * fix(29734): fix usage of "latest" for version * fix(29734): fix imports * fix(29734): fix bug with detection of schema versions * test(29734): add tests * fix(29734): fix bug with i18n resources * fix(29734): fix bug with id (node) being duplicated by using id (func… * fix(29734): fix formating of function name * test(29734): fix tests * test(29734): fix tests * test(29734): fix tests * fix(29734): fix bug with detection of script versions * Update hivemq-edge-frontend/src/extensions/datahub/designer/script/Fu… * fix(29734): fix bug with id (node) being duplicated by using id (func… * test(29734): fix tests * test(29734): fix tests * test(29734): refactor the uuid test for clarity * fix(29734): fix typo * fix(29734): fix comment
1 parent 5dee237 commit a1075f2

27 files changed

+521
-125
lines changed
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import { AccessibleDraggableProvider } from '@/hooks/useAccessibleDraggable'
2+
import type { FC, PropsWithChildren } from 'react'
3+
4+
export const getAccessibleDraggableProvider = () => {
5+
const WrapperEdgeProvider: FC<PropsWithChildren> = ({ children }) => {
6+
return <AccessibleDraggableProvider>{children}</AccessibleDraggableProvider>
7+
}
8+
9+
return WrapperEdgeProvider
10+
}

hivemq-edge-frontend/src/extensions/datahub/__test-utils__/transform.mocks.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { OperationData } from '@datahub/types.ts'
2+
import { SCRIPT_FUNCTION_LATEST } from '@datahub/utils/datahub.utils.ts'
23

34
const NODE1_ID = 'node_07280ae8-6470-48f8-87da-84cc4bcb6d2b'
45
const NODE2_ID = 'node_4ad0412f-e773-49d3-81e3-d5f54f9fbd09'
@@ -68,7 +69,7 @@ export const MOCK_TRANSFORM = {
6869
functionId: 'Serdes.deserialize',
6970
formData: {
7071
schemaId: 'dfdffd',
71-
schemaVersion: 'latest',
72+
schemaVersion: SCRIPT_FUNCTION_LATEST,
7273
},
7374
metadata: {
7475
isTerminal: false,
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import type { DataHubNodeType } from '@datahub/types.ts'
2+
3+
export const vitest_ExpectStringContainingUUIDFromNodeType = (type: DataHubNodeType) => {
4+
return expect.stringContaining(`${type}_`)
5+
}

hivemq-edge-frontend/src/extensions/datahub/components/pages/DataHubListings.tsx

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,16 @@ const DataHubListings: FC = () => {
9090
<ScriptTable onDeleteItem={handleOnDelete} />
9191
</TabPanel>
9292
</TabPanels>
93-
<ConfirmationDialog
94-
isOpen={isConfirmDeleteOpen}
95-
onClose={handleConfirmOnClose}
96-
onSubmit={handleConfirmOnSubmit}
97-
header={t('Listings.modal.delete.header', { context: deleteItem?.type })}
98-
message={t('Listings.modal.delete.message', { context: deleteItem?.type })}
99-
prompt={t('Listings.modal.delete.prompt')}
100-
/>
93+
{deleteItem && (
94+
<ConfirmationDialog
95+
isOpen={isConfirmDeleteOpen}
96+
onClose={handleConfirmOnClose}
97+
onSubmit={handleConfirmOnSubmit}
98+
header={t('Listings.modal.delete.header', { context: deleteItem?.type })}
99+
message={t('Listings.modal.delete.message', { context: deleteItem?.type })}
100+
prompt={t('Listings.modal.delete.prompt')}
101+
/>
102+
)}
101103
</Tabs>
102104
)
103105
}

hivemq-edge-frontend/src/extensions/datahub/designer/behavior_policy/BehaviorPolicyNode.utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export const loadBehaviorPolicy = (behaviorPolicy: BehaviorPolicy): NodeAddChang
6161
}
6262

6363
const behaviorPolicyNode: Node<BehaviorPolicyData> = {
64-
id: getNodeId(),
64+
id: getNodeId(DataHubNodeType.BEHAVIOR_POLICY),
6565
type: DataHubNodeType.BEHAVIOR_POLICY,
6666
position,
6767
data: {

hivemq-edge-frontend/src/extensions/datahub/designer/client_filter/ClientFilterNode.utils.spec.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { expect } from 'vitest'
22
import type { Connection, Node, NodeAddChange } from '@xyflow/react'
33
import { MOCK_DEFAULT_NODE } from '@/__test-utils__/react-flow/nodes.ts'
4+
import { vitest_ExpectStringContainingUUIDFromNodeType } from '@datahub/__test-utils__/vitest.utils.ts'
45

56
import type { BehaviorPolicyData, ClientFilterData, WorkspaceState } from '@datahub/types.ts'
67
import { BehaviorPolicyType, DataHubNodeType } from '@datahub/types.ts'
@@ -145,7 +146,7 @@ describe('loadClientFilter', () => {
145146
data: {
146147
clients: ['*.*'],
147148
},
148-
id: expect.stringContaining('node_'),
149+
id: vitest_ExpectStringContainingUUIDFromNodeType(DataHubNodeType.CLIENT_FILTER),
149150
position: {
150151
x: -320,
151152
y: 0,
@@ -155,7 +156,7 @@ describe('loadClientFilter', () => {
155156
type: 'add',
156157
}),
157158
expect.objectContaining({
158-
source: expect.stringContaining('node_'),
159+
source: vitest_ExpectStringContainingUUIDFromNodeType(DataHubNodeType.CLIENT_FILTER),
159160
target: 'node-id',
160161
}),
161162
])

hivemq-edge-frontend/src/extensions/datahub/designer/client_filter/ClientFilterNode.utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ export const loadClientFilter = (
4949
}
5050

5151
const topicNode: Node<ClientFilterData> = {
52-
id: getNodeId(),
52+
id: getNodeId(DataHubNodeType.CLIENT_FILTER),
5353
type: DataHubNodeType.CLIENT_FILTER,
5454
position,
5555
data: {

hivemq-edge-frontend/src/extensions/datahub/designer/data_policy/DataPolicyNode.utils.spec.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
import { expect } from 'vitest'
22
import type { Node, NodeAddChange } from '@xyflow/react'
33
import { MOCK_DEFAULT_NODE } from '@/__test-utils__/react-flow/nodes.ts'
4+
import { vitest_ExpectStringContainingUUIDFromNodeType } from '@datahub/__test-utils__/vitest.utils.ts'
45

6+
import type { DataPolicy } from '@/api/__generated__'
57
import type { DataPolicyData, TopicFilterData, WorkspaceState } from '@datahub/types.ts'
68
import { DataHubNodeType } from '@datahub/types.ts'
79
import { checkValidityFilter, loadDataPolicy } from '@datahub/designer/data_policy/DataPolicyNode.utils.ts'
8-
import type { DataPolicy } from '@/api/__generated__'
910

1011
const NODE_DATA_ID = 'my-policy-id'
1112

@@ -147,7 +148,7 @@ describe('loadDataPolicy', () => {
147148
it('should return nodes', () => {
148149
expect(loadDataPolicy(dataPolicy)).toStrictEqual<NodeAddChange>({
149150
item: expect.objectContaining<Node<DataPolicyData>>({
150-
id: expect.stringContaining('node_'),
151+
id: vitest_ExpectStringContainingUUIDFromNodeType(DataHubNodeType.DATA_POLICY),
151152
type: DataHubNodeType.DATA_POLICY,
152153
data: { id: 'string' },
153154
position: { x: 0, y: 0 },

hivemq-edge-frontend/src/extensions/datahub/designer/data_policy/DataPolicyNode.utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ export const loadDataPolicy = (policy: DataPolicy): NodeAddChange => {
123123
}
124124

125125
const dataPolicyNode: Node<DataPolicyData> = {
126-
id: getNodeId(),
126+
id: getNodeId(DataHubNodeType.DATA_POLICY),
127127
type: DataHubNodeType.DATA_POLICY,
128128
position,
129129
data: { id: policy.id },

0 commit comments

Comments
 (0)