refactor: update main with changes from next

refactor: getting rid of next

design/GlobalToken.json

@@ -1160,4 +1160,4 @@
   "boxShadowTabsOverflowBottom": {
     "value": "inset 0 -10px 8px -8px rgba(0, 0, 0, 0.08)"
   }
-}
+}

package.json

@@ -100,4 +100,4 @@
       "path": "./node_modules/cz-conventional-changelog"
     }
   }
-}
+}

src/components/data-display/Avatar/Avatar.stories.tsx

@@ -195,4 +195,4 @@ export const ExampleAutosetFontSize: Story = {
       </ExampleStory>
     )
   },
-}
+}

src/components/data-display/Empty/Empty.stories.tsx

@@ -138,4 +138,4 @@ export const ExampleGlobalEmpty: Story = {
       </ExampleStory>
     )
   },
-}
+}

src/components/feedback/Progress/Progress.stories.tsx

@@ -279,4 +279,4 @@ export const ExampleProgressSize: Story = {
       </ExampleStory>
     )
   },
-}
+}

src/components/general/Typography/Text.stories.tsx

@@ -5,6 +5,7 @@ import { Switch } from 'src/components'
 import { Text } from 'src/components/general/Typography/Typography'
 import { ExampleStory } from 'src/utils/ExampleStory'
 import { useState } from 'react'
+import { expect } from '@storybook/test'
 
 const meta: Meta<typeof Text> = {
   title: 'Aquarium/General/Text',
@@ -43,7 +44,12 @@ type Story = StoryObj<typeof Text>
   Customize the stories based on specific requirements.
 */
 
-export const Primary: Story = {}
+export const Primary: Story = {
+  play: async context => {
+    const text = context.canvasElement.querySelector('span')
+    void expect(text?.textContent).toEqual('Example Text')
+  },
+}
 
 export const Code: Story = {
   args: {
@@ -188,4 +194,4 @@ export const ExampleEllipsis: Story = {
       </ExampleStory>
     )
   },
-}
+}

src/components/icons/index.ts

@@ -48,4 +48,4 @@ export {
   CircleNodesIcon,
   CloudIcon,
   FolderClosedIcon,
-}
+}

src/components/index.ts

@@ -124,4 +124,4 @@ export {
   CircleNodesIcon,
   CloudIcon,
   FolderClosedIcon,
-} from './icons/index'
+} from './icons/index'

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

@@ -914,4 +914,4 @@ export const Cortex: Story = {
       alert('going to overview map')
     },
   },
-}
+}

src/components/navigation/GlobalNavigation/GlobalNavigation.tsx

@@ -96,4 +96,4 @@ export const GlobalNavigation = (props: IGlobalNavigationProps) => {
       </Layout.Sider>
     </Layout>
   )
-}
+}

src/components/navigation/GlobalNavigation/WorkspaceSelector/WorkspaceSelector.tsx

@@ -23,7 +23,7 @@ import { getInitials } from 'src/utils/utils'
 import { type InputRef } from 'antd'
 import { WorkspaceSelectorContent } from 'src/components/navigation/GlobalNavigation/WorkspaceSelector/WorkspaceSelectorContent'
 import { useMount } from 'src/hooks/useMount'
-import { PaddingXxs } from "src/styles/style";
+import { PaddingXxs } from 'src/styles/style'
 
 export interface IWorkspaceSelectorProps {
   orgs: INavigationOrg[]
@@ -255,4 +255,4 @@ export function WorkspaceSelector(props: IWorkspaceSelectorProps) {
       }
     }
   }
-}
+}

src/components/navigation/GlobalNavigation/WorkspaceSelector/WorkspaceSelectorItems.d.ts

@@ -30,4 +30,4 @@ export interface IWorkspaceSelectorDisplayItem extends MenuItemType {
   accounts?: INavigationAccount[]
   workspaces?: INavigationWorkspace[]
   isActive?: boolean
-}
+}

src/components/navigation/GlobalNavigation/WorkspaceSelector/workspace-selector.css

@@ -96,7 +96,6 @@
   height: var(--size-sm);
 }
 
-
 .workspaceSelector__orgName,
 .workspaceSelector__accountName {
   pointer-events: none; /* only workspaces are clickable */
@@ -130,4 +129,4 @@
 
 .workspaceSelector__signoutButton {
   width: 100%;
-}
+}

src/styles/readme.md

@@ -10,4 +10,4 @@ Then open the story `GetGlobalToken` to retrieve the latest global design token
 
 Then paste that into [GlobalTokens.json](https://github.com/mParticle/aquarium/blob/main/design/GlobalToken.json)
 
-These will then be converted into css variables on push, and committed via the [github action](https://github.com/mParticle/aquarium/blob/main/.github/workflows/tokens-to-css.yml)
+These will then be converted into css variables on push, and committed via the [github action](https://github.com/mParticle/aquarium/blob/main/.github/workflows/tokens-to-css.yml)

src/styles/style.ts

@@ -1,6 +1,6 @@
 /**
  * Do not edit directly
- * Generated on Thu, 14 Mar 2024 23:28:17 GMT
+ * Generated on Thu, 14 Mar 2024 23:33:29 GMT
  */
 
 export const Blue = "#1677ff";

src/utils/GetGlobalToken.tsx

@@ -10,33 +10,34 @@ export function GetGlobalToken(): React.ReactNode {
 
   function wrapValuesInObject(obj: AliasToken) {
     return Object.fromEntries(
-      Object.entries(obj).map(([key, value]) => {
-        const pxKeys = ['padding', 'margin', 'borderRadius', 'screen', 'size', 'font', 'width', 'height']
-        const excludePxKeys = ['lineHeight', 'fontWeight']
-
-        const addPx =
-          typeof value === 'number' &&
-          pxKeys.some(k => (key + '').toLowerCase().includes(k.toLowerCase())) &&
-          !excludePxKeys.some(k => (key + '').toLowerCase().includes(k.toLowerCase()))
-
-        if (addPx) value += 'px'
-
-        // remove newlines [from properties like box-shadow]
-        if (typeof value === 'string') value = value.replace(/[\r\n]/gm, '')
-
-        // remove deprecated color key syntax - https://ant.design/changelog#530
-        const regex = /-([1-9]|10)$/
-        if (regex.test(key)) {
-          console.log(key)
-          return [null, { value }]
-        }
-        return [key, { value }]
-      })
-      .filter(([key]) => key !== null),
+      Object.entries(obj)
+        .map(([key, value]) => {
+          const pxKeys = ['padding', 'margin', 'borderRadius', 'screen', 'size', 'font', 'width', 'height']
+          const excludePxKeys = ['lineHeight', 'fontWeight']
+
+          const addPx =
+            typeof value === 'number' &&
+            pxKeys.some(k => (key + '').toLowerCase().includes(k.toLowerCase())) &&
+            !excludePxKeys.some(k => (key + '').toLowerCase().includes(k.toLowerCase()))
+
+          if (addPx) value += 'px'
+
+          // remove newlines [from properties like box-shadow]
+          if (typeof value === 'string') value = value.replace(/[\r\n]/gm, '')
+
+          // remove deprecated color key syntax - https://ant.design/changelog#530
+          const regex = /-([1-9]|10)$/
+          if (regex.test(key)) {
+            console.log(key)
+            return [null, { value }]
+          }
+          return [key, { value }]
+        })
+        .filter(([key]) => key !== null),
     )
   }
 
   const globalToken = wrapValuesInObject(getDesignToken(LightTheme))
 
   return <>{JSON.stringify(globalToken, null, 1)}</>
-}
+}

style-dictionary.json

@@ -23,4 +23,4 @@
       ]
     }
   }
-}
+}