From 951a0efd930a186c4b0e258d5dd8759ece217f73 Mon Sep 17 00:00:00 2001
From: soupette <cyril@strapi.io>
Date: Wed, 27 Oct 2021 12:58:01 +0200
Subject: [PATCH 1/2] Fix input uid

Signed-off-by: soupette <cyril@strapi.io>
---
 .../admin/src/content-manager/components/InputUID/index.js  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/core/admin/admin/src/content-manager/components/InputUID/index.js b/packages/core/admin/admin/src/content-manager/components/InputUID/index.js
index 4644a02c02..bbfea8bcd5 100644
--- a/packages/core/admin/admin/src/content-manager/components/InputUID/index.js
+++ b/packages/core/admin/admin/src/content-manager/components/InputUID/index.js
@@ -123,7 +123,8 @@ const InputUID = ({
     if (
       debouncedValue &&
       debouncedValue.trim().match(UID_REGEX) &&
-      debouncedValue !== initialValue
+      debouncedValue !== initialValue &&
+      !value
     ) {
       checkAvailability();
     }
@@ -154,7 +155,8 @@ const InputUID = ({
       !isCustomized &&
       isCreation &&
       debouncedTargetFieldValue &&
-      modifiedData[attribute.targetField]
+      modifiedData[attribute.targetField] &&
+      !value
     ) {
       generateUid.current(true);
     }

From 8f3398a7804feabfc2991564559c5083ac8c19f3 Mon Sep 17 00:00:00 2001
From: soupette <cyril@strapi.io>
Date: Wed, 27 Oct 2021 13:05:15 +0200
Subject: [PATCH 2/2] Fix snapshots

Signed-off-by: soupette <cyril@strapi.io>
---
 .../components/InputUID/tests/index.test.js   | 49 +++++--------------
 1 file changed, 13 insertions(+), 36 deletions(-)

diff --git a/packages/core/admin/admin/src/content-manager/components/InputUID/tests/index.test.js b/packages/core/admin/admin/src/content-manager/components/InputUID/tests/index.test.js
index 2874a68c52..36fa132f49 100644
--- a/packages/core/admin/admin/src/content-manager/components/InputUID/tests/index.test.js
+++ b/packages/core/admin/admin/src/content-manager/components/InputUID/tests/index.test.js
@@ -63,20 +63,6 @@ describe('<InputUID />', () => {
         align-items: center;
       }
 
-      .c10 {
-        display: -webkit-box;
-        display: -webkit-flex;
-        display: -ms-flexbox;
-        display: flex;
-        -webkit-flex-direction: row;
-        -ms-flex-direction: row;
-        flex-direction: row;
-        -webkit-align-items: center;
-        -webkit-box-align: center;
-        -ms-flex-align: center;
-        align-items: center;
-      }
-
       .c2 {
         font-weight: 500;
         font-size: 0.75rem;
@@ -217,11 +203,6 @@ describe('<InputUID />', () => {
         fill: #4945ff;
       }
 
-      .c11 {
-        -webkit-animation: gzYjWD 2s infinite linear;
-        animation: gzYjWD 2s infinite linear;
-      }
-
       <div>
         <div>
           <div
@@ -260,24 +241,20 @@ describe('<InputUID />', () => {
                     class="c8 c9"
                     type="button"
                   >
-                    <div
-                      class="c10 c11"
+                    <svg
+                      fill="none"
+                      height="1em"
+                      viewBox="0 0 24 24"
+                      width="1em"
+                      xmlns="http://www.w3.org/2000/svg"
                     >
-                      <svg
-                        fill="none"
-                        height="1em"
-                        viewBox="0 0 24 24"
-                        width="1em"
-                        xmlns="http://www.w3.org/2000/svg"
-                      >
-                        <path
-                          clip-rule="evenodd"
-                          d="M12.057 18c.552 0 1 .451 1 .997v4.006a1 1 0 01-.941.995l-.059.002c-.552 0-1-.451-1-.997v-4.006a1 1 0 01.941-.995l.06-.002zm-3.06-.736l.055.03c.478.276.64.89.367 1.364l-2.002 3.468a1 1 0 01-1.31.394l-.055-.03a1.002 1.002 0 01-.368-1.363l2.003-3.469a1 1 0 011.31-.394zm7.42.394l2.002 3.468a1 1 0 01-.314 1.331l-.053.033a1.002 1.002 0 01-1.365-.363l-2.003-3.469a1 1 0 01.314-1.33l.054-.034a1.002 1.002 0 011.364.364zm-9.548-2.66l.033.054c.276.478.11 1.091-.364 1.364L3.07 18.42a1 1 0 01-1.331-.314l-.033-.053a1.001 1.001 0 01.364-1.365l3.468-2.003a1 1 0 011.33.314zm11.79-.313l3.468 2.002a1 1 0 01.393 1.31l-.03.055c-.276.478-.89.64-1.363.367l-3.469-2.003a1 1 0 01-.394-1.309l.03-.055c.276-.479.89-.64 1.364-.367zm4.344-3.628a1 1 0 01.995.941l.002.06c0 .551-.451 1-.997 1h-4.006a1 1 0 01-.995-.942L18 12.057c0-.552.451-1 .997-1h4.006zm-18 0a1 1 0 01.995.941l.002.06c0 .551-.451 1-.998 1H.998a1 1 0 01-.996-.942L0 12.057c0-.552.451-1 .998-1h4.004zm17.454-5.059l.033.054c.277.478.11 1.091-.363 1.365l-3.469 2.002a1 1 0 01-1.33-.314l-.034-.053a1.002 1.002 0 01.364-1.365l3.468-2.003a1 1 0 011.331.314zM3.07 5.684l3.468 2.003a1 1 0 01.394 1.31l-.03.055c-.276.478-.89.64-1.364.367L2.07 7.417a1 1 0 01-.394-1.31l.03-.055c.276-.479.89-.64 1.364-.368zm14.926-4.008l.056.03c.478.276.64.89.367 1.364l-2.003 3.468a1 1 0 01-1.309.394l-.055-.03a1.002 1.002 0 01-.367-1.364l2.002-3.468a1 1 0 011.31-.394zm-10.58.394L9.42 5.538a1 1 0 01-.314 1.33l-.053.034a1.002 1.002 0 01-1.365-.364L5.684 3.07a1 1 0 01.314-1.331l.054-.033a1.002 1.002 0 011.365.364zM12.058 0c.552 0 1 .451 1 .998v4.004a1 1 0 01-.941.996L12.057 6c-.552 0-1-.451-1-.998V.998a1 1 0 01.941-.996l.06-.002z"
-                          fill="#212134"
-                          fill-rule="evenodd"
-                        />
-                      </svg>
-                    </div>
+                      <path
+                        clip-rule="evenodd"
+                        d="M15.681 2.804A9.64 9.64 0 0011.818 2C6.398 2 2 6.48 2 12c0 5.521 4.397 10 9.818 10 2.03 0 4.011-.641 5.67-1.835a9.987 9.987 0 003.589-4.831 1.117 1.117 0 00-.664-1.418 1.086 1.086 0 00-1.393.676 7.769 7.769 0 01-2.792 3.758 7.546 7.546 0 01-4.41 1.428V4.222h.002a7.492 7.492 0 013.003.625 7.61 7.61 0 012.5 1.762l.464.551-2.986 3.042a.186.186 0 00.129.316H22V3.317a.188.188 0 00-.112-.172.179.179 0 00-.199.04l-2.355 2.4-.394-.468-.02-.02a9.791 9.791 0 00-3.239-2.293zm-3.863 1.418V2v2.222zm0 0v15.556c-4.216 0-7.636-3.484-7.636-7.778s3.42-7.777 7.636-7.778z"
+                        fill="#212134"
+                        fill-rule="evenodd"
+                      />
+                    </svg>
                   </button>
                 </div>
               </div>