Merge pull request #2093 from upalatucci/remove-detach-namespace

CNV-44420: Fix detach disk crash
kubevirt-ui · Jul 23, 2024 · d2baec5 · d2baec5
2 parents 7bb67ad + 4831a5a
commit d2baec5
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 10 deletions.
diff --git a/src/views/catalog/wizard/tabs/disks/components/DiskRowActions.tsx b/src/views/catalog/wizard/tabs/disks/components/DiskRowActions.tsx
@@ -72,10 +72,7 @@ const DiskRowActions: FC<DiskRowActionsProps> = ({ diskName }) => {
         submitBtnText={deleteBtnText}
         submitBtnVariant={ButtonVariant.danger}
       >
-        <ConfirmActionMessage
-          action="detach"
-          obj={{ metadata: { name: diskName, namespace: vm?.metadata?.namespace } }}
-        />
+        <ConfirmActionMessage action="detach" obj={{ metadata: { name: diskName } }} />
       </TabModal>
     ));
   };

diff --git a/src/views/templates/details/tabs/disks/components/DiskRowActions.tsx b/src/views/templates/details/tabs/disks/components/DiskRowActions.tsx
@@ -60,10 +60,7 @@ const DiskRowActions: FC<DiskRowActionsProps> = ({ diskName, isDisabled, onUpdat
         submitBtnText={deleteBtnText}
         submitBtnVariant={ButtonVariant.danger}
       >
-        <ConfirmActionMessage
-          action="detach"
-          obj={{ metadata: { name: diskName, namespace: vm?.metadata?.namespace } }}
-        />
+        <ConfirmActionMessage action="detach" obj={{ metadata: { name: diskName } }} />
       </TabModal>
     ));
   };

diff --git a/...s/virtualmachines/details/tabs/configuration/storage/components/modal/DeleteDiskModal.tsx b/...s/virtualmachines/details/tabs/configuration/storage/components/modal/DeleteDiskModal.tsx
@@ -108,7 +108,7 @@ const DeleteDiskModal: FC<DeleteDiskModalProps> = ({ isOpen, onClose, vm, volume
         <StackItem>
           <ConfirmActionMessage
             obj={{
-              metadata: { name: diskName, namespace: updatedVirtualMachine?.metadata?.namespace },
+              metadata: { name: diskName },
             }}
             action="detach"
           />

diff --git a/...ines/details/tabs/configuration/storage/components/modal/hooks/useVolumeOwnedResource.tsx b/...ines/details/tabs/configuration/storage/components/modal/hooks/useVolumeOwnedResource.tsx
@@ -42,7 +42,6 @@ const useVolumeOwnedResource: UseVolumeOwnedResource = (vm, volume) => {
     volumeGroupVersionKind && volumeResourceName && watchVolumeResource,
   );
 
-  volumeResourceModel.verbs;
   if (!volumeResourceModel || !volumeResourceName) {
     return {
       error: error || isCdiConfigError,