From: Ariel Kenan Date: Sun, 7 Jul 2019 11:08:55 +0000 (+0300) Subject: Upgrade to ONAP-UI X-Git-Tag: 1.5.0~4 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=36d376ea2124d88d627a0ada4e176e37e070f571;p=sdc%2Fsdc-workflow-designer.git Upgrade to ONAP-UI Change-Id: I1266dea133a4bd5196ba7662c0905afaa021972d Issue-ID: SDC-2411 Signed-off-by: Ariel Kenan --- diff --git a/workflow-designer-ui/src/main/frontend/package.json b/workflow-designer-ui/src/main/frontend/package.json index f1fde4d4..bc43db1b 100644 --- a/workflow-designer-ui/src/main/frontend/package.json +++ b/workflow-designer-ui/src/main/frontend/package.json @@ -34,6 +34,8 @@ "lodash.set": "^4.3.2", "md5": "^2.2.1", "moment": "^2.18.1", + "onap-ui-common": "^1.0.101", + "onap-ui-react": "^1.0.0", "perfect-scrollbar": "^1.4.0", "prop-types": "^15.6.1", "qs": "^6.5.2", @@ -52,7 +54,6 @@ "redux-saga": "^0.16.0", "redux-thunk": "^2.3.0", "reselect": "^3.0.1", - "sdc-ui": "1.6.61", "uuid-js": "^0.7.5", "validator": "^10.2.0" }, diff --git a/workflow-designer-ui/src/main/frontend/resources/scss/_common.scss b/workflow-designer-ui/src/main/frontend/resources/scss/_common.scss index edde536f..825609d7 100644 --- a/workflow-designer-ui/src/main/frontend/resources/scss/_common.scss +++ b/workflow-designer-ui/src/main/frontend/resources/scss/_common.scss @@ -1,5 +1,5 @@ -@import '../../node_modules/sdc-ui/lib/style/scss/common/typography.scss'; -@import '../../node_modules/sdc-ui/lib/style/scss/common/variables.scss'; +@import '~onap-ui-common/lib/scss/_typography.scss'; +@import '~onap-ui-common/lib/scss/variables.scss'; @import 'common/fonts'; @import 'common/utils'; @import 'common/customVariables'; diff --git a/workflow-designer-ui/src/main/frontend/resources/scss/style.scss b/workflow-designer-ui/src/main/frontend/resources/scss/style.scss index 88e33a9c..09e8c8bc 100644 --- a/workflow-designer-ui/src/main/frontend/resources/scss/style.scss +++ b/workflow-designer-ui/src/main/frontend/resources/scss/style.scss @@ -1,7 +1,7 @@ -@import '../../node_modules/bpmn-js/dist/assets/diagram-js.css'; -@import '../../node_modules/bpmn-js/dist/assets/bpmn-font/css/bpmn.css'; +@import '~bpmn-js/dist/assets/diagram-js.css'; +@import '~bpmn-js/dist/assets/bpmn-font/css/bpmn.css'; @import 'common'; -@import '../../node_modules/sdc-ui/lib/css/style.css'; -@import '../../node_modules/perfect-scrollbar/css/perfect-scrollbar.css'; +@import '~onap-ui-common/lib/style.css'; +@import '~perfect-scrollbar/css/perfect-scrollbar.css'; @import 'components'; @import 'features'; diff --git a/workflow-designer-ui/src/main/frontend/src/features/catalog/views/AddWorkflow.jsx b/workflow-designer-ui/src/main/frontend/src/features/catalog/views/AddWorkflow.jsx index 7209f633..1700d92e 100644 --- a/workflow-designer-ui/src/main/frontend/src/features/catalog/views/AddWorkflow.jsx +++ b/workflow-designer-ui/src/main/frontend/src/features/catalog/views/AddWorkflow.jsx @@ -17,7 +17,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { Translate } from 'react-redux-i18n'; -import SVGIcon from 'sdc-ui/lib/react/SVGIcon'; +import { SVGIcon } from 'onap-ui-react'; class AddWorkflow extends React.Component { render() { diff --git a/workflow-designer-ui/src/main/frontend/src/features/catalog/views/Main.jsx b/workflow-designer-ui/src/main/frontend/src/features/catalog/views/Main.jsx index b363dd84..b4288f3b 100644 --- a/workflow-designer-ui/src/main/frontend/src/features/catalog/views/Main.jsx +++ b/workflow-designer-ui/src/main/frontend/src/features/catalog/views/Main.jsx @@ -19,7 +19,7 @@ import PropTypes from 'prop-types'; import { Translate } from 'react-redux-i18n'; import { ASC } from 'features/catalog/catalogConstants'; -import SVGIcon from 'sdc-ui/lib/react/SVGIcon'; +import { SVGIcon } from 'onap-ui-react'; class Main extends Component { render() { diff --git a/workflow-designer-ui/src/main/frontend/src/features/catalog/views/Workflows.jsx b/workflow-designer-ui/src/main/frontend/src/features/catalog/views/Workflows.jsx index a94e4541..d69ec47e 100644 --- a/workflow-designer-ui/src/main/frontend/src/features/catalog/views/Workflows.jsx +++ b/workflow-designer-ui/src/main/frontend/src/features/catalog/views/Workflows.jsx @@ -17,7 +17,7 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { Tile, TileInfo, TileInfoLine } from 'sdc-ui/lib/react'; +import { Tile, TileInfo, TileInfoLine } from 'onap-ui-react'; const Workflows = ({ items, onWorkflowClick }) => items.map((workflow, index) => ( diff --git a/workflow-designer-ui/src/main/frontend/src/features/version/composition/components/CompositionButton.js b/workflow-designer-ui/src/main/frontend/src/features/version/composition/components/CompositionButton.js index 433e0559..62500d25 100644 --- a/workflow-designer-ui/src/main/frontend/src/features/version/composition/components/CompositionButton.js +++ b/workflow-designer-ui/src/main/frontend/src/features/version/composition/components/CompositionButton.js @@ -15,7 +15,7 @@ */ import React from 'react'; import PropTypes from 'prop-types'; -import SVGIcon from 'sdc-ui/lib/react/SVGIcon'; +import { SVGIcon } from 'onap-ui-react'; const CompositionButton = ({ onClick, name, title, disabled }) => (
description