From a0e1aeafb469cb8dca1fd8e648758500508ac690 Mon Sep 17 00:00:00 2001
From: April Smith <april.smith@ably.com>
Date: Wed, 10 Jul 2024 17:15:05 +0100
Subject: [PATCH 1/7] Remove the Meganav Account Panel dropdown

---
 src/core/MeganavItemsSignedIn.tsx | 73 -------------------------------
 1 file changed, 73 deletions(-)

diff --git a/src/core/MeganavItemsSignedIn.tsx b/src/core/MeganavItemsSignedIn.tsx
index 70b78891d..7cf16abbc 100644
--- a/src/core/MeganavItemsSignedIn.tsx
+++ b/src/core/MeganavItemsSignedIn.tsx
@@ -1,7 +1,6 @@
 import React from "react";
 
 import MeganavControl from "./MeganavControl";
-import SignOutLink from "./SignOutLink";
 import MeganavSearch from "./MeganavSearch";
 import { AbsUrl, MeganavSessionState, MeganavTheme } from "./Meganav";
 
@@ -22,13 +21,7 @@ const MeganavItemsSignedIn = ({
   theme,
   absUrl,
 }: MeganavItemsSignedIn) => {
-  const links = sessionState.account
-    ? Object.keys(sessionState.account.links).map(
-        (key) => sessionState.account.links[key],
-      )
-    : [];
   const accountName = truncate(sessionState.accountName, 20);
-  const preferredEmail = truncate(sessionState.preferredEmail, 20);
 
   return (
     <ul className="hidden md:flex items-center">
@@ -41,72 +34,6 @@ const MeganavItemsSignedIn = ({
         >
           {accountName}
         </MeganavControl>
-
-        <div
-          className="ui-meganav-panel-account invisible"
-          id="account-panel"
-          data-id="meganav-panel"
-        >
-          {/* Users exist without accounts in which case there is no links here */}
-          {sessionState.account && (
-            <>
-              <p className="ui-meganav-overline mt-16 mx-16">Your account</p>
-              <ul className="mb-16 mx-16">
-                {links.map((item) => (
-                  <li key={item.href}>
-                    <a
-                      className="ui-meganav-account-link"
-                      href={absUrl(item.href)}
-                    >
-                      {item.text}
-                    </a>
-                  </li>
-                ))}
-              </ul>
-            </>
-          )}
-
-          <p className="ui-meganav-overline mx-16">{preferredEmail}</p>
-          <ul className="mb-8 mx-16">
-            <li>
-              <a
-                href={absUrl(sessionState.mySettings.href)}
-                className="ui-meganav-account-link"
-              >
-                {sessionState.mySettings.text}
-              </a>
-            </li>
-            {sessionState.myAccessTokens && (
-              <li>
-                <a
-                  href={absUrl(sessionState.myAccessTokens.href)}
-                  className="ui-meganav-account-link"
-                >
-                  {sessionState.myAccessTokens.text}
-                  <span className="ui-version-tag">preview</span>
-                </a>
-              </li>
-            )}
-          </ul>
-
-          <hr className="ui-meganav-hr mb-16" />
-
-          {sessionState.logOut && (
-            <div className="mb-16 px-16">
-              <SignOutLink absUrl={absUrl} {...sessionState.logOut}>
-                {({ text, href, onClick }) => (
-                  <a
-                    onClick={onClick}
-                    href={absUrl(href)}
-                    className="ui-meganav-account-link"
-                  >
-                    {text}
-                  </a>
-                )}
-              </SignOutLink>
-            </div>
-          )}
-        </div>
       </li>
 
       <li>

From 2067fc8bd333ff7961492c1c50d4d59b7a59eb6b Mon Sep 17 00:00:00 2001
From: April Smith <april.smith@ably.com>
Date: Wed, 10 Jul 2024 18:21:35 +0100
Subject: [PATCH 2/7] Create MeganavItemsSignedIn in the storybook for testing
 preview

---
 src/core/MeganavItemsSignedIn.stories.tsx | 45 +++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 src/core/MeganavItemsSignedIn.stories.tsx

diff --git a/src/core/MeganavItemsSignedIn.stories.tsx b/src/core/MeganavItemsSignedIn.stories.tsx
new file mode 100644
index 000000000..66193b604
--- /dev/null
+++ b/src/core/MeganavItemsSignedIn.stories.tsx
@@ -0,0 +1,45 @@
+import type { Meta, StoryObj } from "@storybook/react";
+
+import MeganavItemsSignedIn from "./MeganavItemsSignedIn";
+
+const meta = {
+  component: MeganavItemsSignedIn,
+} satisfies Meta<typeof MeganavItemsSignedIn>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {
+  args: {
+    sessionState: {
+      signedIn: true,
+      accountName: "Free account",
+      preferredEmail: "free6218@ably.io",
+      account: {
+        links: {
+          dashboard: {
+            href: "https://ably.com/account",
+          },
+        },
+      },
+      logOut: {
+        token: "",
+        href: "",
+        text: "",
+      },
+      mySettings: {
+        text: "",
+        href: "",
+      },
+      myAccessTokens: {
+        text: "",
+        href: "",
+      },
+    },
+
+    theme: {},
+
+    absUrl: () => "https://ably.com/search?",
+  },
+};

From 073700acbbf652a18485dd4aeca0f8b7f4c53278 Mon Sep 17 00:00:00 2001
From: April Smith <april.smith@ably.com>
Date: Fri, 12 Jul 2024 11:35:49 +0100
Subject: [PATCH 3/7] Publish v14.1.5-dev.8b0e545

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6eacca002..714646a70 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ably/ui",
-  "version": "14.1.5",
+  "version": "14.1.5-dev.8b0e545",
   "description": "Home of the Ably design system library ([design.ably.com](https://design.ably.com)). It provides a showcase, development/test environment and a publishing pipeline for different distributables.",
   "repository": {
     "type": "git",

From 1612894fd645435e04a0f2f34bab49dec8deab62 Mon Sep 17 00:00:00 2001
From: April Smith <april.smith@ably.com>
Date: Fri, 12 Jul 2024 12:36:55 +0100
Subject: [PATCH 4/7] Update missing styles by removing the styling as dropdown
 link

---
 src/core/MeganavItemsSignedIn.tsx | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/core/MeganavItemsSignedIn.tsx b/src/core/MeganavItemsSignedIn.tsx
index 7cf16abbc..be7f6af35 100644
--- a/src/core/MeganavItemsSignedIn.tsx
+++ b/src/core/MeganavItemsSignedIn.tsx
@@ -1,6 +1,4 @@
 import React from "react";
-
-import MeganavControl from "./MeganavControl";
 import MeganavSearch from "./MeganavSearch";
 import { AbsUrl, MeganavSessionState, MeganavTheme } from "./Meganav";
 
@@ -10,7 +8,7 @@ type MeganavItemsSignedIn = {
   absUrl: AbsUrl;
 };
 
-const truncate = (string, length) => {
+const truncate = (string: string, length: number) => {
   return string?.length && string.length > length
     ? `${string.slice(0, length - 1)}…`
     : string;
@@ -18,7 +16,6 @@ const truncate = (string, length) => {
 
 const MeganavItemsSignedIn = ({
   sessionState,
-  theme,
   absUrl,
 }: MeganavItemsSignedIn) => {
   const accountName = truncate(sessionState.accountName, 20);
@@ -26,14 +23,9 @@ const MeganavItemsSignedIn = ({
   return (
     <ul className="hidden md:flex items-center">
       <li className="ui-meganav-item relative">
-        <MeganavControl
-          ariaControls="account-panel"
-          ariaLabel="Account"
-          theme={theme}
-          additionalCSS="mr-0"
-        >
+        <span className="ui-meganav-link h-64 hover:text-cool-black">
           {accountName}
-        </MeganavControl>
+        </span>
       </li>
 
       <li>

From 5ca6850603e8a1d78b2f01b760fd530707c69dd5 Mon Sep 17 00:00:00 2001
From: April Smith <april.smith@ably.com>
Date: Fri, 12 Jul 2024 14:33:41 +0100
Subject: [PATCH 5/7] Publish v14.1.5-dev.382c080

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 714646a70..78028f392 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ably/ui",
-  "version": "14.1.5-dev.8b0e545",
+  "version": "14.1.5-dev.382c080",
   "description": "Home of the Ably design system library ([design.ably.com](https://design.ably.com)). It provides a showcase, development/test environment and a publishing pipeline for different distributables.",
   "repository": {
     "type": "git",

From 6428dade56ae9b5620d557174697f8b20e3f91e8 Mon Sep 17 00:00:00 2001
From: April Smith <april.smith@ably.com>
Date: Wed, 17 Jul 2024 11:52:42 +0100
Subject: [PATCH 6/7] pre-bump version to 14.1.7

skip 14.1.6 due to error I did last time when pre-releasing develooment
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 78028f392..3f8bc8af8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ably/ui",
-  "version": "14.1.5-dev.382c080",
+  "version": "14.1.7",
   "description": "Home of the Ably design system library ([design.ably.com](https://design.ably.com)). It provides a showcase, development/test environment and a publishing pipeline for different distributables.",
   "repository": {
     "type": "git",

From 711737c773b575648fe609e24698e5d3cafa558a Mon Sep 17 00:00:00 2001
From: April Smith <april.smith@ably.com>
Date: Wed, 17 Jul 2024 23:26:12 +0100
Subject: [PATCH 7/7] Remove the MeganavSignedIn story to avoid separating it
 from Meganav

Added a new SignedInStory
- Default will be not login by assigning the sessionData empty http handler
- Added a new  Meganav SignedIn story with signed in data by adding a dummy http response account signed in

adjusting the space between the account name and search icon
---
 src/core/Meganav/Meganav.stories.tsx      | 39 ++++++++++++++++++--
 src/core/MeganavItemsSignedIn.stories.tsx | 45 -----------------------
 src/core/MeganavItemsSignedIn.tsx         |  2 +-
 3 files changed, 37 insertions(+), 49 deletions(-)
 delete mode 100644 src/core/MeganavItemsSignedIn.stories.tsx

diff --git a/src/core/Meganav/Meganav.stories.tsx b/src/core/Meganav/Meganav.stories.tsx
index 2152cd029..31bf05b4b 100644
--- a/src/core/Meganav/Meganav.stories.tsx
+++ b/src/core/Meganav/Meganav.stories.tsx
@@ -1,6 +1,5 @@
 import React, { useEffect } from "react";
 import { http, HttpResponse } from "msw";
-
 import Meganav from "../Meganav";
 import loadIcons from "../icons.js";
 import logo from "../images/ably-logo.png";
@@ -26,7 +25,18 @@ export default {
     msw: {
       handlers: [
         http.get("/api/me", () => {
-          return HttpResponse.json({});
+          return HttpResponse.json({
+            accountName: "Account Name",
+            signedIn: true,
+            account: {
+              links: {
+                dashboard: {
+                  text: "Dashboard",
+                  href: "/accounts/1",
+                },
+              },
+            },
+          });
         }),
         http.get("/api/blog", () => {
           return HttpResponse.json([
@@ -66,7 +76,7 @@ const Page = () => {
 
     const store = getRemoteDataStore();
 
-    fetchSessionData(store, "/api/me");
+    fetchSessionData(store, "");
     fetchBlogPosts(store, "/api/blog");
   }, []);
 
@@ -84,3 +94,26 @@ const Page = () => {
 export const Default = {
   render: () => <Page />,
 };
+
+const PageSignedIn = () => {
+  useEffect(() => {
+    loadIcons();
+    const store = getRemoteDataStore();
+    fetchSessionData(store, "/api/me");
+    fetchBlogPosts(store, "/api/blog");
+  }, []);
+
+  return (
+    <Meganav
+      paths={{
+        logo,
+        ablyStack,
+        awsLogo,
+      }}
+    />
+  );
+};
+
+export const SignedIn = {
+  render: () => <PageSignedIn />,
+};
diff --git a/src/core/MeganavItemsSignedIn.stories.tsx b/src/core/MeganavItemsSignedIn.stories.tsx
deleted file mode 100644
index 66193b604..000000000
--- a/src/core/MeganavItemsSignedIn.stories.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-import type { Meta, StoryObj } from "@storybook/react";
-
-import MeganavItemsSignedIn from "./MeganavItemsSignedIn";
-
-const meta = {
-  component: MeganavItemsSignedIn,
-} satisfies Meta<typeof MeganavItemsSignedIn>;
-
-export default meta;
-
-type Story = StoryObj<typeof meta>;
-
-export const Default: Story = {
-  args: {
-    sessionState: {
-      signedIn: true,
-      accountName: "Free account",
-      preferredEmail: "free6218@ably.io",
-      account: {
-        links: {
-          dashboard: {
-            href: "https://ably.com/account",
-          },
-        },
-      },
-      logOut: {
-        token: "",
-        href: "",
-        text: "",
-      },
-      mySettings: {
-        text: "",
-        href: "",
-      },
-      myAccessTokens: {
-        text: "",
-        href: "",
-      },
-    },
-
-    theme: {},
-
-    absUrl: () => "https://ably.com/search?",
-  },
-};
diff --git a/src/core/MeganavItemsSignedIn.tsx b/src/core/MeganavItemsSignedIn.tsx
index be7f6af35..f60a7e0cc 100644
--- a/src/core/MeganavItemsSignedIn.tsx
+++ b/src/core/MeganavItemsSignedIn.tsx
@@ -23,7 +23,7 @@ const MeganavItemsSignedIn = ({
   return (
     <ul className="hidden md:flex items-center">
       <li className="ui-meganav-item relative">
-        <span className="ui-meganav-link h-64 hover:text-cool-black">
+        <span className="ui-meganav-link h-64 hover:text-cool-black mr-0">
           {accountName}
         </span>
       </li>