From b6886d8fc867e1a0c486f27a1f423cd98fae8bd0 Mon Sep 17 00:00:00 2001
From: Krzysztof Bialoglowicz <krzysztof@mirumee.com>
Date: Fri, 13 Sep 2019 14:57:10 +0200
Subject: [PATCH] Fix configuration labels and types

---
 src/components/AppLayout/MenuList.tsx   |  9 ++++-----
 src/configuration/ConfigurationPage.tsx | 22 ++++++++++------------
 src/configuration/index.tsx             | 16 ++++++++++++----
 3 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/src/components/AppLayout/MenuList.tsx b/src/components/AppLayout/MenuList.tsx
index c73f7857e..30dbfb43d 100644
--- a/src/components/AppLayout/MenuList.tsx
+++ b/src/components/AppLayout/MenuList.tsx
@@ -174,12 +174,11 @@ const MenuList = withStyles(styles, { name: "MenuList" })(
     const intl = useIntl();
 
     const configutationMenu = createConfigurationMenu(intl).map(menu => {
-      menu.menuItems.map(item => {
-        return user.permissions
-          .map(perm => perm.code)
-          .includes(item.permission);
-      });
+      menu.menuItems.map(item =>
+        user.permissions.map(perm => perm.code).includes(item.permission)
+      );
     });
+
     const handleSubMenu = itemLabel => {
       setActiveSubMenu({
         isActive:
diff --git a/src/configuration/ConfigurationPage.tsx b/src/configuration/ConfigurationPage.tsx
index 883a626a5..85d020b8c 100644
--- a/src/configuration/ConfigurationPage.tsx
+++ b/src/configuration/ConfigurationPage.tsx
@@ -20,15 +20,13 @@ import { PermissionEnum } from "../types/globalTypes";
 
 export interface MenuItem {
   label: string;
-  menuItems: [
-    {
-      description: string;
-      icon: React.ReactElement<IconProps>;
-      permission: PermissionEnum;
-      title: string;
-      url?: string;
-    }
-  ];
+  menuItems: Array<{
+    description: string;
+    icon: React.ReactElement<IconProps>;
+    permission: PermissionEnum;
+    title: string;
+    url?: string;
+  }>;
 }
 
 const styles = (theme: Theme) =>
@@ -115,16 +113,16 @@ export const ConfigurationPage = withStyles(styles, {
             menu.menuItems.map(item => hasPermission(item.permission, user))
           )
           .map((menu, menuIndex) => (
-            <div className={classes.configurationCategory}>
+            <div className={classes.configurationCategory} key={menuIndex}>
               <div className={classes.configurationLabel}>
                 <Typography>{menu.label}</Typography>
               </div>
               <div className={classes.configurationItem}>
-                {menu.menuItems.map(item => (
+                {menu.menuItems.map((item, itemIndex) => (
                   <Card
                     className={item.url ? classes.card : classes.cardDisabled}
                     onClick={() => onSectionClick(item.url)}
-                    key={menuIndex}
+                    key={itemIndex}
                   >
                     <CardContent className={classes.cardContent}>
                       <div className={classes.icon}>{item.icon}</div>
diff --git a/src/configuration/index.tsx b/src/configuration/index.tsx
index 6a9734a92..9c9cf5bfb 100644
--- a/src/configuration/index.tsx
+++ b/src/configuration/index.tsx
@@ -30,7 +30,9 @@ import ConfigurationPage, { MenuItem } from "./ConfigurationPage";
 export function createConfigurationMenu(intl: IntlShape): MenuItem[] {
   return [
     {
-      label: "Attributes and Product Types",
+      label: intl.formatMessage({
+        defaultMessage: "Attributes and Product Typess"
+      }),
       menuItems: [
         {
           description: intl.formatMessage({
@@ -55,7 +57,9 @@ export function createConfigurationMenu(intl: IntlShape): MenuItem[] {
       ]
     },
     {
-      label: "Product Settings",
+      label: intl.formatMessage({
+        defaultMessage: "Product Settings"
+      }),
       menuItems: [
         {
           description: intl.formatMessage({
@@ -80,7 +84,9 @@ export function createConfigurationMenu(intl: IntlShape): MenuItem[] {
       ]
     },
     {
-      label: "Staff Settings",
+      label: intl.formatMessage({
+        defaultMessage: "Staff Settings"
+      }),
       menuItems: [
         {
           description: intl.formatMessage({
@@ -95,7 +101,9 @@ export function createConfigurationMenu(intl: IntlShape): MenuItem[] {
       ]
     },
     {
-      label: "Miscellaneous",
+      label: intl.formatMessage({
+        defaultMessage: "Miscellaneous"
+      }),
       menuItems: [
         {
           description: intl.formatMessage({