Skip to content

Commit

Permalink
chore: Update DV plugin version (#299)
Browse files Browse the repository at this point in the history
  • Loading branch information
neeilya committed Jun 11, 2019
1 parent ab13e1c commit 9ba4342
Show file tree
Hide file tree
Showing 9 changed files with 1,236 additions and 1,150 deletions.
7 changes: 5 additions & 2 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-05-28T11:59:48.644Z\n"
"PO-Revision-Date: 2019-05-28T11:59:48.644Z\n"
"POT-Creation-Date: 2019-06-11T12:01:09.869Z\n"
"PO-Revision-Date: 2019-06-11T12:01:09.869Z\n"

msgid "Rename successful"
msgstr ""
Expand Down Expand Up @@ -124,6 +124,9 @@ msgstr ""
msgid "Chart error"
msgstr ""

msgid "Error generating chart, please try again"
msgstr ""

msgid "Aggregation type"
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 @@ -30,7 +30,7 @@
"@dhis2/d2-ui-core": "5.3.8",
"@dhis2/d2-ui-file-menu": "5.3.9",
"@dhis2/d2-ui-interpretations": "5.2.10",
"@dhis2/data-visualizer-plugin": "33.0.2",
"@dhis2/data-visualizer-plugin": "33.0.3",
"@dhis2/ui": "^1.0.0-beta.11",
"@material-ui/core": "^3.1.2",
"@material-ui/icons": "^3.0.1",
Expand Down
4 changes: 1 addition & 3 deletions packages/app/src/components/AxisSetup/AxisSetup.js
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,7 @@ class AxisSetup extends Component {
<colgroup>
<col className={classes.nameColumn} />
<col
className={`${classes.axisColumn} ${
classes.coloredColumn
}`}
className={`${classes.axisColumn} ${classes.coloredColumn}`}
/>
<col className={classes.axisColumn} />
</colgroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ import styles from './styles/Interpretations.style';
export class Interpretations extends Component {
onInterpretationChange = interpretation => {
if (interpretation) {
const interpretationUrl = `/${this.props.id}/interpretation/${
interpretation.id
}`;
const interpretationUrl = `/${this.props.id}/interpretation/${interpretation.id}`;

// this covers the case when the URL contains already an interpretation id,
// the Interpretations component loads it and fires this callback passing the interpretation
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,7 @@ export class VisualizationTypeSelector extends Component {

await apiSaveAOInUserDataStore(currentAnalyticalObject);

window.location.href = `${
this.baseUrl
}/${MAPS_APP_URL}?${CURRENT_AO_KEY}=true`;
window.location.href = `${this.baseUrl}/${MAPS_APP_URL}?${CURRENT_AO_KEY}=true`;
};

handleClose = () => {
Expand Down
4 changes: 1 addition & 3 deletions packages/app/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,7 @@ const render = (location, baseUrl, d2, userSettings) => {
const init = async () => {
// log app info
console.info(
`Data Visualizer app, v${manifest.version}, ${
manifest.manifest_generated_at
}`
`Data Visualizer app, v${manifest.version}, ${manifest.manifest_generated_at}`
);

// d2 config
Expand Down
20 changes: 5 additions & 15 deletions packages/app/src/reducers/__tests__/ui.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,7 @@ describe('reducer: ui', () => {
});
});

it(`${
ui.SET_UI_FROM_VISUALIZATION
} sets the new ui based on a visualization`, () => {
it(`${ui.SET_UI_FROM_VISUALIZATION} sets the new ui based on a visualization`, () => {
const expectedState = {
...ui.DEFAULT_UI,
type,
Expand Down Expand Up @@ -180,9 +178,7 @@ describe('reducer: ui', () => {
expect(actualState).toEqual(expectedState);
});

it(`${
ui.ADD_UI_LAYOUT_DIMENSIONS
}: should add/remove layout dimensions`, () => {
it(`${ui.ADD_UI_LAYOUT_DIMENSIONS}: should add/remove layout dimensions`, () => {
const state = {
layout: {
columns: [DIMENSION_ID_DATA],
Expand All @@ -209,9 +205,7 @@ describe('reducer: ui', () => {
expect(actualState).toEqual(expectedState);
});

it(`${
ui.REMOVE_UI_LAYOUT_DIMENSIONS
}: should remove a single dimension`, () => {
it(`${ui.REMOVE_UI_LAYOUT_DIMENSIONS}: should remove a single dimension`, () => {
const state = {
layout: {
columns: [DIMENSION_ID_DATA],
Expand Down Expand Up @@ -432,9 +426,7 @@ describe('reducer: ui', () => {
expect(actualState).toEqual(expectedState);
});

it(`${
ui.SET_UI_YEAR_ON_YEAR_CATEGORY
} sets new yearOverYearCategory`, () => {
it(`${ui.SET_UI_YEAR_ON_YEAR_CATEGORY} sets new yearOverYearCategory`, () => {
const category = ['LAST_3_MONTHS'];

const actualState = reducer(ui.DEFAULT_UI, {
Expand Down Expand Up @@ -494,9 +486,7 @@ describe('reducer: ui', () => {
expect(actualState.activeModalDialog).toEqual(dialog);
});

it(`${
ui.TOGGLE_UI_RIGHT_SIDEBAR_OPEN
} toggles the state of the right sidebar`, () => {
it(`${ui.TOGGLE_UI_RIGHT_SIDEBAR_OPEN} toggles the state of the right sidebar`, () => {
let actualState = reducer(ui.DEFAULT_UI, {
type: ui.TOGGLE_UI_RIGHT_SIDEBAR_OPEN,
});
Expand Down
2 changes: 1 addition & 1 deletion packages/plugin/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dhis2/data-visualizer-plugin",
"version": "33.0.2",
"version": "33.0.3",
"description": "DHIS2 Data Visualizer plugin",
"main": "./build/index.js",
"license": "BSD-3-Clause",
Expand Down
Loading

0 comments on commit 9ba4342

Please sign in to comment.