From 32dbeb3467a20e8773e0122c587ac88f9507c5e3 Mon Sep 17 00:00:00 2001
From: soupette <cyril.lpz@gmail.com>
Date: Wed, 12 Jun 2019 11:17:39 +0200
Subject: [PATCH] Fixes #3224

---
 .../admin/src/containers/App/saga.js          | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 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 af2e27279b..847ac38f70 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
@@ -41,12 +41,12 @@ export function* deleteModel({
       request,
       requestURL,
       { method: 'DELETE' },
-      true,
+      true
     );
 
     if (response.ok === true) {
       strapi.notification.success(
-        `${pluginId}.notification.success.contentTypeDeleted`,
+        `${pluginId}.notification.success.contentTypeDeleted`
       );
       yield put(deleteModelSucceeded(modelName));
 
@@ -54,10 +54,10 @@ export function* deleteModel({
       const appMenu = get(
         appPlugins,
         ['content-manager', 'leftMenuSections'],
-        [{ links: [] }],
+        [{ links: [] }]
       );
       const updatedMenu = appMenu[0].links.filter(
-        el => el.destination !== modelName,
+        el => el.destination !== modelName
       );
       appMenu[0].links = sortBy(updatedMenu, 'label');
       updatePlugin('content-manager', 'leftMenuSections', appMenu);
@@ -88,7 +88,8 @@ export function* submitCT({
     yield call(request, requestURL, opts, true);
     emitEvent('didSaveContentType');
     yield put(submitContentTypeSucceeded());
-    history.push(`/plugins/${pluginId}/models/${name}`);
+    const suffixUrl = source ? `&source=${source}` : '';
+    history.push(`/plugins/${pluginId}/models/${name}${suffixUrl}`);
 
     if (name !== oldContentTypeName) {
       emitEvent('didEditNameOfContentType');
@@ -97,10 +98,10 @@ export function* submitCT({
       const appMenu = get(
         appPlugins,
         ['content-manager', 'leftMenuSections'],
-        [],
+        []
       );
       const oldContentTypeNameIndex = appMenu[0].links.findIndex(
-        el => el.destination === oldContentTypeName,
+        el => el.destination === oldContentTypeName
       );
       const updatedLink = {
         destination: name.toLowerCase(),
@@ -114,7 +115,7 @@ export function* submitCT({
     const errorMessage = get(
       error,
       ['response', 'payload', 'message', '0', 'messages', '0', 'id'],
-      'notification.error',
+      'notification.error'
     );
     strapi.notification.error(errorMessage);
   }
@@ -141,7 +142,7 @@ export function* submitTempCT({
     const appMenu = get(
       appPlugins,
       ['content-manager', 'leftMenuSections'],
-      [],
+      []
     );
     const newLink = {
       destination: name.toLowerCase(),
@@ -155,7 +156,7 @@ export function* submitTempCT({
     const errorMessage = get(
       error,
       ['response', 'payload', 'message', '0', 'messages', '0', 'id'],
-      'notification.error',
+      'notification.error'
     );
     strapi.notification.error(errorMessage);
   }