Merge branch 'master' into network_improvements

products.d/agama-products-opensuse.changes

@@ -4,6 +4,11 @@ Wed Jun 26 08:25:00 UTC 2024 - Ladislav Slezák <lslezak@suse.com>
 - Remove the "32bit" pattern from openSUSE MicroOS
   (gh#openSUSE/agama#1381)
 
+-------------------------------------------------------------------
+Mon Jun 24 20:35:00 UTC 2024 - Lubos Kocman <lubos.kocman@suse.com>
+
+- Add Leap 16 (gh#openSUSE/agama#1371)
+
 -------------------------------------------------------------------
 Tue May 21 11:35:51 UTC 2024 - Richard Brown <rbrown@suse.com>
 

rust/agama-lib/src/proxies.rs

@@ -182,3 +182,13 @@ trait Issues {
     #[dbus_proxy(property)]
     fn all(&self) -> zbus::Result<Vec<(String, String, u32, u32)>>;
 }
+
+#[dbus_proxy(
+    interface = "org.opensuse.Agama1.Locale",
+    default_service = "org.opensuse.Agama.Manager1",
+    default_path = "/org/opensuse/Agama/Manager1"
+)]
+trait Locale {
+    /// SetLocale method
+    fn set_locale(&self, locale: &str) -> zbus::Result<()>;
+}

rust/agama-lib/src/software/proxies.rs

@@ -80,8 +80,7 @@ trait SoftwareProduct {
     /// SelectProduct method
     fn select_product(&self, id: &str) -> zbus::Result<(u32, String)>;
 
-    /// AvailableProducts property
-    #[dbus_proxy(property)]
+    /// AvailableProducts method
     fn available_products(&self) -> zbus::Result<Vec<Product>>;
 
     /// SelectedProduct property

rust/agama-server/src/l10n/web.rs

@@ -7,7 +7,9 @@ use crate::{
     error::Error,
     web::{Event, EventsSender},
 };
-use agama_lib::{error::ServiceError, localization::LocaleProxy};
+use agama_lib::{
+    error::ServiceError, localization::LocaleProxy, proxies::LocaleProxy as ManagerLocaleProxy,
+};
 use agama_locale_data::LocaleId;
 use axum::{
     extract::State,
@@ -24,6 +26,7 @@ use tokio::sync::RwLock;
 struct LocaleState<'a> {
     locale: Arc<RwLock<L10n>>,
     proxy: LocaleProxy<'a>,
+    manager_proxy: ManagerLocaleProxy<'a>,
     events: EventsSender,
 }
 
@@ -37,9 +40,11 @@ pub async fn l10n_service(
     let id = LocaleId::default();
     let locale = L10n::new_with_locale(&id).unwrap();
     let proxy = LocaleProxy::new(&dbus).await?;
+    let manager_proxy = ManagerLocaleProxy::new(&dbus).await?;
     let state = LocaleState {
         locale: Arc::new(RwLock::new(locale)),
         proxy,
+        manager_proxy,
         events,
     };
 
@@ -144,7 +149,9 @@ async fn set_config(
             .try_into()
             .map_err(|_e| LocaleError::UnknownLocale(ui_locale.to_string()))?;
         data.translate(&locale)?;
-        changes.ui_locale = Some(locale.to_string());
+        let locale_string = locale.to_string();
+        state.manager_proxy.set_locale(&locale_string).await?;
+        changes.ui_locale = Some(locale_string);
 
         _ = state.events.send(Event::LocaleChanged {
             locale: locale.to_string(),

rust/agama-server/src/network/model.rs

@@ -1314,7 +1314,6 @@ impl fmt::Display for InfinibandTransportMode {
     }
 }
 
-
 #[derive(Default, Debug, PartialEq, Clone, Serialize)]
 pub enum TunMode {
     #[default]
@@ -1329,7 +1328,6 @@ pub struct TunConfig {
     pub owner: Option<String>,
 }
 
-
 /// Represents a network change.
 #[derive(Debug, Clone, Serialize)]
 #[serde(rename_all = "camelCase")]

rust/agama-server/src/network/nm/dbus.rs

@@ -543,9 +543,8 @@ fn infiniband_config_from_dbus(conn: &OwnedNestedHash) -> Option<InfinibandConfi
 }
 
 fn tun_config_to_dbus(config: &TunConfig) -> HashMap<&str, zvariant::Value> {
-    let mut tun_config: HashMap<&str, zvariant::Value> = HashMap::from([
-        ("mode", Value::new(config.mode.clone() as u32)),
-    ]);
+    let mut tun_config: HashMap<&str, zvariant::Value> =
+        HashMap::from([("mode", Value::new(config.mode.clone() as u32))]);
 
     if let Some(group) = &config.group {
         tun_config.insert("group", group.into());
@@ -563,7 +562,6 @@ fn tun_config_from_dbus(conn: &OwnedNestedHash) -> Option<TunConfig> {
 
     let mut tun_config = TunConfig::default();
 
-
     if let Some(mode) = tun.get("mode") {
         tun_config.mode = match mode.downcast_ref::<u32>()? {
             2 => TunMode::Tap,

rust/package/agama.changes

@@ -1,12 +1,13 @@
 -------------------------------------------------------------------
-Tue Jun 25 15:04:20 UTC 2024 - David Diaz <dgonzalez@suse.com>
+Tue Jun 25 15:16:33 UTC 2024 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
 
-- Add resize actions to storage model (gh#openSUSE/agama#1354).
+- Use the new SetLocale D-Bus method to change the language and the
+  keyboard layout (gh#openSUSE/agama#1375).
 
 -------------------------------------------------------------------
-Mon Jun 24 20:35:00 UTC 2024 - Lubos Kocman <lubos.kocman@suse.com>
+Tue Jun 25 15:04:20 UTC 2024 - David Diaz <dgonzalez@suse.com>
 
-- Add Leap 16 (gh#openSUSE/agama#1371)
+- Add resize actions to storage model (gh#openSUSE/agama#1354).
 
 -------------------------------------------------------------------
 Thu Jun 21 15:00:00 UTC 2024 - Clemens Famulla-Conrad <cfamullaconrad@suse.de>

service/lib/agama/dbus/clients/software.rb

@@ -21,6 +21,7 @@
 
 require "agama/dbus/clients/base"
 require "agama/dbus/clients/with_issues"
+require "agama/dbus/clients/with_locale"
 require "agama/dbus/clients/with_progress"
 require "agama/dbus/clients/with_service_status"
 
@@ -29,6 +30,7 @@ module DBus
     module Clients
       # D-Bus client for software configuration
       class Software < Base
+        include WithLocale
         include WithIssues
         include WithProgress
         include WithServiceStatus

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

@@ -21,6 +21,7 @@
 
 require "agama/dbus/clients/base"
 require "agama/dbus/clients/with_service_status"
+require "agama/dbus/clients/with_locale"
 require "agama/dbus/clients/with_progress"
 require "agama/dbus/clients/with_issues"
 
@@ -29,6 +30,7 @@ module DBus
     module Clients
       # D-Bus client for storage configuration
       class Storage < Base
+        include WithLocale
         include WithServiceStatus
         include WithProgress
         include WithIssues

service/lib/agama/dbus/clients/with_locale.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+# Copyright (c) [2024] SUSE LLC
+#
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of version 2 of the GNU General Public License as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, contact SUSE LLC.
+#
+# To contact SUSE LLC about this file by physical or electronic mail, you may
+# find current contact information at www.suse.com.
+
+module Agama
+  module DBus
+    module Clients
+      # Mixin for clients of services that define the Locale D-Bus interface
+      #
+      # Provides a method to interact with the API of the Locale interface.
+      #
+      # @note This mixin is expected to be included in a class inherited from {Clients::Base} and
+      #   it requires a #dbus_object method that returns a {::DBus::Object} implementing the
+      #   Locale interface.
+      module WithLocale
+        # Changes the service locale
+        #
+        # @param locale [String] new locale
+        def locale=(locale)
+          dbus_object.SetLocale(locale)
+        end
+      end
+    end
+  end
+end

service/lib/agama/dbus/interfaces/locale.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+# Copyright (c) [2024] SUSE LLC
+#
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of version 2 of the GNU General Public License as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, contact SUSE LLC.
+#
+# To contact SUSE LLC about this file by physical or electronic mail, you may
+# find current contact information at www.suse.com.
+
+require "yast"
+require "dbus"
+
+Yast.import "WFM"
+
+module Agama
+  module DBus
+    module Interfaces
+      # Mixin to define the Locale interface.
+      #
+      # @note This mixin is expected to be included in a class that inherits from {DBus::BaseObject}
+      # and it requires a #locale= method that sets the service's locale.
+      module Locale
+        include Yast::I18n
+        include Yast::Logger
+
+        LOCALE_INTERFACE = "org.opensuse.Agama1.Locale"
+
+        def self.included(base)
+          base.class_eval do
+            dbus_interface LOCALE_INTERFACE do
+              # It expects a locale (en_US.UTF-8) as argument.
+              dbus_method :SetLocale, "in locale:s" do |locale|
+                self.locale = locale
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

service/lib/agama/dbus/manager.rb

@@ -24,6 +24,7 @@
 require "agama/dbus/base_object"
 require "agama/dbus/with_service_status"
 require "agama/dbus/interfaces/progress"
+require "agama/dbus/interfaces/locale"
 require "agama/dbus/interfaces/service_status"
 require "agama/autoyast/converter"
 
@@ -34,6 +35,7 @@ class Manager < BaseObject
       include WithServiceStatus
       include Interfaces::Progress
       include Interfaces::ServiceStatus
+      include Interfaces::Locale
 
       PATH = "/org/opensuse/Agama/Manager1"
       private_constant :PATH
@@ -141,6 +143,12 @@ def service_status
         backend.service_status
       end
 
+      def locale=(locale)
+        safe_run do
+          busy_while { backend.locale = locale }
+        end
+      end
+
     private
 
       # @return [Agama::Manager]

service/lib/agama/dbus/manager_service.rb

@@ -28,7 +28,6 @@
 require "agama/dbus/manager"
 require "agama/dbus/users"
 require "agama/dbus/storage/proposal"
-require "agama/ui_locale"
 
 module Agama
   module DBus
@@ -74,8 +73,6 @@ def start
         export
         # We need locale for data from users
         locale_client = Clients::Locale.instance
-        # TODO: test if we need to pass block with additional actions
-        @ui_locale = UILocale.new(locale_client)
         manager.on_progress_change { dispatch } # make single thread more responsive
         manager.startup_phase
       end

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

@@ -24,6 +24,7 @@
 require "agama/dbus/clients/locale"
 require "agama/dbus/clients/network"
 require "agama/dbus/interfaces/issues"
+require "agama/dbus/interfaces/locale"
 require "agama/dbus/interfaces/progress"
 require "agama/dbus/interfaces/service_status"
 require "agama/dbus/with_service_status"
@@ -37,6 +38,7 @@ class Manager < BaseObject
         include Interfaces::Progress
         include Interfaces::ServiceStatus
         include Interfaces::Issues
+        include Interfaces::Locale
 
         PATH = "/org/opensuse/Agama/Software1"
         private_constant :PATH
@@ -134,6 +136,12 @@ def finish
           busy_while { backend.finish }
         end
 
+        def locale=(locale)
+          busy_while do
+            backend.locale = locale
+          end
+        end
+
       private
 
         # @return [Agama::Software]

service/lib/agama/dbus/software/product.rb

@@ -23,6 +23,7 @@
 require "suse/connect"
 require "agama/dbus/base_object"
 require "agama/dbus/interfaces/issues"
+require "agama/dbus/clients/locale"
 require "agama/registration"
 
 module Agama
@@ -90,7 +91,9 @@ def select_product(id)
         private_constant :PRODUCT_INTERFACE
 
         dbus_interface PRODUCT_INTERFACE do
-          dbus_reader :available_products, "a(ssa{sv})"
+          dbus_method :AvailableProducts, "out result:a(ssa{sv})" do
+            [available_products]
+          end
 
           dbus_reader :selected_product, "s"
 
@@ -248,6 +251,11 @@ def registration_properties_changed
             interfaces_and_properties[REGISTRATION_INTERFACE], [])
         end
 
+        def product_properties_changed
+          dbus_properties_changed(PRODUCT_INTERFACE,
+            interfaces_and_properties[PRODUCT_INTERFACE], [])
+        end
+
         # Result from calling to SUSE connect.
         #
         # @raise [Exception] if an unexpected error is found.