Fix DR Status is not displayed for discovered apps in Virtual Machine page

https://issues.redhat.com/browse/DFBUGS-2822
https://issues.redhat.com/browse/DFBUGS-2823

Signed-off-by: Timothy Asir Jeyasingh <[email protected]>

Author: Timothy Asir

packages/mco/components/dr-status-popover/parsers/virtualmachine-parser.tsx

@@ -1,9 +1,5 @@
 import * as React from 'react';
-import {
-  DISCOVERED_APP_NS,
-  KUBE_INSTANCE_LABEL,
-  ODF_RESOURCE_TYPE_LABEL,
-} from '@odf/mco/constants';
+import { DISCOVERED_APP_NS, KUBE_INSTANCE_LABEL } from '@odf/mco/constants';
 import {
   getApplicationResourceObj,
   getApplicationSetResourceObj,
@@ -27,7 +23,6 @@ import {
   getLabel,
   getName,
   getNamespace,
-  VirtualMachineModel,
 } from '@odf/shared';
 import {
   K8sResourceCommon,
@@ -75,12 +70,6 @@ const DiscoveredHelper: React.FC<ParserHelperProps> = ({
   >(
     getDRPlacementControlResourceObj({
       namespace: DISCOVERED_APP_NS,
-      selector: {
-        matchLabels: {
-          // To optimize the VM DRPC watch
-          [ODF_RESOURCE_TYPE_LABEL]: VirtualMachineModel.kind.toLowerCase(),
-        },
-      },
     })
   );
 

packages/mco/components/modals/app-manage-policies/parsers/discovered-vm-parser.tsx

@@ -1,10 +1,6 @@
 import * as React from 'react';
 import { getPlacementKindObj } from '@odf/mco/components/discovered-application-wizard/utils/k8s-utils';
-import {
-  DISCOVERED_APP_NS,
-  DRApplication,
-  ODF_RESOURCE_TYPE_LABEL,
-} from '@odf/mco/constants';
+import { DISCOVERED_APP_NS, DRApplication } from '@odf/mco/constants';
 import {
   getDRPlacementControlResourceObj,
   getDRPolicyResourceObj,
@@ -16,7 +12,7 @@ import {
   getSearchResultItems,
   queryAppWorkloadPVCs,
 } from '@odf/mco/utils';
-import { getName, getNamespace, VirtualMachineModel } from '@odf/shared';
+import { getName, getNamespace } from '@odf/shared';
 import {
   K8sResourceCommon,
   useK8sWatchResource,
@@ -53,12 +49,6 @@ export const DiscoveredVMParser: React.FC<DiscoveredVMParserProps> = ({
   >(
     getDRPlacementControlResourceObj({
       namespace: DISCOVERED_APP_NS,
-      selector: {
-        matchLabels: {
-          // To optimize the VM DRPC watch
-          [ODF_RESOURCE_TYPE_LABEL]: VirtualMachineModel.kind.toLowerCase(),
-        },
-      },
     })
   );
 

packages/mco/components/modals/app-manage-policies/utils/parser-utils.ts

@@ -180,7 +180,10 @@ export const findDRPCUsingVM = (
 ): DRPlacementControlKind | undefined =>
   drpcs.find(
     (drpc) =>
-      getVMNamesFromRecipe(drpc.spec).includes(vmName) &&
+      (getVMNamesFromRecipe(drpc.spec).includes(vmName) ||
+        (
+          drpc.status?.resourceConditions?.resourceMeta?.protectedpvcs || []
+        ).some((pvc) => pvc.startsWith(vmName))) &&
       drpc.spec?.protectedNamespaces?.includes(vmNamespace) &&
       getPrimaryClusterName(drpc) === cluster
   );