From cbfae0b6f52b77139d28d88ec161f94b600e5874 Mon Sep 17 00:00:00 2001
From: Janne Savolainen <janne.savolainen@live.fi>
Date: Mon, 17 Oct 2022 13:16:45 +0300
Subject: [PATCH] Tweak UI for preference navigation tab groups

Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com>

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>
---
 ...ensions-preference-tab-group.injectable.ts |  1 +
 .../preference-item-injection-token.ts        |  1 +
 .../preference-items/preference-tab-root.tsx  | 21 +++++++++++++
 .../preferences-composite.injectable.ts       | 15 +---------
 .../preferences-navigation.tsx                | 30 ++++++++++++++-----
 5 files changed, 47 insertions(+), 21 deletions(-)
 create mode 100644 src/features/preferences/renderer/preference-items/preference-tab-root.tsx

diff --git a/src/features/preferences/renderer/preference-items/extensions-preference-tab-group.injectable.ts b/src/features/preferences/renderer/preference-items/extensions-preference-tab-group.injectable.ts
index 4609fc0906..fe7da9d9f9 100644
--- a/src/features/preferences/renderer/preference-items/extensions-preference-tab-group.injectable.ts
+++ b/src/features/preferences/renderer/preference-items/extensions-preference-tab-group.injectable.ts
@@ -15,6 +15,7 @@ const extensionsPreferenceTabGroupInjectable = getInjectable({
     parentId: "preference-tabs" as const,
     label: "Extensions",
     orderNumber: 20,
+    iconName: "extension",
   }),
 
   injectionToken: preferenceItemInjectionToken,
diff --git a/src/features/preferences/renderer/preference-items/preference-item-injection-token.ts b/src/features/preferences/renderer/preference-items/preference-item-injection-token.ts
index 6662a6e645..935b9052d3 100644
--- a/src/features/preferences/renderer/preference-items/preference-item-injection-token.ts
+++ b/src/features/preferences/renderer/preference-items/preference-item-injection-token.ts
@@ -26,6 +26,7 @@ export interface PreferenceTabGroup {
   label: string;
   orderNumber: number;
   isShown?: boolean;
+  iconName?: string;
 }
 
 export interface PreferencePage {
diff --git a/src/features/preferences/renderer/preference-items/preference-tab-root.tsx b/src/features/preferences/renderer/preference-items/preference-tab-root.tsx
new file mode 100644
index 0000000000..7e2292b955
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/preference-tab-root.tsx
@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import React from "react";
+
+export interface PreferenceTabsRoot {
+  kind: "preference-tabs-root";
+  id: string;
+  parentId: undefined;
+  isShown: true;
+  childrenSeparator: () => React.ReactElement;
+}
+
+export const preferenceTabsRoot: PreferenceTabsRoot = {
+  kind: "preference-tabs-root" as const,
+  id: "preference-tabs",
+  parentId: undefined,
+  isShown: true,
+  childrenSeparator: () => <hr />,
+};
diff --git a/src/features/preferences/renderer/preference-items/preferences-composite.injectable.ts b/src/features/preferences/renderer/preference-items/preferences-composite.injectable.ts
index ba23c28f5c..6720e44bb7 100644
--- a/src/features/preferences/renderer/preference-items/preferences-composite.injectable.ts
+++ b/src/features/preferences/renderer/preference-items/preferences-composite.injectable.ts
@@ -10,20 +10,7 @@ import { preferenceItemInjectionToken } from "./preference-item-injection-token"
 import getComposite from "../../../application-menu/main/menu-items/get-composite/get-composite";
 import { filter } from "lodash/fp";
 import { pipeline } from "@ogre-tools/fp";
-
-export interface PreferenceTabsRoot {
-  kind: "preference-tabs-root";
-  id: string;
-  parentId: undefined;
-  isShown: true;
-}
-
-const preferenceTabsRoot: PreferenceTabsRoot = {
-  kind: "preference-tabs-root" as const,
-  id: "preference-tabs",
-  parentId: undefined,
-  isShown: true,
-};
+import { preferenceTabsRoot } from "./preference-tab-root";
 
 const preferencesCompositeInjectable = getInjectable({
   id: "preferences-composite",
diff --git a/src/features/preferences/renderer/preference-navigation/preferences-navigation.tsx b/src/features/preferences/renderer/preference-navigation/preferences-navigation.tsx
index e1bc94faf8..3a62b1568e 100644
--- a/src/features/preferences/renderer/preference-navigation/preferences-navigation.tsx
+++ b/src/features/preferences/renderer/preference-navigation/preferences-navigation.tsx
@@ -13,14 +13,16 @@ import preferencesCompositeInjectable from "../preference-items/preferences-comp
 import { observer } from "mobx-react";
 import { PreferencesNavigationTab } from "./preferences-navigation-tab";
 import { compositeHasDescendant } from "../../../application-menu/main/menu-items/get-composite/composite-has-descendant/composite-has-descendant";
+import type { PreferenceTabsRoot } from "../preference-items/preference-tab-root";
+import { Icon } from "../../../../renderer/components/icon";
 
 interface Dependencies {
-  composite: IComputedValue<Composite<PreferenceTypes>>;
+  composite: IComputedValue<Composite<PreferenceTypes | PreferenceTabsRoot>>;
 }
 
 const NonInjectedPreferencesNavigation = observer(({ composite }: Dependencies) => (
   <Tabs className="flex column" scrollable={false}>
-    <Map items={composite.get().children}>{toNavigationHierarchy}</Map>
+    {toNavigationHierarchy(composite.get())}
   </Tabs>
 ));
 
@@ -35,7 +37,7 @@ export const PreferencesNavigation = withInjectables<Dependencies>(
 );
 
 
-const toNavigationHierarchy = (composite: Composite<PreferenceTypes>) => {
+const toNavigationHierarchy = (composite: Composite<PreferenceTypes | PreferenceTabsRoot>) => {
   // Note: This makes tab groups and tabs without content not render anything in navigation.
   if (!hasContent(composite)) {
     return emptyRender;
@@ -60,10 +62,18 @@ const toNavigationHierarchy = (composite: Composite<PreferenceTypes>) => {
     }
 
     case "tab-group": {
-
       return (
         <>
-          <div data-testid={value.testId} className="header">{value.label}</div>
+          <div data-testid={value.testId} className="header flex items-center">
+            {value.iconName && (
+              <Icon
+                material={value.iconName}
+                smallest
+                className="mr-3"
+              />
+            )}
+            {value.label}
+          </div>
 
           <Map items={composite.children}>{toNavigationHierarchy}</Map>
         </>
@@ -71,8 +81,14 @@ const toNavigationHierarchy = (composite: Composite<PreferenceTypes>) => {
     }
 
     case "tab": {
+      return <PreferencesNavigationTab tab={value} />;
+    }
+
+    case "preference-tabs-root": {
       return (
-        <PreferencesNavigationTab tab={value} />
+        <Map items={composite.children} getSeparator={value.childrenSeparator}>
+          {toNavigationHierarchy}
+        </Map>
       );
     }
 
@@ -91,7 +107,7 @@ const toNavigationHierarchy = (composite: Composite<PreferenceTypes>) => {
   }
 };
 
-const hasContent = compositeHasDescendant<PreferenceTypes>(
+const hasContent = compositeHasDescendant<PreferenceTypes | PreferenceTabsRoot>(
   (composite) => composite.value.kind === "item",
 );