From a4e2a5fbacfac1720f53c397e58eea33a589829c Mon Sep 17 00:00:00 2001
From: p_0g_8mm3_ <37022952+pr0gr8mm3r@users.noreply.github.com>
Date: Fri, 31 Dec 2021 14:44:35 +0100
Subject: [PATCH 1/3] make left menu header title and workplace string
 resources

---
 .../admin/admin/src/components/LeftMenu/index.js   | 14 +++++++++++---
 packages/core/admin/admin/src/translations/en.json |  2 ++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/packages/core/admin/admin/src/components/LeftMenu/index.js b/packages/core/admin/admin/src/components/LeftMenu/index.js
index cccb1454b0..f911a5e10f 100644
--- a/packages/core/admin/admin/src/components/LeftMenu/index.js
+++ b/packages/core/admin/admin/src/components/LeftMenu/index.js
@@ -80,12 +80,20 @@ const LeftMenu = ({ generalSectionLinks, pluginsSectionLinks }) => {
     }
   };
 
+  const menuTitle = formatMessage({
+    id: 'content-manager.plugin.name',
+    defaultMessage: 'Strapi Dashboard',
+  });
+
   return (
     <MainNav condensed={condensed}>
       <NavBrand
-        workplace="Workplace"
-        title="Strapi Dashboard"
-        icon={<img src={menuLogo} alt="Strapi Dashboard" />}
+        workplace={formatMessage({
+          id: 'content-manager.plugin.name',
+          defaultMessage: 'Workplace',
+        })}
+        title={menuTitle}
+        icon={<img src={menuLogo} alt={menuTitle} />}
       />
 
       <Divider />
diff --git a/packages/core/admin/admin/src/translations/en.json b/packages/core/admin/admin/src/translations/en.json
index 8dff8a2553..a9a145657e 100644
--- a/packages/core/admin/admin/src/translations/en.json
+++ b/packages/core/admin/admin/src/translations/en.json
@@ -239,6 +239,8 @@
   "app.component.table.edit": "Edit {target}",
   "app.component.table.select.all-entries": "Select all entries",
   "app.component.table.select.one-entry": "Select {target}",
+  "app.components.menuBrand.title": "Strapi Dashboard",
+  "app.components.menuBrand.workplace": "Workplace",
   "app.components.BlockLink.blog": "Blog",
   "app.components.BlockLink.blog.content": "Read the latest news about Strapi and the ecosystem.",
   "app.components.BlockLink.code": "Code examples",

From 3f3edd27aee9d1fe67d199c4a1576a032044a51d Mon Sep 17 00:00:00 2001
From: p_0g_8mm3_ <37022952+pr0gr8mm3r@users.noreply.github.com>
Date: Mon, 3 Jan 2022 16:16:40 +0100
Subject: [PATCH 2/3] fix displaying wrong translations, rename translations

---
 packages/core/admin/admin/src/components/LeftMenu/index.js | 4 ++--
 packages/core/admin/admin/src/translations/en.json         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/core/admin/admin/src/components/LeftMenu/index.js b/packages/core/admin/admin/src/components/LeftMenu/index.js
index f911a5e10f..422dc8f3d3 100644
--- a/packages/core/admin/admin/src/components/LeftMenu/index.js
+++ b/packages/core/admin/admin/src/components/LeftMenu/index.js
@@ -81,7 +81,7 @@ const LeftMenu = ({ generalSectionLinks, pluginsSectionLinks }) => {
   };
 
   const menuTitle = formatMessage({
-    id: 'content-manager.plugin.name',
+    id: 'app.components.LeftMenu.navbrand.title',
     defaultMessage: 'Strapi Dashboard',
   });
 
@@ -89,7 +89,7 @@ const LeftMenu = ({ generalSectionLinks, pluginsSectionLinks }) => {
     <MainNav condensed={condensed}>
       <NavBrand
         workplace={formatMessage({
-          id: 'content-manager.plugin.name',
+          id: 'app.components.LeftMenu.navbrand.workplace',
           defaultMessage: 'Workplace',
         })}
         title={menuTitle}
diff --git a/packages/core/admin/admin/src/translations/en.json b/packages/core/admin/admin/src/translations/en.json
index a9a145657e..deaeb1cb34 100644
--- a/packages/core/admin/admin/src/translations/en.json
+++ b/packages/core/admin/admin/src/translations/en.json
@@ -239,8 +239,6 @@
   "app.component.table.edit": "Edit {target}",
   "app.component.table.select.all-entries": "Select all entries",
   "app.component.table.select.one-entry": "Select {target}",
-  "app.components.menuBrand.title": "Strapi Dashboard",
-  "app.components.menuBrand.workplace": "Workplace",
   "app.components.BlockLink.blog": "Blog",
   "app.components.BlockLink.blog.content": "Read the latest news about Strapi and the ecosystem.",
   "app.components.BlockLink.code": "Code examples",
@@ -286,6 +284,8 @@
   "app.components.LeftMenu.expand": "Expand the navbar",
   "app.components.LeftMenu.logout": "Logout",
   "app.components.LeftMenu.profile": "Profile",
+  "app.components.LeftMenu.navbrand.title": "Strapi Dashboard",
+  "app.components.LeftMenu.navbrand.workplace": "Workplace",
   "app.components.LeftMenuFooter.documentation": "Documentation",
   "app.components.LeftMenuFooter.help": "Help",
   "app.components.LeftMenuFooter.poweredBy": "Powered by ",

From 01190a00b572dbf3e341e2c24786842a84b7fcf5 Mon Sep 17 00:00:00 2001
From: ronronscelestes <julie.plantey@gmail.com>
Date: Wed, 5 Jan 2022 17:26:14 +0100
Subject: [PATCH 3/3] added ui when richtext is required

---
 .../admin/src/content-manager/components/Wysiwyg/index.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/core/admin/admin/src/content-manager/components/Wysiwyg/index.js b/packages/core/admin/admin/src/content-manager/components/Wysiwyg/index.js
index 5b9aeb9f1c..d0a372e94d 100644
--- a/packages/core/admin/admin/src/content-manager/components/Wysiwyg/index.js
+++ b/packages/core/admin/admin/src/content-manager/components/Wysiwyg/index.js
@@ -26,6 +26,10 @@ const LabelAction = styled(Box)`
   }
 `;
 
+const TypographyAsterisk = styled(Typography)`
+  line-height: 0;
+`;
+
 const Wysiwyg = ({
   description,
   disabled,
@@ -36,6 +40,7 @@ const Wysiwyg = ({
   onChange,
   placeholder,
   value,
+  required,
 }) => {
   const { formatMessage } = useIntl();
   const textareaRef = useRef(null);
@@ -124,6 +129,7 @@ const Wysiwyg = ({
         <Stack horizontal size={1}>
           <Typography variant="pi" fontWeight="bold" textColor="neutral800">
             {label}
+            {required && <TypographyAsterisk textColor="danger600">*</TypographyAsterisk>}
           </Typography>
           {labelAction && <LabelAction paddingLeft={1}>{labelAction}</LabelAction>}
         </Stack>
@@ -182,6 +188,7 @@ Wysiwyg.defaultProps = {
   error: '',
   labelAction: undefined,
   placeholder: null,
+  required: false,
   value: '',
 };
 
@@ -206,6 +213,7 @@ Wysiwyg.propTypes = {
     defaultMessage: PropTypes.string.isRequired,
     values: PropTypes.object,
   }),
+  required: PropTypes.bool,
   value: PropTypes.string,
 };