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

chore(ui): upgrade ui libraries to newest #462

Closed
wants to merge 1 commit into from
Closed

chore(ui): upgrade ui libraries to newest #462

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
"@dhis2/d2-ui-translation-dialog": "^6.0.1",
"@dhis2/data-visualizer-plugin": "^33.1.6",
"@dhis2/prop-types": "^1.2.1",
"@dhis2/ui-core": "^3.12.0",
"@dhis2/ui-widgets": "^2.0.0",
"@dhis2/ui-core": "^4.0.0-beta.1",
"@dhis2/ui-widgets": "^2.0.1-beta.1",
"@material-ui/core": "^3.9.2",
"@material-ui/icons": "^3.0.2",
"d2": "^31.6.0",
Expand Down
1 change: 0 additions & 1 deletion src/components/ItemSelector/ItemSelector.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import './styles/ItemSelector.css';

const ItemSearchField = props => (
<InputField
filled
name="Dashboard item search"
label={i18n.t('Search for items to add to this dashboard')}
type="text"
Expand Down
15 changes: 3 additions & 12 deletions src/components/TitleBar/EditTitleBar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ import { connect } from 'react-redux';
import PropTypes from 'prop-types';
import { withStyles } from '@material-ui/core/styles';
import i18n from '@dhis2/d2-i18n';
import MuiInputField from '@material-ui/core/TextField';
import { InputField } from '@dhis2/ui-core';
import { InputField, TextAreaField } from '@dhis2/ui-core';

import ItemSelector from '../ItemSelector/ItemSelector';
import {
Expand Down Expand Up @@ -71,27 +70,19 @@ export const EditTitleBar = ({
<div className={classes.titleDescription}>
<InputField
className={classes.title}
filled
name="Dashboard title input"
label={i18n.t('Dashboard title')}
type="text"
onChange={updateTitle}
value={name}
/>
<MuiInputField

<TextAreaField
className={classes.description}
name="Dashboard description input"
label={i18n.t('Dashboard description')}
onChange={updateDescription}
value={description}
variant="filled"
multiline
InputProps={{
classes: {
root: classes.input,
underline: classes.underline,
},
}}
/>
</div>
<div className={classes.itemSelector}>
Expand Down
4 changes: 0 additions & 4 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { Provider } from 'react-redux';
import { MuiThemeProvider, createMuiTheme } from '@material-ui/core/styles';
import { init as d2Init, config, getManifest, getUserSettings } from 'd2';
import dhis2theme from '@dhis2/d2-ui-core/theme/mui3.theme';
import { colors } from '@dhis2/ui-core';

import { Provider as RuntimeProvider } from '@dhis2/app-runtime';
import { CssReset } from '@dhis2/ui-core';
Expand All @@ -14,9 +13,6 @@ import './index.css';
import i18n from './locales';
import configureStore from './configureStore';

// small workaround until ui-core textarea is ready
dhis2theme.palette.primary.dark = colors.teal600;

const muiTheme = () => createMuiTheme(dhis2theme);

const configI18n = userSettings => {
Expand Down
34 changes: 20 additions & 14 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1302,21 +1302,19 @@
resolved "https://registry.yarnpkg.com/@dhis2/prop-types/-/prop-types-1.0.4.tgz#37eb55a3baf7bc9cf76e19222ad4e2d0e465be8f"
integrity sha512-BiDR0KKn5fyUQ12u6XPq9pLs/tKR3hwiLzSWc+wVxN/enwgb8XUnLpt+Schc/ZBZq+sGozeUfPbFMRqIsifsIA==

"@dhis2/prop-types@^1.1.1", "@dhis2/prop-types@^1.2.1":
"@dhis2/prop-types@^1.2.1":
version "1.2.1"
resolved "https://registry.yarnpkg.com/@dhis2/prop-types/-/prop-types-1.2.1.tgz#acd62fc65f7c2f55126844289e601e2b842d3421"
integrity sha512-L3y0x8TOFwn12oBin4pkfTOn7CqGrKIN73Q4qLooA4/lM1qlM6GE3Qm7zB5p1Ko8rCThjEiHKSb9CfMGoo/GzQ==
dependencies:
prop-types "^15"

"@dhis2/ui-core@3.12.0", "@dhis2/ui-core@^3.12.0":
version "3.12.0"
resolved "https://registry.yarnpkg.com/@dhis2/ui-core/-/ui-core-3.12.0.tgz#6216868b1bd76b816df8c3272c2b9200972f0858"
integrity sha512-9JYl0TP6Wkb2yD5OkiN4juHYxW37UYZF1egbCAxuUCx7Uox5HqUkzxaKw25bQKN+4684vDnIJgh0Z2qSTszg1g==
"@dhis2/prop-types@^1.3.0":
version "1.3.0"
resolved "https://registry.yarnpkg.com/@dhis2/prop-types/-/prop-types-1.3.0.tgz#5c9d94bc618792e513758ba8e7ff30d118d233cd"
integrity sha512-2+1ovw8ySGWDSzgDc1Y3ITBfWTTWchypTSJfeEDZbM3Ov0UE99TPhPNzXLQ0hW2ZJueRMcPceQ2lvueLVzusZA==
dependencies:
"@dhis2/prop-types" "^1.1.1"
classnames "^2.2.6"
styled-jsx "^3.2.2"
prop-types "^15"

"@dhis2/ui-core@^3.4.0":
version "3.9.0"
Expand All @@ -1327,13 +1325,21 @@
classnames "^2.2.6"
styled-jsx "^3.2.1"

"@dhis2/ui-widgets@^2.0.0":
version "2.0.0"
resolved "https://registry.yarnpkg.com/@dhis2/ui-widgets/-/ui-widgets-2.0.0.tgz#7c5e3511bc8685e05c2a9a647f3c387ebb0edc61"
integrity sha512-GVeYBGh6bBHC4AwHBAlp9emYXWsSq9LgDixYjhJ4wbiJ8cnzM3rHAB2mUcP9wt455RMmMyR7QNg6To1ZDm60Jg==
"@dhis2/ui-core@^4.0.0-beta.1":
version "4.0.0-beta.1"
resolved "https://registry.yarnpkg.com/@dhis2/ui-core/-/ui-core-4.0.0-beta.1.tgz#619940ad8366527c63632108a0f6fabdfebb8bee"
integrity sha512-FZrpC1SZsiL5jnd3W8x4d5SHkjezcBx04bVUg4YKlzF2Xm8zGr3IVUbjeavXre4VVY670j5tkucVso5zgpR6Pw==
dependencies:
"@dhis2/prop-types" "^1.3.0"
classnames "^2.2.6"
styled-jsx "^3.2.3"

"@dhis2/ui-widgets@^2.0.1-beta.1":
version "2.0.1-beta.1"
resolved "https://registry.yarnpkg.com/@dhis2/ui-widgets/-/ui-widgets-2.0.1-beta.1.tgz#cc6601228d06840c9b33e365465c3cc3888e54f4"
integrity sha512-pl4YWM1vhZTJNjSZzdJb+yYPrvJ7XxHoih8iV/7XbSQwXVBZsRdnJKkzf94GV+DM/B+BGAKDT/E1xOFCoqY9QQ==
dependencies:
"@dhis2/d2-i18n" "1.0.6"
"@dhis2/ui-core" "3.12.0"
classnames "^2.2.6"
concurrently "^5.0.0"
styled-jsx "^3.2.3"
Expand Down Expand Up @@ -11355,7 +11361,7 @@ styled-jsx@^3.2.1:
stylis "3.5.4"
stylis-rule-sheet "0.0.10"

styled-jsx@^3.2.2, styled-jsx@^3.2.3:
styled-jsx@^3.2.3:
version "3.2.3"
resolved "https://registry.yarnpkg.com/styled-jsx/-/styled-jsx-3.2.3.tgz#c3b160a0622c892485103d0fef855347d78b9b67"
integrity sha512-TvEaDN4ArhFHJSZPzsKXmOiCTqWP434NW4eJD4iaTI5g3zph1BdpJPhAoE6I6wO1F6uYNgJZdT4AC2QlunTGcQ==
Expand Down