fix ts and add t's

apache · Feb 17, 2022 · 57e001c · 57e001c
1 parent 32f6e79
commit 57e001c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/superset-frontend/src/views/components/Menu.tsx b/superset-frontend/src/views/components/Menu.tsx
@@ -74,11 +74,13 @@ export interface MenuProps {
 
 interface MenuObjectChildProps {
   label: string;
-  name: string;
+  name?: string;
   icon?: string;
   index?: number;
   url?: string;
   isFrontendRoute?: boolean;
+  perm?: string;
+  view?: string;
 }
 
 export interface MenuObjectProps extends MenuObjectChildProps {

diff --git a/superset-frontend/src/views/components/MenuRight.tsx b/superset-frontend/src/views/components/MenuRight.tsx
@@ -30,26 +30,26 @@ import {
 import LanguagePicker from './LanguagePicker';
 import { NavBarProps, MenuObjectProps } from './Menu';
 
-export const dropdownItems = [
+export const dropdownItems: MenuObjectProps[] = [
   {
     label: t('Data'),
     icon: 'fa-database',
     childs: [
       {
         icon: 'fa-upload',
-        label: 'Upload a CSV',
+        label: t('Upload a CSV'),
         name: 'Upload a CSV',
         url: '/csvtodatabaseview/form',
       },
       {
         icon: 'fa-upload',
-        label: 'Upload a Columnar File',
+        label: t('Upload a Columnar File'),
         name: 'Upload a Columnar file',
         url: '/columnartodatabaseview/form',
       },
       {
         icon: 'fa-upload',
-        label: 'Upload Excel',
+        label: t('Upload Excel'),
         name: 'Upload Excel',
         url: '/exceltodatabaseview/form',
       },
@@ -161,9 +161,11 @@ const RightMenu = ({
                   <SubMenu
                     key="sub2"
                     className="data-menu"
-                    title={menuIconAndLabel(menu as MenuObjectProps)}
+                    title={menuIconAndLabel(menu)}
                   >
                     {menu.childs.map(item =>
+                      typeof item !== 'string' &&
+                      item.name &&
                       configMap[item.name] === true ? (
                         <Menu.Item key={item.name}>
                           <a href={item.url}> {item.label} </a>