chore: use @dhis2/d2-ui-analytics package for shared components (#242)

The internal "shared" package is removed. Instead, get ItemSelector from @dhis2/d2-ui-analytics, and move the colors file back to app since it is only used there, and not in the plugin. This PR does not introduce any functional changes.
dhis2 · Apr 15, 2019 · 6d1d25d · 6d1d25d
1 parent 773be50
commit 6d1d25d
Show file tree

Hide file tree

Showing 45 changed files with 130 additions and 1,571 deletions.
diff --git a/packages/app/package.json b/packages/app/package.json
@@ -25,6 +25,7 @@
     },
     "dependencies": {
         "@dhis2/d2-i18n": "^1.0.3",
+        "@dhis2/d2-ui-analytics": "^0.0.12",
         "@dhis2/d2-ui-core": "5.1.3",
         "@dhis2/d2-ui-file-menu": "5.2.11",
         "@dhis2/d2-ui-interpretations": "5.2.10",

diff --git a/packages/app/src/components/AddToLayoutButton/styles/DropDownButton.style.js b/packages/app/src/components/AddToLayoutButton/styles/DropDownButton.style.js
@@ -1,4 +1,4 @@
-import { colors } from 'analytics-shared';
+import { colors } from '../../../modules/colors';
 
 export default {
     arrowDown: {

diff --git a/packages/app/src/components/AxisSetup/styles/AxisSetup.style.js b/packages/app/src/components/AxisSetup/styles/AxisSetup.style.js
@@ -1,4 +1,4 @@
-import { colors } from 'analytics-shared';
+import { colors } from '../../../modules/colors';
 
 export default {
     tableContainer: {

diff --git a/packages/app/src/components/DimensionsPanel/Dialogs/DataDimension/DataDimension.js b/packages/app/src/components/DimensionsPanel/Dialogs/DataDimension/DataDimension.js
@@ -8,7 +8,7 @@ import debounce from 'lodash-es/debounce';
 import keyBy from 'lodash-es/keyBy';
 import isEqual from 'lodash-es/isEqual';
 
-import { ItemSelector } from 'analytics-shared';
+import { ItemSelector } from '@dhis2/d2-ui-analytics';
 import DataTypes from './DataTypesSelector';
 import Groups from './Groups';
 import FilterField from '../FilterField';

diff --git a/...pp/src/components/DimensionsPanel/Dialogs/DataDimension/styles/DataTypesSelector.style.js b/...pp/src/components/DimensionsPanel/Dialogs/DataDimension/styles/DataTypesSelector.style.js
@@ -1,4 +1,4 @@
-import { colors } from 'analytics-shared';
+import { colors } from '../../../../../modules/colors';
 
 export const styles = {
     container: {

diff --git a/packages/app/src/components/DimensionsPanel/Dialogs/DataDimension/styles/Groups.style.js b/packages/app/src/components/DimensionsPanel/Dialogs/DataDimension/styles/Groups.style.js
@@ -1,4 +1,4 @@
-import { colors } from 'analytics-shared';
+import { colors } from '../../../../../modules/colors';
 
 export const styles = {
     container: {

diff --git a/packages/app/src/components/DimensionsPanel/Dialogs/DynamicDimension/DynamicDimension.js b/packages/app/src/components/DimensionsPanel/Dialogs/DynamicDimension/DynamicDimension.js
@@ -5,7 +5,7 @@ import DialogTitle from '@material-ui/core/DialogTitle';
 import DialogContent from '@material-ui/core/DialogContent';
 import i18n from '@dhis2/d2-i18n';
 import keyBy from 'lodash-es/keyBy';
-import { ItemSelector } from 'analytics-shared';
+import { ItemSelector } from '@dhis2/d2-ui-analytics';
 
 import FilterField from '../FilterField';
 

diff --git a/packages/app/src/components/DimensionsPanel/Dialogs/OrgUnitDimension/OrgUnitDimension.js b/packages/app/src/components/DimensionsPanel/Dialogs/OrgUnitDimension/OrgUnitDimension.js
@@ -5,7 +5,7 @@ import DialogContent from '@material-ui/core/DialogContent';
 import DialogTitle from '@material-ui/core/DialogTitle';
 import i18n from '@dhis2/d2-i18n';
 import PropTypes from 'prop-types';
-import { colors } from 'analytics-shared';
+import { colors } from '../../../../modules/colors';
 import { OrgUnitSelector, userOrgUnits } from '@dhis2/d2-ui-org-unit-dialog';
 
 import {

diff --git a/packages/app/src/components/DimensionsPanel/Dialogs/styles/FilterField.style.js b/packages/app/src/components/DimensionsPanel/Dialogs/styles/FilterField.style.js
@@ -1,4 +1,4 @@
-import { colors } from 'analytics-shared';
+import { colors } from '../../../../modules/colors';
 
 export const styles = {
     container: {

diff --git a/packages/app/src/components/DimensionsPanel/Filter/styles/Filter.style.js b/packages/app/src/components/DimensionsPanel/Filter/styles/Filter.style.js
@@ -1,4 +1,4 @@
-import { colors } from 'analytics-shared';
+import { colors } from '../../../../modules/colors';
 
 export const styles = {
     searchIcon: {

diff --git a/packages/app/src/components/DimensionsPanel/List/styles/DimensionItem.style.js b/packages/app/src/components/DimensionsPanel/List/styles/DimensionItem.style.js
@@ -1,4 +1,4 @@
-import { colors } from 'analytics-shared';
+import { colors } from '../../../../modules/colors';
 
 export const styles = {
     text: {

diff --git a/packages/app/src/components/DimensionsPanel/List/styles/RecommendedIcon.style.js b/packages/app/src/components/DimensionsPanel/List/styles/RecommendedIcon.style.js
@@ -1,4 +1,4 @@
-import { colors } from 'analytics-shared';
+import { colors } from '../../../../modules/colors';
 
 export const styles = {
     toolTip: {

diff --git a/packages/app/src/components/DimensionsPanel/styles/DimensionsPanel.style.js b/packages/app/src/components/DimensionsPanel/styles/DimensionsPanel.style.js
@@ -1,4 +1,4 @@
-import { colors } from 'analytics-shared';
+import { colors } from '../../../modules/colors';
 
 export const styles = {
     divContainer: {

diff --git a/packages/app/src/components/Layout/DefaultLayout/styles/DefaultAxis.style.js b/packages/app/src/components/Layout/DefaultLayout/styles/DefaultAxis.style.js
@@ -1,4 +1,4 @@
-import { colors } from 'analytics-shared';
+import { colors } from '../../../../modules/colors';
 import defaultLayoutStyle from './DefaultLayout.style';
 import * as layoutStyle from '../../styles/style';
 

diff --git a/packages/app/src/components/Layout/styles/Chip.style.js b/packages/app/src/components/Layout/styles/Chip.style.js
@@ -1,4 +1,4 @@
-import { colors } from 'analytics-shared';
+import { colors } from '../../../modules/colors';
 import * as layoutStyle from './style';
 
 export const styles = {

diff --git a/packages/app/src/components/Layout/styles/Tooltip.style.js b/packages/app/src/components/Layout/styles/Tooltip.style.js
@@ -1,4 +1,4 @@
-import { colors } from 'analytics-shared';
+import { colors } from '../../../modules/colors';
 
 export const styles = {
     tooltip: {

diff --git a/packages/app/src/components/Layout/styles/style.js b/packages/app/src/components/Layout/styles/style.js
@@ -1,4 +1,4 @@
-import { colors } from 'analytics-shared';
+import { colors } from '../../../modules/colors';
 
 // Layout
 export const LAYOUT_HEIGHT = '78px';

diff --git a/packages/app/src/components/Snackbar/styles/Snackbar.style.js b/packages/app/src/components/Snackbar/styles/Snackbar.style.js
@@ -1,4 +1,4 @@
-import { colors } from 'analytics-shared';
+import { colors } from '../../../modules/colors';
 
 export default theme => ({
     container: {

diff --git a/packages/app/src/components/TitleBar/styles/TitleBar.style.js b/packages/app/src/components/TitleBar/styles/TitleBar.style.js
@@ -1,4 +1,4 @@
-import { colors } from 'analytics-shared';
+import { colors } from '../../../modules/colors';
 
 export default {
     titleBar: {

diff --git a/packages/app/src/components/UpdateButton/styles/UpdateButton.style.js b/packages/app/src/components/UpdateButton/styles/UpdateButton.style.js
@@ -1,4 +1,4 @@
-import { colors } from 'analytics-shared';
+import { colors } from '../../../modules/colors';
 
 export default {
     flat: {

diff --git a/packages/app/src/components/Visualization/styles/BlankCanvas.style.js b/packages/app/src/components/Visualization/styles/BlankCanvas.style.js
@@ -1,4 +1,4 @@
-import { colors } from 'analytics-shared';
+import { colors } from '../../../modules/colors';
 
 const error = {
     fontWeight: 'bold',

diff --git a/...es/app/src/components/VisualizationTypeSelector/styles/VisualizationTypeSelector.style.js b/...es/app/src/components/VisualizationTypeSelector/styles/VisualizationTypeSelector.style.js
@@ -1,4 +1,4 @@
-import { colors } from 'analytics-shared';
+import { colors } from '../../../modules/colors';
 
 export default {
     button: {

diff --git a/packages/shared/src/modules/colors.js → packages/app/src/modules/colors.js b/packages/shared/src/modules/colors.js → packages/app/src/modules/colors.js
diff --git a/packages/shared/package.json b/packages/shared/package.json
diff --git a/packages/shared/src/components/ItemSelector/Item.js b/packages/shared/src/components/ItemSelector/Item.js
diff --git a/packages/shared/src/components/ItemSelector/ItemIcon.js b/packages/shared/src/components/ItemSelector/ItemIcon.js
diff --git a/packages/shared/src/components/ItemSelector/ItemSelector.css b/packages/shared/src/components/ItemSelector/ItemSelector.css