From 545fceb01dfdde56fd0a61427945688d473fafa6 Mon Sep 17 00:00:00 2001 From: jvega190 Date: Wed, 16 Oct 2024 08:36:29 -0600 Subject: [PATCH 1/8] [6694] MUIv6 Upgrade - initial work --- ui/app/package.json | 6 +- .../BrokenReferencesDialogContainer.tsx | 4 +- .../ConflictedPathDiffDialogUI.tsx | 6 +- .../CreateSiteDialog/BaseSiteForm.tsx | 10 +- .../CreateSiteDialog/BlueprintForm.tsx | 2 +- .../CreateSiteDialog/BlueprintReview.tsx | 8 +- .../CreateSiteDialogContainer.tsx | 13 +- .../components/CreateSiteDialog/GitForm.tsx | 12 +- .../CreateUserDialogContainer.tsx | 14 +- .../DeleteDialog/DeleteDialogUIBody.tsx | 6 +- .../DuplicateSiteDialogContainer.tsx | 10 +- .../EditSiteDialogContainer.tsx | 12 +- .../EditUserDialog/EditUserDialogUI.tsx | 10 +- .../GitManagement/RepoStatus/RepoStatusUI.tsx | 6 +- .../IconGuideDashlet/IconGuideDashlet.tsx | 8 +- .../KeyboardShortcutsDialog/utils.ts | 13 +- ui/app/src/components/Launcher/Launcher.tsx | 10 +- .../MarketplaceDialog/PluginList.tsx | 4 +- .../NewRemoteRepositoryForm.tsx | 18 +- .../PluginDetailsView/PluginDetailsView.tsx | 6 +- .../PluginFormBuilder/PluginFormEngine.tsx | 4 +- .../AudiencesFormSection.tsx | 4 +- .../AudiencesPanelUI.tsx | 2 +- .../PublishDialog/PublishDialogContentUI.tsx | 6 +- .../PublishOnDemandForm.tsx | 8 +- .../PublishingDashboard.tsx | 8 +- .../RejectDialog/RejectDialogUI.tsx | 6 +- ui/app/src/components/SearchUI/SearchUI.tsx | 7 +- .../SiteDashboard/SiteDashboard.tsx | 14 +- ui/app/src/components/SitesGrid/SitesGrid.tsx | 4 +- .../SitesGridSkeleton/SitesGridSkeleton.tsx | 4 +- .../components/WidgetsGrid/WidgetsGrid.tsx | 4 +- .../WorkflowCancellationDialogUI.tsx | 4 +- ui/guest/package.json | 4 +- yarn.lock | 318 ++++++++++++++---- 35 files changed, 392 insertions(+), 183 deletions(-) diff --git a/ui/app/package.json b/ui/app/package.json index aa692116f2..e98e3231e6 100644 --- a/ui/app/package.json +++ b/ui/app/package.json @@ -59,9 +59,9 @@ "@emotion/react": "^11.13.3", "@emotion/styled": "^11.13.0", "@graphiql/plugin-explorer": "^3.0.1", - "@mui/icons-material": "^5.15.20", - "@mui/lab": "^5.0.0-alpha.173", - "@mui/material": "^5.16.7", + "@mui/icons-material": "^6.1.3", + "@mui/lab": "6.0.0-beta.11", + "@mui/material": "^6.1.3", "@mui/x-data-grid": "^7.13.0", "@mui/x-date-pickers": "^7.13.0", "@mui/x-tree-view": "^7.13.0", diff --git a/ui/app/src/components/BrokenReferencesDialog/BrokenReferencesDialogContainer.tsx b/ui/app/src/components/BrokenReferencesDialog/BrokenReferencesDialogContainer.tsx index a6c20b284d..ee915e5525 100644 --- a/ui/app/src/components/BrokenReferencesDialog/BrokenReferencesDialogContainer.tsx +++ b/ui/app/src/components/BrokenReferencesDialog/BrokenReferencesDialogContainer.tsx @@ -23,7 +23,7 @@ import { fetchBrokenReferences, showEditDialog } from '../../state/actions/dialo import useActiveSiteId from '../../hooks/useActiveSiteId'; import useEnv from '../../hooks/useEnv'; import { DialogBody } from '../DialogBody'; -import Grid from '@mui/material/Grid'; +import Grid from '@mui/material/Grid2'; import List from '@mui/material/List'; import ListItem from '@mui/material/ListItem'; import ListItemText from '@mui/material/ListItemText'; @@ -56,7 +56,7 @@ export function BrokenReferencesDialogContainer(props: BrokenReferencesDialogCon {references.length > 0 ? ( - + `1px solid ${theme.palette.divider}`, diff --git a/ui/app/src/components/ConflictedPathDiffDialog/ConflictedPathDiffDialogUI.tsx b/ui/app/src/components/ConflictedPathDiffDialog/ConflictedPathDiffDialogUI.tsx index 8d2c313a57..c45eaf87df 100644 --- a/ui/app/src/components/ConflictedPathDiffDialog/ConflictedPathDiffDialogUI.tsx +++ b/ui/app/src/components/ConflictedPathDiffDialog/ConflictedPathDiffDialogUI.tsx @@ -21,7 +21,7 @@ import { makeStyles } from 'tss-react/mui'; import AceEditor from '../AceEditor/AceEditor'; import ConflictedPathDiffDialogSplitView from './ConflictedPathDiffDialogSplitView'; -import Grid from '@mui/material/Grid'; +import Grid from '@mui/material/Grid2'; import Typography from '@mui/material/Typography'; import { FormattedMessage } from 'react-intl'; @@ -74,12 +74,12 @@ export function ConflictedPathDiffDialogUI(props: RemoteRepositoriesDiffDialogUI {tab === 1 && (
- + - + diff --git a/ui/app/src/components/CreateSiteDialog/BaseSiteForm.tsx b/ui/app/src/components/CreateSiteDialog/BaseSiteForm.tsx index a7c6135a38..28cd401a77 100644 --- a/ui/app/src/components/CreateSiteDialog/BaseSiteForm.tsx +++ b/ui/app/src/components/CreateSiteDialog/BaseSiteForm.tsx @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -import Grid from '@mui/material/Grid'; +import Grid from '@mui/material/Grid2'; import TextField from '@mui/material/TextField'; import { siteIdMaxLength, siteInputMaxLength, siteNameMaxLength } from './utils'; import React from 'react'; @@ -85,7 +85,7 @@ export function BaseSiteForm(props: BaseSiteFormProps) { return ( <> - + - + - + - + - + {formatMessage(messages.creationStrategy)} onGoTo(0)} size="large"> @@ -266,7 +266,7 @@ function BlueprintReview(props: BlueprintReviewProps) {
)} - + {formatMessage(messages.siteInfo)} onGoTo(1)} size="large"> @@ -295,7 +295,7 @@ function BlueprintReview(props: BlueprintReviewProps) { {blueprint.source !== 'GIT' && blueprint.id === 'GIT' && renderGitOptions()} {blueprint.parameters && !!blueprint.parameters.length && ( - + {formatMessage(messages.blueprintParameters)} onGoTo(1)} size="large"> diff --git a/ui/app/src/components/CreateSiteDialog/CreateSiteDialogContainer.tsx b/ui/app/src/components/CreateSiteDialog/CreateSiteDialogContainer.tsx index 08e8309e36..9e0510f060 100644 --- a/ui/app/src/components/CreateSiteDialog/CreateSiteDialogContainer.tsx +++ b/ui/app/src/components/CreateSiteDialog/CreateSiteDialogContainer.tsx @@ -27,7 +27,7 @@ import { setRequestForgeryToken, setSiteCookie } from '../../utils/auth'; import { Subscription } from 'rxjs'; import { create, exists, fetchBlueprints as fetchBuiltInBlueprints } from '../../services/sites'; import { getSystemLink } from '../../utils/system'; -import Grid from '@mui/material/Grid'; +import Grid from '@mui/material/Grid2'; import PluginCard from '../PluginCard'; import ConfirmDialog from '../ConfirmDialog'; import LoadingState from '../LoadingState'; @@ -501,7 +501,10 @@ export function CreateSiteDialogContainer(props: CreateSiteDialogContainerProps) const disableCard = isDuplicateItem && !permissionsLookup['duplicate_site']; return ( - + - + - + {formatMessage(messages.publicMarketplaceBlueprints)} @@ -669,7 +672,7 @@ export function CreateSiteDialogContainer(props: CreateSiteDialogContainerProps) /> {search.searchSelected && site.selectedView === 0 && ( - +
- + - + - +
- + - + - + - + } @@ -309,7 +309,7 @@ export function CreateUserDialogContainer(props: CreateUserDialogContainerProps) inputProps={{ maxLength: USER_USERNAME_MAX_LENGTH }} /> - + } @@ -333,7 +333,7 @@ export function CreateUserDialogContainer(props: CreateUserDialogContainerProps) }} /> - + - + diff --git a/ui/app/src/components/DeleteDialog/DeleteDialogUIBody.tsx b/ui/app/src/components/DeleteDialog/DeleteDialogUIBody.tsx index c7ecd9201a..41807b0ddb 100644 --- a/ui/app/src/components/DeleteDialog/DeleteDialogUIBody.tsx +++ b/ui/app/src/components/DeleteDialog/DeleteDialogUIBody.tsx @@ -16,7 +16,7 @@ import React from 'react'; import { useDeleteDialogUIStyles } from './styles'; -import Grid from '@mui/material/Grid'; +import Grid from '@mui/material/Grid2'; import TextFieldWithMax from '../TextFieldWithMax/TextFieldWithMax'; import { FormattedMessage } from 'react-intl'; import { SelectionList } from '../DependencySelection/SelectionList'; @@ -52,7 +52,7 @@ export function DeleteDialogUIBody(props: DeleteDialogContentUIProps) { const { classes } = useDeleteDialogUIStyles(); return ( - +
} @@ -134,7 +134,7 @@ export function DeleteDialogUIBody(props: DeleteDialogContentUIProps) { />
- +
} diff --git a/ui/app/src/components/DuplicateSiteDialog/DuplicateSiteDialogContainer.tsx b/ui/app/src/components/DuplicateSiteDialog/DuplicateSiteDialogContainer.tsx index 7d011d8468..d49e586cdb 100644 --- a/ui/app/src/components/DuplicateSiteDialog/DuplicateSiteDialogContainer.tsx +++ b/ui/app/src/components/DuplicateSiteDialog/DuplicateSiteDialogContainer.tsx @@ -22,7 +22,7 @@ import Button from '@mui/material/Button'; import { FormattedMessage, useIntl } from 'react-intl'; import PrimaryButton from '../PrimaryButton'; import React, { MouseEvent, useEffect, useMemo, useRef, useState } from 'react'; -import Grid from '@mui/material/Grid'; +import Grid from '@mui/material/Grid2'; import Typography from '@mui/material/Typography'; import IconButton from '@mui/material/IconButton'; import EditIcon from '@mui/icons-material/Edit'; @@ -281,7 +281,7 @@ export function DuplicateSiteDialogContainer(props: DuplicateSiteDialogContainer {site.selectedView === 0 && ( - + @@ -318,7 +318,7 @@ export function DuplicateSiteDialogContainer(props: DuplicateSiteDialogContainer onKeyPress={onKeyPress} /> {sourceSiteHasBlobStores && ( - + - + {onGoBack && ( @@ -372,7 +372,7 @@ export function DuplicateSiteDialogContainer(props: DuplicateSiteDialogContainer
- + - + @@ -177,9 +177,9 @@ export function EditSiteDialogContainer(props: EditSiteDialogContainerProps) { - + - + - + - + - +
@@ -284,7 +284,7 @@ export function EditUserDialogUI(props: EditUserDialogUIProps) {
- +
@@ -296,14 +296,14 @@ export function EditUserDialogUI(props: EditUserDialogUIProps) { - + {sites.map((site) => ( {site.name} ))} - + {sites.map((site, i) => rolesBySite[site.id] ? ( rolesBySite[site.id].length ? ( diff --git a/ui/app/src/components/GitManagement/RepoStatus/RepoStatusUI.tsx b/ui/app/src/components/GitManagement/RepoStatus/RepoStatusUI.tsx index e607750143..83e1f17e10 100644 --- a/ui/app/src/components/GitManagement/RepoStatus/RepoStatusUI.tsx +++ b/ui/app/src/components/GitManagement/RepoStatus/RepoStatusUI.tsx @@ -31,7 +31,7 @@ import { messages } from './translations'; import Alert from '@mui/material/Alert'; import translations from '../translations'; import Box from '@mui/material/Box'; -import Grid from '@mui/material/Grid'; +import Grid from '@mui/material/Grid2'; import { DropDownMenu } from '../../DropDownMenuButton'; export interface RepoStatusUIProps { @@ -138,7 +138,7 @@ export function RepoStatusUI(props: RepoStatusUIProps) { {status.conflicting.length > 0 && ( - + @@ -180,7 +180,7 @@ export function RepoStatusUI(props: RepoStatusUIProps) { )} {status.uncommittedChanges.length > 0 && ( - + diff --git a/ui/app/src/components/IconGuideDashlet/IconGuideDashlet.tsx b/ui/app/src/components/IconGuideDashlet/IconGuideDashlet.tsx index f1d8f91d17..290cf40eef 100644 --- a/ui/app/src/components/IconGuideDashlet/IconGuideDashlet.tsx +++ b/ui/app/src/components/IconGuideDashlet/IconGuideDashlet.tsx @@ -17,7 +17,7 @@ import React, { useState } from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; import Typography from '@mui/material/Typography'; -import Grid from '@mui/material/Grid'; +import Grid from '@mui/material/Grid2'; import { makeStyles } from 'tss-react/mui'; import ItemStateIcon from '../ItemStateIcon'; import { getItemPublishingTargetText, getItemStateText } from '../ItemDisplay/utils'; @@ -142,7 +142,7 @@ export function IconGuideDashlet(props: IconGuideDashletProps) { {Object.keys(status).map((key) => ( - + {getItemPublishingTargetText(status[key].stateMap)} @@ -156,7 +156,7 @@ export function IconGuideDashlet(props: IconGuideDashletProps) { {Object.keys(states).map((key) => ( - + {getItemStateText(states[key].stateMap)} @@ -170,7 +170,7 @@ export function IconGuideDashlet(props: IconGuideDashletProps) { {Object.keys(types).map((key) => ( - + {formatMessage(messages[key])} diff --git a/ui/app/src/components/KeyboardShortcutsDialog/utils.ts b/ui/app/src/components/KeyboardShortcutsDialog/utils.ts index 47d065b956..1ceae3f804 100644 --- a/ui/app/src/components/KeyboardShortcutsDialog/utils.ts +++ b/ui/app/src/components/KeyboardShortcutsDialog/utils.ts @@ -15,18 +15,19 @@ */ import { EnhancedDialogProps } from '../EnhancedDialog'; -import { PartialSxRecord } from '../../models/CustomRecord'; import { MessageDescriptor } from 'react-intl'; +import { TypographyProps } from '@mui/material/Typography'; +import { ChipProps, ListProps } from '@mui/material'; export interface KeyboardShortcutsDialogProps extends EnhancedDialogProps { shortcuts: KeyboardShortcutsCategory[]; - sxs?: KeyboardShortcutsDialogPartialSx; + sxs?: Partial<{ + categoryTitle: TypographyProps['sx']; + shortcutChip: ChipProps['sx']; + shortcutsList: ListProps['sx']; + }>; } -export type KeyboardShortcutsDialogClassKey = 'categoryTitle' | 'shortcutChip' | 'shortcutsList'; - -export type KeyboardShortcutsDialogPartialSx = PartialSxRecord; - export interface KeyboardShortcutDescriptor { label: MessageDescriptor | string; shortcut: string; diff --git a/ui/app/src/components/Launcher/Launcher.tsx b/ui/app/src/components/Launcher/Launcher.tsx index f0d2059204..7edca8769f 100644 --- a/ui/app/src/components/Launcher/Launcher.tsx +++ b/ui/app/src/components/Launcher/Launcher.tsx @@ -18,7 +18,7 @@ import React, { Suspense, useEffect, useMemo } from 'react'; import { defineMessages, FormattedMessage, IntlShape, useIntl } from 'react-intl'; import { makeStyles } from 'tss-react/mui'; import Popover from '@mui/material/Popover'; -import Grid from '@mui/material/Grid'; +import Grid from '@mui/material/Grid2'; import Typography from '@mui/material/Typography'; import LauncherSiteCard, { LauncherSiteCardOption } from '../LauncherSiteCard/LauncherSiteCard'; import CloseIcon from '@mui/icons-material/Close'; @@ -244,7 +244,7 @@ const AppsRail = ({ clsx, lonely }: AppsRailProps) => ( - +
{globalNavigationPosition === 'before' && } {renderWidgets(widgets, { userRoles })} @@ -256,7 +256,7 @@ const AppsRail = ({ ); const AppsRailSkeleton = ({ classes, closeButtonPosition, formatMessage, onLogout, user, clsx }) => ( - +
{new Array(9).fill(null).map((_, i) => ( @@ -283,7 +283,7 @@ interface SitesRailProps { const SitesRail = ({ classes, formatMessage, sites, site, onSiteCardClick, options, version }: SitesRailProps) => ( - +
{formatMessage(messages.mySites)} @@ -320,7 +320,7 @@ const SitesRail = ({ classes, formatMessage, sites, site, onSiteCardClick, optio ); const SiteRailSkeleton = ({ classes, formatMessage, version }) => ( - +
{formatMessage(messages.mySites)} diff --git a/ui/app/src/components/MarketplaceDialog/PluginList.tsx b/ui/app/src/components/MarketplaceDialog/PluginList.tsx index d327df447d..874f484a62 100644 --- a/ui/app/src/components/MarketplaceDialog/PluginList.tsx +++ b/ui/app/src/components/MarketplaceDialog/PluginList.tsx @@ -15,7 +15,7 @@ */ import { PluginListProps } from './utils'; -import Grid from '@mui/material/Grid'; +import Grid from '@mui/material/Grid2'; import PluginCard from '../PluginCard'; import { FormattedMessage } from 'react-intl'; import React from 'react'; @@ -45,7 +45,7 @@ export function PluginList(props: PluginListProps) { /> ) : ( plugins.map((plugin) => ( - + - + + } - InputLabelProps={{ shrink: true }} + slotProps={{ + inputLabel: { shrink: true } + }} required placeholder="origin" autoFocus @@ -67,12 +69,14 @@ export function NewRemoteRepositoryForm(props: NewRemoteRepositoryFormProps) { } /> - + } - InputLabelProps={{ shrink: true }} + slotProps={{ + inputLabel: { shrink: true } + }} required fullWidth placeholder={'e.g. https://github.com/craftercms/craftercms-react-blueprint.git'} @@ -87,7 +91,7 @@ export function NewRemoteRepositoryForm(props: NewRemoteRepositoryFormProps) { } /> - + diff --git a/ui/app/src/components/PluginDetailsView/PluginDetailsView.tsx b/ui/app/src/components/PluginDetailsView/PluginDetailsView.tsx index 64a5a2d9a7..4c8a7f1a73 100644 --- a/ui/app/src/components/PluginDetailsView/PluginDetailsView.tsx +++ b/ui/app/src/components/PluginDetailsView/PluginDetailsView.tsx @@ -25,7 +25,7 @@ import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; import { MarketplacePlugin } from '../../models/MarketplacePlugin'; import Fab from '@mui/material/Fab'; import ArrowBackIcon from '@mui/icons-material/ArrowBack'; -import Grid from '@mui/material/Grid'; +import Grid from '@mui/material/Grid2'; import OpenInNewIcon from '@mui/icons-material/OpenInNew'; import Alert from '@mui/material/Alert'; import { backgroundColor } from '../../styles/theme'; @@ -300,7 +300,7 @@ export function PluginDetailsView(props: PluginDetailsViewProps) { )}
- + {isMarketplacePlugin && !compatible && ( {description} - +
{developer && {formatMessage(messages.developer)}} {developer && developer.company && ( diff --git a/ui/app/src/components/PluginFormBuilder/PluginFormEngine.tsx b/ui/app/src/components/PluginFormBuilder/PluginFormEngine.tsx index 9bfecb8742..e2813636cf 100644 --- a/ui/app/src/components/PluginFormBuilder/PluginFormEngine.tsx +++ b/ui/app/src/components/PluginFormBuilder/PluginFormEngine.tsx @@ -17,7 +17,7 @@ import React from 'react'; import { MarketplacePluginParameter } from '../../models/MarketplacePlugin'; import TextField from '@mui/material/TextField'; -import Grid from '@mui/material/Grid'; +import Grid from '@mui/material/Grid2'; import { makeStyles } from 'tss-react/mui'; import { defineMessages, useIntl } from 'react-intl'; import PasswordTextField from '../PasswordTextField/PasswordTextField'; @@ -74,7 +74,7 @@ export function PluginFormEngine(props: PluginFormEngineProps) { function renderParameters(parameters: [MarketplacePluginParameter]) { return parameters.map((parameter, index) => { return ( - + {parameter.type === 'STRING' ? ( - + {children} {field.helpText} diff --git a/ui/app/src/components/PreviewAudiencesPanel/AudiencesPanelUI.tsx b/ui/app/src/components/PreviewAudiencesPanel/AudiencesPanelUI.tsx index b9b02edb65..f912bc5ed2 100644 --- a/ui/app/src/components/PreviewAudiencesPanel/AudiencesPanelUI.tsx +++ b/ui/app/src/components/PreviewAudiencesPanel/AudiencesPanelUI.tsx @@ -15,7 +15,7 @@ */ import ContentInstance from '../../models/ContentInstance'; -import Grid from '@mui/material/Grid'; +import Grid from '@mui/material/Grid2'; import { AudiencesFormSection } from './AudiencesFormSection'; import SecondaryButton from '../SecondaryButton'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; diff --git a/ui/app/src/components/PublishDialog/PublishDialogContentUI.tsx b/ui/app/src/components/PublishDialog/PublishDialogContentUI.tsx index cacef565b2..866290f3cf 100644 --- a/ui/app/src/components/PublishDialog/PublishDialogContentUI.tsx +++ b/ui/app/src/components/PublishDialog/PublishDialogContentUI.tsx @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -import Grid from '@mui/material/Grid'; +import Grid from '@mui/material/Grid2'; import DependencySelection from '../DependencySelection/DependencySelection'; import PublishDialogForm from './PublishDialogForm'; import React from 'react'; @@ -71,7 +71,7 @@ export function PublishDialogContentUI(props: PublishDialogContentUIProps) { return ( <> - + {published ? ( <> {isRequestPublish && ( @@ -103,7 +103,7 @@ export function PublishDialogContentUI(props: PublishDialogContentUIProps) { )} - + {mode !== 'everything' && ( - + )} - + {publishingTargets ? ( @@ -162,7 +162,7 @@ export function PublishOnDemandForm(props: PublishOnDemandFormProps) { )} - + - + {userPermissions.includes('get_publishing_queue') && ( - + )} {hasPublishPermission && ( - + - + {error ? ( ) : !Boolean(items && nnou(published) && cannedMessages) ? ( @@ -89,7 +89,7 @@ export function RejectDialogUI(props: RejectDialogUIProps) { )} - +
diff --git a/ui/app/src/components/SearchUI/SearchUI.tsx b/ui/app/src/components/SearchUI/SearchUI.tsx index d98de8086c..89e070c6fc 100644 --- a/ui/app/src/components/SearchUI/SearchUI.tsx +++ b/ui/app/src/components/SearchUI/SearchUI.tsx @@ -30,7 +30,7 @@ import Typography from '@mui/material/Typography'; import { translations } from '../Search/translations'; import TablePagination from '@mui/material/TablePagination'; import ApiResponseErrorState from '../ApiResponseErrorState'; -import Grid from '@mui/material/Grid'; +import Grid from '@mui/material/Grid2'; import MediaCard from '../MediaCard/MediaCard'; import EmptyState from '../EmptyState/EmptyState'; import ItemActionsSnackbar from '../ItemActionsSnackbar'; @@ -454,7 +454,10 @@ export function SearchUI(props: SearchUIProps) { <> {searchResults.items.length > 0 ? ( searchResults.items.map((item: MediaItem, i) => ( - + (widget, index) => ( - + {mapper(widget, index)} ) }) ) : ( - + {/* Displays on desktop - inside grid, below the last rendered dashlet */} {desktopScreen && ( - + )} @@ -211,7 +209,7 @@ function DashboardSkeleton() { return ( <> {new Array(3).fill(null).map((nothing, index) => ( - + ))} diff --git a/ui/app/src/components/SitesGrid/SitesGrid.tsx b/ui/app/src/components/SitesGrid/SitesGrid.tsx index fc4c609de4..8ab00c6031 100644 --- a/ui/app/src/components/SitesGrid/SitesGrid.tsx +++ b/ui/app/src/components/SitesGrid/SitesGrid.tsx @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -import Grid from '@mui/material/Grid'; +import Grid from '@mui/material/Grid2'; import React from 'react'; import { Resource } from '../../models/Resource'; import { Site } from '../../models/Site'; @@ -55,7 +55,7 @@ export function SitesGrid(props: SitesGridProps) {
{sites.map((site) => ( - + {items.map((num, i) => ( - + ))} diff --git a/ui/app/src/components/WidgetsGrid/WidgetsGrid.tsx b/ui/app/src/components/WidgetsGrid/WidgetsGrid.tsx index fd2dd47abb..2cd3c12369 100644 --- a/ui/app/src/components/WidgetsGrid/WidgetsGrid.tsx +++ b/ui/app/src/components/WidgetsGrid/WidgetsGrid.tsx @@ -14,14 +14,14 @@ * along with this program. If not, see . */ -import Grid, { GridProps } from '@mui/material/Grid'; +import Grid, { Grid2Props } from '@mui/material/Grid2'; import React from 'react'; import { renderWidgets } from '../Widget'; import { WidgetDescriptor } from '../../models'; import useActiveSiteId from '../../hooks/useActiveSiteId'; import useActiveUser from '../../hooks/useActiveUser'; -export interface WidgetsGridProps extends GridProps { +export interface WidgetsGridProps extends Grid2Props { widgets: WidgetDescriptor[]; } diff --git a/ui/app/src/components/WorkflowCancellationDialog/WorkflowCancellationDialogUI.tsx b/ui/app/src/components/WorkflowCancellationDialog/WorkflowCancellationDialogUI.tsx index 4ddab8b252..a7bdc252e4 100644 --- a/ui/app/src/components/WorkflowCancellationDialog/WorkflowCancellationDialogUI.tsx +++ b/ui/app/src/components/WorkflowCancellationDialog/WorkflowCancellationDialogUI.tsx @@ -16,7 +16,7 @@ import { FormattedMessage } from 'react-intl'; import DialogBody from '../DialogBody/DialogBody'; -import Grid from '@mui/material/Grid'; +import Grid from '@mui/material/Grid2'; import List from '@mui/material/List'; import ListItem from '@mui/material/ListItem'; import ListItemText from '@mui/material/ListItemText'; @@ -32,7 +32,7 @@ export function WorkflowCancellationDialogUI(props: WorkflowCancellationDialogUI <> - + {items.map((item) => ( diff --git a/ui/guest/package.json b/ui/guest/package.json index 728d203d96..f93f311d3f 100644 --- a/ui/guest/package.json +++ b/ui/guest/package.json @@ -103,8 +103,8 @@ "@emotion/css": "^11.13.0", "@emotion/react": "^11.13.3", "@emotion/styled": "^11.13.0", - "@mui/icons-material": "^5.15.20", - "@mui/material": "^5.16.7", + "@mui/icons-material": "^6.1.3", + "@mui/material": "^6.1.3", "@reduxjs/toolkit": "^2.2.5", "@rollup/plugin-alias": "^5.1.0", "@types/react-dom": "^18.3.0", diff --git a/yarn.lock b/yarn.lock index 41007532a2..9fb24065bd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1468,6 +1468,15 @@ __metadata: languageName: node linkType: hard +"@babel/runtime@npm:^7.25.6": + version: 7.25.7 + resolution: "@babel/runtime@npm:7.25.7" + dependencies: + regenerator-runtime: "npm:^0.14.0" + checksum: 10/73411fe0f1bff3a962586cef05b30f49e554b6563767e6d84f7d79d605b2c20e7fc3df291a3aebef69043181a8f893afdab9e6672557a5c2d08b9377d6f678cd + languageName: node + linkType: hard + "@babel/template@npm:^7.24.0, @babel/template@npm:^7.24.7": version: 7.24.7 resolution: "@babel/template@npm:7.24.7" @@ -1544,8 +1553,8 @@ __metadata: "@emotion/css": "npm:^11.13.0" "@emotion/react": "npm:^11.13.3" "@emotion/styled": "npm:^11.13.0" - "@mui/icons-material": "npm:^5.15.20" - "@mui/material": "npm:^5.16.7" + "@mui/icons-material": "npm:^6.1.3" + "@mui/material": "npm:^6.1.3" "@reduxjs/toolkit": "npm:^2.2.5" "@rollup/plugin-alias": "npm:^5.1.0" "@rollup/plugin-swc": "npm:^0.3.0" @@ -1667,9 +1676,9 @@ __metadata: "@emotion/styled": "npm:^11.13.0" "@formatjs/cli": "npm:^6.2.12" "@graphiql/plugin-explorer": "npm:^3.0.1" - "@mui/icons-material": "npm:^5.15.20" - "@mui/lab": "npm:^5.0.0-alpha.173" - "@mui/material": "npm:^5.16.7" + "@mui/icons-material": "npm:^6.1.3" + "@mui/lab": "npm:6.0.0-beta.11" + "@mui/material": "npm:^6.1.3" "@mui/x-data-grid": "npm:^7.13.0" "@mui/x-date-pickers": "npm:^7.13.0" "@mui/x-tree-view": "npm:^7.13.0" @@ -1821,7 +1830,7 @@ __metadata: languageName: node linkType: hard -"@emotion/cache@npm:*, @emotion/cache@npm:^11.11.0, @emotion/cache@npm:^11.13.0": +"@emotion/cache@npm:*, @emotion/cache@npm:^11.11.0, @emotion/cache@npm:^11.13.0, @emotion/cache@npm:^11.13.1": version: 11.13.1 resolution: "@emotion/cache@npm:11.13.1" dependencies: @@ -1920,6 +1929,19 @@ __metadata: languageName: node linkType: hard +"@emotion/serialize@npm:^1.3.2": + version: 1.3.2 + resolution: "@emotion/serialize@npm:1.3.2" + dependencies: + "@emotion/hash": "npm:^0.9.2" + "@emotion/memoize": "npm:^0.9.0" + "@emotion/unitless": "npm:^0.10.0" + "@emotion/utils": "npm:^1.4.1" + csstype: "npm:^3.0.2" + checksum: 10/ead557c1ff19d917ef8169c02738ef36f0851fbfdf0bf69a543045bddea3b7281dc8252ee466cc5fb44ed27d1e61280ff943bb60a2c04158751fb07b3457cc93 + languageName: node + linkType: hard + "@emotion/sheet@npm:^1.4.0": version: 1.4.0 resolution: "@emotion/sheet@npm:1.4.0" @@ -1970,6 +1992,13 @@ __metadata: languageName: node linkType: hard +"@emotion/utils@npm:^1.4.1": + version: 1.4.1 + resolution: "@emotion/utils@npm:1.4.1" + checksum: 10/95e56fc0c9e05cf01a96268f0486ce813f1109a8653d2f575c67df9e8765d9c1b2daf09ad1ada67d933efbb08ca7990228e14b210c713daf90156b4869abe6a7 + languageName: node + linkType: hard + "@emotion/weak-memoize@npm:^0.4.0": version: 0.4.0 resolution: "@emotion/weak-memoize@npm:0.4.0" @@ -2196,6 +2225,16 @@ __metadata: languageName: node linkType: hard +"@floating-ui/dom@npm:^1.0.0": + version: 1.6.11 + resolution: "@floating-ui/dom@npm:1.6.11" + dependencies: + "@floating-ui/core": "npm:^1.6.0" + "@floating-ui/utils": "npm:^0.2.8" + checksum: 10/8579392ad10151474869e7640af169b0d7fc2df48d4da27b6dcb1a57202329147ed986b2972787d4b8cd550c87897271b2d9c4633c2ec7d0b3ad37ce1da636f1 + languageName: node + linkType: hard + "@floating-ui/dom@npm:^1.6.1": version: 1.6.1 resolution: "@floating-ui/dom@npm:1.6.1" @@ -2206,7 +2245,7 @@ __metadata: languageName: node linkType: hard -"@floating-ui/react-dom@npm:^2.0.0, @floating-ui/react-dom@npm:^2.0.8": +"@floating-ui/react-dom@npm:^2.0.0": version: 2.0.8 resolution: "@floating-ui/react-dom@npm:2.0.8" dependencies: @@ -2218,6 +2257,18 @@ __metadata: languageName: node linkType: hard +"@floating-ui/react-dom@npm:^2.1.1": + version: 2.1.2 + resolution: "@floating-ui/react-dom@npm:2.1.2" + dependencies: + "@floating-ui/dom": "npm:^1.0.0" + peerDependencies: + react: ">=16.8.0" + react-dom: ">=16.8.0" + checksum: 10/2a67dc8499674e42ff32c7246bded185bb0fdd492150067caf9568569557ac4756a67787421d8604b0f241e5337de10762aee270d9aeef106d078a0ff13596c4 + languageName: node + linkType: hard + "@floating-ui/utils@npm:^0.2.1": version: 0.2.1 resolution: "@floating-ui/utils@npm:0.2.1" @@ -2225,6 +2276,13 @@ __metadata: languageName: node linkType: hard +"@floating-ui/utils@npm:^0.2.8": + version: 0.2.8 + resolution: "@floating-ui/utils@npm:0.2.8" + checksum: 10/3e3ea3b2de06badc4baebdf358b3dbd77ccd9474a257a6ef237277895943db2acbae756477ec64de65a2a1436d94aea3107129a1feeef6370675bf2b161c1abc + languageName: node + linkType: hard + "@formatjs/cli@npm:^6.2.12": version: 6.2.12 resolution: "@formatjs/cli@npm:6.2.12" @@ -2619,16 +2677,16 @@ __metadata: languageName: node linkType: hard -"@mui/base@npm:5.0.0-beta.40": - version: 5.0.0-beta.40 - resolution: "@mui/base@npm:5.0.0-beta.40" +"@mui/base@npm:5.0.0-beta.58": + version: 5.0.0-beta.58 + resolution: "@mui/base@npm:5.0.0-beta.58" dependencies: - "@babel/runtime": "npm:^7.23.9" - "@floating-ui/react-dom": "npm:^2.0.8" - "@mui/types": "npm:^7.2.14" - "@mui/utils": "npm:^5.15.14" + "@babel/runtime": "npm:^7.25.0" + "@floating-ui/react-dom": "npm:^2.1.1" + "@mui/types": "npm:^7.2.15" + "@mui/utils": "npm:6.0.0-rc.0" "@popperjs/core": "npm:^2.11.8" - clsx: "npm:^2.1.0" + clsx: "npm:^2.1.1" prop-types: "npm:^15.8.1" peerDependencies: "@types/react": ^17.0.0 || ^18.0.0 @@ -2637,74 +2695,77 @@ __metadata: peerDependenciesMeta: "@types/react": optional: true - checksum: 10/ebee3d9e1136710dcb2af5828acc6bd8d54f6b124785d011585c2665a48dc66e35ccb344d5ebc7fd8bfd776cccb8ea434911f151a62bee193677ee9dc67fc7fc + checksum: 10/151842a4b3421cb40dbcc88d22200ae3112174bcc160211baa3ac6f932e58eb13627c339a6bc457e3ccbcb279bf3605203d75b4e2cf0e4c195df59583ebbc4a6 languageName: node linkType: hard -"@mui/core-downloads-tracker@npm:^5.16.7": - version: 5.16.7 - resolution: "@mui/core-downloads-tracker@npm:5.16.7" - checksum: 10/b65c48ba2bf6bba6435ba9f2d6c33db0c8a85b3ff7599136a9682b72205bec76470ab5ed5e6e625d5bd012ed9bcbc641ed677548be80d217c9fb5d0435567062 +"@mui/core-downloads-tracker@npm:^6.1.3": + version: 6.1.3 + resolution: "@mui/core-downloads-tracker@npm:6.1.3" + checksum: 10/e8b3bc8cce8dd3497c2d27a2e15ab989489011a1c85aedb634f4a20b71412d01f12d15a59a9824861022f12625b208e7da17a1e5d9a7e57b458ed4c82a8032eb languageName: node linkType: hard -"@mui/icons-material@npm:^5.15.20": - version: 5.15.20 - resolution: "@mui/icons-material@npm:5.15.20" +"@mui/icons-material@npm:^6.1.3": + version: 6.1.3 + resolution: "@mui/icons-material@npm:6.1.3" dependencies: - "@babel/runtime": "npm:^7.23.9" + "@babel/runtime": "npm:^7.25.6" peerDependencies: - "@mui/material": ^5.0.0 - "@types/react": ^17.0.0 || ^18.0.0 - react: ^17.0.0 || ^18.0.0 + "@mui/material": ^6.1.3 + "@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0 + react: ^17.0.0 || ^18.0.0 || ^19.0.0 peerDependenciesMeta: "@types/react": optional: true - checksum: 10/fe83713840b84f745005ef457cf3a3672099d1cc9db538214016a2679d964a0b93b82bb6c33c27e405a6d0204c1d1325fc68f0d546b20b4d2d0b5a6a4bec152f + checksum: 10/ec644d748863ab0b7a5a1c34e15fdc0b8654bdceae4dbe253d797a29b190e993f467bb641b35f71713b2e02ee8165f985c438a313e29e9715314d3ea49f98b57 languageName: node linkType: hard -"@mui/lab@npm:^5.0.0-alpha.173": - version: 5.0.0-alpha.173 - resolution: "@mui/lab@npm:5.0.0-alpha.173" +"@mui/lab@npm:6.0.0-beta.11": + version: 6.0.0-beta.11 + resolution: "@mui/lab@npm:6.0.0-beta.11" dependencies: - "@babel/runtime": "npm:^7.23.9" - "@mui/base": "npm:5.0.0-beta.40" - "@mui/system": "npm:^5.16.5" - "@mui/types": "npm:^7.2.15" - "@mui/utils": "npm:^5.16.5" - clsx: "npm:^2.1.0" + "@babel/runtime": "npm:^7.25.6" + "@mui/base": "npm:5.0.0-beta.58" + "@mui/system": "npm:^6.1.3" + "@mui/types": "npm:^7.2.18" + "@mui/utils": "npm:^6.1.3" + clsx: "npm:^2.1.1" prop-types: "npm:^15.8.1" peerDependencies: "@emotion/react": ^11.5.0 "@emotion/styled": ^11.3.0 - "@mui/material": ">=5.15.0" - "@types/react": ^17.0.0 || ^18.0.0 - react: ^17.0.0 || ^18.0.0 - react-dom: ^17.0.0 || ^18.0.0 + "@mui/material": ^6.1.3 + "@mui/material-pigment-css": ^6.1.3 + "@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0 + react: ^17.0.0 || ^18.0.0 || ^19.0.0 + react-dom: ^17.0.0 || ^18.0.0 || ^19.0.0 peerDependenciesMeta: "@emotion/react": optional: true "@emotion/styled": optional: true + "@mui/material-pigment-css": + optional: true "@types/react": optional: true - checksum: 10/6b5bd0665f524d074bba41f76ea70d2938be16dbb7c0360d4d6be6c61d540a4fc06d765ed277ca205a40686212361e528c945b9150caefe40bac483cdec525e0 + checksum: 10/04580e7845e152dfc40df4516ac52d4743fdc9b0c490a5b0c268218d691677d0614a32f84393eef949546ac1fefa82bf2965654adb240fc23ff40af284dea1b6 languageName: node linkType: hard -"@mui/material@npm:^5.16.7": - version: 5.16.7 - resolution: "@mui/material@npm:5.16.7" +"@mui/material@npm:^6.1.3": + version: 6.1.3 + resolution: "@mui/material@npm:6.1.3" dependencies: - "@babel/runtime": "npm:^7.23.9" - "@mui/core-downloads-tracker": "npm:^5.16.7" - "@mui/system": "npm:^5.16.7" - "@mui/types": "npm:^7.2.15" - "@mui/utils": "npm:^5.16.6" + "@babel/runtime": "npm:^7.25.6" + "@mui/core-downloads-tracker": "npm:^6.1.3" + "@mui/system": "npm:^6.1.3" + "@mui/types": "npm:^7.2.18" + "@mui/utils": "npm:^6.1.3" "@popperjs/core": "npm:^2.11.8" - "@types/react-transition-group": "npm:^4.4.10" - clsx: "npm:^2.1.0" + "@types/react-transition-group": "npm:^4.4.11" + clsx: "npm:^2.1.1" csstype: "npm:^3.1.3" prop-types: "npm:^15.8.1" react-is: "npm:^18.3.1" @@ -2712,17 +2773,20 @@ __metadata: peerDependencies: "@emotion/react": ^11.5.0 "@emotion/styled": ^11.3.0 - "@types/react": ^17.0.0 || ^18.0.0 - react: ^17.0.0 || ^18.0.0 - react-dom: ^17.0.0 || ^18.0.0 + "@mui/material-pigment-css": ^6.1.3 + "@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0 + react: ^17.0.0 || ^18.0.0 || ^19.0.0 + react-dom: ^17.0.0 || ^18.0.0 || ^19.0.0 peerDependenciesMeta: "@emotion/react": optional: true "@emotion/styled": optional: true + "@mui/material-pigment-css": + optional: true "@types/react": optional: true - checksum: 10/67f118e5a4bc89553d87b1b5bfe8c37b979ee981415dfda39fba0b27d08636be91fa9f270ea674d19f5a23186f53be67e3eb397f03333a7342170f43db8d0058 + checksum: 10/4fe7c5054a39427763bc4c1908644c92672b156337681da7231e2fb24563ac05f8472797622a711493f1a55c80ce419724782e102ecec314bd309d8172e909b6 languageName: node linkType: hard @@ -2743,6 +2807,23 @@ __metadata: languageName: node linkType: hard +"@mui/private-theming@npm:^6.1.3": + version: 6.1.3 + resolution: "@mui/private-theming@npm:6.1.3" + dependencies: + "@babel/runtime": "npm:^7.25.6" + "@mui/utils": "npm:^6.1.3" + prop-types: "npm:^15.8.1" + peerDependencies: + "@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0 + react: ^17.0.0 || ^18.0.0 || ^19.0.0 + peerDependenciesMeta: + "@types/react": + optional: true + checksum: 10/178cf8a1f6f748b9b894277f85ee32b653608cd2ac6121177f94274678ffb7b291424ac6709147a7d403e4ec4270546d06509177104bd264d3945c8328b7168e + languageName: node + linkType: hard + "@mui/styled-engine@npm:^5.16.6": version: 5.16.6 resolution: "@mui/styled-engine@npm:5.16.6" @@ -2764,7 +2845,30 @@ __metadata: languageName: node linkType: hard -"@mui/system@npm:^5.16.5, @mui/system@npm:^5.16.7": +"@mui/styled-engine@npm:^6.1.3": + version: 6.1.3 + resolution: "@mui/styled-engine@npm:6.1.3" + dependencies: + "@babel/runtime": "npm:^7.25.6" + "@emotion/cache": "npm:^11.13.1" + "@emotion/serialize": "npm:^1.3.2" + "@emotion/sheet": "npm:^1.4.0" + csstype: "npm:^3.1.3" + prop-types: "npm:^15.8.1" + peerDependencies: + "@emotion/react": ^11.4.1 + "@emotion/styled": ^11.3.0 + react: ^17.0.0 || ^18.0.0 || ^19.0.0 + peerDependenciesMeta: + "@emotion/react": + optional: true + "@emotion/styled": + optional: true + checksum: 10/59c1fce0b20d3ffef61b62048f9c607d5cc350f2df96d604b4672f59d5336b694b180d1f39021598f673b13493768625e6939421fa22b13991254a12cf55aebc + languageName: node + linkType: hard + +"@mui/system@npm:^5.16.5": version: 5.16.7 resolution: "@mui/system@npm:5.16.7" dependencies: @@ -2792,7 +2896,35 @@ __metadata: languageName: node linkType: hard -"@mui/types@npm:^7.2.14, @mui/types@npm:^7.2.15": +"@mui/system@npm:^6.1.3": + version: 6.1.3 + resolution: "@mui/system@npm:6.1.3" + dependencies: + "@babel/runtime": "npm:^7.25.6" + "@mui/private-theming": "npm:^6.1.3" + "@mui/styled-engine": "npm:^6.1.3" + "@mui/types": "npm:^7.2.18" + "@mui/utils": "npm:^6.1.3" + clsx: "npm:^2.1.1" + csstype: "npm:^3.1.3" + prop-types: "npm:^15.8.1" + peerDependencies: + "@emotion/react": ^11.5.0 + "@emotion/styled": ^11.3.0 + "@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0 + react: ^17.0.0 || ^18.0.0 || ^19.0.0 + peerDependenciesMeta: + "@emotion/react": + optional: true + "@emotion/styled": + optional: true + "@types/react": + optional: true + checksum: 10/86679cd0fc42fdb9bdf3d8299d83b2cab272d3d0ac899efe60de5aad5ee3c4e2055abe27f2e4ec1d4f481c0abc09ecbbcee4856fd150682f1a65fff39bf5ab57 + languageName: node + linkType: hard + +"@mui/types@npm:^7.2.15": version: 7.2.15 resolution: "@mui/types@npm:7.2.15" peerDependencies: @@ -2804,7 +2936,39 @@ __metadata: languageName: node linkType: hard -"@mui/utils@npm:^5.15.14, @mui/utils@npm:^5.16.5, @mui/utils@npm:^5.16.6": +"@mui/types@npm:^7.2.18": + version: 7.2.18 + resolution: "@mui/types@npm:7.2.18" + peerDependencies: + "@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0 + peerDependenciesMeta: + "@types/react": + optional: true + checksum: 10/662b0e2858b1675cff54e69082f2265d4f2be247627f97333a9e6afa7199b6d520f57b3f366c8b62ade1593228a95a7618d21ac229102d58dd4906f804fcd7b6 + languageName: node + linkType: hard + +"@mui/utils@npm:6.0.0-rc.0": + version: 6.0.0-rc.0 + resolution: "@mui/utils@npm:6.0.0-rc.0" + dependencies: + "@babel/runtime": "npm:^7.25.0" + "@mui/types": "npm:^7.2.15" + "@types/prop-types": "npm:^15.7.12" + clsx: "npm:^2.1.1" + prop-types: "npm:^15.8.1" + react-is: "npm:^18.3.1" + peerDependencies: + "@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0 + react: ^17.0.0 || ^18.0.0 || ^19.0.0 + peerDependenciesMeta: + "@types/react": + optional: true + checksum: 10/9254808d615b0d2f20fdc866f4e90587d7c650ddfb2a989ec6aa553ce0d774dce296d246896bb608ef51e9b9192f83bb6bfd9e02353d9e5fe4cbeaec9b8a702a + languageName: node + linkType: hard + +"@mui/utils@npm:^5.16.5, @mui/utils@npm:^5.16.6": version: 5.16.6 resolution: "@mui/utils@npm:5.16.6" dependencies: @@ -2824,6 +2988,26 @@ __metadata: languageName: node linkType: hard +"@mui/utils@npm:^6.1.3": + version: 6.1.3 + resolution: "@mui/utils@npm:6.1.3" + dependencies: + "@babel/runtime": "npm:^7.25.6" + "@mui/types": "npm:^7.2.18" + "@types/prop-types": "npm:^15.7.13" + clsx: "npm:^2.1.1" + prop-types: "npm:^15.8.1" + react-is: "npm:^18.3.1" + peerDependencies: + "@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0 + react: ^17.0.0 || ^18.0.0 || ^19.0.0 + peerDependenciesMeta: + "@types/react": + optional: true + checksum: 10/8255f2ad21fd58606bd8abcc740f58852580584e93bf8ecc754b13af00a7ac89d95f3833cdfca074ad37d6c0533a3895f600674c768e8b38e53482e93c881aad + languageName: node + linkType: hard + "@mui/x-data-grid@npm:^7.13.0": version: 7.13.0 resolution: "@mui/x-data-grid@npm:7.13.0" @@ -4389,6 +4573,13 @@ __metadata: languageName: node linkType: hard +"@types/prop-types@npm:^15.7.13": + version: 15.7.13 + resolution: "@types/prop-types@npm:15.7.13" + checksum: 10/8935cad87c683c665d09a055919d617fe951cb3b2d5c00544e3a913f861a2bd8d2145b51c9aa6d2457d19f3107ab40784c40205e757232f6a80cc8b1c815513c + languageName: node + linkType: hard + "@types/react-dom@npm:^18.3.0": version: 18.3.0 resolution: "@types/react-dom@npm:18.3.0" @@ -4434,6 +4625,15 @@ __metadata: languageName: node linkType: hard +"@types/react-transition-group@npm:^4.4.11": + version: 4.4.11 + resolution: "@types/react-transition-group@npm:4.4.11" + dependencies: + "@types/react": "npm:*" + checksum: 10/a7f4de6e5f57d9fcdea027e22873c633f96a803c96d422db8b99a45c36a9cceb7882d152136bbc31c7158fc1827e37aea5070d369724bb71dd11b5687332bc4d + languageName: node + linkType: hard + "@types/react@npm:*, @types/react@npm:16 || 17 || 18, @types/react@npm:^18.3.2": version: 18.3.3 resolution: "@types/react@npm:18.3.3" From 8a4d82c23ae1e28675239916bddfdc9aab95e1d9 Mon Sep 17 00:00:00 2001 From: jvega190 Date: Wed, 16 Oct 2024 15:23:50 -0600 Subject: [PATCH 2/8] [6694] MUIv6 Upgrade - Update deprecated components/props --- ui/app/package.json | 12 +- .../ActivityDashlet/ActivityDashlet.tsx | 50 +-- .../AuditGridFilterPopoverBody.tsx | 22 +- .../CreateFileDialogContainer.tsx | 4 +- .../CreateFolderContainer.tsx | 4 +- .../CreateSiteDialog/BaseSiteForm.tsx | 12 +- .../components/CreateSiteDialog/GitForm.tsx | 4 +- .../CreateUserDialogContainer.tsx | 21 +- .../DependencySelection/SelectionList.tsx | 57 +-- .../EditSiteDialogContainer.tsx | 8 +- .../EditUserDialog/EditUserDialogUI.tsx | 12 +- .../components/EncryptTool/EncryptTool.tsx | 4 +- .../components/GitAuthForm/GitAuthForm.tsx | 56 +-- .../LegacyComponentsPanel.tsx | 2 +- ui/app/src/components/LoginView/LoginView.tsx | 4 +- .../PagesSearchAhead/PagesSearchAhead.tsx | 7 +- .../PasswordTextField/PasswordTextField.tsx | 12 +- .../PathSelectionInput/PathSelectionInput.tsx | 50 +-- .../PreviewInPageInstancesPanel.tsx | 11 +- .../PublishOnDemandForm.tsx | 4 +- .../PublishingQueue/FilterDropdown.tsx | 4 +- .../RejectDialog/RejectDialogContentUI.tsx | 6 +- .../RenameDialogBody/RenameItemView.tsx | 4 +- .../SiteConfigurationManagement.tsx | 10 +- .../TextFieldWithMax/TextFieldWithMax.tsx | 2 +- .../WorkflowStateManagement.tsx | 4 +- ui/guest/package.json | 4 +- yarn.lock | 356 ++++++------------ 28 files changed, 338 insertions(+), 408 deletions(-) diff --git a/ui/app/package.json b/ui/app/package.json index e98e3231e6..47aa9f6677 100644 --- a/ui/app/package.json +++ b/ui/app/package.json @@ -59,12 +59,12 @@ "@emotion/react": "^11.13.3", "@emotion/styled": "^11.13.0", "@graphiql/plugin-explorer": "^3.0.1", - "@mui/icons-material": "^6.1.3", - "@mui/lab": "6.0.0-beta.11", - "@mui/material": "^6.1.3", - "@mui/x-data-grid": "^7.13.0", - "@mui/x-date-pickers": "^7.13.0", - "@mui/x-tree-view": "^7.13.0", + "@mui/icons-material": "^6.1.4", + "@mui/lab": "6.0.0-beta.12", + "@mui/material": "^6.1.4", + "@mui/x-data-grid": "^7.20.0", + "@mui/x-date-pickers": "^7.20.0", + "@mui/x-tree-view": "^7.20.0", "@prettier/plugin-xml": "3.3.0", "@reduxjs/toolkit": "^2.2.5", "@stomp/stompjs": "^7.0.0", diff --git a/ui/app/src/components/ActivityDashlet/ActivityDashlet.tsx b/ui/app/src/components/ActivityDashlet/ActivityDashlet.tsx index ecb003e819..8a261b943b 100644 --- a/ui/app/src/components/ActivityDashlet/ActivityDashlet.tsx +++ b/ui/app/src/components/ActivityDashlet/ActivityDashlet.tsx @@ -425,30 +425,32 @@ export function ActivityDashlet(props: ActivityDashletProps) { onChange={handleAuthorFilterInputChange} placeholder='e.g. "jon.doe, jdoe, jane@example.com"' onKeyUp={handleAuthorFilterKeyUp} - InputProps={{ - inputRef: authorFilterInputRef, - endAdornment: ( - - - - - - - - - ) + slotProps={{ + input: { + inputRef: authorFilterInputRef, + endAdornment: ( + + + + + + + + + ) + } }} /> diff --git a/ui/app/src/components/AuditGridFilterPopover/AuditGridFilterPopoverBody.tsx b/ui/app/src/components/AuditGridFilterPopover/AuditGridFilterPopoverBody.tsx index 7f8da45b28..f9d8a76f2f 100644 --- a/ui/app/src/components/AuditGridFilterPopover/AuditGridFilterPopoverBody.tsx +++ b/ui/app/src/components/AuditGridFilterPopover/AuditGridFilterPopoverBody.tsx @@ -246,7 +246,9 @@ export function AuditGridFilterPopoverBody(props: AuditGridFilterPopoverProps) { select label={formatMessage(translations[filterId])} value={value?.split(',') ?? ['all']} - SelectProps={{ multiple: true }} + slotProps={{ + select: { multiple: true } + }} onChange={onMultipleSelectChanges} sx={{ width: 200 }} > @@ -271,14 +273,16 @@ export function AuditGridFilterPopoverBody(props: AuditGridFilterPopoverProps) { }> - onClearTextField()}> - - - - ) + slotProps={{ + input: { + endAdornment: keyword && ( + }> + onClearTextField()}> + + + + ) + } }} fullWidth onChange={onTextFieldChanges} diff --git a/ui/app/src/components/CreateFileDialog/CreateFileDialogContainer.tsx b/ui/app/src/components/CreateFileDialog/CreateFileDialogContainer.tsx index a3f7acca91..beca50c023 100644 --- a/ui/app/src/components/CreateFileDialog/CreateFileDialogContainer.tsx +++ b/ui/app/src/components/CreateFileDialog/CreateFileDialogContainer.tsx @@ -191,8 +191,8 @@ export function CreateFileDialogContainer(props: CreateFileContainerProps) { } disabled={isSubmitting} margin="normal" - InputLabelProps={{ - shrink: true + slotProps={{ + inputLabel: { shrink: true } }} onChange={(event) => onInputChanges(applyAssetNameRules(event.target.value, { allowBraces }))} /> diff --git a/ui/app/src/components/CreateFolderDialog/CreateFolderContainer.tsx b/ui/app/src/components/CreateFolderDialog/CreateFolderContainer.tsx index fca1424c85..b8ba9a0811 100644 --- a/ui/app/src/components/CreateFolderDialog/CreateFolderContainer.tsx +++ b/ui/app/src/components/CreateFolderDialog/CreateFolderContainer.tsx @@ -232,8 +232,8 @@ export function CreateFolderContainer(props: CreateFolderContainerProps) { } disabled={isSubmitting} margin="normal" - InputLabelProps={{ - shrink: true + slotProps={{ + inputLabel: { shrink: true } }} onChange={(event) => onInputChanges(applyFolderNameRules(event.target.value, { allowBraces }))} /> diff --git a/ui/app/src/components/CreateSiteDialog/BaseSiteForm.tsx b/ui/app/src/components/CreateSiteDialog/BaseSiteForm.tsx index 28cd401a77..f4c2e7f9af 100644 --- a/ui/app/src/components/CreateSiteDialog/BaseSiteForm.tsx +++ b/ui/app/src/components/CreateSiteDialog/BaseSiteForm.tsx @@ -99,7 +99,9 @@ export function BaseSiteForm(props: BaseSiteFormProps) { onKeyUp={(event) => checkSiteNames(event)} onChange={(event) => handleInputChange(event)} value={inputs.siteName} - inputProps={{ maxLength: siteNameMaxLength }} + slotProps={{ + htmlInput: { maxLength: siteNameMaxLength } + }} error={inputs.submitted && fieldsErrorsLookup['siteName']} helperText={ inputs.submitted && !inputs.siteName @@ -123,7 +125,9 @@ export function BaseSiteForm(props: BaseSiteFormProps) { onKeyUp={(event) => checkSites(event)} onChange={(event) => handleInputChange(event)} value={inputs.siteId} - inputProps={{ maxLength: siteIdMaxLength }} + slotProps={{ + htmlInput: { maxLength: siteIdMaxLength } + }} error={inputs.submitted && fieldsErrorsLookup['siteId']} helperText={renderSiteFormHelperText( formatMessage(messages.siteId), @@ -144,7 +148,9 @@ export function BaseSiteForm(props: BaseSiteFormProps) { multiline onChange={(event) => handleInputChange(event)} value={inputs.description} - inputProps={{ maxLength: siteInputMaxLength }} + slotProps={{ + htmlInput: { maxLength: siteInputMaxLength } + }} helperText={formatMessage(messages.fieldMaxLength, { maxLength: siteInputMaxLength })} /> diff --git a/ui/app/src/components/CreateSiteDialog/GitForm.tsx b/ui/app/src/components/CreateSiteDialog/GitForm.tsx index a3425feefa..f9b8873250 100644 --- a/ui/app/src/components/CreateSiteDialog/GitForm.tsx +++ b/ui/app/src/components/CreateSiteDialog/GitForm.tsx @@ -165,7 +165,9 @@ function GitForm(props: GitFormProps) { id="repoRemoteName" name="repoRemoteName" label={formatMessage(messages.remoteName)} - InputLabelProps={{ shrink: true }} + slotProps={{ + inputLabel: { shrink: true } + }} placeholder="origin" fullWidth onKeyPress={onKeyPress} diff --git a/ui/app/src/components/CreateUserDialog/CreateUserDialogContainer.tsx b/ui/app/src/components/CreateUserDialog/CreateUserDialogContainer.tsx index 4419cb201f..711f704016 100644 --- a/ui/app/src/components/CreateUserDialog/CreateUserDialogContainer.tsx +++ b/ui/app/src/components/CreateUserDialog/CreateUserDialogContainer.tsx @@ -241,7 +241,9 @@ export function CreateUserDialogContainer(props: CreateUserDialogContainerProps) ) : null } onChange={(e) => setNewUser({ firstName: e.target.value })} - inputProps={{ maxLength: USER_FIRST_NAME_MAX_LENGTH }} + slotProps={{ + htmlInput: { maxLength: USER_FIRST_NAME_MAX_LENGTH } + }} /> @@ -266,7 +268,9 @@ export function CreateUserDialogContainer(props: CreateUserDialogContainerProps) ) : null } onChange={(e) => setNewUser({ lastName: e.target.value })} - inputProps={{ maxLength: USER_LAST_NAME_MAX_LENGTH }} + slotProps={{ + htmlInput: { maxLength: USER_LAST_NAME_MAX_LENGTH } + }} /> @@ -285,7 +289,9 @@ export function CreateUserDialogContainer(props: CreateUserDialogContainerProps) ) : null } onChange={(e) => setNewUser({ email: e.target.value })} - inputProps={{ maxLength: USER_EMAIL_MAX_LENGTH }} + slotProps={{ + htmlInput: { maxLength: USER_EMAIL_MAX_LENGTH } + }} /> setNewUser({ username: e.target.value })} - inputProps={{ maxLength: USER_USERNAME_MAX_LENGTH }} + slotProps={{ + htmlInput: { maxLength: USER_USERNAME_MAX_LENGTH } + }} /> @@ -327,9 +335,8 @@ export function CreateUserDialogContainer(props: CreateUserDialogContainerProps) onChange={(e) => onChangeValue('password', e.target.value)} onFocus={(e) => setAnchorEl(e.target.parentElement)} onBlur={() => setAnchorEl(null)} - inputProps={{ - maxLength: USER_PASSWORD_MAX_LENGTH, - autoComplete: 'new-password' + slotProps={{ + htmlInput: { maxLength: USER_PASSWORD_MAX_LENGTH, autoComplete: 'new-password' } }} /> diff --git a/ui/app/src/components/DependencySelection/SelectionList.tsx b/ui/app/src/components/DependencySelection/SelectionList.tsx index c5b0c97e70..fe3c2a4285 100644 --- a/ui/app/src/components/DependencySelection/SelectionList.tsx +++ b/ui/app/src/components/DependencySelection/SelectionList.tsx @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -import React, { ReactNode, useMemo } from 'react'; +import React, { ElementType, ReactNode, useMemo } from 'react'; import { DetailedItem } from '../../models/Item'; import { useLocale } from '../../hooks/useLocale'; import ListItem from '@mui/material/ListItem'; @@ -36,6 +36,7 @@ import InfoIcon from '@mui/icons-material/InfoOutlined'; import { makeStyles } from 'tss-react/mui'; import LookupTable from '../../models/LookupTable'; +import ListItemButton from '@mui/material/ListItemButton'; export interface SelectionListProps { title: ReactNode; @@ -158,15 +159,8 @@ export function SelectionList(props: SelectionListProps) { {items.map((item) => { const labelId = `checkbox-list-label-${item.path}`; - return ( - onItemClicked(e, item.path) : void 0} - > + const listItemComponentChildren = ( + <> {onItemClicked && ( - + ); + + if (onItemClicked) { + return ( + onItemClicked(e, item.path)} + children={listItemComponentChildren} + /> + ); + } else { + return ; + } })} ) : ( @@ -256,15 +264,8 @@ export function SelectionList(props: SelectionListProps) { {paths.length ? ( paths.map((path: string) => { const labelId = `checkbox-list-label-${path}`; - return ( - onItemClicked(e, path) : null} - > + const listItemComponentChildren = ( + <> {onItemClicked && ( )} - + ); + + if (onItemClicked) { + return ( + onItemClicked(e, path)} + children={listItemComponentChildren} + /> + ); + } else { + return ; + } }) ) : ( diff --git a/ui/app/src/components/EditSiteDialog/EditSiteDialogContainer.tsx b/ui/app/src/components/EditSiteDialog/EditSiteDialogContainer.tsx index 013beb4a4a..8d33fa7b99 100644 --- a/ui/app/src/components/EditSiteDialog/EditSiteDialogContainer.tsx +++ b/ui/app/src/components/EditSiteDialog/EditSiteDialogContainer.tsx @@ -189,7 +189,9 @@ export function EditSiteDialogContainer(props: EditSiteDialogContainerProps) { onChange={(event) => onSiteNameChange(event.target.value)} onKeyDown={onKeyPress} value={name} - inputProps={{ maxLength: 255 }} + slotProps={{ + htmlInput: { maxLength: 255 } + }} error={hasNameConflict} helperText={ !name.trim() @@ -240,7 +242,9 @@ export function EditSiteDialogContainer(props: EditSiteDialogContainerProps) { } }} value={description ?? ''} - inputProps={{ maxLength: 4000 }} + slotProps={{ + htmlInput: { maxLength: 4000 } + }} /> diff --git a/ui/app/src/components/EditUserDialog/EditUserDialogUI.tsx b/ui/app/src/components/EditUserDialog/EditUserDialogUI.tsx index a77e22b623..e05fe2217b 100644 --- a/ui/app/src/components/EditUserDialog/EditUserDialogUI.tsx +++ b/ui/app/src/components/EditUserDialog/EditUserDialogUI.tsx @@ -195,7 +195,9 @@ export function EditUserDialogUI(props: EditUserDialogUIProps) { onInputChange({ firstName: e.currentTarget.value })} - inputProps={{ maxLength: USER_FIRST_NAME_MAX_LENGTH }} + slotProps={{ + htmlInput: { maxLength: USER_FIRST_NAME_MAX_LENGTH } + }} value={user.firstName} fullWidth error={ @@ -226,7 +228,9 @@ export function EditUserDialogUI(props: EditUserDialogUIProps) { onInputChange({ lastName: e.currentTarget.value })} - inputProps={{ maxLength: USER_LAST_NAME_MAX_LENGTH }} + slotProps={{ + htmlInput: { maxLength: USER_LAST_NAME_MAX_LENGTH } + }} value={user.lastName} fullWidth error={validateRequiredField(user.lastName) || validateFieldMinLength('lastName', user.lastName)} @@ -265,7 +269,9 @@ export function EditUserDialogUI(props: EditUserDialogUIProps) { ) : null } - inputProps={{ maxLength: USER_EMAIL_MAX_LENGTH }} + slotProps={{ + htmlInput: { maxLength: USER_EMAIL_MAX_LENGTH } + }} /> ) : ( diff --git a/ui/app/src/components/EncryptTool/EncryptTool.tsx b/ui/app/src/components/EncryptTool/EncryptTool.tsx index fa8f997b5d..89a148002e 100644 --- a/ui/app/src/components/EncryptTool/EncryptTool.tsx +++ b/ui/app/src/components/EncryptTool/EncryptTool.tsx @@ -191,7 +191,9 @@ export const EncryptTool = (props: EncryptToolProps) => { sx={{ mb: 2 }} ref={inputRef} label={} - InputProps={{ readOnly: true }} + slotProps={{ + input: { readOnly: true } + }} value={result} onClick={(e: any) => { const input = e.target; diff --git a/ui/app/src/components/GitAuthForm/GitAuthForm.tsx b/ui/app/src/components/GitAuthForm/GitAuthForm.tsx index d246967c1e..41010cd17b 100644 --- a/ui/app/src/components/GitAuthForm/GitAuthForm.tsx +++ b/ui/app/src/components/GitAuthForm/GitAuthForm.tsx @@ -141,19 +141,21 @@ function AuthFields(props: AuthFieldsProps) { true, inputs.submitted )} - InputProps={{ - endAdornment: ( - - - {showPassword ? : } - - - ) + slotProps={{ + input: { + endAdornment: ( + + + {showPassword ? : } + + + ) + } }} /> )} @@ -171,19 +173,21 @@ function AuthFields(props: AuthFieldsProps) { helperText={renderHelperText(formatMessage(messages.token), inputs.repoToken, '', true, inputs.submitted)} onKeyPress={onKeyPress} onChange={handleInputChange} - InputProps={{ - endAdornment: ( - - - {showPassword ? : } - - - ) + slotProps={{ + input: { + endAdornment: ( + + + {showPassword ? : } + + + ) + } }} /> )} diff --git a/ui/app/src/components/LegacyComponentsPanel/LegacyComponentsPanel.tsx b/ui/app/src/components/LegacyComponentsPanel/LegacyComponentsPanel.tsx index 3ea630ff57..58aee5d4ad 100644 --- a/ui/app/src/components/LegacyComponentsPanel/LegacyComponentsPanel.tsx +++ b/ui/app/src/components/LegacyComponentsPanel/LegacyComponentsPanel.tsx @@ -614,7 +614,7 @@ export function LegacyComponentsPanel(props: LegacyComponentsPanelProps) { return ( <> - + diff --git a/ui/app/src/components/LoginView/LoginView.tsx b/ui/app/src/components/LoginView/LoginView.tsx index caf7b4e4ab..6d51278f3d 100644 --- a/ui/app/src/components/LoginView/LoginView.tsx +++ b/ui/app/src/components/LoginView/LoginView.tsx @@ -327,7 +327,9 @@ function RecoverView(props: SubViewProps) { onChange={(e: any) => setUsername(e.target.value)} className={classes?.username} label={} - inputProps={{ maxLength: USER_USERNAME_MAX_LENGTH }} + slotProps={{ + htmlInput: { maxLength: USER_USERNAME_MAX_LENGTH } + }} /> - - )} + ) : null + } + > + ))} diff --git a/ui/app/src/components/DeleteDialog/DeleteDialogUIBody.tsx b/ui/app/src/components/DeleteDialog/DeleteDialogUIBody.tsx index 41807b0ddb..015ecb3027 100644 --- a/ui/app/src/components/DeleteDialog/DeleteDialogUIBody.tsx +++ b/ui/app/src/components/DeleteDialog/DeleteDialogUIBody.tsx @@ -28,7 +28,6 @@ import ListItem from '@mui/material/ListItem'; import ListItemText from '@mui/material/ListItemText'; import Typography from '@mui/material/Typography'; import List from '@mui/material/List'; -import ListItemSecondaryAction from '@mui/material/ListItemSecondaryAction'; import Button from '@mui/material/Button'; import Box from '@mui/material/Box'; import InfoIcon from '@mui/icons-material/InfoOutlined'; @@ -78,19 +77,10 @@ export function DeleteDialogUIBody(props: DeleteDialogContentUIProps) { {dependentItems.map((path) => { return ( - - - + onEditDependantClick(e, path)} @@ -103,7 +93,19 @@ export function DeleteDialogUIBody(props: DeleteDialogContentUIProps) { > - + } + > + ); })} diff --git a/ui/app/src/components/DraggablePanelListItem/DraggablePanelListItem.tsx b/ui/app/src/components/DraggablePanelListItem/DraggablePanelListItem.tsx index 6a93cd83af..6199dfc5b0 100644 --- a/ui/app/src/components/DraggablePanelListItem/DraggablePanelListItem.tsx +++ b/ui/app/src/components/DraggablePanelListItem/DraggablePanelListItem.tsx @@ -19,12 +19,12 @@ import ListItemAvatar from '@mui/material/ListItemAvatar'; import Avatar from '@mui/material/Avatar'; import DragIndicatorRounded from '@mui/icons-material/DragIndicatorRounded'; import ListItemText from '@mui/material/ListItemText'; -import ListItemSecondaryAction from '@mui/material/ListItemSecondaryAction'; import IconButton from '@mui/material/IconButton'; import MoreVertRounded from '@mui/icons-material/MoreVertRounded'; import { darken, useTheme } from '@mui/material/styles'; import ListItemButton from '@mui/material/ListItemButton'; import { getAvatarWithIconColors } from '../../utils/contentType'; +import ListItem from '@mui/material/ListItem'; interface PanelListItemProps { primaryText: string; @@ -55,6 +55,7 @@ export function DraggablePanelListItem(props: PanelListItemProps) { return ( + + + ) : null + } > - {hasMenu && ( - - - - - - )} ); } diff --git a/ui/app/src/components/LauncherSiteCard/LauncherSiteCard.tsx b/ui/app/src/components/LauncherSiteCard/LauncherSiteCard.tsx index c44af25507..92c561e804 100644 --- a/ui/app/src/components/LauncherSiteCard/LauncherSiteCard.tsx +++ b/ui/app/src/components/LauncherSiteCard/LauncherSiteCard.tsx @@ -23,7 +23,6 @@ import MenuItem from '@mui/material/MenuItem'; import Link from '@mui/material/Link'; import ListItem from '@mui/material/ListItem'; import ListItemText from '@mui/material/ListItemText'; -import ListItemSecondaryAction from '@mui/material/ListItemSecondaryAction'; import { Site } from '../../models/Site'; import SiteStatusIndicator from '../SiteStatusIndicator/SiteStatusIndicator'; import ListItemButton from '@mui/material/ListItemButton'; @@ -85,24 +84,23 @@ function LauncherSiteCard(props: LauncherSiteCardProps) { className={cx(classes.card, props.classes?.root)} sx={{ position: 'relative' }} title={title} - > - - - {(!isSiteReady || hasOptions) && ( - - {isSiteReady ? ( + secondaryAction={ + !isSiteReady || hasOptions ? ( + isSiteReady ? ( ) : ( - )} - - )} + ) + ) : null + } + > + {hasOptions && diff --git a/ui/app/src/components/LegacyComponentsPanel/LegacyComponentsPanel.tsx b/ui/app/src/components/LegacyComponentsPanel/LegacyComponentsPanel.tsx index 58aee5d4ad..c65e7b2fd7 100644 --- a/ui/app/src/components/LegacyComponentsPanel/LegacyComponentsPanel.tsx +++ b/ui/app/src/components/LegacyComponentsPanel/LegacyComponentsPanel.tsx @@ -19,7 +19,6 @@ import ListItemIcon from '@mui/material/ListItemIcon'; import SystemIcon, { SystemIconDescriptor } from '../SystemIcon'; import ListItemText from '@mui/material/ListItemText'; import { usePossibleTranslation } from '../../hooks/usePossibleTranslation'; -import ListItemSecondaryAction from '@mui/material/ListItemSecondaryAction'; import React, { useCallback, useEffect, useState } from 'react'; import Switch from '@mui/material/Switch'; import { fetchConfigurationJSON } from '../../services/configuration'; @@ -614,7 +613,10 @@ export function LegacyComponentsPanel(props: LegacyComponentsPanelProps) { return ( <> - + } + > @@ -623,9 +625,6 @@ export function LegacyComponentsPanel(props: LegacyComponentsPanelProps) { primaryTypographyProps={{ noWrap: true }} secondaryTypographyProps={{ noWrap: true }} /> - - - , contentType: ContentType) => { const { backgroundColor, textColor } = getAvatarWithIconColors(contentType.name, theme, darken); + e.stopPropagation(); setMenuContext({ anchor: e.currentTarget, contentType, backgroundColor, textColor }); }; // endregion @@ -307,7 +307,22 @@ export function PreviewComponentsPanel() { darken ); return ( - + onMenuButtonClickHandler(e, type)} + > + + + } + > } /> - - onMenuButtonClickHandler(e, type)} - > - - - ); })} diff --git a/ui/app/src/components/ToolsPanelListItemButton/ToolsPanelListItemButton.tsx b/ui/app/src/components/ToolsPanelListItemButton/ToolsPanelListItemButton.tsx index f1e75f4ad4..79ea6f658a 100644 --- a/ui/app/src/components/ToolsPanelListItemButton/ToolsPanelListItemButton.tsx +++ b/ui/app/src/components/ToolsPanelListItemButton/ToolsPanelListItemButton.tsx @@ -17,13 +17,13 @@ import ListItemButton, { ListItemButtonProps } from '@mui/material/ListItemButton'; import ListItemIcon from '@mui/material/ListItemIcon'; import ListItemText from '@mui/material/ListItemText'; -import ListItemSecondaryAction from '@mui/material/ListItemSecondaryAction'; import IconButton from '@mui/material/IconButton'; import ChevronRounded from '@mui/icons-material/ChevronRightRounded'; import React from 'react'; import SystemIcon, { SystemIconDescriptor } from '../SystemIcon'; import { usePossibleTranslation } from '../../hooks/usePossibleTranslation'; import TranslationOrText from '../../models/TranslationOrText'; +import ListItem from '@mui/material/ListItem'; export interface ToolsPanelListItemButtonProps extends Omit { title: TranslationOrText; @@ -44,7 +44,18 @@ export function ToolsPanelListItemButton(props: ToolsPanelListItemButtonProps) { ...listItemButtonProps } = props; return ( - + + {secondaryActionIcon} + + ) : null + } + > {icon && ( @@ -56,15 +67,7 @@ export function ToolsPanelListItemButton(props: ToolsPanelListItemButtonProps) { primaryTypographyProps={{ noWrap: true }} secondaryTypographyProps={{ noWrap: true }} /> - {onSecondaryActionClick ? ( - - - {secondaryActionIcon} - - - ) : ( - - )} + {!onSecondaryActionClick && } ); } diff --git a/ui/app/src/components/VersionList/VersionList.tsx b/ui/app/src/components/VersionList/VersionList.tsx index d51890076a..0fe1da327c 100644 --- a/ui/app/src/components/VersionList/VersionList.tsx +++ b/ui/app/src/components/VersionList/VersionList.tsx @@ -20,7 +20,6 @@ import React from 'react'; import List from '@mui/material/List'; import ListItemText from '@mui/material/ListItemText'; import Chip from '@mui/material/Chip'; -import ListItemSecondaryAction from '@mui/material/ListItemSecondaryAction'; import IconButton from '@mui/material/IconButton'; import MoreVertIcon from '@mui/icons-material/MoreVertRounded'; import { ItemHistoryEntry } from '../../models/Version'; @@ -28,9 +27,9 @@ import palette from '../../styles/palette'; import GlobalState from '../../models/GlobalState'; import { useSelection } from '../../hooks/useSelection'; import ListItemButton from '@mui/material/ListItemButton'; -import ListItemIcon from '@mui/material/ListItemIcon'; import Checkbox from '@mui/material/Checkbox'; import { createPresenceTable } from '../../utils/array'; +import ListItem from '@mui/material/ListItem'; const versionListStyles = makeStyles()((theme) => ({ list: { @@ -112,9 +111,34 @@ export function VersionList(props: VersionListProps) { return ( onItemClick(version)} className={cx(classes.listItem, isSelected && 'selected')} + secondaryAction={ + onOpenMenu || isSelectMode ? ( + <> + {isSelectMode && } + {!isSelectMode && onOpenMenu && ( + { + e.stopPropagation(); + onOpenMenu( + e.currentTarget, + version, + current === version.versionNumber, + versions.length === i + 1 + ); + }} + > + + + )} + + ) : null + } > - {(onOpenMenu || isSelectMode) && ( - - {isSelectMode && } - {!isSelectMode && onOpenMenu && ( - { - e.stopPropagation(); - onOpenMenu( - e.currentTarget, - version, - current === version.versionNumber, - versions.length === i + 1 - ); - }} - > - - - )} - - )} ); })} From 8a8955e84bca61dc85aab0f46c899800aa1305d2 Mon Sep 17 00:00:00 2001 From: jvega190 Date: Wed, 16 Oct 2024 16:59:15 -0600 Subject: [PATCH 4/8] [6694] Remove deprecated Hidden component --- ui/app/src/components/Launcher/Launcher.tsx | 71 +++++++++---------- .../LauncherSiteCard/LauncherSiteCard.tsx | 2 +- 2 files changed, 35 insertions(+), 38 deletions(-) diff --git a/ui/app/src/components/Launcher/Launcher.tsx b/ui/app/src/components/Launcher/Launcher.tsx index 7edca8769f..f5554df921 100644 --- a/ui/app/src/components/Launcher/Launcher.tsx +++ b/ui/app/src/components/Launcher/Launcher.tsx @@ -23,7 +23,6 @@ import Typography from '@mui/material/Typography'; import LauncherSiteCard, { LauncherSiteCardOption } from '../LauncherSiteCard/LauncherSiteCard'; import CloseIcon from '@mui/icons-material/Close'; import IconButton from '@mui/material/IconButton'; -import Hidden from '@mui/material/Hidden'; import { useDispatch } from 'react-redux'; import { getInitials } from '../../utils/string'; import { changeSite } from '../../state/actions/sites'; @@ -123,7 +122,7 @@ const useLauncherStyles = makeStyles()((theme) => ({ }, appsRail: {}, railTop: { - padding: '30px', + padding: '30px 29px', overflow: 'auto', height: 'calc(100% - 65px)', maxHeight: 'calc(100vh - 95px)' @@ -282,41 +281,39 @@ interface SitesRailProps { } const SitesRail = ({ classes, formatMessage, sites, site, onSiteCardClick, options, version }: SitesRailProps) => ( - - -
- - {formatMessage(messages.mySites)} - - {sites.length ? ( - - {sites.map((item, i) => ( - onSiteCardClick(item.id)} - options={options} - /> - ))} - - ) : ( - } - /> - )} -
-
- - - {version} - -
- - + +
+ + {formatMessage(messages.mySites)} + + {sites.length ? ( + + {sites.map((item, i) => ( + onSiteCardClick(item.id)} + options={options} + /> + ))} + + ) : ( + } + /> + )} +
+
+ + + {version} + +
+ ); const SiteRailSkeleton = ({ classes, formatMessage, version }) => ( diff --git a/ui/app/src/components/LauncherSiteCard/LauncherSiteCard.tsx b/ui/app/src/components/LauncherSiteCard/LauncherSiteCard.tsx index 92c561e804..27e9ec7d23 100644 --- a/ui/app/src/components/LauncherSiteCard/LauncherSiteCard.tsx +++ b/ui/app/src/components/LauncherSiteCard/LauncherSiteCard.tsx @@ -97,7 +97,7 @@ function LauncherSiteCard(props: LauncherSiteCardProps) { } > From cc34ccb741876b36a1caf701b9f3a33a98b8c433 Mon Sep 17 00:00:00 2001 From: jvega190 Date: Thu, 17 Oct 2024 08:53:39 -0600 Subject: [PATCH 5/8] [6694] Fix fullscreen dashlets padding --- ui/app/src/components/SiteDashboard/SiteDashboard.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/app/src/components/SiteDashboard/SiteDashboard.tsx b/ui/app/src/components/SiteDashboard/SiteDashboard.tsx index a29e8d339f..f15a34f162 100644 --- a/ui/app/src/components/SiteDashboard/SiteDashboard.tsx +++ b/ui/app/src/components/SiteDashboard/SiteDashboard.tsx @@ -80,7 +80,6 @@ export function Dashboard(props: DashboardProps) { Date: Thu, 17 Oct 2024 09:37:13 -0600 Subject: [PATCH 6/8] [6694] Fix padding in PluginForm fields --- .../src/components/PluginFormBuilder/PluginFormEngine.tsx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ui/app/src/components/PluginFormBuilder/PluginFormEngine.tsx b/ui/app/src/components/PluginFormBuilder/PluginFormEngine.tsx index e2813636cf..bd4b999c27 100644 --- a/ui/app/src/components/PluginFormBuilder/PluginFormEngine.tsx +++ b/ui/app/src/components/PluginFormBuilder/PluginFormEngine.tsx @@ -35,9 +35,7 @@ export interface PluginFormEngineProps { const useStyles = makeStyles()(() => ({ container: { width: '100%', - paddingLeft: '24px', '& .MuiGrid-item': { - paddingTop: '24px', '&:last-child': { paddingBottom: '12px' } @@ -74,7 +72,7 @@ export function PluginFormEngine(props: PluginFormEngineProps) { function renderParameters(parameters: [MarketplacePluginParameter]) { return parameters.map((parameter, index) => { return ( - + {parameter.type === 'STRING' ? ( + {renderParameters(parameters)} ); From 9c12c57ad8c85d08e758ff7266c6bde66fb4210d Mon Sep 17 00:00:00 2001 From: jvega190 Date: Thu, 17 Oct 2024 09:50:37 -0600 Subject: [PATCH 7/8] [6694] Remove rowCount from DataGrid on AuditGridSkeleton, it has no effect since is for server side pagination --- ui/app/src/components/AuditGrid/AuditGridSkeleton.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/ui/app/src/components/AuditGrid/AuditGridSkeleton.tsx b/ui/app/src/components/AuditGrid/AuditGridSkeleton.tsx index 06a58aab44..c9478b95dc 100644 --- a/ui/app/src/components/AuditGrid/AuditGridSkeleton.tsx +++ b/ui/app/src/components/AuditGrid/AuditGridSkeleton.tsx @@ -179,7 +179,6 @@ export function AuditGridSkeleton(props: AuditGridSkeletonProps) { rows={rows} columns={columns} paginationModel={{ page: 0, pageSize: numOfItems }} - rowCount={numOfItems} /> ); From 62e473d265e914af1edb4f1ca8ff3acd347d813b Mon Sep 17 00:00:00 2001 From: jvega190 Date: Tue, 29 Oct 2024 12:36:11 -0600 Subject: [PATCH 8/8] [6694] Update MUI packages --- ui/app/package.json | 12 +-- ui/guest/package.json | 4 +- yarn.lock | 170 +++++++++++++++++++++++------------------- 3 files changed, 103 insertions(+), 83 deletions(-) diff --git a/ui/app/package.json b/ui/app/package.json index 47aa9f6677..0003ade7c2 100644 --- a/ui/app/package.json +++ b/ui/app/package.json @@ -59,12 +59,12 @@ "@emotion/react": "^11.13.3", "@emotion/styled": "^11.13.0", "@graphiql/plugin-explorer": "^3.0.1", - "@mui/icons-material": "^6.1.4", - "@mui/lab": "6.0.0-beta.12", - "@mui/material": "^6.1.4", - "@mui/x-data-grid": "^7.20.0", - "@mui/x-date-pickers": "^7.20.0", - "@mui/x-tree-view": "^7.20.0", + "@mui/icons-material": "^6.1.5", + "@mui/lab": "6.0.0-beta.13", + "@mui/material": "^6.1.5", + "@mui/x-data-grid": "^7.22.0", + "@mui/x-date-pickers": "^7.22.0", + "@mui/x-tree-view": "^7.22.0", "@prettier/plugin-xml": "3.3.0", "@reduxjs/toolkit": "^2.2.5", "@stomp/stompjs": "^7.0.0", diff --git a/ui/guest/package.json b/ui/guest/package.json index dd088c37fe..156b362cfc 100644 --- a/ui/guest/package.json +++ b/ui/guest/package.json @@ -103,8 +103,8 @@ "@emotion/css": "^11.13.0", "@emotion/react": "^11.13.3", "@emotion/styled": "^11.13.0", - "@mui/icons-material": "^6.1.4", - "@mui/material": "^6.1.4", + "@mui/icons-material": "^6.1.5", + "@mui/material": "^6.1.5", "@reduxjs/toolkit": "^2.2.5", "@rollup/plugin-alias": "^5.1.0", "@types/react-dom": "^18.3.0", diff --git a/yarn.lock b/yarn.lock index 4a664cb3e0..fb2a57a3c2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1553,8 +1553,8 @@ __metadata: "@emotion/css": "npm:^11.13.0" "@emotion/react": "npm:^11.13.3" "@emotion/styled": "npm:^11.13.0" - "@mui/icons-material": "npm:^6.1.4" - "@mui/material": "npm:^6.1.4" + "@mui/icons-material": "npm:^6.1.5" + "@mui/material": "npm:^6.1.5" "@reduxjs/toolkit": "npm:^2.2.5" "@rollup/plugin-alias": "npm:^5.1.0" "@rollup/plugin-swc": "npm:^0.3.0" @@ -1676,12 +1676,12 @@ __metadata: "@emotion/styled": "npm:^11.13.0" "@formatjs/cli": "npm:^6.2.12" "@graphiql/plugin-explorer": "npm:^3.0.1" - "@mui/icons-material": "npm:^6.1.4" - "@mui/lab": "npm:6.0.0-beta.12" - "@mui/material": "npm:^6.1.4" - "@mui/x-data-grid": "npm:^7.20.0" - "@mui/x-date-pickers": "npm:^7.20.0" - "@mui/x-tree-view": "npm:^7.20.0" + "@mui/icons-material": "npm:^6.1.5" + "@mui/lab": "npm:6.0.0-beta.13" + "@mui/material": "npm:^6.1.5" + "@mui/x-data-grid": "npm:^7.22.0" + "@mui/x-date-pickers": "npm:^7.22.0" + "@mui/x-tree-view": "npm:^7.22.0" "@prettier/plugin-xml": "npm:3.3.0" "@reduxjs/toolkit": "npm:^2.2.5" "@rollup/plugin-swc": "npm:^0.3.0" @@ -2677,14 +2677,14 @@ __metadata: languageName: node linkType: hard -"@mui/base@npm:5.0.0-beta.59": - version: 5.0.0-beta.59 - resolution: "@mui/base@npm:5.0.0-beta.59" +"@mui/base@npm:5.0.0-beta.60": + version: 5.0.0-beta.60 + resolution: "@mui/base@npm:5.0.0-beta.60" dependencies: "@babel/runtime": "npm:^7.25.7" "@floating-ui/react-dom": "npm:^2.1.1" "@mui/types": "npm:^7.2.18" - "@mui/utils": "npm:^6.1.4" + "@mui/utils": "npm:^6.1.5" "@popperjs/core": "npm:^2.11.8" clsx: "npm:^2.1.1" prop-types: "npm:^15.8.1" @@ -2695,49 +2695,49 @@ __metadata: peerDependenciesMeta: "@types/react": optional: true - checksum: 10/de222259133cb5a7f2185910be4fc0d45608b6fff5649c60a245605f6660a6d3e9ee3770cd24dc9f6c0cf3090384db833a3a5ac5adf610029ea9d35728d13354 + checksum: 10/03700f9a9bb4bfaa99daa525c0ecd56060479a918be8b7d38b97dda2217de3f38877c360a4200a09f87a384554d4a896a68472102c0f090e7c3780af265f5201 languageName: node linkType: hard -"@mui/core-downloads-tracker@npm:^6.1.4": - version: 6.1.4 - resolution: "@mui/core-downloads-tracker@npm:6.1.4" - checksum: 10/6bffe7e09ec3cd5d47c52d4f4520b4138f5767776d7fc49942902c118bd9b4399eb329f335c156a8a6de32c7e6d74ba63ce407947a89401fe0441f37adaa6c1c +"@mui/core-downloads-tracker@npm:^6.1.5": + version: 6.1.5 + resolution: "@mui/core-downloads-tracker@npm:6.1.5" + checksum: 10/9f207d77ebf1ae30d2e9c3caa5725953e29ea7e722a5dab280f02bad14a2e5147bb9da3356b384564a65d3545404ecd79149f72675d19aedeb9b9c28d2256766 languageName: node linkType: hard -"@mui/icons-material@npm:^6.1.4": - version: 6.1.4 - resolution: "@mui/icons-material@npm:6.1.4" +"@mui/icons-material@npm:^6.1.5": + version: 6.1.5 + resolution: "@mui/icons-material@npm:6.1.5" dependencies: "@babel/runtime": "npm:^7.25.7" peerDependencies: - "@mui/material": ^6.1.4 + "@mui/material": ^6.1.5 "@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0 react: ^17.0.0 || ^18.0.0 || ^19.0.0 peerDependenciesMeta: "@types/react": optional: true - checksum: 10/333693faac7b32b98fb5fbad76ab55a3d27ae72a2baac90a151bce24fb6779d67f7d9434b72a0e33834b10f5570319863da9b3f3932bdce3bb7531a198956530 + checksum: 10/b83fa80ec703eebe988c090f9743a71a63245379f691191d5fceb282df41d49eef1d84d16a84f05259d5acbf048f0941e8954ad789885da8acf5af5d56bf532e languageName: node linkType: hard -"@mui/lab@npm:6.0.0-beta.12": - version: 6.0.0-beta.12 - resolution: "@mui/lab@npm:6.0.0-beta.12" +"@mui/lab@npm:6.0.0-beta.13": + version: 6.0.0-beta.13 + resolution: "@mui/lab@npm:6.0.0-beta.13" dependencies: "@babel/runtime": "npm:^7.25.7" - "@mui/base": "npm:5.0.0-beta.59" - "@mui/system": "npm:^6.1.4" + "@mui/base": "npm:5.0.0-beta.60" + "@mui/system": "npm:^6.1.5" "@mui/types": "npm:^7.2.18" - "@mui/utils": "npm:^6.1.4" + "@mui/utils": "npm:^6.1.5" clsx: "npm:^2.1.1" prop-types: "npm:^15.8.1" peerDependencies: "@emotion/react": ^11.5.0 "@emotion/styled": ^11.3.0 - "@mui/material": ^6.1.4 - "@mui/material-pigment-css": ^6.1.4 + "@mui/material": ^6.1.5 + "@mui/material-pigment-css": ^6.1.5 "@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0 react: ^17.0.0 || ^18.0.0 || ^19.0.0 react-dom: ^17.0.0 || ^18.0.0 || ^19.0.0 @@ -2750,19 +2750,19 @@ __metadata: optional: true "@types/react": optional: true - checksum: 10/fa264281e864611f4001980a807d1b2bc0aa789cc9f8e898931dd952c423369f44626a79b4a07fb673785fc7b9d6f7d924104bb82bd1883f15839d48cdc45497 + checksum: 10/48c8e57cdba4a74128a910f961f1da7f37a604d063bf3cf0ff37af57220790bf1f40cc1f826880ce6b16bab4d3da99be00bdc278b098fa89bbc06c8f09d04aff languageName: node linkType: hard -"@mui/material@npm:^6.1.4": - version: 6.1.4 - resolution: "@mui/material@npm:6.1.4" +"@mui/material@npm:^6.1.5": + version: 6.1.5 + resolution: "@mui/material@npm:6.1.5" dependencies: "@babel/runtime": "npm:^7.25.7" - "@mui/core-downloads-tracker": "npm:^6.1.4" - "@mui/system": "npm:^6.1.4" + "@mui/core-downloads-tracker": "npm:^6.1.5" + "@mui/system": "npm:^6.1.5" "@mui/types": "npm:^7.2.18" - "@mui/utils": "npm:^6.1.4" + "@mui/utils": "npm:^6.1.5" "@popperjs/core": "npm:^2.11.8" "@types/react-transition-group": "npm:^4.4.11" clsx: "npm:^2.1.1" @@ -2773,7 +2773,7 @@ __metadata: peerDependencies: "@emotion/react": ^11.5.0 "@emotion/styled": ^11.3.0 - "@mui/material-pigment-css": ^6.1.4 + "@mui/material-pigment-css": ^6.1.5 "@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0 react: ^17.0.0 || ^18.0.0 || ^19.0.0 react-dom: ^17.0.0 || ^18.0.0 || ^19.0.0 @@ -2786,16 +2786,16 @@ __metadata: optional: true "@types/react": optional: true - checksum: 10/6b1a484a92deaf939c887bc8130ee052babd5a97cc08a969213fd3376b44c416e83b934597977a51c43eeabae82073cfa3cc8e9dde0bc6734e2687e737b76d3a + checksum: 10/a2929cdcf82f008f3da3c85a1f0af7013f3101c1df85b9660733b949ffacd75b6c24f784dafd44a3f6d62efce82bcb25ac38cfd794f9a063f701591a2c43a223 languageName: node linkType: hard -"@mui/private-theming@npm:^6.1.4": - version: 6.1.4 - resolution: "@mui/private-theming@npm:6.1.4" +"@mui/private-theming@npm:^6.1.5": + version: 6.1.5 + resolution: "@mui/private-theming@npm:6.1.5" dependencies: "@babel/runtime": "npm:^7.25.7" - "@mui/utils": "npm:^6.1.4" + "@mui/utils": "npm:^6.1.5" prop-types: "npm:^15.8.1" peerDependencies: "@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0 @@ -2803,13 +2803,13 @@ __metadata: peerDependenciesMeta: "@types/react": optional: true - checksum: 10/bed667f2748376fec1da254b8d6dbad2129dbeec0e8ab9a8f945d31da4fc3f4d7433ffead02ad75a968eec21e051d8ebe85af041750f124a9e442bf76c84a0a4 + checksum: 10/a53a95600eb5b45af951fd0efaf43dd2eec7236b814ce69b80cb77c2b3ac1b54706b57e23f16e528998772850001149d0a767f3005f763a4463a7b60f5ca7634 languageName: node linkType: hard -"@mui/styled-engine@npm:^6.1.4": - version: 6.1.4 - resolution: "@mui/styled-engine@npm:6.1.4" +"@mui/styled-engine@npm:^6.1.5": + version: 6.1.5 + resolution: "@mui/styled-engine@npm:6.1.5" dependencies: "@babel/runtime": "npm:^7.25.7" "@emotion/cache": "npm:^11.13.1" @@ -2826,19 +2826,19 @@ __metadata: optional: true "@emotion/styled": optional: true - checksum: 10/331db5dc2cf830ec65edf03f7ad4bc54618121aab0de56ed20a227b6a383d6dace86faf071edbb334e2d63ff1f921a48b990eaf409644d35c68238790974ca36 + checksum: 10/c032f4dbbef4c8fedfdd272f922acc8a5cb0ce575ff4ed6aee5fa15856b1a53e4ddf06a892aeb5a8eae2d4a0ad9d5d53c1319d76436c7036dcbc00d49189d708 languageName: node linkType: hard -"@mui/system@npm:^6.1.4": - version: 6.1.4 - resolution: "@mui/system@npm:6.1.4" +"@mui/system@npm:^6.1.5": + version: 6.1.5 + resolution: "@mui/system@npm:6.1.5" dependencies: "@babel/runtime": "npm:^7.25.7" - "@mui/private-theming": "npm:^6.1.4" - "@mui/styled-engine": "npm:^6.1.4" + "@mui/private-theming": "npm:^6.1.5" + "@mui/styled-engine": "npm:^6.1.5" "@mui/types": "npm:^7.2.18" - "@mui/utils": "npm:^6.1.4" + "@mui/utils": "npm:^6.1.5" clsx: "npm:^2.1.1" csstype: "npm:^3.1.3" prop-types: "npm:^15.8.1" @@ -2854,7 +2854,7 @@ __metadata: optional: true "@types/react": optional: true - checksum: 10/66c93a0d54688bce4a6126ac214c375b0abb639566735a2ea1fe5e40b694c2f9bea27e2c7d8dde1bad76ce32d3150e854799938e9906f7fec808c37d832166ef + checksum: 10/00fb9fdaaef435e3e4d129a07a57eec3a7abe74e96e1e493d42e0d16721b0a10a6176d870c26d625bd0a69ae4110ae392355619fffd88577d999c09f52e002df languageName: node linkType: hard @@ -2870,7 +2870,7 @@ __metadata: languageName: node linkType: hard -"@mui/utils@npm:^5.16.6 || ^6.0.0, @mui/utils@npm:^6.1.4": +"@mui/utils@npm:^5.16.6 || ^6.0.0": version: 6.1.4 resolution: "@mui/utils@npm:6.1.4" dependencies: @@ -2890,13 +2890,33 @@ __metadata: languageName: node linkType: hard -"@mui/x-data-grid@npm:^7.20.0": - version: 7.20.0 - resolution: "@mui/x-data-grid@npm:7.20.0" +"@mui/utils@npm:^6.1.5": + version: 6.1.5 + resolution: "@mui/utils@npm:6.1.5" + dependencies: + "@babel/runtime": "npm:^7.25.7" + "@mui/types": "npm:^7.2.18" + "@types/prop-types": "npm:^15.7.13" + clsx: "npm:^2.1.1" + prop-types: "npm:^15.8.1" + react-is: "npm:^18.3.1" + peerDependencies: + "@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0 + react: ^17.0.0 || ^18.0.0 || ^19.0.0 + peerDependenciesMeta: + "@types/react": + optional: true + checksum: 10/8d99b7f0d54ae9b1ac57dfae695afcd15b446364cda0c0ba3ca076a719881ff556564eba62962168719862ee086e12d8ba107440e8aa86fdecfe2eca5826e051 + languageName: node + linkType: hard + +"@mui/x-data-grid@npm:^7.22.0": + version: 7.22.0 + resolution: "@mui/x-data-grid@npm:7.22.0" dependencies: "@babel/runtime": "npm:^7.25.7" "@mui/utils": "npm:^5.16.6 || ^6.0.0" - "@mui/x-internals": "npm:7.20.0" + "@mui/x-internals": "npm:7.21.0" clsx: "npm:^2.1.1" prop-types: "npm:^15.8.1" reselect: "npm:^5.1.1" @@ -2912,17 +2932,17 @@ __metadata: optional: true "@emotion/styled": optional: true - checksum: 10/3190130e7f006a14d5683858f7f544a0e1dda9a8963218cd8947bfd9676813c2d2f20c5f4a64ab711b8777c40f880ed41340a9c8f76450332ccc3a9da99fbf1a + checksum: 10/3e2088bf422e0db94947786036f49984245f183245d172bc85d6cd6dd104d247552d774072e8777f7d5df5304286ce3f000b366d56080da429b90dbe097fb4fe languageName: node linkType: hard -"@mui/x-date-pickers@npm:^7.20.0": - version: 7.20.0 - resolution: "@mui/x-date-pickers@npm:7.20.0" +"@mui/x-date-pickers@npm:^7.22.0": + version: 7.22.0 + resolution: "@mui/x-date-pickers@npm:7.22.0" dependencies: "@babel/runtime": "npm:^7.25.7" "@mui/utils": "npm:^5.16.6 || ^6.0.0" - "@mui/x-internals": "npm:7.20.0" + "@mui/x-internals": "npm:7.21.0" "@types/react-transition-group": "npm:^4.4.11" clsx: "npm:^2.1.1" prop-types: "npm:^15.8.1" @@ -2960,29 +2980,29 @@ __metadata: optional: true moment-jalaali: optional: true - checksum: 10/92c2d751a4496c2fb22f23642673019b332e12dddfda5871b0f9744cfa98ca07907a0ee6aee51a389381345583c208defb10ec22d0a8ef9b23ea2fe303c0ca48 + checksum: 10/0f1d20415ed3f904b4fce2d29e2df450ae3bd60dcc1123ab3348a0772b2aeb8d93d827c1d9b3e8c2ae8c89de34844d66aa1782a63e7b5876ab32d971d6489764 languageName: node linkType: hard -"@mui/x-internals@npm:7.20.0": - version: 7.20.0 - resolution: "@mui/x-internals@npm:7.20.0" +"@mui/x-internals@npm:7.21.0": + version: 7.21.0 + resolution: "@mui/x-internals@npm:7.21.0" dependencies: "@babel/runtime": "npm:^7.25.7" "@mui/utils": "npm:^5.16.6 || ^6.0.0" peerDependencies: react: ^17.0.0 || ^18.0.0 - checksum: 10/2cd3749205794a125508b953152147010f8193e1c78ac1b4dc9bb3dd0c2fb1f01b3d35ca362b269a640b2df55db1fac7bc6edcb9d8b3d9b1c037c09f8fdac211 + checksum: 10/57a91e67cff9f82fafe883ae0e54e56c43d3ba15f5f99652e66e25e65900f76a5c0b0a49aac27f0f3167e7f955438c987c0a6dae61117420a9b851258a3f7360 languageName: node linkType: hard -"@mui/x-tree-view@npm:^7.20.0": - version: 7.20.0 - resolution: "@mui/x-tree-view@npm:7.20.0" +"@mui/x-tree-view@npm:^7.22.0": + version: 7.22.0 + resolution: "@mui/x-tree-view@npm:7.22.0" dependencies: "@babel/runtime": "npm:^7.25.7" "@mui/utils": "npm:^5.16.6 || ^6.0.0" - "@mui/x-internals": "npm:7.20.0" + "@mui/x-internals": "npm:7.21.0" "@types/react-transition-group": "npm:^4.4.11" clsx: "npm:^2.1.1" prop-types: "npm:^15.8.1" @@ -2999,7 +3019,7 @@ __metadata: optional: true "@emotion/styled": optional: true - checksum: 10/68d36bfab13644a34c2fa1af80f50d3a696f5f666a08f7572b3bf66eeb48783e57c1e3214dc603bfbc83d260d31e160ed3fb4a8226c2e81c87396df982abac88 + checksum: 10/4ad864693235f6d542205be536aaa42cdc3c171b56bc40d7a4bbf2512f2982f3d8e03a425a9c4d8fc57978cba017d254e65a85e30e3ea9cb2c63d683f3ce4852 languageName: node linkType: hard