foreman_snapshot_management 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 852f360b2e273ab1e59ba5b2e7960633cdfc169acd60e98f8fc9abeb2616a098
-  data.tar.gz: 9c292f218d3f01ef7e3cba1eab5caaac82e94a65891d88a1b11f19952da39c8a
+  metadata.gz: 682e7ff61a5f90d7c1e1a07c12d1d27dc40deafb6bbae57e842fcf906e15c30f
+  data.tar.gz: ddf453d479054de2f1f1b7efe78b24ae12977882482db989953125aea0488fd8
 SHA512:
-  metadata.gz: ca9602895984df366f86addc657df08ce8c2c2e69fedd9d554115829f36bd956838fb05d2eb3a7d5a6c9a4d0af9f5385ac40573804bb54e9766be6014a49acf9
-  data.tar.gz: 949d446c4f72c2ad58c4098d5866d53259151bb35597444f402b3fd08a3d68ba5f4e76a975bab5be16098b13e4ebbb16531b841869cbd6e53ca31ff99cd924ae
+  metadata.gz: b92836939d7d8c70f965fa1f1859895412ddc66a8e64a353b60b2fb8a8ad120a737ad39cd1d38ff91eb58f48e057bcee1572c9a00d4e4d988f9902df4bd2c2d7
+  data.tar.gz: 4a0b0488fb4e7642f065b04d15925faa4550dd669129aeb1c40e18bd0a7cbca6a014ab8c16551f2c3d61b13843e7ffe964fd28b60f258ce09baf6dd272455b86

data/README.md

@@ -150,7 +150,7 @@ curl -s -u "$AUTH" \
 }
 ```
 
-### Delete a snashot
+### Delete a snapshot
 
 ```bash
 curl -s -u "$AUTH" \

data/app/controllers/api/v2/snapshots_controller.rb

@@ -49,7 +49,7 @@ module Api
       param_group :snapshot, :as => :create
 
       def create
-        @snapshot = resource_class.new(snapshot_params.to_h.merge(host: @host).merge(include_ram: params[:include_ram]))
+        @snapshot = resource_class.new(snapshot_params.to_h.merge(host: @host).merge(include_ram: Foreman::Cast.to_bool(params[:include_ram])))
         process_response @snapshot.create
       end
 

data/lib/foreman_snapshot_management/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ForemanSnapshotManagement
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end

data/test/controllers/api/v2/snapshots_test.rb

@@ -12,13 +12,17 @@ class Api::V2::SnapshotsControllerTest < ActionController::TestCase
   let(:uuid) { '5032c8a5-9c5e-ba7a-3804-832a03e16381' }
   let(:host) { FactoryBot.create(:host, :managed, :compute_resource => compute_resource, :uuid => uuid) }
   let(:snapshot_id) { 'snapshot-0101' }
-  let(:proxmox_compute_resource) do
-    cr = FactoryBot.create(:proxmox_cr)
-    ComputeResource.find_by(id: cr.id)
+
+  if defined?(TEST_PROXMOX)
+    let(:vmid) { '100' }
+    let(:proxmox_compute_resource) do
+      cr = FactoryBot.create(:proxmox_cr)
+      ComputeResource.find_by(id: cr.id)
+    end
+    let(:proxmox_host) { FactoryBot.create(:host, :managed, :compute_resource => proxmox_compute_resource, :uuid => "1_#{vmid}") }
+    let(:proxmox_snapshot) { 'snapshot1' }
   end
-  let(:vmid) { '100' }
-  let(:proxmox_host) { FactoryBot.create(:host, :managed, :compute_resource => proxmox_compute_resource, :uuid => "1_#{vmid}") }
-  let(:proxmox_snapshot) { 'snapshot1' }
+
   let(:manager_user) do
     roles = [Role.find_by(name: 'Snapshot Manager')]
     FactoryBot.create(:user, :organizations => [tax_organization], :locations => [tax_location], :roles => roles)
@@ -34,7 +38,7 @@ class Api::V2::SnapshotsControllerTest < ActionController::TestCase
     setup do
       # Make sure that test-hosts are created here (by the admin-user)
       host
-      proxmox_host
+      proxmox_host if defined?(TEST_PROXMOX)
       @orig_user = User.current
       User.current = view_user
     end
@@ -51,14 +55,16 @@ class Api::V2::SnapshotsControllerTest < ActionController::TestCase
       assert_not_empty body['results']
     end
 
-    test 'should get index of Proxmox Snapshots' do
-      Host::Managed.any_instance.stubs(:vm_exists?).returns(false)
-      get :index, params: { :host_id => proxmox_host.to_param }
-      assert_response :success
-      assert_not_nil assigns(:snapshots)
-      body = ActiveSupport::JSON.decode(@response.body)
-      assert_not_empty body
-      assert_not_empty body['results']
+    if defined?(TEST_PROXMOX)
+      test 'should get index of Proxmox Snapshots' do
+        Host::Managed.any_instance.stubs(:vm_exists?).returns(false)
+        get :index, params: { :host_id => proxmox_host.to_param }
+        assert_response :success
+        assert_not_nil assigns(:snapshots)
+        body = ActiveSupport::JSON.decode(@response.body)
+        assert_not_empty body
+        assert_not_empty body['results']
+      end
     end
 
     test 'should search VMware snapshot' do
@@ -71,15 +77,17 @@ class Api::V2::SnapshotsControllerTest < ActionController::TestCase
       assert_equal body['results'].count, 1
     end
 
-    test 'should search Proxmox snapshot' do
-      Host::Managed.any_instance.stubs(:vm_exists?).returns(false)
-      get :index, params: { :host_id => proxmox_host.to_param, :search => 'name= snapshot1' }
-      assert_response :success
-      assert_not_nil assigns(:snapshots)
-      body = ActiveSupport::JSON.decode(@response.body)
-      assert_not_empty body
-      assert_not_empty body['results']
-      assert_equal body['results'].count, 1
+    if defined?(TEST_PROXMOX)
+      test 'should search Proxmox snapshot' do
+        Host::Managed.any_instance.stubs(:vm_exists?).returns(false)
+        get :index, params: { :host_id => proxmox_host.to_param, :search => 'name= snapshot1' }
+        assert_response :success
+        assert_not_nil assigns(:snapshots)
+        body = ActiveSupport::JSON.decode(@response.body)
+        assert_not_empty body
+        assert_not_empty body['results']
+        assert_equal body['results'].count, 1
+      end
     end
 
     test 'should refute search Vmware snapshot' do
@@ -95,13 +103,15 @@ class Api::V2::SnapshotsControllerTest < ActionController::TestCase
       assert_not_empty body
     end
 
-    test 'should show Proxmox snapshot' do
-      Host::Managed.any_instance.stubs(:vm_exists?).returns(false)
-      get :show, params: { :host_id => proxmox_host.to_param, :id => proxmox_snapshot }
-      assert_not_nil assigns(:snapshot)
-      assert_response :success
-      body = ActiveSupport::JSON.decode(@response.body)
-      assert_not_empty body
+    if defined?(TEST_PROXMOX)
+      test 'should show Proxmox snapshot' do
+        Host::Managed.any_instance.stubs(:vm_exists?).returns(false)
+        get :show, params: { :host_id => proxmox_host.to_param, :id => proxmox_snapshot }
+        assert_not_nil assigns(:snapshot)
+        assert_response :success
+        body = ActiveSupport::JSON.decode(@response.body)
+        assert_not_empty body
+      end
     end
 
     test 'should 404 for unknown Vmware snapshot' do
@@ -125,10 +135,12 @@ class Api::V2::SnapshotsControllerTest < ActionController::TestCase
       assert_response :forbidden
     end
 
-    test 'should refute revert Proxmox snapshot' do
-      Host::Managed.any_instance.stubs(:vm_exists?).returns(false)
-      put :revert, params: { :host_id => proxmox_host.to_param, :id => proxmox_snapshot.to_param }
-      assert_response :forbidden
+    if defined?(TEST_PROXMOX)
+      test 'should refute revert Proxmox snapshot' do
+        Host::Managed.any_instance.stubs(:vm_exists?).returns(false)
+        put :revert, params: { :host_id => proxmox_host.to_param, :id => proxmox_snapshot.to_param }
+        assert_response :forbidden
+      end
     end
   end
 
@@ -136,7 +148,7 @@ class Api::V2::SnapshotsControllerTest < ActionController::TestCase
     setup do
       # Make sure that test-hosts are created here (by the admin-user)
       host
-      proxmox_host
+      proxmox_host if defined?(TEST_PROXMOX)
       @orig_user = User.current
       User.current = manager_user
     end
@@ -153,14 +165,16 @@ class Api::V2::SnapshotsControllerTest < ActionController::TestCase
       assert_not_empty body['results']
     end
 
-    test 'should get index of Proxmox Snapshots' do
-      Host::Managed.any_instance.stubs(:vm_exists?).returns(false)
-      get :index, params: { :host_id => proxmox_host.to_param }
-      assert_response :success
-      assert_not_nil assigns(:snapshots)
-      body = ActiveSupport::JSON.decode(@response.body)
-      assert_not_empty body
-      assert_not_empty body['results']
+    if defined?(TEST_PROXMOX)
+      test 'should get index of Proxmox Snapshots' do
+        Host::Managed.any_instance.stubs(:vm_exists?).returns(false)
+        get :index, params: { :host_id => proxmox_host.to_param }
+        assert_response :success
+        assert_not_nil assigns(:snapshots)
+        body = ActiveSupport::JSON.decode(@response.body)
+        assert_not_empty body
+        assert_not_empty body['results']
+      end
     end
 
     test 'should search VMware snapshot' do
@@ -173,15 +187,17 @@ class Api::V2::SnapshotsControllerTest < ActionController::TestCase
       assert_equal body['results'].count, 1
     end
 
-    test 'should search Proxmox snapshot' do
-      Host::Managed.any_instance.stubs(:vm_exists?).returns(false)
-      get :index, params: { :host_id => proxmox_host.to_param, :search => 'name= snapshot1' }
-      assert_response :success
-      assert_not_nil assigns(:snapshots)
-      body = ActiveSupport::JSON.decode(@response.body)
-      assert_not_empty body
-      assert_not_empty body['results']
-      assert_equal body['results'].count, 1
+    if defined?(TEST_PROXMOX)
+      test 'should search Proxmox snapshot' do
+        Host::Managed.any_instance.stubs(:vm_exists?).returns(false)
+        get :index, params: { :host_id => proxmox_host.to_param, :search => 'name= snapshot1' }
+        assert_response :success
+        assert_not_nil assigns(:snapshots)
+        body = ActiveSupport::JSON.decode(@response.body)
+        assert_not_empty body
+        assert_not_empty body['results']
+        assert_equal body['results'].count, 1
+      end
     end
 
     test 'should refute search Vmware snapshot' do
@@ -197,13 +213,15 @@ class Api::V2::SnapshotsControllerTest < ActionController::TestCase
       assert_not_empty body
     end
 
-    test 'should show Proxmox snapshot' do
-      Host::Managed.any_instance.stubs(:vm_exists?).returns(false)
-      get :show, params: { :host_id => proxmox_host.to_param, :id => proxmox_snapshot }
-      assert_not_nil assigns(:snapshot)
-      assert_response :success
-      body = ActiveSupport::JSON.decode(@response.body)
-      assert_not_empty body
+    if defined?(TEST_PROXMOX)
+      test 'should show Proxmox snapshot' do
+        Host::Managed.any_instance.stubs(:vm_exists?).returns(false)
+        get :show, params: { :host_id => proxmox_host.to_param, :id => proxmox_snapshot }
+        assert_not_nil assigns(:snapshot)
+        assert_response :success
+        body = ActiveSupport::JSON.decode(@response.body)
+        assert_not_empty body
+      end
     end
 
     test 'should 404 for unknown Vmware snapshot' do
@@ -217,11 +235,13 @@ class Api::V2::SnapshotsControllerTest < ActionController::TestCase
       assert_not_nil assigns(:snapshot)
     end
 
-    test 'should create Proxmox snapshot' do
-      Host::Managed.any_instance.stubs(:vm_exists?).returns(false)
-      post :create, params: { :host_id => proxmox_host.to_param, :name => 'test' }
-      assert_response :created
-      assert_not_nil assigns(:snapshot)
+    if defined?(TEST_PROXMOX)
+      test 'should create Proxmox snapshot' do
+        Host::Managed.any_instance.stubs(:vm_exists?).returns(false)
+        post :create, params: { :host_id => proxmox_host.to_param, :name => 'test' }
+        assert_response :created
+        assert_not_nil assigns(:snapshot)
+      end
     end
 
     test 'should update Vmware snapshot' do
@@ -230,18 +250,20 @@ class Api::V2::SnapshotsControllerTest < ActionController::TestCase
       assert_response :success
     end
 
-    test 'should update Proxmox snapshot' do
-      Host::Managed.any_instance.stubs(:vm_exists?).returns(false)
-      description = 'snapshot1 updated'
-      put :update, params: { :host_id => proxmox_host.to_param, :id => proxmox_snapshot.to_param, :description => description.to_param }
-      assert_response :success
-    end
+    if defined?(TEST_PROXMOX)
+      test 'should update Proxmox snapshot' do
+        Host::Managed.any_instance.stubs(:vm_exists?).returns(false)
+        description = 'snapshot1 updated'
+        put :update, params: { :host_id => proxmox_host.to_param, :id => proxmox_snapshot.to_param, :description => description.to_param }
+        assert_response :success
+      end
 
-    test 'should refute update Proxmox snapshot name' do
-      Host::Managed.any_instance.stubs(:vm_exists?).returns(false)
-      name = 'test'
-      put :update, params: { :host_id => proxmox_host.to_param, :id => proxmox_snapshot.to_param, :name => name.to_param }
-      assert_response :unprocessable_entity
+      test 'should refute update Proxmox snapshot name' do
+        Host::Managed.any_instance.stubs(:vm_exists?).returns(false)
+        name = 'test'
+        put :update, params: { :host_id => proxmox_host.to_param, :id => proxmox_snapshot.to_param, :name => name.to_param }
+        assert_response :unprocessable_entity
+      end
     end
 
     test 'should destroy Vmware snapshot' do
@@ -249,24 +271,26 @@ class Api::V2::SnapshotsControllerTest < ActionController::TestCase
       assert_response :success
     end
 
-    test 'should destroy Proxmox snapshot' do
-      Host::Managed.any_instance.stubs(:vm_exists?).returns(false)
-      delete :destroy, params: { :host_id => proxmox_host.to_param, :id => proxmox_snapshot.to_param }
-      assert_response :success
-      body = ActiveSupport::JSON.decode(@response.body)
-      assert_not_nil body['name']
-      assert_nil body['id']
-    end
-
     test 'should revert Vmware snapshot' do
       put :revert, params: { :host_id => host.to_param, :id => snapshot_id.to_param }
       assert_response :success
     end
 
-    test 'should revert Proxmox snapshot' do
-      Host::Managed.any_instance.stubs(:vm_exists?).returns(false)
-      put :revert, params: { :host_id => proxmox_host.to_param, :id => proxmox_snapshot.to_param }
-      assert_response :success
+    if defined?(TEST_PROXMOX)
+      test 'should destroy Proxmox snapshot' do
+        Host::Managed.any_instance.stubs(:vm_exists?).returns(false)
+        delete :destroy, params: { :host_id => proxmox_host.to_param, :id => proxmox_snapshot.to_param }
+        assert_response :success
+        body = ActiveSupport::JSON.decode(@response.body)
+        assert_not_nil body['name']
+        assert_nil body['id']
+      end
+
+      test 'should revert Proxmox snapshot' do
+        Host::Managed.any_instance.stubs(:vm_exists?).returns(false)
+        put :revert, params: { :host_id => proxmox_host.to_param, :id => proxmox_snapshot.to_param }
+        assert_response :success
+      end
     end
   end
 end

data/test/controllers/foreman_snapshot_management/snapshots_controller_test.rb

@@ -15,13 +15,17 @@ module ForemanSnapshotManagement
     let(:host) { FactoryBot.create(:host, :managed, :compute_resource => compute_resource, :uuid => uuid) }
     let(:host2) { FactoryBot.create(:host, :managed, :compute_resource => compute_resource, :uuid => uuid2) }
     let(:snapshot_id) { 'snapshot-0101' }
-    let(:proxmox_compute_resource) do
-      FactoryBot.create(:proxmox_cr)
-      ComputeResource.find_by(type: 'ForemanFogProxmox::Proxmox')
+
+    if defined?(TEST_PROXMOX)
+      let(:vmid) { '1_100' }
+      let(:proxmox_compute_resource) do
+        FactoryBot.create(:proxmox_cr)
+        ComputeResource.find_by(type: 'ForemanFogProxmox::Proxmox')
+      end
+      let(:proxmox_host) { FactoryBot.create(:host, :managed, :compute_resource => proxmox_compute_resource, :uuid => vmid) }
+      let(:proxmox_snapshot) { 'snapshot1' }
     end
-    let(:vmid) { '1_100' }
-    let(:proxmox_host) { FactoryBot.create(:host, :managed, :compute_resource => proxmox_compute_resource, :uuid => vmid) }
-    let(:proxmox_snapshot) { 'snapshot1' }
+
     setup { ::Fog.mock! }
     teardown { ::Fog.unmock! }
 
@@ -33,12 +37,14 @@ module ForemanSnapshotManagement
         assert_template 'foreman_snapshot_management/snapshots/_index'
       end
 
-      test 'should get Proxmox index' do
-        Host::Managed.any_instance.stubs(:vm_exists?).returns(false)
-        get :index, params: { :host_id => proxmox_host.to_param }, session: set_session_user
-        assert_response :success
-        assert_not_nil assigns(:snapshots)
-        assert_template 'foreman_snapshot_management/snapshots/_index'
+      if defined?(TEST_PROXMOX)
+        test 'should get Proxmox index' do
+          Host::Managed.any_instance.stubs(:vm_exists?).returns(false)
+          get :index, params: { :host_id => proxmox_host.to_param }, session: set_session_user
+          assert_response :success
+          assert_not_nil assigns(:snapshots)
+          assert_template 'foreman_snapshot_management/snapshots/_index'
+        end
       end
     end
 
@@ -49,11 +55,13 @@ module ForemanSnapshotManagement
         assert_includes flash[:notice] || flash[:success], 'Successfully created Snapshot.'
       end
 
-      test 'create valid proxmox snapshot' do
-        Host::Managed.any_instance.stubs(:vm_exists?).returns(false)
-        post :create, params: { :host_id => proxmox_host.to_param, :snapshot => { :name => 'test' } }, session: set_session_user
-        assert_redirected_to host_url(proxmox_host, :anchor => 'snapshots')
-        assert_includes flash[:notice] || flash[:success], 'Successfully created Snapshot.'
+      if defined?(TEST_PROXMOX)
+        test 'create valid proxmox snapshot' do
+          Host::Managed.any_instance.stubs(:vm_exists?).returns(false)
+          post :create, params: { :host_id => proxmox_host.to_param, :snapshot => { :name => 'test' } }, session: set_session_user
+          assert_redirected_to host_url(proxmox_host, :anchor => 'snapshots')
+          assert_includes flash[:notice] || flash[:success], 'Successfully created Snapshot.'
+        end
       end
 
       test 'create valid multiple' do
@@ -84,11 +92,13 @@ module ForemanSnapshotManagement
         assert_includes flash[:notice] || flash[:success], 'Successfully deleted Snapshot.'
       end
 
-      test 'destroy successful' do
-        Host::Managed.any_instance.stubs(:vm_exists?).returns(false)
-        delete :destroy, params: { :host_id => proxmox_host.to_param, :id => proxmox_snapshot }, session: set_session_user
-        assert_redirected_to host_url(proxmox_host, :anchor => 'snapshots')
-        assert_includes flash[:notice] || flash[:success], 'Successfully deleted Snapshot.'
+      if defined?(TEST_PROXMOX)
+        test 'destroy successful' do
+          Host::Managed.any_instance.stubs(:vm_exists?).returns(false)
+          delete :destroy, params: { :host_id => proxmox_host.to_param, :id => proxmox_snapshot }, session: set_session_user
+          assert_redirected_to host_url(proxmox_host, :anchor => 'snapshots')
+          assert_includes flash[:notice] || flash[:success], 'Successfully deleted Snapshot.'
+        end
       end
 
       test 'destroy with error' do
@@ -106,11 +116,13 @@ module ForemanSnapshotManagement
         assert_includes flash[:notice] || flash[:success], 'VM successfully rolled back.'
       end
 
-      test 'revert successful proxmox snapshot' do
-        Host::Managed.any_instance.stubs(:vm_exists?).returns(false)
-        put :revert, params: { :host_id => proxmox_host.to_param, :id => proxmox_snapshot }, session: set_session_user
-        assert_redirected_to host_url(proxmox_host, :anchor => 'snapshots')
-        assert_includes flash[:notice] || flash[:success], 'VM successfully rolled back.'
+      if defined?(TEST_PROXMOX)
+        test 'revert successful proxmox snapshot' do
+          Host::Managed.any_instance.stubs(:vm_exists?).returns(false)
+          put :revert, params: { :host_id => proxmox_host.to_param, :id => proxmox_snapshot }, session: set_session_user
+          assert_redirected_to host_url(proxmox_host, :anchor => 'snapshots')
+          assert_includes flash[:notice] || flash[:success], 'VM successfully rolled back.'
+        end
       end
 
       test 'revert with error' do
@@ -130,13 +142,15 @@ module ForemanSnapshotManagement
         assert_equal(data, body)
       end
 
-      test 'update successful proxmox' do
-        Host::Managed.any_instance.stubs(:vm_exists?).returns(false)
-        data = { 'name' => 'snapshot1', 'description' => 'updated snapshot1' }
-        put :update, params: { :host_id => proxmox_host.to_param, :id => proxmox_snapshot, :snapshot => data }, session: set_session_user
-        assert_response :success
-        body = ActiveSupport::JSON.decode(@response.body)
-        assert_equal(data, body)
+      if defined?(TEST_PROXMOX)
+        test 'update successful proxmox' do
+          Host::Managed.any_instance.stubs(:vm_exists?).returns(false)
+          data = { 'name' => 'snapshot1', 'description' => 'updated snapshot1' }
+          put :update, params: { :host_id => proxmox_host.to_param, :id => proxmox_snapshot, :snapshot => data }, session: set_session_user
+          assert_response :success
+          body = ActiveSupport::JSON.decode(@response.body)
+          assert_equal(data, body)
+        end
       end
 
       test 'update with error VMware snapshot' do
@@ -145,11 +159,13 @@ module ForemanSnapshotManagement
         assert_response :unprocessable_entity
       end
 
-      test 'update with error proxmox snapshot' do
-        Host::Managed.any_instance.stubs(:vm_exists?).returns(false)
-        ForemanSnapshotManagement::Snapshot.any_instance.stubs(:save).returns(false)
-        put :update, params: { :host_id => proxmox_host.to_param, :id => proxmox_snapshot, :snapshot => { :name => 'snapshot1', :description => 'fail' } }, session: set_session_user
-        assert_response :unprocessable_entity
+      if defined?(TEST_PROXMOX)
+        test 'update with error proxmox snapshot' do
+          Host::Managed.any_instance.stubs(:vm_exists?).returns(false)
+          ForemanSnapshotManagement::Snapshot.any_instance.stubs(:save).returns(false)
+          put :update, params: { :host_id => proxmox_host.to_param, :id => proxmox_snapshot, :snapshot => { :name => 'snapshot1', :description => 'fail' } }, session: set_session_user
+          assert_response :unprocessable_entity
+        end
       end
     end
   end

data/webpack/components/SnapshotManagement/SnapshotManagementActions.js

@@ -1,6 +1,6 @@
 import { API, actionTypeGenerator } from 'foremanReact/redux/API';
 import { sprintf, translate as __ } from 'foremanReact/common/I18n';
-import { addToast } from 'foremanReact/redux/actions/toasts';
+import { addToast } from 'foremanReact/components/ToastsList';
 
 import {
   SNAPSHOT_LIST,

data/webpack/components/SnapshotManagement/__tests__/__snapshots__/SnapshotManagementActions.test.js.snap

@@ -62,13 +62,13 @@ Array [
     Object {
       "payload": Object {
         "key": "FOREMAN_SNAPSHOT_MANAGEMENT_SNAPSHOT_DELETE_SUCCESS",
-        "message": Object {
+        "toast": Object {
           "key": "FOREMAN_SNAPSHOT_MANAGEMENT_SNAPSHOT_DELETE_SUCCESS",
           "message": "Successfully removed Snapshot \\"Savegame\\" from host deep.thought",
           "type": "success",
         },
       },
-      "type": "TOASTS_ADD",
+      "type": "toasts/addToast",
     },
   ],
   Array [
@@ -108,13 +108,13 @@ Array [
     Object {
       "payload": Object {
         "key": "FOREMAN_SNAPSHOT_MANAGEMENT_SNAPSHOT_DELETE_FAILURE",
-        "message": Object {
+        "toast": Object {
           "key": "FOREMAN_SNAPSHOT_MANAGEMENT_SNAPSHOT_DELETE_FAILURE",
           "message": "Error occurred while removing Snapshot: Error: some-error",
           "type": "error",
         },
       },
-      "type": "TOASTS_ADD",
+      "type": "toasts/addToast",
     },
   ],
   Array [
@@ -151,13 +151,13 @@ Array [
     Object {
       "payload": Object {
         "key": "FOREMAN_SNAPSHOT_MANAGEMENT_SNAPSHOT_ROLLBACK_FAILURE",
-        "message": Object {
+        "toast": Object {
           "key": "FOREMAN_SNAPSHOT_MANAGEMENT_SNAPSHOT_ROLLBACK_FAILURE",
           "message": "Error occurred while rolling back VM: Error: some-error",
           "type": "error",
         },
       },
-      "type": "TOASTS_ADD",
+      "type": "toasts/addToast",
     },
   ],
   Array [
@@ -194,13 +194,13 @@ Array [
     Object {
       "payload": Object {
         "key": "FOREMAN_SNAPSHOT_MANAGEMENT_SNAPSHOT_ROLLBACK_SUCCESS",
-        "message": Object {
+        "toast": Object {
           "key": "FOREMAN_SNAPSHOT_MANAGEMENT_SNAPSHOT_ROLLBACK_SUCCESS",
           "message": "Successfully rolled back Snapshot \\"Savegame\\" on host deep.thought",
           "type": "success",
         },
       },
-      "type": "TOASTS_ADD",
+      "type": "toasts/addToast",
     },
   ],
   Array [
@@ -241,13 +241,13 @@ Array [
     Object {
       "payload": Object {
         "key": "FOREMAN_SNAPSHOT_MANAGEMENT_SNAPSHOT_UPDATE_FAILURE",
-        "message": Object {
+        "toast": Object {
           "key": "FOREMAN_SNAPSHOT_MANAGEMENT_SNAPSHOT_UPDATE_FAILURE",
           "message": "Error occurred while updating Snapshot: Error: some-error",
           "type": "error",
         },
       },
-      "type": "TOASTS_ADD",
+      "type": "toasts/addToast",
     },
   ],
   Array [
@@ -288,13 +288,13 @@ Array [
     Object {
       "payload": Object {
         "key": "FOREMAN_SNAPSHOT_MANAGEMENT_SNAPSHOT_UPDATE_SUCCESS",
-        "message": Object {
+        "toast": Object {
           "key": "FOREMAN_SNAPSHOT_MANAGEMENT_SNAPSHOT_UPDATE_SUCCESS",
           "message": "Successfully updated Snapshot \\"Savegame\\"",
           "type": "success",
         },
       },
-      "type": "TOASTS_ADD",
+      "type": "toasts/addToast",
     },
   ],
   Array [

data/webpack/components/SnapshotManagement/components/SnapshotForm/SnapshotForm.js

@@ -18,6 +18,7 @@ const SnapshotForm = ({
   capabilities,
   ...props
 }) => {
+  const { setModalClosed } = props;
   let nameValidation = Yup.string().max(80, 'Too Long!');
   if (capabilities.limitSnapshotNameFormat)
     nameValidation = nameValidation
@@ -36,7 +37,7 @@ const SnapshotForm = ({
     includeRam: Yup.bool(),
   });
 
-  const handleSubmit = async (values, actions) => {
+  const handleSubmit = (values, actions) => {
     const submitValues = {
       include_ram: values.includeRam || false,
       snapshot: {
@@ -45,22 +46,22 @@ const SnapshotForm = ({
       },
     };
 
-    await submitForm({
+    submitForm({
       item: 'Snapshot',
       url: SNAPSHOT_CREATE_URL.replace(':hostId', hostId),
       values: submitValues,
       message: __('Snapshot successfully created!'),
+      successCallback: setModalClosed,
+      actions,
     });
-    actions.setSubmitting(false);
-    props.setModalClosed();
   };
 
   return (
     <ForemanForm
-      onSubmit={(values, actions) => handleSubmit(values, actions)}
+      onSubmit={handleSubmit}
       initialValues={initialValues}
       validationSchema={validationSchema}
-      onCancel={() => props.setModalClosed()}
+      onCancel={setModalClosed}
     >
       <TextField
         name="name"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_snapshot_management
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - ATIX AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-15 00:00:00.000000000 Z
+date: 2022-10-07 00:00:00.000000000 Z
 dependencies: []
 description: Foreman-plugin to manage snapshots in a virtual-hardware environments.
 email:
@@ -111,12 +111,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Snapshot Management for machines on virtualization-platforms
 test_files:
-- test/controllers/api/v2/snapshots_test.rb
-- test/controllers/foreman_snapshot_management/snapshots_controller_test.rb
-- test/test_plugin_helper.rb
 - test/factories/proxmox_factory.rb
+- test/test_plugin_helper.rb
+- test/controllers/foreman_snapshot_management/snapshots_controller_test.rb
+- test/controllers/api/v2/snapshots_test.rb