From d07fbe8054a1158f26f2bd64ee10fadb60641763 Mon Sep 17 00:00:00 2001
From: Alexandre Bodin <bodin.alex@gmail.com>
Date: Fri, 17 May 2019 18:24:15 +0200
Subject: [PATCH] Fix missing history in saga

---
 .../admin/src/containers/App/saga.js                          | 4 ++--
 .../admin/src/containers/ModelPage/index.js                   | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/App/saga.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/App/saga.js
index f161adcfeb..af2e27279b 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/containers/App/saga.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/App/saga.js
@@ -71,7 +71,7 @@ export function* submitCT({
   oldContentTypeName,
   body,
   source,
-  context: { emitEvent, plugins, router, updatePlugin },
+  context: { emitEvent, plugins, history, updatePlugin },
 }) {
   try {
     const requestURL = `/${pluginId}/models/${oldContentTypeName}`;
@@ -88,7 +88,7 @@ export function* submitCT({
     yield call(request, requestURL, opts, true);
     emitEvent('didSaveContentType');
     yield put(submitContentTypeSucceeded());
-    router.history.push(`/plugins/${pluginId}/models/${name}`);
+    history.push(`/plugins/${pluginId}/models/${name}`);
 
     if (name !== oldContentTypeName) {
       emitEvent('didEditNameOfContentType');
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/ModelPage/index.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/ModelPage/index.js
index 5b0678ca1d..6fe3e2e7c2 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/containers/ModelPage/index.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/ModelPage/index.js
@@ -207,7 +207,9 @@ export class ModelPage extends React.Component {
           submitContentType(
             this.getModelName(),
             get(modifiedData, this.getModelName()),
-            this.context,
+            Object.assign(this.context, {
+              history: this.props.history,
+            }),
             this.getSource(),
           );
         };