Merge pull request #178 from dhis2/dependabot/npm_and_yarn/dhis2/ui-6…

….6.2 chore(deps): bump @dhis2/ui from 6.5.0-alpha.2 to 6.6.2
dhis2 · May 20, 2021 · 44953f5 · 44953f5
2 parents 7574c90 + 3ea1e88
commit 44953f5
Show file tree

Hide file tree

Showing 31 changed files with 39 additions and 989 deletions.
diff --git a/package.json b/package.json
@@ -23,7 +23,7 @@
         "@dhis2/app-runtime": "^2.8.0",
         "@dhis2/d2-i18n": "^1.1.0",
         "@dhis2/prop-types": "2.0.3",
-        "@dhis2/ui": "^6.5.0-alpha.2",
+        "@dhis2/ui": "^6.6.2",
         "cronstrue": "^1.113.0",
         "history": "^4.9.0",
         "moment": "^2.29.1",

diff --git a/src/components/FormFields/ParameterFields.js b/src/components/FormFields/ParameterFields.js
@@ -1,9 +1,8 @@
 import React from 'react'
 import i18n from '@dhis2/d2-i18n'
 import { PropTypes } from '@dhis2/prop-types'
-import { ReactFinalForm, InputFieldFF, Box } from '@dhis2/ui'
+import { ReactFinalForm, InputFieldFF, Box, SwitchFieldFF } from '@dhis2/ui'
 import { hooks } from '../Store'
-import { SwitchFieldFF } from '../Temporary'
 import { formatToString } from './formatters'
 import SkipTableTypesField from './SkipTableTypesField'
 import LabeledOptionsField from './LabeledOptionsField'

diff --git a/src/components/Temporary/LinkButton.js → src/components/LinkButton/LinkButton.js b/src/components/Temporary/LinkButton.js → src/components/LinkButton/LinkButton.js
diff --git a/...omponents/Temporary/LinkButton.module.css → ...mponents/LinkButton/LinkButton.module.css b/...omponents/Temporary/LinkButton.module.css → ...mponents/LinkButton/LinkButton.module.css
diff --git a/src/components/LinkButton/index.js b/src/components/LinkButton/index.js
@@ -0,0 +1,3 @@
+import LinkButton from './LinkButton'
+
+export { LinkButton }
diff --git a/src/components/Modal/CronPresetModal.js b/src/components/Modal/CronPresetModal.js
@@ -7,9 +7,9 @@ import {
     ModalContent,
     ModalActions,
     ButtonStrip,
+    Radio,
 } from '@dhis2/ui'
 import i18n from '@dhis2/d2-i18n'
-import { Radio } from '../Temporary'
 
 const cronPresets = [
     {

diff --git a/src/components/Switches/ToggleJobSwitch.js b/src/components/Switches/ToggleJobSwitch.js
@@ -2,7 +2,7 @@ import React from 'react'
 import { PropTypes } from '@dhis2/prop-types'
 import { useDataMutation } from '@dhis2/app-runtime'
 import i18n from '@dhis2/d2-i18n'
-import { Switch } from '../Temporary'
+import { Switch } from '@dhis2/ui'
 import { hooks } from '../Store'
 
 /* istanbul ignore next */

diff --git a/src/components/Temporary/Radio.js b/src/components/Temporary/Radio.js
diff --git a/src/components/Temporary/RadioIcons.js b/src/components/Temporary/RadioIcons.js
diff --git a/src/components/Temporary/RadioIcons.module.css b/src/components/Temporary/RadioIcons.module.css
diff --git a/src/components/Temporary/Required.js b/src/components/Temporary/Required.js
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		import LinkButton from './LinkButton'

		export { LinkButton }