Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: removes the 'view as' menu from gauge and pie (DHIS2-8455) #615

Merged
merged 4 commits into from
Mar 6, 2020
Merged

fix: removes the 'view as' menu from gauge and pie (DHIS2-8455) #615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2781608
fix: removes the 'view as' menu from gauge and pie
martinkrulltott Mar 5, 2020
aec5282
refactor: changed the not equal type
martinkrulltott Mar 5, 2020
d816df0
fix: tiny css change to fix misaligned icon
martinkrulltott Mar 6, 2020
6c95174
chore: inline comment to explain the previous commit
martinkrulltott Mar 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions src/components/Item/VisualizationItem/ItemHeaderButtons.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
import React, { useState } from 'react';
import PropTypes from 'prop-types';

import { isSingleValue, isYearOverYear } from '@dhis2/analytics';
import {
isSingleValue,
isYearOverYear,
VIS_TYPE_GAUGE,
VIS_TYPE_PIE,
} from '@dhis2/analytics';
import { Button, Menu, MenuItem, Divider, colors } from '@dhis2/ui-core';
import i18n from '@dhis2/d2-i18n';
import Popover from '@material-ui/core/Popover';
Expand Down Expand Up @@ -61,7 +66,11 @@ const ItemHeaderButtons = props => {
const handleClose = () => setAnchorEl(null);

const type = visualization.type || item.type;
const canViewAs = !isSingleValue(type) && !isYearOverYear(type);
const canViewAs =
!isSingleValue(type) &&
!isYearOverYear(type) &&
type !== VIS_TYPE_GAUGE &&
type !== VIS_TYPE_PIE;

const interpretationMenuLabel = props.activeFooter
? i18n.t(`Hide interpretations and details`)
Expand Down
1 change: 1 addition & 0 deletions src/components/Item/VisualizationItem/assets/icons.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ export const SpeechBubble = () => (
viewBox="0 0 20 20"
width="20"
xmlns="http://www.w3.org/2000/svg"
style={{ margin: '3px 2px 0 2px' }} // Temporary fix for the misaligned icon, should be removed once the icon is replaced
>
<path
d="m20 2h-16c-1.1 0-1.99.9-1.99 2l-.01 18 4-4h14c1.1 0 2-.9 2-2v-12c0-1.1-.9-2-2-2zm-2 12h-12v-2h12zm0-3h-12v-2h12zm0-3h-12v-2h12z"
Expand Down