Add object (and entity name alias) to create/update action result, update...

Add object (and entity name alias) to create/update action result, update EntityForm with modal version

frontend/src/metabase/entities/collections.js

@@ -18,6 +18,9 @@ const Collections = createEntity({
   path: "/api/collection",
   schema: CollectionSchema,
 
+  displayNameOne: t`collection`,
+  displayNameMany: t`collections`,
+
   objectActions: {
     setArchived: ({ id }, archived, opts) =>
       Collections.actions.update(

frontend/src/metabase/entities/containers/EntityForm.jsx

 /* @flow */
 
 import React from "react";
+import { t } from "c-3po";
 
 import Form from "metabase/containers/Form";
+import ModalContent from "metabase/components/ModalContent";
+
 import entityType from "./EntityType";
 
 @entityType()
@@ -10,22 +13,42 @@ export default class EntityForm extends React.Component {
   render() {
     const {
       entityDef,
-      entityObject,
+      object = this.props[entityDef.nameOne],
       update,
       create,
+      onClose,
       onSaved,
+      modal,
+      title,
       ...props
     } = this.props;
-    return (
+    const form = (
       <Form
         {...props}
         form={entityDef.form}
-        initialValues={entityObject}
-        onSubmit={values =>
-          values.id != null ? update(values) : create(values)
+        initialValues={object}
+        onSubmit={object =>
+          object.id != null ? update(object) : create(object)
         }
-        onSubmitSuccess={action => onSaved && onSaved(action.payload)}
+        onSubmitSuccess={action => onSaved && onSaved(action.payload.object)}
       />
     );
+    if (modal) {
+      return (
+        <ModalContent
+          title={
+            title ||
+            (object && object.id != null
+              ? entityDef.objectSelectors.getName(object)
+              : t`New ${entityDef.displayNameOne}`)
+          }
+          onClose={onClose}
+        >
+          {form}
+        </ModalContent>
+      );
+    } else {
+      return form;
+    }
   }
 }

frontend/src/metabase/entities/containers/index.js

@@ -41,4 +41,10 @@ export function addEntityContainers(entity) {
     <EntityForm entityType={entity.name} entityObject={user} {...props} />
   );
   entity.Form.displayName = `${ObjectName}Form`;
+
+  // Entity.ModalForm component
+  entity.ModalForm = ({ user, ...props }) => (
+    <EntityForm modal entityType={entity.name} entityObject={user} {...props} />
+  );
+  entity.ModalForm.displayName = `${ObjectName}ModalForm`;
 }

frontend/src/metabase/entities/dashboards.js

@@ -26,6 +26,9 @@ const Dashboards = createEntity({
   name: "dashboards",
   path: "/api/dashboard",
 
+  displayNameOne: t`dashboard`,
+  displayNameMany: t`dashboards`,
+
   api: {
     favorite: POST("/api/dashboard/:id/favorite"),
     unfavorite: DELETE("/api/dashboard/:id/favorite"),

frontend/src/metabase/entities/users.js

@@ -45,13 +45,19 @@ const Users = createEntity({
       pre: user => {
         let newUser = user;
         if (!MetabaseSettings.isEmailConfigured()) {
-          newUser.password = MetabaseUtils.generatePassword();
+          newUser = {
+            ...newUser,
+            password: MetabaseUtils.generatePassword()
+          }
         }
         return newUser;
       },
-      post: ({ result }, user) => {
-        return { ...user, id: result };
-      },
+      post: (result, user) => ({
+        // HACK: include user ID and password for temporaryPasswords reducer
+        id: result.result,
+        password: user.password,
+        ...result,
+      })
     },
     update: {
       post: (result, user, dispatch) => {

frontend/src/metabase/lib/entities.js

@@ -46,6 +46,9 @@ type EntityDefinition = {
   nameOne?: string,
   nameMany?: string,
 
+  displayNameOne?: string,
+  displayNameMany?: string,
+
   schema?: schema.Entity,
   path?: string,
   api?: { [method: string]: APIMethod },
@@ -93,6 +96,9 @@ export type Entity = {
   nameOne: string,
   nameMany: string,
 
+  displayNameOne: string,
+  displayNameMany: string,
+
   path?: string,
   api: {
     list: APIMethod,
@@ -174,6 +180,13 @@ export function createEntity(def: EntityDefinition): Entity {
     entity.nameMany = entity.name;
   }
 
+  if (!entity.displayNameOne) {
+    entity.displayNameOne = entity.nameOne;
+  }
+  if (!entity.displayNameMany) {
+    entity.displayNameMany = entity.nameMany;
+  }
+
   // defaults
   if (!entity.schema) {
     entity.schema = new schema.Entity(entity.name);
@@ -254,15 +267,21 @@ export function createEntity(def: EntityDefinition): Entity {
         );
         try {
           dispatch(setRequestState({ statePath, state: "LOADING" }));
-          const result = normalize(
-            await entity.api.create(getWritableProperties(entityObject)),
-            entity.schema,
+          const object = await entity.api.create(
+            getWritableProperties(entityObject),
           );
+          const result = normalize(object, entity.schema);
           dispatch(setRequestState({ statePath, state: "LOADED" }));
           return runActionDecorator(
             "create",
             "post",
-            result,
+            {
+              // include raw object (and alias under nameOne) for convienence
+              object,
+              [entity.nameOne]: object,
+              // include normalizr properties "entities" and "result"
+              ...result,
+            },
             entityObject,
             dispatch,
             getState,
@@ -324,10 +343,10 @@ export function createEntity(def: EntityDefinition): Entity {
         const statePath = [...getObjectStatePath(entityObject.id), "update"];
         try {
           dispatch(setRequestState({ statePath, state: "LOADING" }));
-          const result = normalize(
-            await entity.api.update(getWritableProperties(entityObject)),
-            entity.schema,
+          const object = await entity.api.update(
+            getWritableProperties(entityObject),
           );
+          const result = normalize(object, entity.schema);
           dispatch(setRequestState({ statePath, state: "LOADED" }));
           if (notify) {
             if (notify.undo) {
@@ -357,7 +376,13 @@ export function createEntity(def: EntityDefinition): Entity {
           return runActionDecorator(
             "update",
             "post",
-            result,
+            {
+              // include raw object (and alias under nameOne) for convienence
+              object,
+              [entity.nameOne]: object,
+              // include normalizr properties "entities" and "result"
+              ...result,
+            },
             entityObject,
             dispatch,
             getState,