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.

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

fix: use shared vis types #368

Merged
merged 8 commits into from
Nov 14, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
49 changes: 5 additions & 44 deletions packages/app/i18n/en.pot
Original file line number Diff line number Diff line change
Expand Up @@ -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-11T13:15:11.091Z\n"
"PO-Revision-Date: 2019-11-11T13:15:11.091Z\n"
"POT-Creation-Date: 2019-11-11T14:45:11.552Z\n"
"PO-Revision-Date: 2019-11-11T14:45:11.552Z\n"

msgid "Rename successful"
msgstr ""
Expand Down Expand Up @@ -45,9 +45,6 @@ msgstr ""
msgid "Hide"
msgstr ""

msgid "Remove"
msgstr ""

msgid "Download"
msgstr ""

Expand Down Expand Up @@ -114,6 +111,9 @@ msgstr ""
msgid "Move to"
msgstr ""

msgid "Remove"
msgstr ""

msgid "None selected"
msgstr ""

Expand Down Expand Up @@ -297,45 +297,6 @@ msgstr ""
msgid "Chart options"
msgstr ""

msgid "Column"
msgstr ""

msgid "Stacked column"
msgstr ""

msgid "Bar"
msgstr ""

msgid "Stacked bar"
msgstr ""

msgid "Line"
msgstr ""

msgid "Area"
msgstr ""

msgid "Pie"
msgstr ""

msgid "Radar"
msgstr ""

msgid "Gauge"
msgstr ""

msgid "Year over year (line)"
msgstr ""

msgid "Year over year (column)"
msgstr ""

msgid "Single value"
msgstr ""

msgid "Open as Map"
msgstr ""

msgid "Reporting rate"
msgstr ""

Expand Down
2 changes: 1 addition & 1 deletion packages/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"webpack-bundle-analyzer": "^3.0.3"
},
"dependencies": {
"@dhis2/analytics": "^2.5.1",
"@dhis2/analytics": "^2.5.2",
"@dhis2/d2-i18n": "^1.0.6",
"@dhis2/d2-ui-core": "^6.2.1",
"@dhis2/d2-ui-file-menu": "^6.2.1",
Expand Down
5 changes: 5 additions & 0 deletions packages/app/src/actions/current.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import {
SET_CURRENT_FROM_UI,
CLEAR_CURRENT,
} from '../reducers/current';
import { sGetUi } from '../reducers/ui';

export const acSetCurrent = value => ({
type: SET_CURRENT,
Expand All @@ -17,3 +18,7 @@ export const acSetCurrentFromUi = value => ({
type: SET_CURRENT_FROM_UI,
value,
});

export const tSetCurrentFromUi = () => async (dispatch, getState) => {
dispatch(acSetCurrentFromUi(sGetUi(getState())));
};
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ import { getAvailableAxes } from '@dhis2/analytics';
import UpdateButton from '../../../UpdateButton/UpdateButton';
import Menu from './Menu';
import {
sGetUi,
sGetUiActiveModalDialog,
sGetDimensionIdsFromLayout,
sGetUiType,
} from '../../../../reducers/ui';
import {
acSetUiActiveModalDialog,
acAddUiLayoutDimensions,
} from '../../../../actions/ui';
import { acSetCurrentFromUi } from '../../../../actions/current';
import { tSetCurrentFromUi } from '../../../../actions/current';

import { ADD_TO_LAYOUT_OPTIONS } from '../../../../modules/layout';
import styles from './styles/AddToLayoutButton.style';
Expand All @@ -41,7 +41,9 @@ export class AddToLayoutButton extends Component {
this.props.onAddDimension({
[this.props.dialogId]: axisName,
});
this.props.onUpdate(this.props.ui);

this.props.onUpdate();

this.props.closeDialog(null);
};

Expand All @@ -53,7 +55,7 @@ export class AddToLayoutButton extends Component {
);

renderMenuItems = () =>
this.getAxisMeta(getAvailableAxes(this.props.ui.type))
this.getAxisMeta(getAvailableAxes(this.props.visType))
.slice(1)
.map(axisMetaObj => (
<MenuItem
Expand All @@ -68,7 +70,7 @@ export class AddToLayoutButton extends Component {

renderAddToLayoutButton = () => {
const availableAxisMeta = this.getAxisMeta(
getAvailableAxes(this.props.ui.type)
getAvailableAxes(this.props.visType)
);

return (
Expand All @@ -79,7 +81,7 @@ export class AddToLayoutButton extends Component {
color="primary"
disableRipple
disableFocusRipple
onClick={() => this.onUpdate(availableAxisMeta[0].name)}
onClick={() => this.onUpdate(availableAxisMeta[0].axisName)}
>
{availableAxisMeta[0].name}
</Button>
Expand Down Expand Up @@ -117,23 +119,25 @@ export class AddToLayoutButton extends Component {

AddToLayoutButton.propTypes = {
classes: PropTypes.object.isRequired,
visType: PropTypes.string.isRequired,
dialogId: PropTypes.string.isRequired,
dimensionIdsInLayout: PropTypes.array.isRequired,
closeDialog: PropTypes.func.isRequired,
onAddDimension: PropTypes.func.isRequired,
onUpdate: PropTypes.func.isRequired,
closeDialog: PropTypes.func.isRequired,
};

const mapStateToProps = state => ({
ui: sGetUi(state),
visType: sGetUiType(state),
dialogId: sGetUiActiveModalDialog(state),
dimensionIdsInLayout: sGetDimensionIdsFromLayout(state),
});

export default connect(
mapStateToProps,
{
closeDialog: acSetUiActiveModalDialog,
onAddDimension: acAddUiLayoutDimensions,
onUpdate: acSetCurrentFromUi,
onUpdate: tSetCurrentFromUi,
closeDialog: acSetUiActiveModalDialog,
}
)(withStyles(styles)(AddToLayoutButton));
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import {
DIMENSION_ID_PERIOD,
DIMENSION_ID_ORGUNIT,
FIXED_DIMENSIONS,
isSingleValue,
} from '@dhis2/analytics';

import HideButton from './HideButton';
Expand Down Expand Up @@ -45,7 +46,6 @@ import { sGetMetadata } from '../../../reducers/metadata';
import { sGetSettingsDisplayNameProperty } from '../../../reducers/settings';
import { apiFetchRecommendedIds } from '../../../api/dimensions';
import { removeLastPathSegment, getOuPath } from '../../../modules/orgUnit';
import { isSingleValue } from '../../../modules/chartTypes';

export class DialogManager extends Component {
state = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ jest.mock('@dhis2/analytics', () => {
DynamicDimension: () => <div />,
PeriodDimension: () => <div />,
OrgUnitDimension: () => <div />,
isSingleValue: () => true,
DIMENSION_ID_DATA: dataId,
DIMENSION_ID_PERIOD: periodId,
DIMENSION_ID_ORGUNIT: ouId,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import {
DIMENSION_ID_PERIOD,
DimensionsPanel,
DimensionMenu,
isYearOverYear,
} from '@dhis2/analytics';

import DialogManager from './Dialogs/DialogManager';
import { SOURCE_DIMENSIONS, getInverseLayout } from '../../modules/layout';
import { setDataTransfer } from '../../modules/dnd';
import { isYearOverYear } from '../../modules/chartTypes';
import * as fromReducers from '../../reducers';
import * as fromActions from '../../actions';

Expand Down
9 changes: 6 additions & 3 deletions packages/app/src/components/Layout/Chip.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
import React from 'react';
import { connect } from 'react-redux';
import i18n from '@dhis2/d2-i18n';
import { FIXED_DIMENSIONS, DIMENSION_ID_DATA } from '@dhis2/analytics';
import WarningIcon from '@material-ui/icons/Warning';
import i18n from '@dhis2/d2-i18n';
import {
FIXED_DIMENSIONS,
DIMENSION_ID_DATA,
isSingleValue,
} from '@dhis2/analytics';

import Menu from './Menu';
import Tooltip from './Tooltip';
Expand All @@ -12,7 +16,6 @@ import { sGetUiItemsByDimension, sGetUiType } from '../../reducers/ui';
import DynamicDimensionIcon from '../../assets/DynamicDimensionIcon';
import { sGetMetadata } from '../../reducers/metadata';
import { styles } from './styles/Chip.style';
import { isSingleValue } from '../../modules/chartTypes';

const TOOLTIP_ENTER_DELAY = 500;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import {
AXIS_NAME_COLUMNS,
AXIS_NAMES,
DIMENSION_ID_DATA,
isYearOverYear,
isDualAxisType,
} from '@dhis2/analytics';

import Chip from '../Chip';
Expand All @@ -18,7 +20,6 @@ import {
} from '../../../actions/ui';
import { SOURCE_DIMENSIONS, menuLabels } from '../../../modules/layout';
import { getAdaptedUiByType } from '../../../modules/ui';
import { isYearOverYear, isDualAxisType } from '../../../modules/chartTypes';

import styles from './styles/DefaultAxis.style';

Expand Down
52 changes: 26 additions & 26 deletions packages/app/src/components/Layout/Layout.js
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
import React from 'react';
import { connect } from 'react-redux';
import {
VIS_TYPE_COLUMN,
VIS_TYPE_STACKED_COLUMN,
VIS_TYPE_BAR,
VIS_TYPE_STACKED_BAR,
VIS_TYPE_LINE,
VIS_TYPE_AREA,
VIS_TYPE_PIE,
VIS_TYPE_RADAR,
VIS_TYPE_GAUGE,
VIS_TYPE_YEAR_OVER_YEAR_LINE,
VIS_TYPE_YEAR_OVER_YEAR_COLUMN,
VIS_TYPE_SINGLE_VALUE,
} from '@dhis2/analytics';

import DefaultLayout from './DefaultLayout/DefaultLayout';
import YearOverYearLayout from './YearOverYearLayout/YearOverYearLayout';
import PieLayout from './PieLayout/PieLayout';
import {
COLUMN,
STACKED_COLUMN,
BAR,
STACKED_BAR,
LINE,
AREA,
PIE,
RADAR,
GAUGE,
YEAR_OVER_YEAR_LINE,
YEAR_OVER_YEAR_COLUMN,
SINGLE_VALUE,
} from '../../modules/chartTypes';
import { sGetUiType } from '../../reducers/ui';

const layoutMap = {
[COLUMN]: DefaultLayout,
[STACKED_COLUMN]: DefaultLayout,
[BAR]: DefaultLayout,
[STACKED_BAR]: DefaultLayout,
[LINE]: DefaultLayout,
[AREA]: DefaultLayout,
[PIE]: PieLayout,
[RADAR]: DefaultLayout,
[GAUGE]: PieLayout,
[YEAR_OVER_YEAR_LINE]: YearOverYearLayout,
[YEAR_OVER_YEAR_COLUMN]: YearOverYearLayout,
[SINGLE_VALUE]: PieLayout,
[VIS_TYPE_COLUMN]: DefaultLayout,
[VIS_TYPE_STACKED_COLUMN]: DefaultLayout,
[VIS_TYPE_BAR]: DefaultLayout,
[VIS_TYPE_STACKED_BAR]: DefaultLayout,
[VIS_TYPE_LINE]: DefaultLayout,
[VIS_TYPE_AREA]: DefaultLayout,
[VIS_TYPE_PIE]: PieLayout,
[VIS_TYPE_RADAR]: DefaultLayout,
[VIS_TYPE_GAUGE]: PieLayout,
[VIS_TYPE_YEAR_OVER_YEAR_LINE]: YearOverYearLayout,
[VIS_TYPE_YEAR_OVER_YEAR_COLUMN]: YearOverYearLayout,
[VIS_TYPE_SINGLE_VALUE]: PieLayout,
};

const getLayoutByType = (type, props) => {
Expand Down
Loading