From f1d9bf460d550308211982c83ed6d7e4fdd06507 Mon Sep 17 00:00:00 2001
From: Aijana Schumann <aijana.schumann@highstreet-technologies.com>
Date: Wed, 4 Nov 2020 17:29:38 +0100
Subject: Update material-ui and material-icons version

Update material-ui and material-icons to latest version

Issue-ID: CCSDK-2884
Signed-off-by: Aijana Schumann <aijana.schumann@highstreet-technologies.com>
Change-Id: Ic20e63f12e2ccaf985e43c99009fff9938a9fd02
---
 sdnr/wt/odlux/apps/configurationApp/package.json                      | 4 ++--
 .../odlux/apps/configurationApp/src/components/uiElementSelection.tsx | 2 +-
 .../apps/configurationApp/src/views/configurationApplication.tsx      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'sdnr/wt/odlux/apps/configurationApp')

diff --git a/sdnr/wt/odlux/apps/configurationApp/package.json b/sdnr/wt/odlux/apps/configurationApp/package.json
index 7b9dce688..d1ab86da7 100644
--- a/sdnr/wt/odlux/apps/configurationApp/package.json
+++ b/sdnr/wt/odlux/apps/configurationApp/package.json
@@ -27,8 +27,8 @@
     "@types/react": "16.9.19",
     "@types/react-dom": "16.9.5",
     "@types/react-router-dom": "4.3.1",
-    "@material-ui/core": "4.9.0",
-    "@material-ui/icons": "4.5.1",
+    "@material-ui/core": "4.11.0",
+    "@material-ui/icons": "4.9.1",
     "@types/classnames": "2.2.6",
     "@types/flux": "3.1.8",
     "@types/jquery": "3.3.10",
diff --git a/sdnr/wt/odlux/apps/configurationApp/src/components/uiElementSelection.tsx b/sdnr/wt/odlux/apps/configurationApp/src/components/uiElementSelection.tsx
index 1cec754ab..278605144 100644
--- a/sdnr/wt/odlux/apps/configurationApp/src/components/uiElementSelection.tsx
+++ b/sdnr/wt/odlux/apps/configurationApp/src/components/uiElementSelection.tsx
@@ -50,7 +50,7 @@ export const UiElementSelection = (props: selectionProps) => {
                 }}
             >
           {element.options.map(option => (
-            <MenuItem key={option.key} title={option.description} value={option.key}>{option.key}</MenuItem>
+            <MenuItem key={option.key} title={option.description || ''} value={option.key}>{option.key}</MenuItem>
           ))}
             </Select>
             <FormHelperText>{error}</FormHelperText>
diff --git a/sdnr/wt/odlux/apps/configurationApp/src/views/configurationApplication.tsx b/sdnr/wt/odlux/apps/configurationApp/src/views/configurationApplication.tsx
index 7b927785d..3b1df6f87 100644
--- a/sdnr/wt/odlux/apps/configurationApp/src/views/configurationApplication.tsx
+++ b/sdnr/wt/odlux/apps/configurationApp/src/views/configurationApplication.tsx
@@ -397,7 +397,7 @@ class ConfigurationApplicationComponent extends React.Component<ConfigurationApp
                 Object.keys(uiElement.cases).map(caseKey => {
                   const caseElm = uiElement.cases[caseKey];
                   return (
-                    <MenuItem key={caseElm.id} value={caseKey}><Tooltip title={caseElm.description}><div style={{width:"100%"}}>{caseElm.label}</div></Tooltip></MenuItem>
+                    <MenuItem key={caseElm.id} value={caseKey}><Tooltip title={caseElm.description || ''}><div style={{width:"100%"}}>{caseElm.label}</div></Tooltip></MenuItem>
                   );
                 })
               }
-- 
cgit 1.2.3-korg