Update M-UI (#569)

* install new MUI v5 packages. * run preset-save coremod. npx @mui/codemod v5.0.0/preset-safe * tmp: try to add emotion. * fix build errors. * add variant=standard. That was the default in MUI v4. * use new date picker package. * remove old material-ui V4 packages. * fix side bar collapse. * fix sidebar selected color. * fix drag-n-drop refs. * Rubocop * More work on mui update * Start fixing color changes * Add missing files * Restyle some elements that change drastically * Add new move date button component * Customer Import Button background color fix * More consts * Changes * Lock devise-jwt version * Fix Gemfile and Gemfile.lock * More fixes * Some minor css fixes and a few mobx comments fixed Co-authored-by: dacin21 <[email protected]>
stiftungswo · Sep 12, 2022 · 205deef · 205deef
1 parent 46152ad
commit 205deef
Show file tree

Hide file tree

Showing 106 changed files with 1,552 additions and 1,116 deletions.
diff --git a/apir/Gemfile.lock b/apir/Gemfile.lock
@@ -320,7 +320,7 @@ GEM
       activesupport (>= 5.2.1)
       i18n
       polyamorous (= 2.3.2)
-    rb-fsevent (0.11.1)
+    rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     redcarpet (3.5.1)

diff --git a/apir/app/assets/fonts/LICENSE.txt b/apir/app/assets/fonts/LICENSE.txt
diff --git a/apir/app/assets/fonts/OFL.txt b/apir/app/assets/fonts/OFL.txt
@@ -1,94 +1,94 @@
-Copyright (c) 2010, ParaType Ltd. (http://www.paratype.com/public),
-with Reserved Font Names "PT Sans", "PT Serif" and "ParaType".
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
+Copyright (c) 2010, ParaType Ltd. (http://www.paratype.com/public),
+with Reserved Font Names "PT Sans", "PT Serif" and "ParaType".
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/frontend/.tool-versions b/frontend/.tool-versions
@@ -1 +1 @@
-nodejs 10.15.3
+nodejs 12.13.0
diff --git a/frontend/package.json b/frontend/package.json
@@ -6,9 +6,12 @@
     "@babel/polyfill": "^7.2.5",
     "@date-io/core": "^1.3.6",
     "@date-io/moment": "^1.0.1",
-    "@material-ui/core": "^4.12.1",
-    "@material-ui/icons": "^4.11.2",
-    "@material-ui/pickers": "^3.2.10",
+    "@emotion/react": "^11.10.0",
+    "@emotion/styled": "^11.10.0",
+    "@mui/icons-material": "^5.8.4",
+    "@mui/material": "^5.10.0",
+    "@mui/styles": "^5.9.3",
+    "@mui/x-date-pickers": "^5.0.0-beta.5",
     "@sentry/browser": "^4.3.0",
     "@typed/compose": "^1.0.0",
     "@types/classnames": "^2.2.6",

diff --git a/frontend/prod.Dockerfile b/frontend/prod.Dockerfile
@@ -1,4 +1,4 @@
-FROM node:10.15.3-alpine as building-stage
+FROM node:12.13.0-alpine as building-stage
 
 WORKDIR 'frontend'
 

diff --git a/frontend/src/form/dialog/CitySelectDialog.tsx b/frontend/src/form/dialog/CitySelectDialog.tsx
@@ -1,30 +1,21 @@
-import Button from '@material-ui/core/Button';
-import Checkbox from '@material-ui/core/Checkbox';
-import Dialog from '@material-ui/core/Dialog';
-import DialogActions from '@material-ui/core/DialogActions';
-import DialogContent from '@material-ui/core/DialogContent';
-import DialogTitle from '@material-ui/core/DialogTitle';
-import FormControlLabel from '@material-ui/core/FormControlLabel';
-import List from '@material-ui/core/List';
-import ListItem from '@material-ui/core/ListItem';
-import ListItemText from '@material-ui/core/ListItemText';
-import Paper from '@material-ui/core/Paper';
-import { withStyles, WithStyles } from '@material-ui/core/styles';
+import Checkbox from '@mui/material/Checkbox';
+import Dialog from '@mui/material/Dialog';
+import DialogContent from '@mui/material/DialogContent';
+import DialogTitle from '@mui/material/DialogTitle';
+import FormControlLabel from '@mui/material/FormControlLabel';
+import List from '@mui/material/List';
+import ListItem from '@mui/material/ListItem';
+import ListItemText from '@mui/material/ListItemText';
 import { inject, observer } from 'mobx-react';
 import * as React from 'react';
 import { FormattedMessage, injectIntl, IntlShape } from 'react-intl';
-import { DimePaper } from '../../layout/DimePaper';
 import { FormHeader } from '../../layout/FormHeader';
 import UnstyledBackendLink from '../../layout/UnstyledBackendLink';
-import { AbstractStore } from '../../stores/abstractStore';
 import { LocationStore } from '../../stores/locationStore';
 import { MainStore } from '../../stores/mainStore';
-import { ServiceStore } from '../../stores/serviceStore';
 import { Location, PositionGroupings, Service } from '../../types';
 import compose from '../../utilities/compose';
-import { defaultPositionGroup } from '../../utilities/helpers';
 import { wrapIntl } from '../../utilities/wrapIntl';
-import { PositionGroupSelect } from '../entitySelect/PositionGroupSelect';
 
 interface Props {
   open: boolean;

diff --git a/frontend/src/form/dialog/FormDialog.tsx b/frontend/src/form/dialog/FormDialog.tsx
@@ -1,15 +1,13 @@
-import {DialogTitle} from '@material-ui/core';
-import Button from '@material-ui/core/Button';
-import Dialog from '@material-ui/core/Dialog';
-import DialogActions from '@material-ui/core/DialogActions';
-import DialogContent from '@material-ui/core/DialogContent';
-import { useTheme } from '@material-ui/core/styles';
-import useMediaQuery from '@material-ui/core/useMediaQuery';
-import { Formik, FormikBag, FormikConfig, FormikProps } from 'formik';
+import {DialogTitle} from '@mui/material';
+import Dialog from '@mui/material/Dialog';
+import DialogActions from '@mui/material/DialogActions';
+import DialogContent from '@mui/material/DialogContent';
+import { Formik, FormikConfig, FormikProps } from 'formik';
 import * as React from 'react';
 import { FormattedMessage, injectIntl, IntlShape } from 'react-intl';
 import { Prompt } from 'react-router';
 import { Schema } from 'yup';
+import BlackButton from '../../layout/BlackButton';
 import { LoadingSpinner } from '../../layout/LoadingSpinner';
 import { HandleFormikSubmit } from '../../types';
 import compose from '../../utilities/compose';
@@ -73,12 +71,12 @@ export class FormDialog<Values = object, ExtraProps = {}> extends React.Componen
               <DialogTitle>{this.props.title}</DialogTitle>
               <DialogContent style={{minWidth: '300px'}}>{render(formikProps)}</DialogContent>
               <DialogActions>
-                <Button onClick={this.handleClose(formikProps, intlText('confirm_close'))}>
+                <BlackButton onClick={this.handleClose(formikProps, intlText('confirm_close'))}>
                   <FormattedMessage id="general.action.cancel" />
-                </Button>
-                <Button onClick={formikProps.submitForm} disabled={formikProps.isSubmitting}>
+                </BlackButton>
+                <BlackButton onClick={formikProps.submitForm} disabled={formikProps.isSubmitting}>
                   {this.props.confirmText || intlText('general.action.save', true)}
-                </Button>
+                </BlackButton>
               </DialogActions>
             </Dialog>
           </FormikSubmitDetector>

diff --git a/frontend/src/form/dialog/PositionGroupRenameDialog.tsx b/frontend/src/form/dialog/PositionGroupRenameDialog.tsx
@@ -1,9 +1,4 @@
-import Box from '@material-ui/core/Box';
-import Button from '@material-ui/core/Button';
-import Dialog from '@material-ui/core/Dialog';
-import DialogActions from '@material-ui/core/DialogActions';
-import DialogContent from '@material-ui/core/DialogContent';
-import DialogTitle from '@material-ui/core/DialogTitle';
+import Box from '@mui/material/Box';
 import { FormikProps } from 'formik';
 import { inject, observer } from 'mobx-react';
 import * as React from 'react';

diff --git a/frontend/src/form/dialog/PositionGroupSortDialog.tsx b/frontend/src/form/dialog/PositionGroupSortDialog.tsx
@@ -1,14 +1,13 @@
-import Button from '@material-ui/core/Button';
-import Dialog from '@material-ui/core/Dialog';
-import DialogActions from '@material-ui/core/DialogActions';
-import DialogContent from '@material-ui/core/DialogContent';
-import DialogTitle from '@material-ui/core/DialogTitle';
+import Dialog from '@mui/material/Dialog';
+import DialogActions from '@mui/material/DialogActions';
+import DialogContent from '@mui/material/DialogContent';
+import DialogTitle from '@mui/material/DialogTitle';
 import { inject, observer } from 'mobx-react';
 import * as React from 'react';
 import { FormattedMessage, injectIntl, IntlShape } from 'react-intl';
-import { AbstractStore } from '../../stores/abstractStore';
+import BlackButton from '../../layout/BlackButton';
 import { ServiceStore } from '../../stores/serviceStore';
-import { PositionGroupings, Service } from '../../types';
+import { PositionGroupings } from '../../types';
 import compose from '../../utilities/compose';
 import { defaultPositionGroup } from '../../utilities/helpers';
 import { wrapIntl } from '../../utilities/wrapIntl';
@@ -70,9 +69,9 @@ export class PositionGroupSortDialog extends React.Component<Props> {
           )}
         </DialogContent>
         <DialogActions>
-          <Button onClick={this.handleSubmit}>
+          <BlackButton onClick={this.handleSubmit}>
             <FormattedMessage id="form.dialog.position_group_sort.confirm" />
-          </Button>
+          </BlackButton>
         </DialogActions>
       </Dialog>
     );

diff --git a/frontend/src/form/dialog/PositionGroupsReorderDialog.tsx b/frontend/src/form/dialog/PositionGroupsReorderDialog.tsx
@@ -1,32 +1,22 @@
-import Box from '@material-ui/core/Box';
-import Button from '@material-ui/core/Button';
-import Dialog from '@material-ui/core/Dialog';
-import DialogActions from '@material-ui/core/DialogActions';
-import DialogContent from '@material-ui/core/DialogContent';
-import DialogTitle from '@material-ui/core/DialogTitle';
-import Table from '@material-ui/core/Table';
-import TableBody from '@material-ui/core/TableBody';
-import TableHead from '@material-ui/core/TableHead';
-import TableRow from '@material-ui/core/TableRow';
-import { ArrayHelpers, FieldArray, FieldArrayRenderProps, FormikProps } from 'formik';
+import Table from '@mui/material/Table';
+import TableHead from '@mui/material/TableHead';
+import TableRow from '@mui/material/TableRow';
+import { FieldArray, FieldArrayRenderProps, FormikProps } from 'formik';
 import { inject, observer } from 'mobx-react';
 import * as React from 'react';
 import { FormattedMessage, injectIntl, IntlShape } from 'react-intl';
 import * as yup from 'yup';
 import { DimeTableCell } from '../../layout/DimeTableCell';
 import { DragHandle } from '../../layout/icons';
 import { PositionGroupStore } from '../../stores/positionGroupStore';
-import { PositionGroup, PositionGroupings, Service } from '../../types';
+import { PositionGroup } from '../../types';
 import compose from '../../utilities/compose';
-import { defaultPositionGroup } from '../../utilities/helpers';
 import { localizeSchema } from '../../utilities/validation';
 import { wrapIntl } from '../../utilities/wrapIntl';
 import { DraggableTableBody } from '../../views/invoices/DraggableTableBody';
-import { PositionGroupSelect } from '../entitySelect/PositionGroupSelect';
 import { TextField } from '../fields/common';
 import { DimeField } from '../fields/formik';
 import { FormDialog } from './FormDialog';
-import { resolveNewGroupName } from './PositionMoveDialog';
 
 const schema = localizeSchema(() =>
   yup.object({