Merge pull request strapi#7589 from strapi/fix/cm-issues

CM bug fixes Signed-off-by: Adam Rensel <renz45@github.com>
renz45 · Aug 26, 2020 · 766e570 · 766e570
2 parents 57f46e9 + c67bb26
commit 766e570
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/packages/strapi-helper-plugin/package.json b/packages/strapi-helper-plugin/package.json
@@ -46,7 +46,7 @@
     "rollup-plugin-node-resolve": "^4.2.3",
     "rollup-plugin-postcss": "^2.0.3",
     "rollup-plugin-replace": "^2.2.0",
-    "rollup-plugin-svg": "^2.0.0",
+    "rollup-plugin-svg": "^1.0.1",
     "rollup-plugin-terser": "^4.0.4"
   },
   "dependencies": {

diff --git a/packages/strapi-plugin-content-manager/admin/src/components/SelectWrapper/index.js b/packages/strapi-plugin-content-manager/admin/src/components/SelectWrapper/index.js
@@ -208,11 +208,11 @@ function SelectWrapper({
     }
 
     if (!isCreatingEntry) {
-      return !isFieldAllowed && isFieldReadable;
+      return (!isFieldAllowed && isFieldReadable) || !editable;
     }
 
     return !editable;
-  });
+  }, [isMorph, isCreatingEntry, editable]);
 
   if (!isFieldAllowed && isCreatingEntry) {
     return <NotAllowedInput label={label} />;

diff --git a/yarn.lock b/yarn.lock
@@ -16236,10 +16236,10 @@ rollup-plugin-replace@^2.2.0:
     magic-string "^0.25.2"
     rollup-pluginutils "^2.6.0"
 
-rollup-plugin-svg@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-svg/-/rollup-plugin-svg-2.0.0.tgz#ce11b55e915d5b2190328c4e6632bd6b4fe12ee9"
-  integrity sha512-DmE7dSQHo1SC5L2uH2qul3Mjyd5oV6U1aVVkyvTLX/mUsRink7f1b1zaIm+32GEBA6EHu8H/JJi3DdWqM53ySQ==
+rollup-plugin-svg@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-svg/-/rollup-plugin-svg-1.0.1.tgz#9de43943cefeacb9ddb09b3ea8ddb9de6552ede1"
+  integrity sha1-neQ5Q87+rLndsJs+qN253mVS7eE=
   dependencies:
     rollup-pluginutils "^1.3.1"