Merge remote-tracking branch 'upstream/master' into avoid-monorepo-alias

mui · Feb 1, 2024 · a30b828 · a30b828
2 parents 8a83819 + 9602d9d
commit a30b828
Show file tree

Hide file tree

Showing 61 changed files with 575 additions and 186 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -31,11 +31,17 @@ commands:
       - when:
           condition: << parameters.browsers >>
           steps:
-            - run:
-                name: Install pnpm package manager
-                command: |
-                  corepack enable
-                  corepack prepare pnpm@latest-8 --activate
+            - run: corepack enable
+      - when:
+          condition:
+            not: << parameters.browsers >>
+          steps:
+            # See https://stackoverflow.com/a/73411601
+            - run: corepack enable --install-directory ~/bin
+
+      - when:
+          condition: << parameters.browsers >>
+          steps:
             - run:
                 name: Prepare playwright hash
                 command: pnpm list --json --filter playwright > /tmp/playwright_info.json

diff --git a/docs/data/toolpad/reference/components/autocomplete.md b/docs/data/toolpad/reference/components/autocomplete.md
@@ -1,4 +1,4 @@
-<!-- This file has been auto-generated using `pnpm docs:build:api`. -->
+<!-- ATTENTION: DO NOT EDIT! This file has been auto-generated using `pnpm docs:build:api`. -->
 
 # Autocomplete
 

diff --git a/docs/data/toolpad/reference/components/button.md b/docs/data/toolpad/reference/components/button.md
@@ -1,4 +1,4 @@
-<!-- This file has been auto-generated using `pnpm docs:build:api`. -->
+<!-- ATTENTION: DO NOT EDIT! This file has been auto-generated using `pnpm docs:build:api`. -->
 
 # Button
 

diff --git a/docs/data/toolpad/reference/components/chart.md b/docs/data/toolpad/reference/components/chart.md
@@ -1,4 +1,4 @@
-<!-- This file has been auto-generated using `pnpm docs:build:api`. -->
+<!-- ATTENTION: DO NOT EDIT! This file has been auto-generated using `pnpm docs:build:api`. -->
 
 # Chart
 

diff --git a/docs/data/toolpad/reference/components/checkbox.md b/docs/data/toolpad/reference/components/checkbox.md
@@ -1,4 +1,4 @@
-<!-- This file has been auto-generated using `pnpm docs:build:api`. -->
+<!-- ATTENTION: DO NOT EDIT! This file has been auto-generated using `pnpm docs:build:api`. -->
 
 # Checkbox
 

diff --git a/docs/data/toolpad/reference/components/container.md b/docs/data/toolpad/reference/components/container.md
@@ -1,4 +1,4 @@
-<!-- This file has been auto-generated using `pnpm docs:build:api`. -->
+<!-- ATTENTION: DO NOT EDIT! This file has been auto-generated using `pnpm docs:build:api`. -->
 
 # Container
 

diff --git a/docs/data/toolpad/reference/components/data-grid.md b/docs/data/toolpad/reference/components/data-grid.md
@@ -1,4 +1,4 @@
-<!-- This file has been auto-generated using `pnpm docs:build:api`. -->
+<!-- ATTENTION: DO NOT EDIT! This file has been auto-generated using `pnpm docs:build:api`. -->
 
 # DataGrid
 

diff --git a/docs/data/toolpad/reference/components/date-picker.md b/docs/data/toolpad/reference/components/date-picker.md
@@ -1,4 +1,4 @@
-<!-- This file has been auto-generated using `pnpm docs:build:api`. -->
+<!-- ATTENTION: DO NOT EDIT! This file has been auto-generated using `pnpm docs:build:api`. -->
 
 # DatePicker
 

diff --git a/docs/data/toolpad/reference/components/file-picker.md b/docs/data/toolpad/reference/components/file-picker.md
@@ -1,4 +1,4 @@
-<!-- This file has been auto-generated using `pnpm docs:build:api`. -->
+<!-- ATTENTION: DO NOT EDIT! This file has been auto-generated using `pnpm docs:build:api`. -->
 
 # FilePicker
 

diff --git a/docs/data/toolpad/reference/components/form.md b/docs/data/toolpad/reference/components/form.md
@@ -1,4 +1,4 @@
-<!-- This file has been auto-generated using `pnpm docs:build:api`. -->
+<!-- ATTENTION: DO NOT EDIT! This file has been auto-generated using `pnpm docs:build:api`. -->
 
 # Form
 

diff --git a/docs/data/toolpad/reference/components/image.md b/docs/data/toolpad/reference/components/image.md
@@ -1,4 +1,4 @@
-<!-- This file has been auto-generated using `pnpm docs:build:api`. -->
+<!-- ATTENTION: DO NOT EDIT! This file has been auto-generated using `pnpm docs:build:api`. -->
 
 # Image
 

diff --git a/docs/data/toolpad/reference/components/list.md b/docs/data/toolpad/reference/components/list.md
@@ -1,4 +1,4 @@
-<!-- This file has been auto-generated using `pnpm docs:build:api`. -->
+<!-- ATTENTION: DO NOT EDIT! This file has been auto-generated using `pnpm docs:build:api`. -->
 
 # List
 

diff --git a/docs/data/toolpad/reference/components/manifest.json b/docs/data/toolpad/reference/components/manifest.json
@@ -1,5 +1,5 @@
 {
-  "//": "This file has been auto-generated using `pnpm docs:build:api`.",
+  "//": "ATTENTION: DO NOT EDIT! This file has been auto-generated using `pnpm docs:build:api`.",
   "pages": [
     {
       "pathname": "/toolpad/reference/components",

diff --git a/docs/data/toolpad/reference/components/metric.md b/docs/data/toolpad/reference/components/metric.md
@@ -1,4 +1,4 @@
-<!-- This file has been auto-generated using `pnpm docs:build:api`. -->
+<!-- ATTENTION: DO NOT EDIT! This file has been auto-generated using `pnpm docs:build:api`. -->
 
 # Metric
 

diff --git a/docs/data/toolpad/reference/components/page-column.md b/docs/data/toolpad/reference/components/page-column.md
@@ -1,4 +1,4 @@
-<!-- This file has been auto-generated using `pnpm docs:build:api`. -->
+<!-- ATTENTION: DO NOT EDIT! This file has been auto-generated using `pnpm docs:build:api`. -->
 
 # PageColumn
 

diff --git a/docs/data/toolpad/reference/components/page-row.md b/docs/data/toolpad/reference/components/page-row.md
@@ -1,4 +1,4 @@
-<!-- This file has been auto-generated using `pnpm docs:build:api`. -->
+<!-- ATTENTION: DO NOT EDIT! This file has been auto-generated using `pnpm docs:build:api`. -->
 
 # PageRow
 

diff --git a/docs/data/toolpad/reference/components/paper.md b/docs/data/toolpad/reference/components/paper.md
@@ -1,4 +1,4 @@
-<!-- This file has been auto-generated using `pnpm docs:build:api`. -->
+<!-- ATTENTION: DO NOT EDIT! This file has been auto-generated using `pnpm docs:build:api`. -->
 
 # Paper
 

diff --git a/docs/data/toolpad/reference/components/select.md b/docs/data/toolpad/reference/components/select.md
@@ -1,4 +1,4 @@
-<!-- This file has been auto-generated using `pnpm docs:build:api`. -->
+<!-- ATTENTION: DO NOT EDIT! This file has been auto-generated using `pnpm docs:build:api`. -->
 
 # Select
 

diff --git a/docs/data/toolpad/reference/components/stack.md b/docs/data/toolpad/reference/components/stack.md
@@ -1,4 +1,4 @@
-<!-- This file has been auto-generated using `pnpm docs:build:api`. -->
+<!-- ATTENTION: DO NOT EDIT! This file has been auto-generated using `pnpm docs:build:api`. -->
 
 # Stack
 

diff --git a/docs/data/toolpad/reference/components/tabs.md b/docs/data/toolpad/reference/components/tabs.md
@@ -1,4 +1,4 @@
-<!-- This file has been auto-generated using `pnpm docs:build:api`. -->
+<!-- ATTENTION: DO NOT EDIT! This file has been auto-generated using `pnpm docs:build:api`. -->
 
 # Tabs
 

diff --git a/docs/data/toolpad/reference/components/text-field.md b/docs/data/toolpad/reference/components/text-field.md
@@ -1,4 +1,4 @@
-<!-- This file has been auto-generated using `pnpm docs:build:api`. -->
+<!-- ATTENTION: DO NOT EDIT! This file has been auto-generated using `pnpm docs:build:api`. -->
 
 # TextField
 

diff --git a/docs/data/toolpad/reference/components/text.md b/docs/data/toolpad/reference/components/text.md
@@ -1,4 +1,4 @@
-<!-- This file has been auto-generated using `pnpm docs:build:api`. -->
+<!-- ATTENTION: DO NOT EDIT! This file has been auto-generated using `pnpm docs:build:api`. -->
 
 # Text
 

diff --git a/docs/pages/toolpad/reference/components/autocomplete.js b/docs/pages/toolpad/reference/components/autocomplete.js
@@ -1,4 +1,4 @@
-/* This file has been auto-generated using `pnpm docs:build:api`. */
+/* ATTENTION: DO NOT EDIT! This file has been auto-generated using `pnpm docs:build:api`. */
 
 import * as React from 'react';
 import MarkdownDocs from '@mui/monorepo/docs/src/modules/components/MarkdownDocs';

diff --git a/docs/pages/toolpad/reference/components/button.js b/docs/pages/toolpad/reference/components/button.js
@@ -1,4 +1,4 @@
-/* This file has been auto-generated using `pnpm docs:build:api`. */
+/* ATTENTION: DO NOT EDIT! This file has been auto-generated using `pnpm docs:build:api`. */
 
 import * as React from 'react';
 import MarkdownDocs from '@mui/monorepo/docs/src/modules/components/MarkdownDocs';

diff --git a/docs/pages/toolpad/reference/components/chart.js b/docs/pages/toolpad/reference/components/chart.js
@@ -1,4 +1,4 @@
-/* This file has been auto-generated using `pnpm docs:build:api`. */
+/* ATTENTION: DO NOT EDIT! This file has been auto-generated using `pnpm docs:build:api`. */
 
 import * as React from 'react';
 import MarkdownDocs from '@mui/monorepo/docs/src/modules/components/MarkdownDocs';

diff --git a/docs/pages/toolpad/reference/components/checkbox.js b/docs/pages/toolpad/reference/components/checkbox.js
@@ -1,4 +1,4 @@
-/* This file has been auto-generated using `pnpm docs:build:api`. */
+/* ATTENTION: DO NOT EDIT! This file has been auto-generated using `pnpm docs:build:api`. */
 
 import * as React from 'react';
 import MarkdownDocs from '@mui/monorepo/docs/src/modules/components/MarkdownDocs';

diff --git a/docs/pages/toolpad/reference/components/container.js b/docs/pages/toolpad/reference/components/container.js
@@ -1,4 +1,4 @@
-/* This file has been auto-generated using `pnpm docs:build:api`. */
+/* ATTENTION: DO NOT EDIT! This file has been auto-generated using `pnpm docs:build:api`. */
 
 import * as React from 'react';
 import MarkdownDocs from '@mui/monorepo/docs/src/modules/components/MarkdownDocs';

diff --git a/docs/pages/toolpad/reference/components/data-grid.js b/docs/pages/toolpad/reference/components/data-grid.js
@@ -1,4 +1,4 @@
-/* This file has been auto-generated using `pnpm docs:build:api`. */
+/* ATTENTION: DO NOT EDIT! This file has been auto-generated using `pnpm docs:build:api`. */
 
 import * as React from 'react';
 import MarkdownDocs from '@mui/monorepo/docs/src/modules/components/MarkdownDocs';

diff --git a/docs/pages/toolpad/reference/components/date-picker.js b/docs/pages/toolpad/reference/components/date-picker.js
@@ -1,4 +1,4 @@
-/* This file has been auto-generated using `pnpm docs:build:api`. */
+/* ATTENTION: DO NOT EDIT! This file has been auto-generated using `pnpm docs:build:api`. */
 
 import * as React from 'react';
 import MarkdownDocs from '@mui/monorepo/docs/src/modules/components/MarkdownDocs';

diff --git a/docs/pages/toolpad/reference/components/file-picker.js b/docs/pages/toolpad/reference/components/file-picker.js
@@ -1,4 +1,4 @@
-/* This file has been auto-generated using `pnpm docs:build:api`. */
+/* ATTENTION: DO NOT EDIT! This file has been auto-generated using `pnpm docs:build:api`. */
 
 import * as React from 'react';
 import MarkdownDocs from '@mui/monorepo/docs/src/modules/components/MarkdownDocs';

diff --git a/docs/pages/toolpad/reference/components/form.js b/docs/pages/toolpad/reference/components/form.js
@@ -1,4 +1,4 @@
-/* This file has been auto-generated using `pnpm docs:build:api`. */
+/* ATTENTION: DO NOT EDIT! This file has been auto-generated using `pnpm docs:build:api`. */
 
 import * as React from 'react';
 import MarkdownDocs from '@mui/monorepo/docs/src/modules/components/MarkdownDocs';

diff --git a/docs/pages/toolpad/reference/components/image.js b/docs/pages/toolpad/reference/components/image.js
@@ -1,4 +1,4 @@
-/* This file has been auto-generated using `pnpm docs:build:api`. */
+/* ATTENTION: DO NOT EDIT! This file has been auto-generated using `pnpm docs:build:api`. */
 
 import * as React from 'react';
 import MarkdownDocs from '@mui/monorepo/docs/src/modules/components/MarkdownDocs';

diff --git a/docs/pages/toolpad/reference/components/index.js b/docs/pages/toolpad/reference/components/index.js
@@ -1,4 +1,4 @@
-/* This file has been auto-generated using `pnpm docs:build:api`. */
+/* ATTENTION: DO NOT EDIT! This file has been auto-generated using `pnpm docs:build:api`. */
 
 import * as React from 'react';
 import MarkdownDocs from '@mui/monorepo/docs/src/modules/components/MarkdownDocs';

diff --git a/docs/pages/toolpad/reference/components/list.js b/docs/pages/toolpad/reference/components/list.js
@@ -1,4 +1,4 @@
-/* This file has been auto-generated using `pnpm docs:build:api`. */
+/* ATTENTION: DO NOT EDIT! This file has been auto-generated using `pnpm docs:build:api`. */
 
 import * as React from 'react';
 import MarkdownDocs from '@mui/monorepo/docs/src/modules/components/MarkdownDocs';

diff --git a/docs/pages/toolpad/reference/components/metric.js b/docs/pages/toolpad/reference/components/metric.js
@@ -1,4 +1,4 @@
-/* This file has been auto-generated using `pnpm docs:build:api`. */
+/* ATTENTION: DO NOT EDIT! This file has been auto-generated using `pnpm docs:build:api`. */
 
 import * as React from 'react';
 import MarkdownDocs from '@mui/monorepo/docs/src/modules/components/MarkdownDocs';

diff --git a/docs/pages/toolpad/reference/components/page-column.js b/docs/pages/toolpad/reference/components/page-column.js
@@ -1,4 +1,4 @@
-/* This file has been auto-generated using `pnpm docs:build:api`. */
+/* ATTENTION: DO NOT EDIT! This file has been auto-generated using `pnpm docs:build:api`. */
 
 import * as React from 'react';
 import MarkdownDocs from '@mui/monorepo/docs/src/modules/components/MarkdownDocs';

diff --git a/docs/pages/toolpad/reference/components/page-row.js b/docs/pages/toolpad/reference/components/page-row.js
@@ -1,4 +1,4 @@
-/* This file has been auto-generated using `pnpm docs:build:api`. */
+/* ATTENTION: DO NOT EDIT! This file has been auto-generated using `pnpm docs:build:api`. */
 
 import * as React from 'react';
 import MarkdownDocs from '@mui/monorepo/docs/src/modules/components/MarkdownDocs';

diff --git a/docs/pages/toolpad/reference/components/paper.js b/docs/pages/toolpad/reference/components/paper.js
@@ -1,4 +1,4 @@
-/* This file has been auto-generated using `pnpm docs:build:api`. */
+/* ATTENTION: DO NOT EDIT! This file has been auto-generated using `pnpm docs:build:api`. */
 
 import * as React from 'react';
 import MarkdownDocs from '@mui/monorepo/docs/src/modules/components/MarkdownDocs';

diff --git a/docs/pages/toolpad/reference/components/select.js b/docs/pages/toolpad/reference/components/select.js
@@ -1,4 +1,4 @@
-/* This file has been auto-generated using `pnpm docs:build:api`. */
+/* ATTENTION: DO NOT EDIT! This file has been auto-generated using `pnpm docs:build:api`. */
 
 import * as React from 'react';
 import MarkdownDocs from '@mui/monorepo/docs/src/modules/components/MarkdownDocs';

diff --git a/docs/pages/toolpad/reference/components/stack.js b/docs/pages/toolpad/reference/components/stack.js
@@ -1,4 +1,4 @@
-/* This file has been auto-generated using `pnpm docs:build:api`. */
+/* ATTENTION: DO NOT EDIT! This file has been auto-generated using `pnpm docs:build:api`. */
 
 import * as React from 'react';
 import MarkdownDocs from '@mui/monorepo/docs/src/modules/components/MarkdownDocs';

diff --git a/docs/pages/toolpad/reference/components/tabs.js b/docs/pages/toolpad/reference/components/tabs.js
@@ -1,4 +1,4 @@
-/* This file has been auto-generated using `pnpm docs:build:api`. */
+/* ATTENTION: DO NOT EDIT! This file has been auto-generated using `pnpm docs:build:api`. */
 
 import * as React from 'react';
 import MarkdownDocs from '@mui/monorepo/docs/src/modules/components/MarkdownDocs';

diff --git a/docs/pages/toolpad/reference/components/text-field.js b/docs/pages/toolpad/reference/components/text-field.js
@@ -1,4 +1,4 @@
-/* This file has been auto-generated using `pnpm docs:build:api`. */
+/* ATTENTION: DO NOT EDIT! This file has been auto-generated using `pnpm docs:build:api`. */
 
 import * as React from 'react';
 import MarkdownDocs from '@mui/monorepo/docs/src/modules/components/MarkdownDocs';

diff --git a/docs/pages/toolpad/reference/components/text.js b/docs/pages/toolpad/reference/components/text.js
@@ -1,4 +1,4 @@
-/* This file has been auto-generated using `pnpm docs:build:api`. */
+/* ATTENTION: DO NOT EDIT! This file has been auto-generated using `pnpm docs:build:api`. */
 
 import * as React from 'react';
 import MarkdownDocs from '@mui/monorepo/docs/src/modules/components/MarkdownDocs';

diff --git a/docs/schemas/v1/definitions.json b/docs/schemas/v1/definitions.json
@@ -27,8 +27,28 @@
                     "properties": {
                       "provider": {
                         "type": "string",
-                        "enum": ["github", "google"],
+                        "enum": ["github", "google", "azure-ad"],
                         "description": "Unique identifier for this authentication provider."
+                      },
+                      "roles": {
+                        "type": "array",
+                        "items": {
+                          "type": "object",
+                          "properties": {
+                            "source": {
+                              "type": "array",
+                              "items": { "type": "string" },
+                              "description": "Authentication provider roles to be mapped from."
+                            },
+                            "target": {
+                              "type": "string",
+                              "description": "Toolpad role to be mapped to."
+                            }
+                          },
+                          "required": ["source", "target"],
+                          "additionalProperties": false
+                        },
+                        "description": "Role mapping definition for this authentication provider."
                       }
                     },
                     "required": ["provider"],

diff --git a/package.json b/package.json
@@ -98,10 +98,11 @@
   },
   "engines": {
     "npm": "please-use-yarn",
-    "node": ">=18"
+    "node": ">=18",
+    "pnpm": "8.15.0"
   },
   "resolutions": {
     "google-auth-library": "*"
   },
-  "packageManager": "pnpm@8.7.0"
+  "packageManager": "pnpm@8.15.0"
 }
diff --git a/packages/toolpad-app/src/components/icons/AzureIcon.tsx b/packages/toolpad-app/src/components/icons/AzureIcon.tsx
@@ -0,0 +1,17 @@
+import * as React from 'react';
+
+interface AzureIconProps {
+  size?: number;
+  color?: string;
+}
+
+export default function AzureIcon({ size = 18, color = 'currentColor' }: AzureIconProps) {
+  return (
+    <svg viewBox="0 0 59.242 47.271" width={size} height={size} xmlns="http://www.w3.org/2000/svg">
+      <path
+        d="m32.368 0-17.468 15.145-14.9 26.75h13.437zm2.323 3.543-7.454 21.008 14.291 17.956-27.728 4.764h45.442z"
+        fill={color}
+      />
+    </svg>
+  );
+}
diff --git a/packages/toolpad-app/src/runtime/AppLayout.tsx b/packages/toolpad-app/src/runtime/AppLayout.tsx
@@ -42,22 +42,22 @@ interface AppPagesNavigationProps {
   pages: NavigationEntry[];
   clipped?: boolean;
   search?: string;
+  basename: string;
 }
 
 function AppPagesNavigation({
   activePageSlug,
   pages,
   clipped = false,
   search,
+  basename,
 }: AppPagesNavigationProps) {
   const navListSubheaderId = React.useId();
 
   const theme = useTheme();
 
   const productIcon = theme.palette.mode === 'dark' ? productIconDark : productIconLight;
 
-  const initialPageSlug = pages[0].slug;
-
   return (
     <Drawer
       variant="permanent"
@@ -77,7 +77,7 @@ function AppPagesNavigation({
       <MuiLink
         color="inherit"
         aria-label="Go to home page"
-        href={initialPageSlug}
+        href={basename}
         underline="none"
         sx={{
           ml: 3,
@@ -139,6 +139,7 @@ export interface ToolpadAppLayoutProps {
   hasHeader?: boolean;
   children?: React.ReactNode;
   clipped?: boolean;
+  basename: string;
 }
 
 export function AppLayout({
@@ -148,6 +149,7 @@ export function AppLayout({
   hasHeader = false,
   children,
   clipped,
+  basename,
 }: ToolpadAppLayoutProps) {
   const theme = useTheme();
 
@@ -194,6 +196,7 @@ export function AppLayout({
           pages={pages}
           clipped={clipped}
           search={retainedSearch}
+          basename={basename}
         />
       ) : null}
       <Box sx={{ minWidth: 0, flex: 1, position: 'relative', flexDirection: 'column' }}>