Include proposal information in the ProposalChanged signal

Author: ancorgs

service/lib/agama/dbus/storage/manager.rb

@@ -79,7 +79,7 @@ def initialize(backend, logger: nil)
           dbus_method(:GetProposal, "out proposal:s") { recover_proposal }
           dbus_method(:GetIssues, "out issues:s") { recover_issues }
           dbus_signal(:SystemChanged, "system:s")
-          dbus_signal(:ProposalChanged)
+          dbus_signal(:ProposalChanged, "proposal:s")
           dbus_signal(:IssuesChanged)
           dbus_signal(:ProgressChanged, "progress:s")
           dbus_signal(:ProgressFinished)
@@ -130,10 +130,7 @@ def configure_product(id)
           end
 
           next_progress_step(CONFIGURING_STEP)
-          backend.configure
-          self.ProposalChanged
-
-          finish_progress
+          calculate_proposal
         end
 
         # Implementation for the API method #Install.
@@ -208,10 +205,7 @@ def configure(serialized_config)
           start_progress(1, CONFIGURING_STEP)
 
           config_json = JSON.parse(serialized_config, symbolize_names: true)
-          backend.configure(config_json)
-          self.ProposalChanged
-
-          finish_progress
+          calculate_proposal(config_json)
         end
 
         # Applies the given serialized config model according to the JSON schema.
@@ -227,10 +221,7 @@ def configure_with_model(serialized_model)
             storage_system: proposal.storage_system
           ).convert
           config_json = { storage: Agama::Storage::ConfigConversions::ToJSON.new(config).convert }
-          backend.configure(config_json)
-          self.ProposalChanged
-
-          finish_progress
+          calculate_proposal(config_json)
         end
 
         # Solves the given serialized config model.
@@ -400,7 +391,16 @@ def configure_with_current
           return unless config_json
 
           configure(config_json)
-          self.ProposalChanged
+        end
+
+        # @see #configure
+        # @see #configure_with_model
+        #
+        # @param config_json [Hash, nil] see Agama::Storage::Manager#configure
+        def calculate_proposal(config_json = nil)
+          backend.configure(config_json)
+          self.ProposalChanged(recover_proposal)
+          finish_progress
         end
 
         # JSON representation of the given devicegraph from StorageManager

service/test/agama/dbus/storage/manager_test.rb

@@ -851,15 +851,17 @@ def parse(string)
       before do
         allow(proposal).to receive(:storage_json).and_return config_json.to_json
         allow(subject).to receive(:ProposalChanged)
-        allow(backend).to receive(:configure)
       end
 
       let(:config_json) do
         {
           storage: {
             drives: [
               {
-                partitions: [{ generate: "defaults" }]
+                partitions: [
+                  { search: "*", delete: true },
+                  { filesystem: { path: "/" }, size: { min: "5 GiB" } }
+                ]
               }
             ]
           }
@@ -878,7 +880,11 @@ def parse(string)
           expect(device[:name]).to eq "/dev/sda"
           expect(system[:availableDrives]).to eq [device[:sid]]
         end
-        expect(subject).to receive(:ProposalChanged)
+        expect(subject).to receive(:ProposalChanged) do |proposal_str|
+          proposal = parse(proposal_str)
+          expect(proposal[:devices]).to be_a Array
+          expect(proposal[:actions]).to be_a Array
+        end
         expect(subject).to receive(:ProgressChanged).with(/storage configuration/i)
         expect(subject).to receive(:ProgressFinished)