Merge pull request #88 from ATIX-AG/Hide_snapshots_in_case_no_VM_asso…

…ciated Hide snapshots in case no vm associated
ATIX-AG · Dec 5, 2023 · b1eb3b9 · b1eb3b9
2 parents 6f28c97 + 4f8cf69
commit b1eb3b9
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 26 deletions.
diff --git a/lib/foreman_snapshot_management/engine.rb b/lib/foreman_snapshot_management/engine.rb
@@ -63,7 +63,7 @@ class Engine < ::Rails::Engine
           context.add_pagelet :main_tabs,
             :name => N_('Snapshots'),
             :partial => 'hosts/snapshots_tab',
-            :onlyif => proc { |host| host&.compute_resource&.capable?(:snapshots) }
+            :onlyif => proc { |host| host&.uuid.present? && host&.compute_resource&.capable?(:snapshots) }
         end
       end
     end

diff --git a/webpack/components/SnapshotManagementCard/SnapshotManagementCard.js b/webpack/components/SnapshotManagementCard/SnapshotManagementCard.js
@@ -18,7 +18,7 @@ const SnapshotManagementCard = ({ hostDetails, ...props }) => {
       hostDetails?.capabilities?.includes('snapshot_include_quiesce') || false,
   };
 
-  if (hostDetails?.id && hostDetails?.permissions)
+  if (hostDetails?.uuid && hostDetails?.id && hostDetails?.permissions) {
     children.push(
       <SnapshotManagement
         key="SnapshotManagement"
@@ -30,14 +30,16 @@ const SnapshotManagementCard = ({ hostDetails, ...props }) => {
         capabilities={capabilities}
       />
     );
-  return (
-    <CardTemplate
-      overrideGridProps={{ xl2: 6, xl: 8, lg: 8, md: 12 }}
-      header={__('Snapshots')}
-    >
-      {children}
-    </CardTemplate>
-  );
+    return (
+      <CardTemplate
+        overrideGridProps={{ xl2: 6, xl: 8, lg: 8, md: 12 }}
+        header={__('Snapshots')}
+      >
+        {children}
+      </CardTemplate>
+    );
+  }
+  return null;
 };
 
 export default SnapshotManagementCard;
@@ -46,6 +48,7 @@ SnapshotManagementCard.propTypes = {
   hostDetails: PropTypes.shape({
     name: PropTypes.string,
     id: PropTypes.number,
+    uuid: PropTypes.string,
     capabilities: PropTypes.array,
     permissions: PropTypes.shape({
       create_snapshots: PropTypes.bool,

diff --git a/webpack/components/SnapshotManagementCard/__tests__/SnapshotManagementCard.test.js b/webpack/components/SnapshotManagementCard/__tests__/SnapshotManagementCard.test.js
@@ -5,6 +5,7 @@ import SnapshotManagementCard from '../SnapshotManagementCard';
 const hostDetails = {
   id: 42,
   name: 'deep.thought',
+  uuid: '829aa26a-928f-11ee-b9d1-0242ac120002',
   permissions: {
     create_snapshots: true,
     edit_snapshots: false,

diff --git a/...onents/SnapshotManagementCard/__tests__/__snapshots__/SnapshotManagementCard.test.js.snap b/...onents/SnapshotManagementCard/__tests__/__snapshots__/SnapshotManagementCard.test.js.snap
@@ -114,19 +114,4 @@ exports[`SnapshotManagementCard renders with VMWare capabilities 1`] = `
 </CardTemplate>
 `;
 
-exports[`SnapshotManagementCard renders without optional Props 1`] = `
-<CardTemplate
-  expandable={false}
-  header="Snapshots"
-  masonryLayout={false}
-  overrideDropdownProps={Object {}}
-  overrideGridProps={
-    Object {
-      "lg": 8,
-      "md": 12,
-      "xl": 8,
-      "xl2": 6,
-    }
-  }
-/>
-`;
+exports[`SnapshotManagementCard renders without optional Props 1`] = `""`;