From 2825eb98ed253825ef69e63c261c7c9605b15f4f Mon Sep 17 00:00:00 2001
From: lorumic <michele.lorusso@canonical.com>
Date: Wed, 17 Jul 2024 18:38:36 +0200
Subject: [PATCH] fix(app-layout): prevent display of empty app navigation
 panel

---
 .../ApplicationLayout.stories.tsx             |  21 ++-
 .../ApplicationLayout.test.tsx                |   5 +
 .../ApplicationLayout/ApplicationLayout.tsx   | 153 +++++++++---------
 3 files changed, 104 insertions(+), 75 deletions(-)

diff --git a/src/components/ApplicationLayout/ApplicationLayout.stories.tsx b/src/components/ApplicationLayout/ApplicationLayout.stories.tsx
index 6c71a657a..cff01a00a 100644
--- a/src/components/ApplicationLayout/ApplicationLayout.stories.tsx
+++ b/src/components/ApplicationLayout/ApplicationLayout.stories.tsx
@@ -59,8 +59,9 @@ export const Default: Story = {
         ]}
         aside={
           showAside ? (
-            <AppAside title="Aside panel" pinned={asidePinned}>
+            <AppAside pinned={asidePinned}>
               <Panel
+                title="Aside panel"
                 controls={
                   <>
                     <Button
@@ -274,3 +275,21 @@ export const Navigation: Story = {
     );
   },
 };
+
+/**
+ * App navigation can also be completely opted out of, for some
+ * particular scenarios (e.g. login page, error pages).
+ */
+export const NoNavigation: Story = {
+  render: () => {
+    return (
+      <ApplicationLayout>
+        <Panel title="Application Layout with no navigation">
+          <Row>
+            <Col size={12}>Content</Col>
+          </Row>
+        </Panel>
+      </ApplicationLayout>
+    );
+  },
+};
diff --git a/src/components/ApplicationLayout/ApplicationLayout.test.tsx b/src/components/ApplicationLayout/ApplicationLayout.test.tsx
index a6650a702..32b288aac 100644
--- a/src/components/ApplicationLayout/ApplicationLayout.test.tsx
+++ b/src/components/ApplicationLayout/ApplicationLayout.test.tsx
@@ -111,3 +111,8 @@ it("collapses the menu using external state", async () => {
   await userEvent.click(screen.getByRole("button", { name: "Menu" }));
   expect(onCollapseMenu).toHaveBeenCalledWith(false);
 });
+
+it("can opt out of app navigation", async () => {
+  render(<ApplicationLayout />);
+  expect(document.querySelector(".l-navigation")).toBeNull();
+});
diff --git a/src/components/ApplicationLayout/ApplicationLayout.tsx b/src/components/ApplicationLayout/ApplicationLayout.tsx
index b0ec921e5..857667dc4 100644
--- a/src/components/ApplicationLayout/ApplicationLayout.tsx
+++ b/src/components/ApplicationLayout/ApplicationLayout.tsx
@@ -44,7 +44,7 @@ export type BaseProps<
     /**
      * The logo to appear in the navigation panels.
      */
-    logo: NonNullable<PanelProps<PL>["logo"]>;
+    logo?: PanelProps<PL>["logo"];
     /**
      * The component to use to render links inside the navigation e.g. when
      * using react-router you'd pass `Link` to this prop.
@@ -96,10 +96,10 @@ export type Props<
 > = BaseProps<NI, PL> &
   ExclusiveProps<
     {
-      navItems: NonNullable<SideNavigationProps<NI>["items"]>;
+      navItems?: SideNavigationProps<NI>["items"];
     },
     {
-      sideNavigation: ReactNode;
+      sideNavigation?: ReactNode;
     }
   >;
 
@@ -145,81 +145,86 @@ const ApplicationLayout = <
 
   return (
     <Application {...props}>
-      <AppNavigationBar className={navigationBarClassName}>
-        <Panel<PL>
-          dark={dark}
-          logo={logo}
-          toggle={{
-            label: "Menu",
-            onClick: () => setMenuCollapsed(!menuIsCollapsed),
-          }}
-        />
-      </AppNavigationBar>
-      <AppNavigation
-        className={navigationClassName}
-        collapsed={menuIsCollapsed}
-        pinned={menuIsPinned}
-      >
-        <Panel<PL>
-          dark={dark}
-          controls={
-            <>
-              <Button
-                hasIcon
-                appearance="base"
-                className={classNames("u-no-margin u-hide--medium", {
-                  "is-dark": dark,
-                })}
-                onClick={(evt) => {
-                  setMenuCollapsed(true);
-                  // The menu stays open while its content has focus, so the
-                  // close button must blur to actually close the menu.
-                  evt.currentTarget.blur();
-                }}
-              >
-                <Icon name="close" className={classNames({ "is-light": dark })}>
-                  Close menu
-                </Icon>
-              </Button>
-              <Button
-                hasIcon
-                appearance="base"
-                className={classNames("u-no-margin u-hide--small", {
-                  "is-dark": dark,
-                })}
-                onClick={() => {
-                  setMenuPinned(!menuIsPinned);
-                }}
-              >
-                <Icon
-                  name={menuIsPinned ? "close" : "pin"}
-                  className={classNames({ "is-light": dark })}
-                >
-                  {menuIsPinned ? "Unpin menu" : "Pin menu"}
-                </Icon>
-              </Button>
-            </>
-          }
-          controlsClassName="u-hide--large"
-          stickyHeader
-          logo={logo}
-        >
-          {navItems ? (
-            <SideNavigation<NI>
+      {(navItems || sideNavigation) && (
+        <>
+          <AppNavigationBar className={navigationBarClassName}>
+            <Panel<PL>
               dark={dark}
-              items={navItems}
-              linkComponent={navLinkComponent}
+              logo={logo}
+              toggle={{
+                label: "Menu",
+                onClick: () => setMenuCollapsed(!menuIsCollapsed),
+              }}
             />
-          ) : (
-            sideNavigation
-          )}
-        </Panel>
-      </AppNavigation>
+          </AppNavigationBar>
+          <AppNavigation
+            className={navigationClassName}
+            collapsed={menuIsCollapsed}
+            pinned={menuIsPinned}
+          >
+            <Panel<PL>
+              dark={dark}
+              controls={
+                <>
+                  <Button
+                    hasIcon
+                    appearance="base"
+                    className={classNames("u-no-margin u-hide--medium", {
+                      "is-dark": dark,
+                    })}
+                    onClick={(evt) => {
+                      setMenuCollapsed(true);
+                      // The menu stays open while its content has focus, so the
+                      // close button must blur to actually close the menu.
+                      evt.currentTarget.blur();
+                    }}
+                  >
+                    <Icon
+                      name="close"
+                      className={classNames({ "is-light": dark })}
+                    >
+                      Close menu
+                    </Icon>
+                  </Button>
+                  <Button
+                    hasIcon
+                    appearance="base"
+                    className={classNames("u-no-margin u-hide--small", {
+                      "is-dark": dark,
+                    })}
+                    onClick={() => {
+                      setMenuPinned(!menuIsPinned);
+                    }}
+                  >
+                    <Icon
+                      name={menuIsPinned ? "close" : "pin"}
+                      className={classNames({ "is-light": dark })}
+                    >
+                      {menuIsPinned ? "Unpin menu" : "Pin menu"}
+                    </Icon>
+                  </Button>
+                </>
+              }
+              controlsClassName="u-hide--large"
+              stickyHeader
+              logo={logo}
+            >
+              {navItems ? (
+                <SideNavigation<NI>
+                  dark={dark}
+                  items={navItems}
+                  linkComponent={navLinkComponent}
+                />
+              ) : (
+                sideNavigation
+              )}
+            </Panel>
+          </AppNavigation>
+        </>
+      )}
       <AppMain className={mainClassName}>{children}</AppMain>
       {aside}
-      {status ? (
-        <AppStatus className={statusClassName}>{status}</AppStatus>
-      ) : null}
+      {status && <AppStatus className={statusClassName}>{status}</AppStatus>}
     </Application>
   );
 };