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(deps): upgrade @dhis2/ui-core to 4.1.1 and @dhis2/ui-widgets to 2.0.4 #198

Merged
merged 5 commits into from
Dec 9, 2019
Merged

chore(deps): upgrade @dhis2/ui-core to 4.1.1 and @dhis2/ui-widgets to 2.0.4 #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
92642b6
chore(deps): bump @dhis2-ui-core to 4.1.1
edoardo Dec 6, 2019
1f3ac98
fix: pass the right arguments to input field onChange
edoardo Dec 9, 2019
70d4f84
chore(deps): upgrade ui-core and ui-widgets in adapter to prevent dups
amcgee Dec 9, 2019
a80e9a5
chore: force lockfile update
amcgee Dec 9, 2019
a00d647
fix: use new Modal sub-components in LoginDialog
amcgee Dec 9, 2019
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
2 changes: 1 addition & 1 deletion cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@dhis2/app-runtime": "^2.0.4",
"@dhis2/cli-helpers-engine": "^1.5.0",
"@dhis2/d2-i18n": "^1.0.5",
"@dhis2/ui-core": "^3.11.0",
"@dhis2/ui-core": "^4.1.1",
"archiver": "^3.1.1",
"babel-jest": "^24.9.0",
"chokidar": "^3.3.0",
Expand Down
5 changes: 2 additions & 3 deletions shell/adapter/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
"build"
],
"dependencies": {
"@dhis2/ui-core": "^3.12.0",
"@dhis2/ui-widgets": "^2.0.2",
"@dhis2/ui-widgets": "^2.0.4",
"moment": "^2.24.0"
},
"devDependencies": {},
Expand All @@ -19,7 +18,7 @@
"peerDependencies": {
"@dhis2/app-runtime": "^2.0.4",
"@dhis2/d2-i18n": "^1.0.5",
"@dhis2/ui-core": "^3.7.1",
"@dhis2/ui-core": "^4.1.1",
"classnames": "^2.2.6",
"moment": "^2.24.0",
"prop-types": "^15.7.2",
Expand Down
25 changes: 16 additions & 9 deletions shell/adapter/src/AuthBoundary/LoginModal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
import React, { useState } from 'react'
import i18n from '../locales'
import { Modal, Button, InputField } from '@dhis2/ui-core'
import {
Modal,
ModalTitle,
ModalContent,
ModalActions,
Button,
InputField,
} from '@dhis2/ui-core'

const staticUrl = process.env.REACT_APP_DHIS2_BASE_URL

Expand Down Expand Up @@ -47,16 +54,16 @@ export const LoginModal = ({ url }) => {
return (
<Modal open small>
<form onSubmit={onSubmit}>
<Modal.Title>{i18n.t('Please sign in')}</Modal.Title>
<Modal.Content>
<ModalTitle>{i18n.t('Please sign in')}</ModalTitle>
<ModalContent>
{!staticUrl && (
<InputField
error={isDirty && !isValid(server)}
label={i18n.t('Server')}
name="server"
type="text"
value={server}
onChange={_ref => setServer(_ref.target.value)}
onChange={input => setServer(input.value)}
/>
)}
<InputField
Expand All @@ -65,22 +72,22 @@ export const LoginModal = ({ url }) => {
name="j_username"
type="text"
value={username}
onChange={_ref => setUsername(_ref.target.value)}
onChange={input => setUsername(input.value)}
/>
<InputField
error={isDirty && !isValid(password)}
label={i18n.t('Password')}
name="j_password"
type="password"
value={password}
onChange={_ref => setPassword(_ref.target.value)}
onChange={input => setPassword(input.value)}
/>
</Modal.Content>
<Modal.Actions>
</ModalContent>
<ModalActions>
<Button primary type="submit">
{i18n.t('Sign in')}
</Button>
</Modal.Actions>
</ModalActions>
</form>
</Modal>
)
Expand Down
Loading