fix: solve problems after merge

dhis2 · Nov 21, 2019 · df7e3f5 · df7e3f5
1 parent f14aad3
commit df7e3f5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/packages/app/i18n/en.pot b/packages/app/i18n/en.pot
@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2019-11-15T12:12:19.215Z\n"
-"PO-Revision-Date: 2019-11-15T12:12:19.215Z\n"
+"POT-Creation-Date: 2019-11-21T10:34:34.957Z\n"
+"PO-Revision-Date: 2019-11-21T10:34:34.957Z\n"
 
 msgid "Rename successful"
 msgstr ""
@@ -297,9 +297,6 @@ msgstr ""
 msgid "Chart options"
 msgstr ""
 
-msgid "Pivot table"
-msgstr ""
-
 msgid "Open as Map"
 msgstr ""
 

diff --git a/packages/app/src/components/App.js b/packages/app/src/components/App.js
@@ -19,7 +19,7 @@ import { sGetUiType } from '../reducers/ui';
 import * as fromActions from '../actions';
 import history from '../modules/history';
 import defaultMetadata from '../modules/metadata';
-import { PIVOT_TABLE } from '../modules/chartTypes';
+import { VIS_TYPE_PIVOT_TABLE } from '@dhis2/analytics';
 import {
     apiFetchAOFromUserDataStore,
     CURRENT_AO_KEY,
@@ -209,7 +209,7 @@ export class App extends Component {
 
 const apiObjectSelector = createSelector(
     [sGetUiType],
-    type => (type === PIVOT_TABLE ? 'reportTable' : 'chart')
+    type => (type === VIS_TYPE_PIVOT_TABLE ? 'reportTable' : 'chart')
 );
 
 const mapStateToProps = state => ({

diff --git a/packages/app/src/components/VisualizationTypeSelector/MenuItemIcon.js b/packages/app/src/components/VisualizationTypeSelector/MenuItemIcon.js
@@ -61,7 +61,7 @@ const MenuItemIcon = ({ iconType, style }) => {
             return <PivotTableIcon style={style} />;
         case VIS_TYPE_COLUMN:
         default:
-            return <LineIcon style={style} />;
+            return <ColumnIcon style={style} />;
     }
 };