From c62d5810e3668a972c13f89684cbbeff22009405 Mon Sep 17 00:00:00 2001
From: soupette <cyril.lpz@gmail.com>
Date: Thu, 3 Sep 2020 12:09:11 +0200
Subject: [PATCH 1/2] Fixes #7699

Signed-off-by: soupette <cyril.lpz@gmail.com>
---
 .../AuthPage/components/Register/index.js     | 21 ++++++++++++-------
 .../admin/src/containers/AuthPage/index.js    |  3 ++-
 .../src/containers/AuthPage/utils/forms.js    |  1 +
 .../admin/src/components/CustomTable/index.js |  1 +
 .../EditViewDataManagerProvider/index.js      |  8 +++++++
 5 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/packages/strapi-admin/admin/src/containers/AuthPage/components/Register/index.js b/packages/strapi-admin/admin/src/containers/AuthPage/components/Register/index.js
index b39708b65c..09ae5e3415 100644
--- a/packages/strapi-admin/admin/src/containers/AuthPage/components/Register/index.js
+++ b/packages/strapi-admin/admin/src/containers/AuthPage/components/Register/index.js
@@ -20,6 +20,7 @@ const Register = ({
   formErrors,
   inputsPrefix,
   modifiedData,
+  noSignin,
   onChange,
   onSubmit,
   requestError,
@@ -135,15 +136,17 @@ const Register = ({
           </Box>
         </Padded>
       </Section>
-      <AuthLink label="Auth.link.signin" to="/auth/login">
-        <Text fontSize="md">
-          {formatMessage({ id: 'Auth.link.signin.account' })}
-          &nbsp;
-          <Text fontSize="md" color="#0097f7" as="span">
-            {formatMessage({ id: 'Auth.link.signin' })}
+      {!noSignin && (
+        <AuthLink label="Auth.link.signin" to="/auth/login">
+          <Text fontSize="md">
+            {formatMessage({ id: 'Auth.link.signin.account' })}
+            &nbsp;
+            <Text fontSize="md" color="#0097f7" as="span">
+              {formatMessage({ id: 'Auth.link.signin' })}
+            </Text>
           </Text>
-        </Text>
-      </AuthLink>
+        </AuthLink>
+      )}
     </>
   );
 };
@@ -151,6 +154,7 @@ const Register = ({
 Register.defaultProps = {
   fieldsToDisable: [],
   inputsPrefix: '',
+  noSignin: false,
   onSubmit: e => e.preventDefault(),
   requestError: null,
 };
@@ -160,6 +164,7 @@ Register.propTypes = {
   formErrors: PropTypes.object.isRequired,
   inputsPrefix: PropTypes.string,
   modifiedData: PropTypes.object.isRequired,
+  noSignin: PropTypes.bool,
   onChange: PropTypes.func.isRequired,
   onSubmit: PropTypes.func,
   requestError: PropTypes.object,
diff --git a/packages/strapi-admin/admin/src/containers/AuthPage/index.js b/packages/strapi-admin/admin/src/containers/AuthPage/index.js
index 27f8b52699..7320bd6f45 100644
--- a/packages/strapi-admin/admin/src/containers/AuthPage/index.js
+++ b/packages/strapi-admin/admin/src/containers/AuthPage/index.js
@@ -22,7 +22,7 @@ const AuthPage = ({ hasAdmin }) => {
   } = useRouteMatch('/auth/:authType');
   const query = useQuery();
   const registrationToken = query.get('registrationToken');
-  const { Component, endPoint, fieldsToDisable, fieldsToOmit, inputsPrefix, schema } = get(
+  const { Component, endPoint, fieldsToDisable, fieldsToOmit, inputsPrefix, schema, ...rest } = get(
     forms,
     authType,
     {}
@@ -285,6 +285,7 @@ const AuthPage = ({ hasAdmin }) => {
         </NavTopRightWrapper>
         <BaselineAlignment top size="78px">
           <Component
+            {...rest}
             fieldsToDisable={fieldsToDisable}
             formErrors={formErrors}
             inputsPrefix={inputsPrefix}
diff --git a/packages/strapi-admin/admin/src/containers/AuthPage/utils/forms.js b/packages/strapi-admin/admin/src/containers/AuthPage/utils/forms.js
index 256cc70e93..76ae8e31b7 100644
--- a/packages/strapi-admin/admin/src/containers/AuthPage/utils/forms.js
+++ b/packages/strapi-admin/admin/src/containers/AuthPage/utils/forms.js
@@ -80,6 +80,7 @@ const forms = {
   'register-admin': {
     Component: Register,
     endPoint: 'register-admin',
+    noSignin: true,
     fieldsToDisable: [],
     fieldsToOmit: ['confirmPassword', 'news'],
     schema: yup.object().shape({
diff --git a/packages/strapi-plugin-content-manager/admin/src/components/CustomTable/index.js b/packages/strapi-plugin-content-manager/admin/src/components/CustomTable/index.js
index 957d6f8c0f..804904fe83 100644
--- a/packages/strapi-plugin-content-manager/admin/src/components/CustomTable/index.js
+++ b/packages/strapi-plugin-content-manager/admin/src/components/CustomTable/index.js
@@ -21,6 +21,7 @@ const CustomTable = ({ canUpdate, canDelete, data, headers, isBulkable, showLoad
     emitEvent('willEditEntryFromList');
     push({
       pathname: `${pathname}/${id}`,
+      state: { from: pathname },
     });
   };
 
diff --git a/packages/strapi-plugin-content-manager/admin/src/containers/EditViewDataManagerProvider/index.js b/packages/strapi-plugin-content-manager/admin/src/containers/EditViewDataManagerProvider/index.js
index a8b4ee946b..f5b89c6a6b 100644
--- a/packages/strapi-plugin-content-manager/admin/src/containers/EditViewDataManagerProvider/index.js
+++ b/packages/strapi-plugin-content-manager/admin/src/containers/EditViewDataManagerProvider/index.js
@@ -183,6 +183,14 @@ const EditViewDataManagerProvider = ({
         console.log(err);
         const status = get(err, 'response.status', null);
 
+        // The record does not exists
+        // Redirect the user to the previous page
+        if (id && status === 404) {
+          push(from);
+
+          return;
+        }
+
         if (id && status === 403) {
           strapi.notification.info(getTrad('permissions.not-allowed.update'));
 

From 84ac0f7c07b0b5ebb35aaa59b362030453a4b966 Mon Sep 17 00:00:00 2001
From: soupette <cyril.lpz@gmail.com>
Date: Thu, 3 Sep 2020 14:23:09 +0200
Subject: [PATCH 2/2] Fix wrong prop

Signed-off-by: soupette <cyril.lpz@gmail.com>
---
 .../src/containers/HomePage/HomePageContent/HomePageSettings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/strapi-plugin-upload/admin/src/containers/HomePage/HomePageContent/HomePageSettings.js b/packages/strapi-plugin-upload/admin/src/containers/HomePage/HomePageContent/HomePageSettings.js
index 9fbe486c31..c42e1f5073 100644
--- a/packages/strapi-plugin-upload/admin/src/containers/HomePage/HomePageContent/HomePageSettings.js
+++ b/packages/strapi-plugin-upload/admin/src/containers/HomePage/HomePageContent/HomePageSettings.js
@@ -53,7 +53,7 @@ const HomePageSettings = ({
         placeholder={formatMessage({ id: getTrad('search.placeholder') })}
         name="_q"
         value={searchValue}
-        autoFocus="true"
+        autoFocus
       />
       {isLoading ? (
         <>