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

Feature/no content text #3451

Merged
merged 6 commits into from
May 31, 2018
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
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ class Widget extends PureComponent {

Widget.propTypes = {
widget: PropTypes.string.isRequired,
title: PropTypes.string.isRequired,
title: PropTypes.object.isRequired,
setWidgetSettingsUrl: PropTypes.func.isRequired,
settings: PropTypes.object,
config: PropTypes.object,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import React, { PureComponent } from 'react';
import PropTypes from 'prop-types';

import NoContent from 'components/ui/no-content';
import WidgetPieChartLegend from 'components/widgets/components/widget-pie-chart-legend';

import './styles';

class WidgetForestryEmployment extends PureComponent {
render() {
const { data } = this.props;

return (
<div className="c-widget-forestry-employment">
{data[0].noContent ? (
<NoContent message="No gender data available" />
) : (
<WidgetPieChartLegend {...this.props} />
)}
</div>
);
}
}

WidgetForestryEmployment.propTypes = {
data: PropTypes.array
};
export default WidgetForestryEmployment;
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Component from 'components/widgets/components/widget-pie-chart-legend';
import Component from './component';
import { getData } from './actions';
import { parseData, getSentence } from './selectors';
import initialState from './initial-state';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@ export const getFilteredData = createSelector(
export const parseData = createSelector(
[getFilteredData, getSettings, getColors],
(data, settings, colors) => {
if (isEmpty(data)) return null;
if (isEmpty(data)) return [{ noContent: true }];

const { year } = settings;
const selectedFAO = data.filter(item => item.year === year);
const { male, female } = selectedFAO[0];
if (!female) return null;
if (!female) return [{ noContent: true }];

const total = male + female;
const formatedData = [
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
@import '~styles/settings.scss';

.c-widget-forestry-employment {
.c-no-content {
padding-top: rem(100px);
}
}