From c5343f97cbbb73d9904762c451bca420558a9352 Mon Sep 17 00:00:00 2001 From: Julia Wegmayr Date: Tue, 11 Feb 2025 09:56:18 +0100 Subject: [PATCH] replace buttons from mui with comet buttons --- .../src/products/generated/ProductsGrid.tsx | 5 +++-- .../src/DatePickerNavigation.tsx | 4 ++-- .../src/core/extension/Link/ToolbarButton.tsx | 7 ++++--- .../admin/src/EditDialog.routerTabs.test.tsx | 10 +++------- .../src/EditDialog.stackRouterTabs.test.tsx | 10 +++------- packages/admin/admin/src/EditDialog.test.tsx | 2 +- .../src/common/buttons/cancel/CancelButton.tsx | 3 +-- .../src/common/buttons/delete/DeleteButton.tsx | 3 ++- .../src/common/buttons/okay/OkayButton.tsx | 9 ++++----- .../admin/admin/src/dataGrid/CrudVisibility.tsx | 5 +++-- .../admin/admin/src/form/file/FileDropzone.tsx | 12 +++--------- .../admin/src/router/ConfirmationDialog.tsx | 11 +++-------- .../admin/admin/src/snackbar/UndoSnackbar.tsx | 5 +++-- .../src/stack/backbutton/StackBackButton.tsx | 3 ++- packages/admin/admin/src/table/AddButton.tsx | 2 +- packages/admin/admin/src/table/DeleteButton.tsx | 3 ++- .../admin/admin/src/table/ExcelExportButton.tsx | 3 ++- .../admin/src/table/TableFilterFinalForm.tsx | 5 +++-- .../FilterBarPopoverFilter.tsx | 8 ++++---- .../src/translator/BaseTranslationDialog.tsx | 8 ++++---- .../src/blocks/common/AdminComponentButton.tsx | 3 ++- .../common/AdminComponentNestedButton.tsx | 5 +++-- .../src/clipboard/CannotPasteBlockDialog.tsx | 8 +++----- .../blocks-admin/src/common/Collapsible.tsx | 5 +++-- .../src/blocks/image/EditImageDialog.tsx | 4 +--- .../cms-admin/src/builds/PublishButton.tsx | 4 ++-- .../cms-admin/src/builds/StartBuildsDialog.tsx | 7 +++---- .../src/common/header/ImpersonationInlay.tsx | 2 +- .../src/common/header/UserHeaderItem.tsx | 7 +++---- .../cms-admin/src/cronJobs/CronJobsGrid.tsx | 6 +++--- .../ManuallyHandleDuplicatedFilenamesDialog.tsx | 8 ++++---- .../fileUpload/FileUploadErrorDialog.tsx | 5 ++--- .../DataGrid/fileUpload/UploadFilesButton.tsx | 5 ++--- .../dam/DataGrid/filter/DamSortPopover.sc.ts | 3 ++- .../dam/FileActions/ConfirmDeleteDialog.sc.ts | 3 ++- .../src/dam/FileForm/CropSettingsFields.tsx | 5 ++--- .../cms-admin/src/dam/FileForm/Duplicates.tsx | 15 +++------------ .../cms-admin/src/dam/FileForm/FilePreview.tsx | 4 ++-- .../src/dam/FileForm/ReplaceFileButton.tsx | 3 +-- .../dam/MoveDamItemDialog/MoveDamItemDialog.tsx | 4 ++-- .../form/file/chooseFile/ChooseFileDialog.tsx | 6 +++--- .../cms-admin/src/generator/generateGrid.ts | 5 +++-- .../cms-admin/src/pages/SaveConflictDialog.tsx | 12 +++++------- .../src/pages/pageTree/BottomAddLink.tsx | 4 ++-- .../src/pages/pageTree/PageDeleteDialog.tsx | 6 +++--- .../useCopyPastePages/ProgressDialog.tsx | 4 ++-- .../pageTreeSelect/PageTreeSelectDialog.tsx | 6 +++--- .../pages/pagesPage/ConfirmPageActionDialog.tsx | 7 +++---- .../pages/pagesPage/PageCanNotDeleteDialog.tsx | 4 ++-- .../cms-admin/src/pages/pagesPage/PagesPage.tsx | 6 +++--- .../pages/pagesPage/PagesPageActionToolbar.tsx | 4 ++-- .../src/preview/site/SitePreview.sc.tsx | 3 ++- .../src/redirects/RedirectActiveness.tsx | 5 +++-- .../cms-admin/src/redirects/RedirectsGrid.tsx | 5 +++-- .../user/ImpersonationButtons.tsx | 6 +++--- .../user/permissions/PermissionGrid.tsx | 7 +++---- storybook/src/admin/alert/Alert.stories.tsx | 14 +++++++------- .../src/admin/alert/AlertInSnackbar.stories.tsx | 4 ++-- .../src/admin/form/CustomButtons.stories.tsx | 6 +++--- storybook/src/admin/mui/DataGrid.stories.tsx | 6 +++--- .../admin/toolbar/DataGridToolbar.stories.tsx | 12 ++---------- .../SplitButton/SplitButton.stories.tsx | 16 ++++++---------- storybook/src/docs/form/Layout.stories.tsx | 17 +++-------------- 63 files changed, 170 insertions(+), 219 deletions(-) diff --git a/demo/admin/src/products/generated/ProductsGrid.tsx b/demo/admin/src/products/generated/ProductsGrid.tsx index f057b7217f..6496f16d24 100644 --- a/demo/admin/src/products/generated/ProductsGrid.tsx +++ b/demo/admin/src/products/generated/ProductsGrid.tsx @@ -2,6 +2,7 @@ // You may choose to use this file as scaffold by moving this file out of generated folder and removing this comment. import { gql, useApolloClient, useQuery } from "@apollo/client"; import { + Button, CrudContextMenu, DataGridToolbar, GridColDef, @@ -20,7 +21,7 @@ import { import { Add as AddIcon, Edit } from "@comet/admin-icons"; import { BlockPreviewContent } from "@comet/blocks-admin"; import { DamImageBlock } from "@comet/cms-admin"; -import { Button, IconButton } from "@mui/material"; +import { IconButton } from "@mui/material"; import { DataGridPro, GridToolbarQuickFilter } from "@mui/x-data-grid-pro"; import * as React from "react"; import { FormattedMessage, useIntl } from "react-intl"; @@ -91,7 +92,7 @@ function ProductsGridToolbar() { - diff --git a/packages/admin/admin-date-time/src/DatePickerNavigation.tsx b/packages/admin/admin-date-time/src/DatePickerNavigation.tsx index b43ddaff57..e85a6bfa26 100644 --- a/packages/admin/admin-date-time/src/DatePickerNavigation.tsx +++ b/packages/admin/admin-date-time/src/DatePickerNavigation.tsx @@ -1,6 +1,6 @@ -import { createComponentSlot, ThemedComponentBaseProps } from "@comet/admin"; +import { Button, createComponentSlot, ThemedComponentBaseProps } from "@comet/admin"; import { ArrowLeft, ArrowRight, ChevronDown } from "@comet/admin-icons"; -import { Box, Button, buttonClasses, ComponentsOverrides, IconButton, Menu, menuClasses, MenuItem } from "@mui/material"; +import { Box, buttonClasses, ComponentsOverrides, IconButton, Menu, menuClasses, MenuItem } from "@mui/material"; import { css, Theme, useThemeProps } from "@mui/material/styles"; import { useRef, useState } from "react"; import { useIntl } from "react-intl"; diff --git a/packages/admin/admin-rte/src/core/extension/Link/ToolbarButton.tsx b/packages/admin/admin-rte/src/core/extension/Link/ToolbarButton.tsx index 10c0dde029..37015bad05 100644 --- a/packages/admin/admin-rte/src/core/extension/Link/ToolbarButton.tsx +++ b/packages/admin/admin-rte/src/core/extension/Link/ToolbarButton.tsx @@ -1,5 +1,6 @@ +import { Button } from "@comet/admin"; import { Check, Close, Delete, RteLink } from "@comet/admin-icons"; -import { Button, Dialog, DialogActions, DialogContent, DialogTitle, FormControl, FormLabel, Grid, InputBase } from "@mui/material"; +import { Dialog, DialogActions, DialogContent, DialogTitle, FormControl, FormLabel, Grid, InputBase } from "@mui/material"; import { EditorState, RichUtils } from "draft-js"; import { MouseEvent, useEffect, useState } from "react"; import { FormattedMessage } from "react-intl"; @@ -120,14 +121,14 @@ function LinkDialog(props: { {linkData && ( - )} - diff --git a/packages/admin/admin/src/EditDialog.routerTabs.test.tsx b/packages/admin/admin/src/EditDialog.routerTabs.test.tsx index aee7b95571..dc5cf6480b 100644 --- a/packages/admin/admin/src/EditDialog.routerTabs.test.tsx +++ b/packages/admin/admin/src/EditDialog.routerTabs.test.tsx @@ -1,5 +1,5 @@ import { Add, Edit } from "@comet/admin-icons"; -import { Button, IconButton } from "@mui/material"; +import { IconButton } from "@mui/material"; import { DataGrid } from "@mui/x-data-grid"; import { screen, waitFor } from "@testing-library/react"; import { createMemoryHistory } from "history"; @@ -8,6 +8,7 @@ import { useIntl } from "react-intl"; import { Router } from "react-router"; import { render } from "test-utils"; +import { Button } from "./common/buttons/Button"; import { ToolbarActions } from "./common/toolbar/actions/ToolbarActions"; import { DataGridToolbar } from "./common/toolbar/DataGridToolbar"; import { ToolbarFillSpace } from "./common/toolbar/fillspace/ToolbarFillSpace"; @@ -107,12 +108,7 @@ describe("EditDialog with Stack, Router Tabs and Grid", () => { componentsProps={{ toolbar: { toolbarAction: ( - ), diff --git a/packages/admin/admin/src/EditDialog.stackRouterTabs.test.tsx b/packages/admin/admin/src/EditDialog.stackRouterTabs.test.tsx index cc9d4f56c6..b2b4f49051 100644 --- a/packages/admin/admin/src/EditDialog.stackRouterTabs.test.tsx +++ b/packages/admin/admin/src/EditDialog.stackRouterTabs.test.tsx @@ -1,5 +1,5 @@ import { Add, Edit } from "@comet/admin-icons"; -import { Button, IconButton } from "@mui/material"; +import { IconButton } from "@mui/material"; import { DataGrid } from "@mui/x-data-grid"; import { screen, within } from "@testing-library/react"; import { createMemoryHistory } from "history"; @@ -8,6 +8,7 @@ import { useIntl } from "react-intl"; import { Router } from "react-router"; import { render } from "test-utils"; +import { Button } from "./common/buttons/Button"; import { MainContent } from "./common/MainContent"; import { ToolbarActions } from "./common/toolbar/actions/ToolbarActions"; import { ToolbarAutomaticTitleItem } from "./common/toolbar/automatictitleitem/ToolbarAutomaticTitleItem"; @@ -119,12 +120,7 @@ describe("EditDialog with Stack, Router Tabs and Grid", () => { componentsProps={{ toolbar: { toolbarAction: ( - ), diff --git a/packages/admin/admin/src/EditDialog.test.tsx b/packages/admin/admin/src/EditDialog.test.tsx index bbd44553af..44fde2cd72 100644 --- a/packages/admin/admin/src/EditDialog.test.tsx +++ b/packages/admin/admin/src/EditDialog.test.tsx @@ -1,7 +1,7 @@ -import { Button } from "@mui/material"; import userEvent from "@testing-library/user-event"; import { render, screen, waitFor } from "test-utils"; +import { Button } from "./common/buttons/Button"; import { useEditDialog } from "./EditDialog"; import { FinalForm } from "./FinalForm"; import { Field } from "./form/Field"; diff --git a/packages/admin/admin/src/common/buttons/cancel/CancelButton.tsx b/packages/admin/admin/src/common/buttons/cancel/CancelButton.tsx index 09e1c92b95..0732308310 100644 --- a/packages/admin/admin/src/common/buttons/cancel/CancelButton.tsx +++ b/packages/admin/admin/src/common/buttons/cancel/CancelButton.tsx @@ -1,10 +1,9 @@ import { Clear } from "@comet/admin-icons"; -import { Button, ButtonClassKey } from "@mui/material"; -import { ButtonProps } from "@mui/material/Button"; import { Theme, useThemeProps } from "@mui/material/styles"; import { ComponentsOverrides } from "@mui/material/styles/overrides"; import { FormattedMessage } from "react-intl"; +import { Button, ButtonClassKey, ButtonProps } from "../../../common/buttons/Button"; import { createComponentSlot } from "../../../helpers/createComponentSlot"; import { messages } from "../../../messages"; diff --git a/packages/admin/admin/src/common/buttons/delete/DeleteButton.tsx b/packages/admin/admin/src/common/buttons/delete/DeleteButton.tsx index 630b3922e0..0b19c2c134 100644 --- a/packages/admin/admin/src/common/buttons/delete/DeleteButton.tsx +++ b/packages/admin/admin/src/common/buttons/delete/DeleteButton.tsx @@ -1,8 +1,9 @@ import { Delete } from "@comet/admin-icons"; -import { Button, ButtonClassKey, ButtonProps, ComponentsOverrides } from "@mui/material"; +import { ComponentsOverrides } from "@mui/material"; import { css, Theme, useThemeProps } from "@mui/material/styles"; import { FormattedMessage } from "react-intl"; +import { Button, ButtonClassKey, ButtonProps } from "../../../common/buttons/Button"; import { createComponentSlot } from "../../../helpers/createComponentSlot"; import { messages } from "../../../messages"; diff --git a/packages/admin/admin/src/common/buttons/okay/OkayButton.tsx b/packages/admin/admin/src/common/buttons/okay/OkayButton.tsx index 734886d972..e84619f919 100644 --- a/packages/admin/admin/src/common/buttons/okay/OkayButton.tsx +++ b/packages/admin/admin/src/common/buttons/okay/OkayButton.tsx @@ -1,8 +1,8 @@ import { Check } from "@comet/admin-icons"; -import { Button, ButtonClassKey, ButtonProps, ComponentsOverrides } from "@mui/material"; -import { Theme, useThemeProps } from "@mui/material/styles"; +import { ComponentsOverrides, Theme, useThemeProps } from "@mui/material/styles"; import { FormattedMessage } from "react-intl"; +import { Button, ButtonClassKey, ButtonProps } from "../../../common/buttons/Button"; import { createComponentSlot } from "../../../helpers/createComponentSlot"; import { messages } from "../../../messages"; @@ -18,13 +18,12 @@ export function OkayButton(inProps: OkayButtonProps) { const { children = , startIcon = , - color = "primary", - variant = "contained", + variant = "primary", ...restProps } = useThemeProps({ props: inProps, name: "CometAdminOkayButton" }); return ( - + {children} ); diff --git a/packages/admin/admin/src/dataGrid/CrudVisibility.tsx b/packages/admin/admin/src/dataGrid/CrudVisibility.tsx index b74da0f32b..23f18c54ca 100644 --- a/packages/admin/admin/src/dataGrid/CrudVisibility.tsx +++ b/packages/admin/admin/src/dataGrid/CrudVisibility.tsx @@ -1,7 +1,8 @@ -import { Button, ListItemIcon, Menu, MenuItem } from "@mui/material"; +import { ListItemIcon, Menu, MenuItem } from "@mui/material"; import { MouseEvent, useState } from "react"; import { FormattedMessage } from "react-intl"; +import { Button } from "../common/buttons/Button"; import { useSnackbarApi } from "../snackbar/SnackbarProvider"; import { UndoSnackbar } from "../snackbar/UndoSnackbar"; import { CrudVisibilityIcon } from "./CrudVisibilityIcon"; @@ -46,7 +47,7 @@ export const CrudVisibility = ({ visibility, onUpdateVisibility }: CrudVisibilit return ( <> - } diff --git a/packages/admin/admin/src/stack/backbutton/StackBackButton.tsx b/packages/admin/admin/src/stack/backbutton/StackBackButton.tsx index c84f0d4b5b..28c26a5e81 100644 --- a/packages/admin/admin/src/stack/backbutton/StackBackButton.tsx +++ b/packages/admin/admin/src/stack/backbutton/StackBackButton.tsx @@ -1,8 +1,9 @@ import { ArrowLeft } from "@comet/admin-icons"; -import { Button, ButtonClassKey, ButtonProps, ComponentsOverrides } from "@mui/material"; +import { ButtonClassKey, ComponentsOverrides } from "@mui/material"; import { Theme, useThemeProps } from "@mui/material/styles"; import { FormattedMessage } from "react-intl"; +import { Button, ButtonProps } from "../../common/buttons/Button"; import { createComponentSlot } from "../../helpers/createComponentSlot"; import { messages } from "../../messages"; import { StackApiContext } from "../Api"; diff --git a/packages/admin/admin/src/table/AddButton.tsx b/packages/admin/admin/src/table/AddButton.tsx index bc465abfb8..03a6d6a8ab 100644 --- a/packages/admin/admin/src/table/AddButton.tsx +++ b/packages/admin/admin/src/table/AddButton.tsx @@ -1,8 +1,8 @@ import { AddNoCircle } from "@comet/admin-icons"; -import { Button } from "@mui/material"; import { Component } from "react"; import { FormattedMessage } from "react-intl"; +import { Button } from "../common/buttons/Button"; import { messages } from "../messages"; import { ISelectionApi } from "../SelectionApi"; diff --git a/packages/admin/admin/src/table/DeleteButton.tsx b/packages/admin/admin/src/table/DeleteButton.tsx index 886a0e51f9..9649321e93 100644 --- a/packages/admin/admin/src/table/DeleteButton.tsx +++ b/packages/admin/admin/src/table/DeleteButton.tsx @@ -1,11 +1,12 @@ import { PureQueryOptions } from "@apollo/client"; import { Delete } from "@comet/admin-icons"; -import { Button, IconButton } from "@mui/material"; +import { IconButton } from "@mui/material"; import { ButtonProps } from "@mui/material/Button"; import CircularProgress from "@mui/material/CircularProgress"; import { Component, ReactNode } from "react"; import { FormattedMessage } from "react-intl"; +import { Button } from "../common/buttons/Button"; import { DeleteMutation } from "../DeleteMutation"; import { messages } from "../messages"; diff --git a/packages/admin/admin/src/table/ExcelExportButton.tsx b/packages/admin/admin/src/table/ExcelExportButton.tsx index bcca03e122..74c527f7ff 100644 --- a/packages/admin/admin/src/table/ExcelExportButton.tsx +++ b/packages/admin/admin/src/table/ExcelExportButton.tsx @@ -1,7 +1,8 @@ -import { Button, CircularProgress } from "@mui/material"; +import { CircularProgress } from "@mui/material"; import { PropsWithChildren, ReactNode } from "react"; import { FormattedMessage } from "react-intl"; +import { Button } from "../common/buttons/Button"; import { FileIcon } from "../fileIcons/FileIcon"; import { IExportApi } from "./excelexport/IExportApi"; diff --git a/packages/admin/admin/src/table/TableFilterFinalForm.tsx b/packages/admin/admin/src/table/TableFilterFinalForm.tsx index ae51c859b1..20941d6da7 100644 --- a/packages/admin/admin/src/table/TableFilterFinalForm.tsx +++ b/packages/admin/admin/src/table/TableFilterFinalForm.tsx @@ -1,10 +1,11 @@ import { Clear } from "@comet/admin-icons"; -import { Button, Grid, Typography } from "@mui/material"; +import { Grid, Typography } from "@mui/material"; import { AnyObject } from "final-form"; import { Component, ReactNode } from "react"; import { Form, FormProps, FormRenderProps } from "react-final-form"; import { FormattedMessage } from "react-intl"; +import { Button } from "../common/buttons/Button"; import { renderFinalFormChildren } from "../renderFinalFormChildren"; import { IFilterApi } from "./useTableQueryFilter"; @@ -52,11 +53,11 @@ export class TableFilterFinalForm extends Component diff --git a/packages/admin/admin/src/table/filterbar/filterBarPopoverFilter/FilterBarPopoverFilter.tsx b/packages/admin/admin/src/table/filterbar/filterBarPopoverFilter/FilterBarPopoverFilter.tsx index 64d76292da..4d037a0585 100644 --- a/packages/admin/admin/src/table/filterbar/filterBarPopoverFilter/FilterBarPopoverFilter.tsx +++ b/packages/admin/admin/src/table/filterbar/filterBarPopoverFilter/FilterBarPopoverFilter.tsx @@ -1,10 +1,11 @@ import { Check, Reset } from "@comet/admin-icons"; -import { Button, ButtonProps, ComponentsOverrides, Popover as MuiPopover, Theme } from "@mui/material"; +import { ComponentsOverrides, Popover as MuiPopover, Theme } from "@mui/material"; import { css, useThemeProps } from "@mui/material/styles"; import { ComponentType, MouseEvent, PropsWithChildren, useState } from "react"; import { Form, useForm } from "react-final-form"; import { FormattedMessage } from "react-intl"; +import { Button, ButtonProps } from "../../../common/buttons/Button"; import { createComponentSlot } from "../../../helpers/createComponentSlot"; import { ThemedComponentBaseProps } from "../../../helpers/ThemedComponentBaseProps"; import { messages } from "../../../messages"; @@ -166,7 +167,7 @@ export function FilterBarPopoverFilter(inProps: PropsWithChildren diff --git a/packages/admin/blocks-admin/src/blocks/common/AdminComponentButton.tsx b/packages/admin/blocks-admin/src/blocks/common/AdminComponentButton.tsx index 5c0befcc1e..63279ad93d 100644 --- a/packages/admin/blocks-admin/src/blocks/common/AdminComponentButton.tsx +++ b/packages/admin/blocks-admin/src/blocks/common/AdminComponentButton.tsx @@ -1,4 +1,4 @@ -import { Button } from "@mui/material"; +import { Button } from "@comet/admin"; import { MouseEventHandler, PropsWithChildren, ReactNode } from "react"; import { AdminComponentPaper } from "./AdminComponentPaper"; @@ -17,6 +17,7 @@ export const AdminComponentButton = ({ variant, size, ...buttonProps }: PropsWit + ); diff --git a/packages/admin/blocks-admin/src/common/Collapsible.tsx b/packages/admin/blocks-admin/src/common/Collapsible.tsx index 3d6e2ddb28..596ff4908b 100644 --- a/packages/admin/blocks-admin/src/common/Collapsible.tsx +++ b/packages/admin/blocks-admin/src/common/Collapsible.tsx @@ -1,4 +1,5 @@ -import { Button, Collapse } from "@mui/material"; +import { Button } from "@comet/admin"; +import { Collapse } from "@mui/material"; import { PropsWithChildren, ReactNode } from "react"; interface CollapsibleProps { @@ -15,7 +16,7 @@ export const Collapsible = ({ header, children, open, onChange }: PropsWithChild onClick={() => { onChange(!open); }} - color="info" + variant="textDark" > {header} diff --git a/packages/admin/cms-admin/src/blocks/image/EditImageDialog.tsx b/packages/admin/cms-admin/src/blocks/image/EditImageDialog.tsx index a1729488e4..5d5e08f2c3 100644 --- a/packages/admin/cms-admin/src/blocks/image/EditImageDialog.tsx +++ b/packages/admin/cms-admin/src/blocks/image/EditImageDialog.tsx @@ -1,11 +1,10 @@ import "react-image-crop/dist/ReactCrop.css"; import { useApolloClient } from "@apollo/client"; -import { CancelButton, Field, FormSection, messages, SaveButton } from "@comet/admin"; +import { Button, CancelButton, Field, FormSection, messages, SaveButton } from "@comet/admin"; import { OpenNewTab } from "@comet/admin-icons"; import { Box, - Button, Dialog, DialogActions, DialogContent as MuiDialogContent, @@ -184,7 +183,6 @@ export function EditImageDialog({ image, initialValues, onSubmit, onClose, inher onClose()} /> - diff --git a/packages/admin/cms-admin/src/dam/DataGrid/fileUpload/UploadFilesButton.tsx b/packages/admin/cms-admin/src/dam/DataGrid/fileUpload/UploadFilesButton.tsx index c255072efc..fa6d34d421 100644 --- a/packages/admin/cms-admin/src/dam/DataGrid/fileUpload/UploadFilesButton.tsx +++ b/packages/admin/cms-admin/src/dam/DataGrid/fileUpload/UploadFilesButton.tsx @@ -1,5 +1,5 @@ +import { Button } from "@comet/admin"; import { Upload } from "@comet/admin-icons"; -import { Button } from "@mui/material"; import { useRef } from "react"; import { FileRejection, useDropzone } from "react-dropzone"; import { FormattedMessage } from "react-intl"; @@ -37,8 +37,7 @@ export const UploadFilesButton = ({ folderId, filter }: UploadFilesButtonProps) return ( <> diff --git a/packages/admin/cms-admin/src/dam/FileForm/FilePreview.tsx b/packages/admin/cms-admin/src/dam/FileForm/FilePreview.tsx index 423d044c66..171b8428d5 100644 --- a/packages/admin/cms-admin/src/dam/FileForm/FilePreview.tsx +++ b/packages/admin/cms-admin/src/dam/FileForm/FilePreview.tsx @@ -1,7 +1,7 @@ import { useApolloClient } from "@apollo/client"; -import { useStackApi } from "@comet/admin"; +import { Button, useStackApi } from "@comet/admin"; import { Archive, Delete, Download, Restore, ZipFile } from "@comet/admin-icons"; -import { Button, Paper } from "@mui/material"; +import { Paper } from "@mui/material"; import { styled } from "@mui/material/styles"; import saveAs from "file-saver"; import { ReactNode, useState } from "react"; diff --git a/packages/admin/cms-admin/src/dam/FileForm/ReplaceFileButton.tsx b/packages/admin/cms-admin/src/dam/FileForm/ReplaceFileButton.tsx index 4289cedf6d..0e24504a10 100644 --- a/packages/admin/cms-admin/src/dam/FileForm/ReplaceFileButton.tsx +++ b/packages/admin/cms-admin/src/dam/FileForm/ReplaceFileButton.tsx @@ -1,7 +1,6 @@ import { useApolloClient } from "@apollo/client"; -import { useErrorDialog } from "@comet/admin"; +import { Button, useErrorDialog } from "@comet/admin"; import { ThreeDotSaving, Upload } from "@comet/admin-icons"; -import { Button } from "@mui/material"; import axios, { CancelTokenSource } from "axios"; import { useRef, useState } from "react"; import { FileRejection, useDropzone } from "react-dropzone"; diff --git a/packages/admin/cms-admin/src/dam/MoveDamItemDialog/MoveDamItemDialog.tsx b/packages/admin/cms-admin/src/dam/MoveDamItemDialog/MoveDamItemDialog.tsx index ebb51d84a2..adafbc215b 100644 --- a/packages/admin/cms-admin/src/dam/MoveDamItemDialog/MoveDamItemDialog.tsx +++ b/packages/admin/cms-admin/src/dam/MoveDamItemDialog/MoveDamItemDialog.tsx @@ -1,8 +1,8 @@ import { useApolloClient, useQuery } from "@apollo/client"; import { FetchResult } from "@apollo/client/link/core"; -import { SaveButton } from "@comet/admin"; +import { Button, SaveButton } from "@comet/admin"; import { Move, Reset } from "@comet/admin-icons"; -import { Button, Dialog, DialogActions, DialogContent, DialogTitle } from "@mui/material"; +import { Dialog, DialogActions, DialogContent, DialogTitle } from "@mui/material"; import { styled } from "@mui/material/styles"; import { useCallback } from "react"; import { FormattedMessage } from "react-intl"; diff --git a/packages/admin/cms-admin/src/form/file/chooseFile/ChooseFileDialog.tsx b/packages/admin/cms-admin/src/form/file/chooseFile/ChooseFileDialog.tsx index deb1a0ceb9..ae063d4cf3 100644 --- a/packages/admin/cms-admin/src/form/file/chooseFile/ChooseFileDialog.tsx +++ b/packages/admin/cms-admin/src/form/file/chooseFile/ChooseFileDialog.tsx @@ -1,6 +1,6 @@ -import { StackLink, SubRoute } from "@comet/admin"; +import { Button, StackLink, SubRoute } from "@comet/admin"; import { Close } from "@comet/admin-icons"; -import { Button, Dialog, DialogTitle, IconButton, Link } from "@mui/material"; +import { Dialog, DialogTitle, IconButton, Link } from "@mui/material"; import { styled } from "@mui/material/styles"; import { SyntheticEvent } from "react"; import { FormattedMessage } from "react-intl"; @@ -56,7 +56,7 @@ const renderDamLabel = ( { matches, filterApi, showLicenseWarnings = false }: RenderDamLabelOptions, ) => { return isFile(row) ? ( - onChooseFile(row.id)} fullWidth> + onChooseFile(row.id)} fullWidth> ) : ( diff --git a/packages/admin/cms-admin/src/generator/generateGrid.ts b/packages/admin/cms-admin/src/generator/generateGrid.ts index e0862e5bd6..a1afdbdab8 100644 --- a/packages/admin/cms-admin/src/generator/generateGrid.ts +++ b/packages/admin/cms-admin/src/generator/generateGrid.ts @@ -206,6 +206,7 @@ export async function writeCrudGrid( const out = `import { gql, useApolloClient, useQuery } from "@apollo/client"; import { + Button, CrudContextMenu, DataGridToolbar, GridColDef, @@ -223,7 +224,7 @@ export async function writeCrudGrid( } from "@comet/admin"; import { Add as AddIcon, Edit } from "@comet/admin-icons"; import { BlockPreviewContent } from "@comet/blocks-admin"; - import { Alert, Button, Box, IconButton } from "@mui/material"; + import { Alert, Box, IconButton } from "@mui/material"; import { DataGridPro, GridToolbarQuickFilter } from "@mui/x-data-grid-pro"; import { useContentScope } from "@src/common/ContentScopeProvider"; import { @@ -307,7 +308,7 @@ export async function writeCrudGrid( ${ hasCreateMutation ? ` - ` diff --git a/packages/admin/cms-admin/src/pages/SaveConflictDialog.tsx b/packages/admin/cms-admin/src/pages/SaveConflictDialog.tsx index cac80d47f4..925613edc6 100644 --- a/packages/admin/cms-admin/src/pages/SaveConflictDialog.tsx +++ b/packages/admin/cms-admin/src/pages/SaveConflictDialog.tsx @@ -1,6 +1,6 @@ -import { Alert, messages } from "@comet/admin"; +import { Alert, Button, messages } from "@comet/admin"; import { Clear, Delete, OpenNewTab } from "@comet/admin-icons"; -import { Box, Button, Dialog, DialogActions, DialogContent, DialogTitle, Stack, Typography } from "@mui/material"; +import { Box, Dialog, DialogActions, DialogContent, DialogTitle, Stack, Typography } from "@mui/material"; import { styled } from "@mui/material/styles"; import { FormattedMessage } from "react-intl"; @@ -86,18 +86,17 @@ function SaveConflictDialog({ open, onClosePressed, onDiscardChangesPressed }: S - } onClick={() => { onClosePressed(); onDiscardChangesPressed(); }} - variant="contained" - color="info" > @@ -107,8 +106,7 @@ function SaveConflictDialog({ open, onClosePressed, onDiscardChangesPressed }: S onClosePressed(); window.open(window.location.href, "_blank"); }} - variant="contained" - color="primary" + variant="primary" > { )} - diff --git a/packages/admin/cms-admin/src/pages/pageTree/useCopyPastePages/ProgressDialog.tsx b/packages/admin/cms-admin/src/pages/pageTree/useCopyPastePages/ProgressDialog.tsx index eea77de432..5d4e534446 100644 --- a/packages/admin/cms-admin/src/pages/pageTree/useCopyPastePages/ProgressDialog.tsx +++ b/packages/admin/cms-admin/src/pages/pageTree/useCopyPastePages/ProgressDialog.tsx @@ -1,5 +1,5 @@ -import { messages } from "@comet/admin"; -import { Box, Button, Dialog, DialogActions, DialogContent, DialogTitle, LinearProgress, LinearProgressProps, Typography } from "@mui/material"; +import { Button, messages } from "@comet/admin"; +import { Box, Dialog, DialogActions, DialogContent, DialogTitle, LinearProgress, LinearProgressProps, Typography } from "@mui/material"; import { ReactNode, useCallback, useState } from "react"; import { FormattedMessage } from "react-intl"; diff --git a/packages/admin/cms-admin/src/pages/pageTreeSelect/PageTreeSelectDialog.tsx b/packages/admin/cms-admin/src/pages/pageTreeSelect/PageTreeSelectDialog.tsx index f6c26510ca..d96df7b5c8 100644 --- a/packages/admin/cms-admin/src/pages/pageTreeSelect/PageTreeSelectDialog.tsx +++ b/packages/admin/cms-admin/src/pages/pageTreeSelect/PageTreeSelectDialog.tsx @@ -1,7 +1,7 @@ import { gql, useQuery } from "@apollo/client"; -import { FillSpace, Toolbar, ToolbarActions, useFocusAwarePolling } from "@comet/admin"; +import { Button, FillSpace, Toolbar, ToolbarActions, useFocusAwarePolling } from "@comet/admin"; import { ArrowRight, Close, Delete } from "@comet/admin-icons"; -import { Button, Dialog, DialogActions, DialogContent, DialogTitle, IconButton, MenuItem, Select } from "@mui/material"; +import { Dialog, DialogActions, DialogContent, DialogTitle, IconButton, MenuItem, Select } from "@mui/material"; import { styled } from "@mui/material/styles"; import { memo, useCallback, useMemo, useRef, useState } from "react"; import { FormattedMessage } from "react-intl"; @@ -243,12 +243,12 @@ export default function PageTreeSelectDialog({ value, onChange, open, onClose, d {value && ( diff --git a/packages/admin/cms-admin/src/pages/pagesPage/ConfirmPageActionDialog.tsx b/packages/admin/cms-admin/src/pages/pagesPage/ConfirmPageActionDialog.tsx index 82d1aada21..33341d37b8 100644 --- a/packages/admin/cms-admin/src/pages/pagesPage/ConfirmPageActionDialog.tsx +++ b/packages/admin/cms-admin/src/pages/pagesPage/ConfirmPageActionDialog.tsx @@ -1,6 +1,6 @@ -import { CancelButton } from "@comet/admin"; +import { Button, CancelButton } from "@comet/admin"; import { Delete } from "@comet/admin-icons"; -import { Button, Dialog, DialogActions, DialogContent, DialogContentText, DialogTitle } from "@mui/material"; +import { Dialog, DialogActions, DialogContent, DialogContentText, DialogTitle } from "@mui/material"; import { ComponentType } from "react"; import { FormattedMessage } from "react-intl"; @@ -70,8 +70,7 @@ export const ConfirmPageActionDialog = ({ open, onCloseDialog, action, selectedP onCloseDialog(false)} /> diff --git a/packages/admin/cms-admin/src/userPermissions/user/ImpersonationButtons.tsx b/packages/admin/cms-admin/src/userPermissions/user/ImpersonationButtons.tsx index 2bb14f2226..45c1661e6c 100644 --- a/packages/admin/cms-admin/src/userPermissions/user/ImpersonationButtons.tsx +++ b/packages/admin/cms-admin/src/userPermissions/user/ImpersonationButtons.tsx @@ -1,4 +1,4 @@ -import { Button, ButtonProps } from "@mui/material"; +import { Button, ButtonProps } from "@comet/admin"; import Cookies from "js-cookie"; import { commonImpersonationMessages } from "../../common/impersonation/commonImpersonationMessages"; @@ -29,14 +29,14 @@ export const StartImpersonationButton = ({ userId }: { userId: string }) => { if (currentUser.id !== userId && !currentUser.impersonated) { return ( - ); } if (currentUser.impersonated && currentUser.id === userId) { - return ; + return ; } return null; diff --git a/packages/admin/cms-admin/src/userPermissions/user/permissions/PermissionGrid.tsx b/packages/admin/cms-admin/src/userPermissions/user/permissions/PermissionGrid.tsx index aa85a84350..1f9d9429bd 100644 --- a/packages/admin/cms-admin/src/userPermissions/user/permissions/PermissionGrid.tsx +++ b/packages/admin/cms-admin/src/userPermissions/user/permissions/PermissionGrid.tsx @@ -1,7 +1,7 @@ import { gql, useQuery } from "@apollo/client"; -import { FillSpace, GridColDef, TableDeleteButton, ToolbarActions, ToolbarTitleItem } from "@comet/admin"; +import { Button, FillSpace, GridColDef, TableDeleteButton, ToolbarActions, ToolbarTitleItem } from "@comet/admin"; import { Add, Delete, Edit, Info, Reject } from "@comet/admin-icons"; -import { Button, Card, Chip, IconButton, Typography } from "@mui/material"; +import { Card, Chip, IconButton, Typography } from "@mui/material"; import { styled } from "@mui/material/styles"; import { DataGrid, GridToolbarContainer } from "@mui/x-data-grid"; import { differenceInDays, parseISO } from "date-fns"; @@ -172,8 +172,7 @@ export const PermissionGrid = ({ userId }: { userId: string }) => { } @@ -34,7 +34,7 @@ export const Alerts = () => { severity="warning" title="Title" action={ - } @@ -50,7 +50,7 @@ export const Alerts = () => { severity="error" title="Title" action={ - } @@ -105,7 +105,7 @@ export const Alerts = () => { }> + } @@ -132,7 +132,7 @@ export const Alerts = () => { }> + } diff --git a/storybook/src/admin/alert/AlertInSnackbar.stories.tsx b/storybook/src/admin/alert/AlertInSnackbar.stories.tsx index bdba47312e..8f22a609fb 100644 --- a/storybook/src/admin/alert/AlertInSnackbar.stories.tsx +++ b/storybook/src/admin/alert/AlertInSnackbar.stories.tsx @@ -1,5 +1,5 @@ -import { Alert } from "@comet/admin"; -import { Button, Snackbar } from "@mui/material"; +import { Alert, Button } from "@comet/admin"; +import { Snackbar } from "@mui/material"; import { useState } from "react"; export default { diff --git a/storybook/src/admin/form/CustomButtons.stories.tsx b/storybook/src/admin/form/CustomButtons.stories.tsx index 00b7971eb5..522bcb86ea 100644 --- a/storybook/src/admin/form/CustomButtons.stories.tsx +++ b/storybook/src/admin/form/CustomButtons.stories.tsx @@ -1,6 +1,6 @@ -import { Field, FinalForm, FinalFormInput } from "@comet/admin"; +import { Button, Field, FinalForm, FinalFormInput } from "@comet/admin"; import { Master } from "@comet/admin-icons"; -import { Box, Button, Card, CardContent } from "@mui/material"; +import { Box, Card, CardContent } from "@mui/material"; import { styled } from "@mui/material/styles"; import { useFormState } from "react-final-form"; @@ -25,7 +25,7 @@ const CustomButtons = () => { return ( } - variant="text" + variant="textDark" disabled={pristine || hasValidationErrors || submitting} onClick={handleCustomButtonClick} > diff --git a/storybook/src/admin/mui/DataGrid.stories.tsx b/storybook/src/admin/mui/DataGrid.stories.tsx index 5dd6dd9dc5..18ac7694d4 100644 --- a/storybook/src/admin/mui/DataGrid.stories.tsx +++ b/storybook/src/admin/mui/DataGrid.stories.tsx @@ -1,6 +1,6 @@ -import { DataGridToolbar, FillSpace, ToolbarActions, ToolbarTitleItem } from "@comet/admin"; +import { Button, DataGridToolbar, FillSpace, ToolbarActions, ToolbarTitleItem } from "@comet/admin"; import { Add } from "@comet/admin-icons"; -import { Box, Button } from "@mui/material"; +import { Box } from "@mui/material"; import { DataGrid } from "@mui/x-data-grid"; import { exampleColumns, exampleRows } from "../../helpers/ExampleDataGrid"; @@ -32,7 +32,7 @@ export const Default = { DataGrid example - diff --git a/storybook/src/admin/toolbar/DataGridToolbar.stories.tsx b/storybook/src/admin/toolbar/DataGridToolbar.stories.tsx index fa5471a4f2..9aea06f77e 100644 --- a/storybook/src/admin/toolbar/DataGridToolbar.stories.tsx +++ b/storybook/src/admin/toolbar/DataGridToolbar.stories.tsx @@ -1,6 +1,5 @@ -import { DataGridToolbar, FillSpace, GridColumnsButton, GridFilterButton, StackLink, ToolbarActions, ToolbarItem } from "@comet/admin"; +import { Button, DataGridToolbar, FillSpace, GridColumnsButton, GridFilterButton, StackLink, ToolbarActions, ToolbarItem } from "@comet/admin"; import { Add as AddIcon } from "@comet/admin-icons"; -import { Button } from "@mui/material"; import { DataGrid, GridToolbarQuickFilter } from "@mui/x-data-grid"; import { storyRouterDecorator } from "../../story-router.decorator"; @@ -42,14 +41,7 @@ export const _DataGridToolbar = { - diff --git a/storybook/src/docs/components/SplitButton/SplitButton.stories.tsx b/storybook/src/docs/components/SplitButton/SplitButton.stories.tsx index 68684cf025..9edad58baf 100644 --- a/storybook/src/docs/components/SplitButton/SplitButton.stories.tsx +++ b/storybook/src/docs/components/SplitButton/SplitButton.stories.tsx @@ -1,6 +1,6 @@ -import { SplitButton } from "@comet/admin"; +import { Button, SplitButton } from "@comet/admin"; import { Home } from "@comet/admin-icons"; -import { Button, Typography } from "@mui/material"; +import { Typography } from "@mui/material"; import { useState } from "react"; export default { @@ -210,7 +210,7 @@ export const VariantChange = { return ( +
@@ -272,9 +270,7 @@ export const CustomComponent = { Home
- + diff --git a/storybook/src/docs/form/Layout.stories.tsx b/storybook/src/docs/form/Layout.stories.tsx index e9d3409d3d..a12a1f5344 100644 --- a/storybook/src/docs/form/Layout.stories.tsx +++ b/storybook/src/docs/form/Layout.stories.tsx @@ -1,4 +1,5 @@ import { + Button, CancelButton, Field, FieldContainer, @@ -10,19 +11,7 @@ import { OkayButton, } from "@comet/admin"; import { createCometTheme } from "@comet/admin-theme"; -import { - Button, - Dialog, - DialogActions, - DialogContent, - DialogTitle, - FormControlLabel, - Grid, - MenuItem, - Paper, - ThemeProvider, - Typography, -} from "@mui/material"; +import { Dialog, DialogActions, DialogContent, DialogTitle, FormControlLabel, Grid, MenuItem, Paper, ThemeProvider, Typography } from "@mui/material"; import { styled, StyledEngineProvider } from "@mui/material/styles"; import { useState } from "react"; import { Form } from "react-final-form"; @@ -179,7 +168,7 @@ export const FieldsInDialog = {
-