Merge pull request #1022

* fix(30991): fix a bug with the reference to the object to validate

* fix(30991): fix status update of visited node

* fix(30991): fix status

* fix(30991): fix schema for the topic filter node

* fix(30991): fix loading of panel

* fix(30991): add a debug message

Author: vanch3d

hivemq-edge-frontend/src/extensions/datahub/api/__generated__/schemas/TopicFilterData.json

@@ -2,26 +2,37 @@ import type { FC } from 'react'
 import { useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Button, Icon } from '@chakra-ui/react'
+import type { Node } from '@xyflow/react'
 
 import { usePolicyDryRun } from '@datahub/hooks/usePolicyDryRun.ts'
 import { usePolicyChecksStore } from '@datahub/hooks/usePolicyChecksStore.ts'
+import useDataHubDraftStore from '@datahub/hooks/useDataHubDraftStore.ts'
 import { getDryRunStatusIcon } from '@datahub/utils/node.utils.ts'
-import { PolicyDryRunStatus } from '@datahub/types.ts'
+import type { DataPolicyData } from '@datahub/types.ts'
+import { type BehaviorPolicyData, DataHubNodeType, PolicyDryRunStatus } from '@datahub/types.ts'
 import { usePolicyGuards } from '@datahub/hooks/usePolicyGuards.ts'
 
 export const ToolbarDryRun: FC = () => {
   const { t } = useTranslation('datahub')
   const { checkPolicyAsync } = usePolicyDryRun()
   const { isPolicyEditable } = usePolicyGuards()
   const { status, node: selectedNode, initReport, setReport } = usePolicyChecksStore()
+  const { nodes: allNodes } = useDataHubDraftStore()
 
   const CheckIcon = useMemo(() => getDryRunStatusIcon(status), [status])
 
   const handleCheckPolicy = () => {
     if (!selectedNode) return
 
+    const target = allNodes.find(
+      (node: Node): node is Node<BehaviorPolicyData> | Node<DataPolicyData> =>
+        node.id === selectedNode.id &&
+        (node.type === DataHubNodeType.DATA_POLICY || node.type === DataHubNodeType.BEHAVIOR_POLICY)
+    )
+    if (!target) return
+
     initReport()
-    checkPolicyAsync(selectedNode).then((results): void => {
+    checkPolicyAsync(target).then((results): void => {
       setReport(results)
     })
   }

hivemq-edge-frontend/src/extensions/datahub/components/toolbar/ToolbarDryRun.tsx

@@ -1,22 +1,24 @@
 import type { FC } from 'react'
 import { useMemo } from 'react'
+import type { CustomValidator } from '@rjsf/utils'
 import type { Node } from '@xyflow/react'
 import { useTranslation } from 'react-i18next'
 import { Card, CardBody } from '@chakra-ui/react'
 
-import type { DataPolicyData, PanelProps } from '@datahub/types.ts'
-import useDataHubDraftStore from '@datahub/hooks/useDataHubDraftStore.ts'
+import LoaderSpinner from '@/components/Chakra/LoaderSpinner.tsx'
+import ErrorMessage from '@/components/ErrorMessage.tsx'
+
+import { useGetAllDataPolicies } from '@datahub/api/hooks/DataHubDataPoliciesService/useGetAllDataPolicies.ts'
 import { ReactFlowSchemaForm } from '@datahub/components/forms/ReactFlowSchemaForm.tsx'
 import { MOCK_DATA_POLICY_SCHEMA } from '@datahub/designer/data_policy/DataPolicySchema.ts'
-import type { CustomValidator } from '@rjsf/utils'
-import { useGetAllDataPolicies } from '@datahub/api/hooks/DataHubDataPoliciesService/useGetAllDataPolicies.ts'
+import useDataHubDraftStore from '@datahub/hooks/useDataHubDraftStore.ts'
 import { usePolicyGuards } from '@datahub/hooks/usePolicyGuards.ts'
-import ErrorMessage from '@/components/ErrorMessage.tsx'
+import type { DataPolicyData, PanelProps } from '@datahub/types.ts'
 
 export const DataPolicyPanel: FC<PanelProps> = ({ selectedNode, onFormSubmit }) => {
   const { t } = useTranslation('datahub')
   const { nodes } = useDataHubDraftStore()
-  const { data: allPolicies } = useGetAllDataPolicies()
+  const { data: allPolicies, isLoading, isError } = useGetAllDataPolicies()
   const { guardAlert, isNodeEditable } = usePolicyGuards(selectedNode)
 
   const data = useMemo(() => {
@@ -25,8 +27,8 @@ export const DataPolicyPanel: FC<PanelProps> = ({ selectedNode, onFormSubmit })
   }, [selectedNode, nodes])
 
   const customValidate: CustomValidator<DataPolicyData> = (formData, errors) => {
-    if (!allPolicies) errors['id']?.addError(t('error.validation.dataPolicy.notLoading'))
-    else {
+    if (isError) errors['id']?.addError(t('error.validation.dataPolicy.notLoading'))
+    else if (allPolicies) {
       const isIdNotUnique = Boolean(allPolicies.items?.find((e) => e.id === formData?.id))
       if (isIdNotUnique) errors['id']?.addError(t('error.validation.dataPolicy.notUnique'))
     }
@@ -35,17 +37,20 @@ export const DataPolicyPanel: FC<PanelProps> = ({ selectedNode, onFormSubmit })
 
   return (
     <Card>
+      {isLoading && <LoaderSpinner />}
       {guardAlert && <ErrorMessage status="info" type={guardAlert.title} message={guardAlert.description} />}
-      <CardBody>
-        <ReactFlowSchemaForm
-          isNodeEditable={isNodeEditable}
-          schema={MOCK_DATA_POLICY_SCHEMA.schema}
-          uiSchema={MOCK_DATA_POLICY_SCHEMA.uiSchema}
-          formData={data}
-          onSubmit={onFormSubmit}
-          customValidate={customValidate}
-        />
-      </CardBody>
+      {!isLoading && (
+        <CardBody>
+          <ReactFlowSchemaForm
+            isNodeEditable={isNodeEditable}
+            schema={MOCK_DATA_POLICY_SCHEMA.schema}
+            uiSchema={MOCK_DATA_POLICY_SCHEMA.uiSchema}
+            formData={data}
+            onSubmit={onFormSubmit}
+            customValidate={customValidate}
+          />
+        </CardBody>
+      )}
     </Card>
   )
 }

hivemq-edge-frontend/src/extensions/datahub/designer/data_policy/DataPolicyPanel.tsx

@@ -1,5 +1,6 @@
 import type { Node } from '@xyflow/react'
 import { getIncomers } from '@xyflow/react'
+import debug from 'debug'
 
 import type { PolicySchema, Script } from '@/api/__generated__'
 
@@ -27,6 +28,8 @@ import { checkValidityTransitions } from '@datahub/designer/transition/Transitio
 import { checkValidityPipeline } from '@datahub/designer/operation/OperationNode.utils.ts'
 import { useFilteredFunctionsFetcher } from '@datahub/hooks/useFilteredFunctionsFetcher.tsx'
 
+const datahubLog = debug('DataHub:usePolicyDryRun')
+
 /* istanbul ignore next -- @preserve */
 const mockDelay = (ms = 100) => new Promise((resolve) => setTimeout(resolve, ms))
 
@@ -52,14 +55,19 @@ export const usePolicyDryRun = () => {
 
   const updateNodeStatus = async (results: DryRunResults<unknown>) => {
     const currentNode = nodes.find((node) => node.id === results.node.id)
+    if (!currentNode) {
+      datahubLog(`Node with ID ${results.node.id} not found in the current nodes list`)
+      return
+    }
 
     const getStatus = (): PolicyDryRunStatus => {
       if (results.error) return PolicyDryRunStatus.FAILURE
+      // If current node was already marked as failure, keep it
       if (currentNode?.data.dryRunStatus === PolicyDryRunStatus.FAILURE) return PolicyDryRunStatus.FAILURE
       return PolicyDryRunStatus.SUCCESS
     }
-    onUpdateNodes<DataHubNodeData>(results.node.id, {
-      ...results.node.data,
+    onUpdateNodes<DataHubNodeData>(currentNode.id, {
+      ...currentNode.data,
       dryRunStatus: getStatus(),
     })
     await mockDelay(DRYRUN_VALIDATION_DELAY)
@@ -98,7 +106,6 @@ export const usePolicyDryRun = () => {
     const schemaResources = validators.reduce(onlyNonNullResources, [] as DryRunResults<PolicySchema>[])
     const allResources = [...successResources, ...errorResources, ...schemaResources].reduce(onlyUniqueResources, [])
 
-    // TODO[29953] This is not enough, potential BehaviorPolicyTransitionEvent needs to be passed
     const allConfigurations = checkValidityConfigurations(allNodes, getFilteredFunctions(DataHubNodeType.DATA_POLICY))
 
     const processedNodes = [

hivemq-edge-frontend/src/extensions/datahub/hooks/usePolicyDryRun.ts

@@ -69,6 +69,7 @@ export interface WorkspaceAction {
 }
 
 export interface PolicyCheckState {
+  // TODO[30991] The bug is fixed but replace with a reference to the id, NOT the node itself!
   node?: Node
   status?: PolicyDryRunStatus
   report?: DryRunResults<unknown, never>[]