Do not require VMs and filter them by activeNamespace in VM dialog (#409

) - fixes https://bugzilla.redhat.com/show_bug.cgi?id=1720603
kubevirt · Jun 18, 2019 · 5476b1c · 5476b1c
1 parent 21f2b48
commit 5476b1c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/frontend/public/kubevirt/components/modals/create-vm-modal.js b/frontend/public/kubevirt/components/modals/create-vm-modal.js
@@ -21,8 +21,8 @@ export const openCreateVmWizard = ( activeNamespace, createTemplate = false ) =>
       resource: getResource(NamespaceModel),
     },
     virtualMachines: {
-      resource: getResource(VirtualMachineModel),
-      required: true,
+      resource: getResource(VirtualMachineModel, {namespace: activeNamespace}),
+      requiredIfAuthorized: true,
     },
     userTemplates: {
       resource: getResource(TemplateModel, {namespace: activeNamespace, prop: 'userTemplates', matchLabels: {[TEMPLATE_TYPE_LABEL]: TEMPLATE_TYPE_VM}}),

diff --git a/frontend/public/kubevirt/components/utils/withResources.jsx b/frontend/public/kubevirt/components/utils/withResources.jsx
@@ -46,6 +46,8 @@ class Resources extends React.Component {
       if (resource) {
         if (resource.loaded) {
           childrenProps[resourceKey] = resource.data;
+        } else if (resourceConfig.requiredIfAuthorized && _.get(resource, 'loadError.json.code') !== 403){
+          loaded = false;
         } else if (resourceConfig.required) {
           loaded = false;
         }