Skip to content

OpenConceptLab/ocl_issues#878 | name locale type standardization #2

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

Open
snyaggarwal wants to merge 1 commit into
base: master
Choose a base branch
from
Open

OpenConceptLab/ocl_issues#878 | name locale type standardization #2

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
21 changes: 15 additions & 6 deletions src/components/concepts/LocaleForm.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import Autocomplete from '@material-ui/lab/Autocomplete';
import { TextField, Checkbox, IconButton, FormControlLabel } from '@material-ui/core';
import { Delete as DeleteIcon } from '@material-ui/icons';
import { find, get } from 'lodash'
import { find, get, map, includes } from 'lodash'
import { ERROR_RED } from '../../common/constants';
import LocaleAutoComplete from '../common/LocaleAutoComplete';

Expand All @@ -14,17 +14,26 @@ const LocaleForm = ({
const nameAttr = isName ? 'name' : 'description';
const typeAttr = `${nameAttr}_type`;
const localeType = get(locale, typeAttr);
const borderColor = error ? ERROR_RED : 'lightgray'
const idPrefix = `${localeAttr}.${index}`;

const [selectedLocale, setSelectedLocale] = React.useState(
locale.locale ? {id: locale.locale, name: locale.locale} : null
)
let selectedLocaleType = localeType ? find(types, {id: locale[typeAttr]}) : null;
const idPrefix = `${localeAttr}.${index}`;
const borderColor = error ? ERROR_RED : 'lightgray'
let formattedTypes = types;

let formattedTypes = isName ? map(types, _type => {
const name = includes(['none', 'definition'], _type.id.toLowerCase()) ?
_type.id :
_type.id.toUpperCase().replaceAll(' ', '_')
return {id: name, name: name}
}) : types;

let selectedLocaleType = localeType ? find(formattedTypes, {id: locale[typeAttr]}) : null;

if(localeType && !selectedLocaleType) {
const _type = {id: localeType, name: localeType}
selectedLocaleType = _type
formattedTypes = [_type, ...types]
formattedTypes = [_type, ...formattedTypes]
}

const onLocaleChange = (event, item) => {
Expand Down