Merge branch 'collections-project-bulk-actions' into dnd-actions

.flowconfig

@@ -9,6 +9,7 @@
 .*/node_modules/resize-observer-polyfill/.*
 .*/node_modules/react-virtualized/.*
 .*/node_modules/styled-components/.*
+.*/node_modules/grid-styled/.*
 .*/node_modules/update-notifier/.*
 .*/node_modules/boxen/.*
 .*/node_modules/libnpx/.*

flow-typed/styled-components.js

@@ -0,0 +1,5 @@
+/* For some reason this is needed to suppress flow errros */
+
+declare module 'styled-components' {
+  declare module.exports: any
+}

frontend/src/metabase/admin/people/components/EditUserForm.jsx

@@ -127,7 +127,7 @@ export default class EditUserForm extends Component {
 
     return (
       <form onSubmit={this.formSubmitted.bind(this)} noValidate>
-        <div className="px4 pb2">
+        <div>
           <FormField fieldName="first_name" formError={formError}>
             <FormLabel
               title={t`First name`}
@@ -238,7 +238,7 @@ export default class EditUserForm extends Component {
           ) : null}
         </div>
 
-        <ModalFooter className="flex align-center">
+        <ModalFooter className="flex align-center p0">
           {formError &&
             formError.data &&
             formError.data.message && (

frontend/src/metabase/admin/people/containers/PeopleListingApp.jsx

@@ -207,8 +207,6 @@ export default class PeopleListingApp extends Component {
 
     return (
       <Modal
-        full
-        form
         title={t`Edit ${user.first_name}'s details`}
         onClose={this.onCloseModal}
       >
@@ -222,17 +220,17 @@ export default class PeopleListingApp extends Component {
 
     return (
       <Modal
-        small
         title={t`${user.first_name} has been added`}
         footer={[
           <Button
             onClick={() => this.props.showModal({ type: MODAL_ADD_PERSON })}
           >{t`Add another person`}</Button>,
           <Button primary onClick={this.onCloseModal}>{t`Done`}</Button>,
         ]}
+        formModal
         onClose={this.onCloseModal}
       >
-        <div className="px4 pb4">
+        <div>
           <div className="pb4">{jt`We couldn’t send them an email invitation,
                     so make sure to tell them to log in using ${(
                       <span className="text-bold">{user.email}</span>
@@ -269,12 +267,11 @@ export default class PeopleListingApp extends Component {
         ]}
         onClose={this.onCloseModal}
       >
-        <div
-          style={{ paddingLeft: "5em", paddingRight: "5em" }}
-          className="pb4"
-        >{jt`We’ve sent an invite to ${(
-          <span className="text-bold">{user.email}</span>
-        )} with instructions to set their password.`}</div>
+        <div className="pb4">
+          {jt`We’ve sent an invite to ${(
+            <span className="text-bold">{user.email}</span>
+          )} with instructions to set their password.`}
+        </div>
       </Modal>
     );
   }
@@ -312,9 +309,7 @@ export default class PeopleListingApp extends Component {
         ]}
         onClose={this.onCloseModal}
       >
-        <div className="px4 pb4">
-          {t`${user.first_name} won't be able to log in anymore.`}
-        </div>
+        {t`${user.first_name} won't be able to log in anymore.`}
       </Modal>
     );
   }
@@ -335,9 +330,7 @@ export default class PeopleListingApp extends Component {
         ]}
         onClose={this.onCloseModal}
       >
-        <div className="px4 pb4">
-          {t`They'll be able to log in again, and they'll be placed back into the groups they were in before their account was deactivated.`}
-        </div>
+        {t`They'll be able to log in again, and they'll be placed back into the groups they were in before their account was deactivated.`}
       </Modal>
     );
   }
@@ -358,7 +351,7 @@ export default class PeopleListingApp extends Component {
         ]}
         onClose={this.onCloseModal}
       >
-        <div className="px4 pb4">{t`Are you sure you want to do this?`}</div>
+        {t`Are you sure you want to do this?`}
       </Modal>
     );
   }
@@ -372,17 +365,15 @@ export default class PeopleListingApp extends Component {
         title={t`${user.first_name}'s password has been reset`}
         footer={
           <button
-            className="Button Button--primary mr2"
+            className="Button Button--primary"
             onClick={this.onCloseModal}
           >{t`Done`}</button>
         }
         onClose={this.onCloseModal}
       >
-        <div className="px4 pb4">
-          <span className="pb3 block">{t`Here’s a temporary password they can use to log in and then change their password.`}</span>
+        <span className="pb3 block">{t`Here’s a temporary password they can use to log in and then change their password.`}</span>
 
-          <PasswordReveal password={password} />
-        </div>
+        <PasswordReveal password={password} />
       </Modal>
     );
   }
@@ -397,7 +388,7 @@ export default class PeopleListingApp extends Component {
         footer={<Button primary onClick={this.onCloseModal}>{t`Done`}</Button>}
         onClose={this.onCloseModal}
       >
-        <div className="px4 pb4">{t`We've sent them an email with instructions for creating a new password.`}</div>
+        {t`We've sent them an email with instructions for creating a new password.`}
       </Modal>
     );
   }

frontend/src/metabase/admin/permissions/components/FixedHeaderGrid.jsx

@@ -15,11 +15,11 @@ const FixedHeaderGrid = ({
   renderCell,
   columnWidth,
   rowHeight,
-  renderColumnHeader,
   columnHeaderHeight,
   rowHeaderWidth,
-  renderRowHeader,
-  renderCorner,
+  renderColumnHeader = () => null,
+  renderRowHeader = () => null,
+  renderCorner = () => null,
   width,
   height,
   paddingBottom = 0,