feat: replacing minimap with suiteSelector component

CHANGELOG.md

@@ -1,3 +1,15 @@
+# [1.29.0-new-nav-suite-selector.1](https://github.com/mParticle/aquarium/compare/v1.28.1...v1.29.0-new-nav-suite-selector.1) (2024-08-29)
+
+### Bug Fixes
+
+- add info icon ([#381](https://github.com/mParticle/aquarium/issues/381)) ([d3aa957](https://github.com/mParticle/aquarium/commit/d3aa957198078ec49ad65fef4d6721becf0ea0d9))
+- add new icons ([#380](https://github.com/mParticle/aquarium/issues/380)) ([db88c4e](https://github.com/mParticle/aquarium/commit/db88c4e3bfb31bd1537dd6ba112a709205391ba5))
+- update nav link active background color ([#376](https://github.com/mParticle/aquarium/issues/376)) ([3965e60](https://github.com/mParticle/aquarium/commit/3965e607f4071b1bef72850bfd10db92fdc1a3fa))
+
+### Features
+
+- replace minimap with suite selector ([9d20a9a](https://github.com/mParticle/aquarium/commit/9d20a9a7185a27f75500ecd7f64b35803d1070c1))
+
 ## [1.28.1](https://github.com/mParticle/aquarium/compare/v1.28.0...v1.28.1) (2024-08-20)
 
 ### Bug Fixes

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mparticle/aquarium",
-  "version": "1.28.1",
+  "version": "1.29.0-new-nav-suite-selector.1",
   "description": "mParticle Component Library",
   "license": "Apache-2.0",
   "keywords": [

src/components/navigation/GlobalNavigation/GlobalNavigation.stories.tsx

@@ -6,7 +6,6 @@ import { Badge } from 'src/components/data-display/Badge/Badge'
 import {
   type IGlobalNavigationItem,
   type IGlobalNavigationLogo,
-  type IMiniMapOptions,
 } from 'src/components/navigation/GlobalNavigation/GlobalNavigationItems'
 import { generateOrgs } from 'src/components/navigation/GlobalNavigation/stories-utils'
 import { type INavigationOrg } from 'src/components/navigation/GlobalNavigation/WorkspaceSelector/WorkspaceSelectorItems'
@@ -165,14 +164,11 @@ export const Primary: Story = {
 const mpLogo: IGlobalNavigationLogo = {
   label: 'Data Platform',
   icon: <Icon name="dataPlatform" />,
-  onSuiteLogoClick: () => {
-    alert('Going to mP Home!')
-  },
 }
 
 const mpLogoWithBackground: IGlobalNavigationLogo = {
-  label: 'Data Platform',
-  icon: 'catalog',
+  label: 'Overview',
+  icon: 'overview',
   type: 'background-solid',
   onSuiteLogoClick: () => {
     alert('Going to mP Home!')
@@ -865,6 +861,40 @@ export const Indicative: Story = {
   },
 }
 
+export const IndicativeWithSuiteSwitcher: Story = {
+  args: {
+    logo: indLogo,
+    tools: indTools,
+    management: indManagement,
+    createItems: indCreateItems,
+    orgs: indOrgs,
+    minimapOptions: {
+      overviewHref: '/',
+      onLinkClick: link => {
+        if (link.linkId !== 'analytics') alert(link.href)
+      },
+      links: [
+        { linkId: 'oversight', href: '/oversight' },
+        { linkId: 'dataPlatform', href: '/data-platform' },
+        { linkId: 'customer360', href: '/customer-360' },
+        { linkId: 'predictions', href: '/predictions' },
+        { linkId: 'analytics', href: '/analytics' },
+        { linkId: 'segmentation', href: '/segmentation' },
+      ],
+      activeLink: 'analytics',
+    },
+    navigationButtonItemOptions: {
+      label: 'Custom Signout Label',
+      onClick: () => {
+        alert('Signout!')
+      },
+    },
+    onMpHomeClick: () => {
+      alert('going to overview map')
+    },
+  },
+}
+
 const cortexLogo: IGlobalNavigationLogo = {
   label: 'Predictions',
   icon: 'predictions',
@@ -1208,26 +1238,6 @@ export const MPWithNavSwitcherTour: Story = {
       },
     }
 
-    const minimapOptions: IMiniMapOptions = {
-      overviewHref: '/',
-      onLinkClick: link => {
-        alert(link.href)
-      },
-      onUnauthorizedClick: link => {
-        alert(`unauthorized ${link?.href} `)
-      },
-      unauthorizedLinks: ['dataPlatform'],
-      activeLink: 'oversight',
-      links: [
-        { linkId: 'oversight', href: '/oversight' },
-        { linkId: 'dataPlatform', href: '/data-platform' },
-        { linkId: 'customer360', href: '/customer-360' },
-        { linkId: 'predictions', href: '/predictions' },
-        { linkId: 'analytics', href: '/analytics' },
-        { linkId: 'segmentation', href: '/segmentation' },
-      ],
-    }
-
     return (
       <div style={{ width: 800 }}>
         <GlobalNavigation
@@ -1242,9 +1252,47 @@ export const MPWithNavSwitcherTour: Story = {
             alert('going to overview map')
           }}
           navigationButtonItemOptions={navigationButtonItemOptions}
-          minimapOptions={minimapOptions}
         />
       </div>
     )
   },
 }
+
+export const MPWithSuiteSelector: Story = {
+  args: {
+    onSearchClick: () => {
+      alert('Searching!')
+    },
+    logo: mpLogoWithBackground,
+    tools: mpTools,
+    management: mpManagement,
+    orgs: mpOrgs,
+    onMpHomeClick: () => {
+      alert('going to overview map')
+    },
+    avatarOptions: {
+      // src: "https://static-qa1.qa.corp.mparticle.com/appimg/logo_af_916397d2-9732-8de6-77cc-80e3bba120ca.png",
+      alt: 'avatar',
+    },
+    showSuiteLogo: true,
+    suiteSelectorOptions: {
+      overviewHref: '/',
+      onLinkClick: link => {
+        alert(link.href)
+      },
+      onUnauthorizedClick: link => {
+        alert(`unauthorized ${link?.href} `)
+      },
+      unauthorizedLinks: ['dataPlatform'],
+      activeLink: 'oversight',
+      links: [
+        { linkId: 'oversight', href: '/oversight' },
+        { linkId: 'dataPlatform', href: '/data-platform' },
+        { linkId: 'customer360', href: '/customer-360' },
+        { linkId: 'predictions', href: '/predictions' },
+        { linkId: 'analytics', href: '/analytics' },
+        { linkId: 'segmentation', href: '/segmentation' },
+      ],
+    },
+  },
+}

src/components/navigation/GlobalNavigation/GlobalNavigation.tsx

@@ -17,7 +17,7 @@ import { NavigationCreate } from 'src/components/navigation/GlobalNavigation/Nav
 import { WorkspaceSelector } from 'src/components/navigation/GlobalNavigation/WorkspaceSelector/WorkspaceSelector'
 import {
   type IGlobalNavigationItem,
-  type IMiniMapOptions,
+  type ISuiteSelectorOptions,
 } from 'src/components/navigation/GlobalNavigation/GlobalNavigationItems'
 import { NavigationItem } from 'src/components/navigation/GlobalNavigation/NavigationItem'
 import { useNewExperienceReminder } from 'src/hooks/NewExperienceReminder/useNewExperienceReminder'
@@ -40,7 +40,12 @@ export interface IGlobalNavigationProps {
     onClick: () => void
     withoutContainer?: boolean
   }
-  minimapOptions?: IMiniMapOptions
+  suiteSelectorOptions?: ISuiteSelectorOptions
+  /**
+   * @deprecated This variant is a temporary fix for new component.
+   * This will be removed once all the apps updated.
+   */
+  minimapOptions?: ISuiteSelectorOptions
 }
 
 export const GlobalNavWidth = 90 as const
@@ -53,7 +58,7 @@ export const GlobalNavigation = ({ showSuiteLogo = true, ...props }: IGlobalNavi
           <div>
             {showSuiteLogo && (
               <>
-                <SuiteLogo {...props.logo} minimapOptions={props.minimapOptions} />
+                <SuiteLogo {...props.logo} suiteSelectorOptions={props.minimapOptions ?? props.suiteSelectorOptions} />
                 <div className="globalNavigation__divider" />
               </>
             )}

src/components/navigation/GlobalNavigation/GlobalNavigationItems.d.ts

@@ -12,7 +12,7 @@ export interface IBaseGlobalNavigationItem {
 }
 
 export interface IGlobalNavigationLogo extends IBaseGlobalNavigationItem {
-  onSuiteLogoClick: () => void
+  onSuiteLogoClick?: () => void
   type?: 'default' | 'background-solid' | 'custom-size'
   icon?: ReactElement | keyof typeof Icons
   navSwitcherTourOptions?: INavSwitcherTourOptions
@@ -34,19 +34,19 @@ export interface IGlobalNavigationLink extends IBaseGlobalNavigationItem {
 
 export type IGlobalNavigationItem = IGlobalNavigationMenu | IGlobalNavigationLink
 
-export type MiniMapLinks = 'oversight' | 'dataPlatform' | 'customer360' | 'predictions' | 'analytics' | 'segmentation'
-export type MiniMapLink = {
-  linkId: MiniMapLinks
+export type SuiteLinks = 'oversight' | 'dataPlatform' | 'customer360' | 'predictions' | 'analytics' | 'segmentation'
+export type SuiteLink = {
+  linkId: SuiteLinks
   href: string
 }
 
-export interface IMiniMapOptions {
+export interface ISuiteSelectorOptions {
   overviewHref: string
-  links: MiniMapLink[]
-  onLinkClick: (link: MiniMapLink) => void
-  onUnauthorizedClick?: (link?: MiniMapLink) => void
-  unauthorizedLinks?: MiniMapLinks[]
-  activeLink: MiniMapLinks
+  links: SuiteLink[]
+  onLinkClick: (link: SuiteLink) => void
+  onUnauthorizedClick?: (link?: SuiteLink) => void
+  unauthorizedLinks?: SuiteLinks[]
+  activeLink: SuiteLinks
 }
 
 export interface INavSwitcherTourOptions extends ITourProps {

src/components/navigation/GlobalNavigation/SuiteLogo.tsx

@@ -1,21 +1,21 @@
 import React, { type ReactNode, useRef, useState } from 'react'
-import { Center, Icon, type ITourProps, Popover, Tour } from 'src/components'
+import { Center, Icon, type ITourProps, Tour } from 'src/components'
 import { NavigationIcon } from 'src/components/navigation/GlobalNavigation/NavigationIcon'
-import MiniMap from 'src/components/navigation/MiniMap/MiniMap'
+import { SuiteSelector } from 'src/components/navigation/GlobalNavigation/SuiteSelector/SuiteSelector'
 import { type Icons } from 'src/constants/Icons'
 import {
   type IGlobalNavigationLogo,
-  type IMiniMapOptions,
   type INavSwitcherTourOptions,
-  type MiniMapLink,
+  type ISuiteSelectorOptions,
+  type SuiteLink,
 } from 'src/components/navigation/GlobalNavigation/GlobalNavigationItems'
 import { type IconColor } from 'src/components/general/Icon/Icon'
 
 // custom-size is the default size to prevent breaking changes.
 type IconColorOptions = 'default' | 'background-solid' | 'custom-size'
 
 interface SuiteLogoProps extends IGlobalNavigationLogo {
-  minimapOptions?: IMiniMapOptions
+  suiteSelectorOptions?: ISuiteSelectorOptions
 }
 
 function isStringIcon(icon: ReactNode | string): icon is keyof typeof Icons {
@@ -28,69 +28,55 @@ export function SuiteLogo({
   type = 'custom-size',
   onSuiteLogoClick,
   navSwitcherTourOptions,
-  minimapOptions,
+  suiteSelectorOptions,
 }: SuiteLogoProps) {
   const logoRef = useRef(null)
 
-  if (!minimapOptions || navSwitcherTourOptions?.open) {
-    return <SuiteLogoContent />
+  if (!suiteSelectorOptions || navSwitcherTourOptions?.open) {
+    return <SuiteLogoContent onLogoClick={onSuiteLogoClick} />
   }
 
-  return (
-    <MinimapWithPopover
-      onUnauthorizedClick={minimapOptions.onUnauthorizedClick}
-      overviewHref={minimapOptions.overviewHref}
-      links={minimapOptions.links}
-      onLinkClick={minimapOptions.onLinkClick}
-      unauthorizedLinks={minimapOptions.unauthorizedLinks}
-      activeLink={minimapOptions.activeLink}
-    />
-  )
-
-  function SuiteLogoContent() {
+  return <LogoWithSuiteSelector {...suiteSelectorOptions} />
+
+  function SuiteLogoContent({ onLogoClick }: { onLogoClick?: () => void }) {
     return (
       <>
         <div ref={logoRef}>
-          {renderNavLogo()}
+          <NavLogo onLogoClick={onLogoClick} />
           {navSwitcherTourOptions && renderNavTour(navSwitcherTourOptions)}
         </div>
       </>
     )
   }
 
-  function MinimapWithPopover(props: IMiniMapOptions) {
+  function LogoWithSuiteSelector(props: ISuiteSelectorOptions) {
     const [isPopoverOpen, setIsPopoverOpen] = useState(false)
-    const handleLinkClick = (link: MiniMapLink) => {
+
+    const handleLinkClick = (link: SuiteLink) => {
       setIsPopoverOpen(false)
       props.onLinkClick(link)
     }
+
     const handlePopoverOpenChange = (newPopoverState: boolean) => {
       setIsPopoverOpen(newPopoverState)
     }
 
+    const handleLogoClick = () => {
+      setIsPopoverOpen(prevPopoverState => !prevPopoverState)
+    }
+
     return (
-      <Popover
-        content={
-          <MiniMap
-            overviewHref={props.overviewHref}
-            onUnauthorizedClick={props.onUnauthorizedClick}
-            links={props.links}
-            onLinkClick={handleLinkClick}
-            unauthorizedLinks={props.unauthorizedLinks}
-            activeLink={props.activeLink}
-          />
-        }
-        placement="bottomLeft"
+      <SuiteSelector
         open={isPopoverOpen}
-        trigger="hover"
         onOpenChange={handlePopoverOpenChange}
-        arrow={false}>
-        <SuiteLogoContent />
-      </Popover>
+        onLinkClick={handleLinkClick}
+        suiteSelectorOptions={props}>
+        <NavLogo onLogoClick={handleLogoClick} />
+      </SuiteSelector>
     )
   }
 
-  function renderNavLogo() {
+  function NavLogo({ onLogoClick }: { onLogoClick?: () => void }) {
     const classMap = {
       default: '',
       'custom-size': 'globalNavigation__icon--suiteLogo',
@@ -111,7 +97,7 @@ export function SuiteLogo({
     }
 
     return (
-      <Center vertical className="globalNavigation__suiteLogo" onClick={onSuiteLogoClick}>
+      <Center vertical className="globalNavigation__suiteLogo" onClick={onLogoClick}>
         <NavigationIcon icon={getIcon()} label="" hideLabel className={classMap[type]} />
         {label}
       </Center>