Make the user visible patterns configurable, added MicroOS products

.yupdate.post

@@ -25,8 +25,8 @@ function restart_service() {
 
   if [ -n "$SERVICE_START" ]; then
     SERVICE_START_UNIX_TIME=$(date -d "$SERVICE_START" +"%s")
-    # find the date of the latest file in the gem
-    NEWEST_FILE_TIME=$(find /usr/lib*/ruby/gems/*/gems/$SERVICE_NAME-* -exec stat --format %Y "{}" \; | sort -nr | head -n 1)
+    # find the date of the latest file in the product configuration or in the gem
+    NEWEST_FILE_TIME=$(find /usr/share/agama/products.d /usr/lib*/ruby/gems/*/gems/$SERVICE_NAME-* -exec stat --format %Y "{}" \; | sort -nr | head -n 1)
 
     # when a file is newer than the start time then restart the service
     if [ -n "$NEWEST_FILE_TIME" ] && [ "$SERVICE_START_UNIX_TIME" -lt "$NEWEST_FILE_TIME" ]; then

Rakefile

@@ -170,5 +170,21 @@ if ENV["YUPDATE_FORCE"] == "1" || File.exist?("/.packages.initrd") || live_iso?
       FileUtils.mkdir_p(File.join(destdir, "/usr/share"))
       FileUtils.cp_r("playwright/.", File.join(destdir, "/usr/share/agama-playwright"))
     end
+
+    if ENV["YUPDATE_SKIP_PRODUCTS"] != "1"
+      files = Dir.glob("products.d/*.y{a}ml")
+      files.each do |f|
+        # the sources contain several products, update only the existing files
+        oldfile = File.join("/usr/share/agama/", f)
+        if File.exist?(oldfile)
+          target = File.join(destdir, "/usr/share/agama/", f)
+          FileUtils.mkdir_p(File.dirname(target))
+          FileUtils.cp(f, target)
+        else
+          # if there is a new product file it needs to be copied manually
+          puts "Skipping product file: #{f}"
+        end
+      end
+    end
   end
 end

products.d/ALP-Dolomite.yaml

@@ -23,6 +23,8 @@ software:
     - alp_cockpit
     - alp_hardware
   optional_patterns: null # no optional pattern shared
+  # no user selectable patterns, do not display the pattern selector
+  user_patterns: []
   mandatory_packages:
     - package: ppc64-diag # Needed for hardware-based installations
       archs: ppc64

products.d/leap16.yaml

@@ -28,6 +28,8 @@ software:
     - alp-container_runtime
     - alp_defaults
   optional_patterns: null # no optional pattern shared
+  user_patterns:
+    - alp_selinux
   mandatory_packages: null
   optional_packages: null
   base_product: Leap16

products.d/tumbleweed.yaml

@@ -47,6 +47,15 @@ software:
   mandatory_patterns:
     - enhanced_base # only pattern that is shared among all roles on TW
   optional_patterns: null # no optional pattern shared
+  user_patterns:
+    - basic_desktop
+    - xfce
+    - kde
+    - gnome
+    - yast2_x11
+    - yast2_server
+    - multimedia
+    - office
   mandatory_packages:
     - NetworkManager
   optional_packages: null

service/lib/agama/config.rb

@@ -170,10 +170,10 @@ def merge(config)
     # @param property [Symbol|String|nil] Property to retrieve of the elements.
     #
     # @return [Array]
-    def arch_elements_from(*keys, property: nil)
+    def arch_elements_from(*keys, property: nil, default: [])
       keys.map!(&:to_s)
       elements = products.dig(*keys)
-      return [] unless elements.is_a?(Array)
+      return default unless elements.is_a?(Array)
 
       elements.map do |element|
         if !element.is_a?(Hash)

service/lib/agama/software/manager.rb

@@ -214,6 +214,11 @@ def patterns(filtered)
         patterns = Y2Packager::Resolvable.find({ kind: :pattern }, preload)
         patterns = patterns.select(&:user_visible) if filtered
 
+        # only display the configured patterns
+        if product.user_patterns
+          patterns.select! {|p| product.user_patterns.include?(p.name)}
+        end
+
         patterns
       end
 

service/lib/agama/software/product.rb

@@ -73,6 +73,11 @@ class Product
       # @return [Array<String>]
       attr_accessor :optional_patterns
 
+      # Optional user selectable patterns
+      #
+      # @return [Array<String>]
+      attr_accessor :user_patterns
+
       # Product translations.
       #
       # @example
@@ -94,6 +99,8 @@ def initialize(id)
         @optional_packages = []
         @mandatory_patterns = []
         @optional_patterns = []
+        # nil = display all patterns, [] = display none patterns
+        @user_patterns = nil
         @translations = {}
       end
 

service/lib/agama/software/product_builder.rb

@@ -47,6 +47,7 @@ def build
             product.optional_packages = data[:optional_packages]
             product.mandatory_patterns = data[:mandatory_patterns]
             product.optional_patterns = data[:optional_patterns]
+            product.user_patterns = data[:user_patterns]
             product.translations = attrs["translations"] || {}
           end
         end
@@ -79,6 +80,9 @@ def product_data_from_config(id)
           ),
           optional_patterns:  config.arch_elements_from(
             id, "software", "optional_patterns", property: :pattern
+          ),
+          user_patterns:  config.arch_elements_from(
+            id, "software", "user_patterns", property: :pattern, default: nil
           )
         }
       end

web/src/components/overview/SoftwareSection.jsx

@@ -34,6 +34,7 @@ const initialState = {
   errors: [],
   errorsRead: false,
   size: "",
+  patterns: {},
   progress: { message: _("Reading software repositories"), current: 0, total: 0, finished: false }
 };
 
@@ -51,8 +52,8 @@ const reducer = (state, action) => {
     case "UPDATE_PROPOSAL": {
       if (state.busy) return state;
 
-      const { errors, size } = action.payload;
-      return { ...state, errors, size, errorsRead: true };
+      const { errors, size, patterns } = action.payload;
+      return { ...state, errors, size, patterns, errorsRead: true };
     }
 
     default: {
@@ -82,8 +83,9 @@ export default function SoftwareSection({ showErrors }) {
     const updateProposal = async () => {
       const errors = await cancellablePromise(client.getIssues());
       const size = await cancellablePromise(client.getUsedSpace());
+      const patterns = await cancellablePromise(client.patterns(true));
 
-      dispatch({ type: "UPDATE_PROPOSAL", payload: { errors, size } });
+      dispatch({ type: "UPDATE_PROPOSAL", payload: { errors, size, patterns } });
     };
 
     updateProposal();
@@ -142,7 +144,8 @@ export default function SoftwareSection({ showErrors }) {
       icon="apps"
       loading={state.busy}
       errors={errors.map(toValidationError)}
-      path="/software"
+      // do not display the pattern selector when there are no patterns to display
+      path={Object.keys(state.patterns).length > 0 ? "/software" : null}
     >
       <SectionContent />
     </Section>

web/src/components/overview/SoftwareSection.test.jsx

@@ -29,9 +29,20 @@ import { SoftwareSection } from "~/components/overview";
 
 jest.mock("~/client");
 
+const kdePattern = {
+  kde: [
+    "Graphical Environments",
+    "Packages providing the Plasma desktop environment and applications from KDE.",
+    "./pattern-kde",
+    "KDE Applications and Plasma 5 Desktop",
+    "1110"
+  ]
+};
+
 let getStatusFn = jest.fn().mockResolvedValue(IDLE);
 let getProgressFn = jest.fn().mockResolvedValue({});
 let getIssuesFn = jest.fn().mockResolvedValue([]);
+let patternsFn = jest.fn().mockResolvedValue(kdePattern);
 
 beforeEach(() => {
   createClient.mockImplementation(() => {
@@ -42,6 +53,7 @@ beforeEach(() => {
         getIssues: getIssuesFn,
         onStatusChange: noop,
         onProgressChange: noop,
+        patterns: patternsFn,
         getUsedSpace: jest.fn().mockResolvedValue("500 MB")
       },
     };
@@ -51,6 +63,7 @@ beforeEach(() => {
 describe("when the proposal is calculated", () => {
   beforeEach(() => {
     getStatusFn = jest.fn().mockResolvedValue(IDLE);
+    patternsFn = jest.fn().mockResolvedValue(kdePattern);
   });
 
   it("renders the required space", async () => {
@@ -59,6 +72,28 @@ describe("when the proposal is calculated", () => {
     await screen.findByText("500 MB");
   });
 
+  describe("patterns are available", () => {
+    it("the header is a link", async () => {
+      const { container } = installerRender(<SoftwareSection showErrors />);
+      // wait until the component is fully rendered
+      await screen.findByText("Installation will take");
+      expect(container.querySelector("h2 a[href='/software']")).not.toBeNull();
+    });
+  });
+
+  describe("no patterns are available", () => {
+    beforeEach(() => {
+      patternsFn = jest.fn().mockResolvedValue({});
+    });
+
+    it("the header is a plain text", async () => {
+      const { container } = installerRender(<SoftwareSection showErrors />);
+      // wait until the component is fully rendered
+      await screen.findByText("Installation will take");
+      expect(container.querySelector("h2 a")).toBeNull();
+    });
+  });
+
   describe("and there are errors", () => {
     beforeEach(() => {
       getIssuesFn = jest.fn().mockResolvedValue([{ description: "Could not install..." }]);