From c7d6f7cfa07f243aae75d40c8ff3dc3c3c2465c4 Mon Sep 17 00:00:00 2001
From: Ahmet Can Buyukyilmaz <ahmet.buyukyilmaz@canonical.com>
Date: Tue, 21 Jan 2025 15:06:03 +0300
Subject: [PATCH] fix(images): Fallback as custom image when splitting OS from
 resource name (#5581)

---
 src/app/store/bootresource/utils.test.ts | 10 +++++-----
 src/app/store/bootresource/utils.ts      |  7 +++++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/app/store/bootresource/utils.test.ts b/src/app/store/bootresource/utils.test.ts
index a671da7bf4..7d86c320c4 100644
--- a/src/app/store/bootresource/utils.test.ts
+++ b/src/app/store/bootresource/utils.test.ts
@@ -40,13 +40,13 @@ describe("bootresource utils", () => {
         os: "centos",
         release: "centos70",
       });
-      expect(splitResourceName("ubuntu")).toStrictEqual({
-        os: "",
-        release: "",
+      expect(splitResourceName("rocky9")).toStrictEqual({
+        os: "other",
+        release: "rocky9",
       });
       expect(splitResourceName("ubuntu/focal/amd64/generic")).toStrictEqual({
-        os: "",
-        release: "",
+        os: "ubuntu",
+        release: "focal",
       });
       expect(splitResourceName("")).toStrictEqual({ os: "", release: "" });
     });
diff --git a/src/app/store/bootresource/utils.ts b/src/app/store/bootresource/utils.ts
index b57325bfc4..9230a29ff2 100644
--- a/src/app/store/bootresource/utils.ts
+++ b/src/app/store/bootresource/utils.ts
@@ -4,9 +4,12 @@ export const splitResourceName = (
   name: BootResource["name"]
 ): { os: string; release: string } => {
   const split = name.split("/");
-  return split.length === 2
+  if (name.length === 0) {
+    return { os: "", release: "" };
+  }
+  return split.length > 1
     ? { os: split[0], release: split[1] }
-    : { os: "", release: "" };
+    : { os: "other", release: name };
 };
 
 export const splitImageName = (