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

fix(organisation unit levels): make translation button work again #2196

Open
wants to merge 1 commit into
base: brute-force
Choose a base branch
from
+58 −55
Open

fix(organisation unit levels): make translation button work again #2196

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
113 changes: 58 additions & 55 deletions src/OrganisationUnitLevels/OrganisationUnitLevels.component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { useD2 } from '@dhis2/app-runtime-adapter-d2';
import PropTypes from 'prop-types';
import { Component } from 'react';
import { Component, useEffect, useState } from 'react';
import { addD2Context } from '@dhis2/d2-ui-core';
import organisationUnitLevelsStore from './organisationUnitLevels.store';
import { withStateFrom } from '@dhis2/d2-ui-core';
Expand All @@ -22,15 +23,17 @@ function saveOrganisationUnitLevels(i18n) {
);
}

function OrganisationUnitLevels(props, context) {
const canEdit = context.d2.currentUser.canUpdate(context.d2.models.organisationUnitLevel);
function OrganisationUnitLevels(props) {
const { d2 } = useD2()

if (props.isLoading) {
if (props.isLoading || !d2) {
return (
<LinearProgress />
);
}

const canEdit = d2.currentUser.canUpdate(d2.models.organisationUnitLevel);

const styles = {
paperWrap: {
padding: '4rem 5rem',
Expand Down Expand Up @@ -98,16 +101,17 @@ function OrganisationUnitLevels(props, context) {

return (
<div>
<Heading>{context.d2.i18n.getTranslation('organisation_unit_level_management')}</Heading>
<Heading>{d2.i18n.getTranslation('organisation_unit_level_management')}</Heading>
<Paper style={styles.paperWrap}>
{fieldRows}
<FormButtons>
{canEdit ? <SaveButton onClick={() => saveOrganisationUnitLevels(context.d2.i18n)} isValid={props.formStatus.every(v => v)} isSaving={props.isSaving} /> : []}
{canEdit ? <SaveButton onClick={() => saveOrganisationUnitLevels(d2.i18n)} isValid={props.formStatus.every(v => v)} isSaving={props.isSaving} /> : []}
</FormButtons>
</Paper>
</div>
);
}

OrganisationUnitLevels.defaultProps = {
fieldsForOrganisationUnitLevel: [],
formStatus: [false],
Expand All @@ -123,65 +127,64 @@ OrganisationUnitLevels.propTypes = {

const componentState$ = organisationUnitLevelsStore;

const OrganisationUnitLevelsWithState = withStateFrom(componentState$, addD2Context(OrganisationUnitLevels));

export default addD2Context(class extends Component {
constructor(...args) {
super(...args);
const OrganisationUnitLevelsWithState = withStateFrom(componentState$, OrganisationUnitLevels);

this.state = {
translation: {
open: false,
},
};
}
export default function OrganisationUnitLevelsWrapper() {
const { d2 } = useD2();
const [translationOpen, setTranslationOpen] = useState(false);
const [translationModel, setTranslationModel] = useState(null);

componentDidMount() {
useEffect(() => {
actions.initOrgUnitLevels();
}
}, [])

render() {
return (
<div>
<OrganisationUnitLevelsWithState onTranslateClick={this._onTranslateClick} />
{this.state.translation.model ? <TranslationDialog
objectToTranslate={this.state.translation.model}
objectTypeToTranslate={this.state.translation.model && this.state.translation.model.modelDefinition}
open={this.state.translation.open}
onTranslationSaved={this._translationSaved}
onTranslationError={this._translationErrored}
onRequestClose={this._closeTranslationDialog}
fieldsToTranslate={['name']}
/> : null }
</div>
);
}
const onTranslateClick = data => {
const model = d2.models.organisationUnitLevel.create(data);

_onTranslateClick = data => {
const model = this.context.d2.models.organisationUnitLevel.create(data);
setTranslationModel(model)
setTranslationOpen(true)
};

this.setState({
translation: {
open: true,
model,
},
const translationSaved = () => {
snackActions.show({
message: d2.i18n.getTranslation('translation_saved'),
});
};

_translationSaved = () => {
snackActions.show({ message: this.context.d2.i18n.getTranslation('translation_saved') });
const translationErrored = () => {
snackActions.show({
message: d2.i18n.getTranslation('translation_save_error'),
action: 'ok',
});
};

_translationErrored = () => {
snackActions.show({ message: this.context.d2.i18n.getTranslation('translation_save_error'), action: 'ok' });
const closeTranslationDialog = () => {
setTranslationOpen(false)
setTranslationModel(null)
};

_closeTranslationDialog = () => {
this.setState({
translation: {
open: false,
model: undefined,
},
});
};
});
if (!d2) {
return (
<LinearProgress />
);
}

return (
<div>
<OrganisationUnitLevelsWithState
onTranslateClick={onTranslateClick}
/>

{translationModel ? <TranslationDialog
d2={d2}
objectToTranslate={translationModel}
objectTypeToTranslate={translationModel && translationModel.modelDefinition}
open={translationOpen}
onTranslationSaved={translationSaved}
onTranslationError={translationErrored}
onRequestClose={closeTranslationDialog}
fieldsToTranslate={['name']}
/> : null }
</div>
);
}