diff options
60 files changed, 91 insertions, 83 deletions
diff --git a/openecomp-ui/package.json b/openecomp-ui/package.json index 4ce2c77582..0bd2243cc8 100644 --- a/openecomp-ui/package.json +++ b/openecomp-ui/package.json @@ -29,9 +29,12 @@ "intl-relativeformat": "^1.2.0", "lodash": "^4.13.1", "md5": "^2.1.0", + "onap-ui-react": "^1.0.0", + "onap-ui-common": "^1.0.101", "prop-types": "^15.6.2", "react": "^16.4.2", "react-bootstrap": "^0.32.1", + "react-checkbox-tree": "1.4.1", "react-click-outside": "^3.0.1", "react-datepicker": "^0.61.0", "react-dnd": "^2.5.4", @@ -45,10 +48,8 @@ "react-sortable": "^1.2.1", "react-transition-group": "^2.4.0", "redux": "^3.7.2", - "sdc-ui": "1.6.62", "uuid-js": "^0.7.5", - "validator": "^4.3.0", - "react-checkbox-tree": "1.4.1" + "validator": "^4.3.0" }, "devDependencies": { "babel-core": "^6.24.0", @@ -116,7 +117,7 @@ "\\.(css|scss)$": "<rootDir>/test-utils/styleMock.js", "\\.worker\\.js$": "<rootDir>/test-utils/workerMock.js", "^nfvo-utils/RestAPIUtil.js$": "<rootDir>/test-utils/MockRest.js", - "^sdc-ui/lib/react/SVGIcon.js$": "<rootDir>/test-utils/MockSVGIcon.js", + "^onap-ui-react/lib/components/SVGIcon.js$": "<rootDir>/test-utils/MockSVGIcon.js", "^react-show-more$": "<rootDir>/test-utils/ShowMore.js", "^nfvo-utils(.*)$": "<rootDir>/src/nfvo-utils$1", "^nfvo-components(.*)$": "<rootDir>/src/nfvo-components$1", diff --git a/openecomp-ui/resources/scss/components/_datepicker.scss b/openecomp-ui/resources/scss/components/_datepicker.scss index e9c0f40425..1b2151cbcd 100644 --- a/openecomp-ui/resources/scss/components/_datepicker.scss +++ b/openecomp-ui/resources/scss/components/_datepicker.scss @@ -92,11 +92,11 @@ } .react-datepicker__navigation--previous::before { left: 0; - content: url(../../node_modules/sdc-ui/assets/icons/angleLeft.svg); + content: url(~onap-ui-common/lib/icons/angleLeft.svg); } .react-datepicker__navigation--next::before { right: 0; - content: url(../../node_modules/sdc-ui/assets/icons/angleRight.svg); + content: url(~onap-ui-common/lib/icons/angleRight.svg); } .react-datepicker__navigation--previous, diff --git a/openecomp-ui/resources/scss/modules/_versionsPage.scss b/openecomp-ui/resources/scss/modules/_versionsPage.scss index c29230198a..0f2e83eec6 100644 --- a/openecomp-ui/resources/scss/modules/_versionsPage.scss +++ b/openecomp-ui/resources/scss/modules/_versionsPage.scss @@ -97,8 +97,8 @@ stroke: $white; padding-top: 5px; padding-bottom: 3px; - height: 29px; - width: 29px; + height: 24px; + width: 32px; border-radius: 20px; border: 1px solid $blue; box-shadow: inset 0px 0px 0px 2px $white; diff --git a/openecomp-ui/src/nfvo-components/SubmitErrorResponse.jsx b/openecomp-ui/src/nfvo-components/SubmitErrorResponse.jsx index 56382d6325..793a42074a 100644 --- a/openecomp-ui/src/nfvo-components/SubmitErrorResponse.jsx +++ b/openecomp-ui/src/nfvo-components/SubmitErrorResponse.jsx @@ -16,7 +16,7 @@ import React, { Component } from 'react'; import ListGroupItem from 'react-bootstrap/lib/ListGroupItem.js'; import i18n from 'nfvo-utils/i18n/i18n.js'; -import SVGIcon from 'sdc-ui/lib/react/SVGIcon.js'; +import { SVGIcon } from 'onap-ui-react'; import { Collapse } from 'react-bootstrap'; /** * parsing and showing the following Java Response object diff --git a/openecomp-ui/src/nfvo-components/datepicker/Datepicker.jsx b/openecomp-ui/src/nfvo-components/datepicker/Datepicker.jsx index 33db247aee..0945a14ecc 100644 --- a/openecomp-ui/src/nfvo-components/datepicker/Datepicker.jsx +++ b/openecomp-ui/src/nfvo-components/datepicker/Datepicker.jsx @@ -17,7 +17,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import DatePicker from 'react-datepicker'; import moment from 'moment'; -import SVGIcon from 'sdc-ui/lib/react/SVGIcon.js'; +import SVGIcon from 'onap-ui-react/lib/components/SVGIcon.js'; class CustomInput extends React.Component { static propTypes = { diff --git a/openecomp-ui/src/nfvo-components/fileupload/DraggableUploadFileBox.jsx b/openecomp-ui/src/nfvo-components/fileupload/DraggableUploadFileBox.jsx index 2dfbf3ab9c..bc0ddab12a 100644 --- a/openecomp-ui/src/nfvo-components/fileupload/DraggableUploadFileBox.jsx +++ b/openecomp-ui/src/nfvo-components/fileupload/DraggableUploadFileBox.jsx @@ -28,7 +28,7 @@ */ import React, { Component } from 'react'; import i18n from 'nfvo-utils/i18n/i18n.js'; -import Button from 'sdc-ui/lib/react/Button.js'; +import { Button } from 'onap-ui-react'; class DraggableUploadFileBox extends Component { render() { diff --git a/openecomp-ui/src/nfvo-components/input/ExpandableInput.jsx b/openecomp-ui/src/nfvo-components/input/ExpandableInput.jsx index 37d79cb72e..e021d6b375 100644 --- a/openecomp-ui/src/nfvo-components/input/ExpandableInput.jsx +++ b/openecomp-ui/src/nfvo-components/input/ExpandableInput.jsx @@ -16,7 +16,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import ReactDOM from 'react-dom'; -import SVGIcon from 'sdc-ui/lib/react/SVGIcon.js'; +import { SVGIcon } from 'onap-ui-react'; import Input from 'nfvo-components/input/validation/InputWrapper.jsx'; const ExpandableInputClosed = ({ iconType, onClick }) => ( diff --git a/openecomp-ui/src/nfvo-components/input/dualListbox/DualListboxView.jsx b/openecomp-ui/src/nfvo-components/input/dualListbox/DualListboxView.jsx index 21f09e6613..ea93b84986 100644 --- a/openecomp-ui/src/nfvo-components/input/dualListbox/DualListboxView.jsx +++ b/openecomp-ui/src/nfvo-components/input/dualListbox/DualListboxView.jsx @@ -15,7 +15,7 @@ */ import React from 'react'; import PropTypes from 'prop-types'; -import SVGIcon from 'sdc-ui/lib/react/SVGIcon.js'; +import SVGIcon from 'onap-ui-react/lib/components/SVGIcon.js'; import Input from 'nfvo-components/input/validation/Input.jsx'; class DualListboxView extends React.Component { diff --git a/openecomp-ui/src/nfvo-components/input/validation/Input.jsx b/openecomp-ui/src/nfvo-components/input/validation/Input.jsx index b27ba1db3b..16a0abc5fd 100644 --- a/openecomp-ui/src/nfvo-components/input/validation/Input.jsx +++ b/openecomp-ui/src/nfvo-components/input/validation/Input.jsx @@ -17,7 +17,7 @@ import React from 'react'; import ReactDOM from 'react-dom'; import classNames from 'classnames'; import Checkbox from 'react-bootstrap/lib/Checkbox.js'; -import Radio from 'sdc-ui/lib/react/Radio.js'; +import { Radio } from 'onap-ui-react'; import FormGroup from 'react-bootstrap/lib/FormGroup.js'; import FormControl from 'react-bootstrap/lib/FormControl.js'; import Overlay from 'react-bootstrap/lib/Overlay.js'; diff --git a/openecomp-ui/src/nfvo-components/input/validation/InputWrapper.jsx b/openecomp-ui/src/nfvo-components/input/validation/InputWrapper.jsx index 3e0bb32ca9..3dcba86def 100644 --- a/openecomp-ui/src/nfvo-components/input/validation/InputWrapper.jsx +++ b/openecomp-ui/src/nfvo-components/input/validation/InputWrapper.jsx @@ -17,7 +17,7 @@ import React from 'react'; import ReactDOM from 'react-dom'; import classNames from 'classnames'; import Checkbox from 'react-bootstrap/lib/Checkbox.js'; -import Radio from 'sdc-ui/lib/react/Radio.js'; +import { Radio } from 'onap-ui-react'; import FormGroup from 'react-bootstrap/lib/FormGroup.js'; import FormControl from 'react-bootstrap/lib/FormControl.js'; diff --git a/openecomp-ui/src/nfvo-components/input/validation/Tabs.jsx b/openecomp-ui/src/nfvo-components/input/validation/Tabs.jsx index 429985a902..6cfb7f6416 100644 --- a/openecomp-ui/src/nfvo-components/input/validation/Tabs.jsx +++ b/openecomp-ui/src/nfvo-components/input/validation/Tabs.jsx @@ -16,7 +16,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import ReactDOM from 'react-dom'; -import { default as SDCTabs } from 'sdc-ui/lib/react/Tabs.js'; +import { Tabs as SDCTabs } from 'onap-ui-react'; import Overlay from 'react-bootstrap/lib/Overlay.js'; import Tooltip from 'react-bootstrap/lib/Tooltip.js'; diff --git a/openecomp-ui/src/nfvo-components/input/validation/ValidationButtons.jsx b/openecomp-ui/src/nfvo-components/input/validation/ValidationButtons.jsx index a4397114a0..9c64986a98 100644 --- a/openecomp-ui/src/nfvo-components/input/validation/ValidationButtons.jsx +++ b/openecomp-ui/src/nfvo-components/input/validation/ValidationButtons.jsx @@ -23,8 +23,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import i18n from 'nfvo-utils/i18n/i18n.js'; -import Button from 'sdc-ui/lib/react/Button.js'; -import SVGIcon from 'sdc-ui/lib/react/SVGIcon.js'; +import { Button, SVGIcon } from 'onap-ui-react'; class ValidationButtons extends React.Component { static propTypes = { diff --git a/openecomp-ui/src/nfvo-components/listEditor/ListEditorItemView.jsx b/openecomp-ui/src/nfvo-components/listEditor/ListEditorItemView.jsx index 359af9d3b8..1edb69fa68 100644 --- a/openecomp-ui/src/nfvo-components/listEditor/ListEditorItemView.jsx +++ b/openecomp-ui/src/nfvo-components/listEditor/ListEditorItemView.jsx @@ -17,7 +17,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import classnames from 'classnames'; import i18n from 'nfvo-utils/i18n/i18n.js'; -import SVGIcon from 'sdc-ui/lib/react/SVGIcon.js'; +import SVGIcon from 'onap-ui-react/lib/components/SVGIcon.js'; import store from 'sdc-app/AppStore.js'; import { actionTypes as modalActionTypes } from 'nfvo-components/modal/GlobalModalConstants.js'; diff --git a/openecomp-ui/src/nfvo-components/listEditor/ListEditorView.jsx b/openecomp-ui/src/nfvo-components/listEditor/ListEditorView.jsx index f71372ce1a..1d079b3f5c 100644 --- a/openecomp-ui/src/nfvo-components/listEditor/ListEditorView.jsx +++ b/openecomp-ui/src/nfvo-components/listEditor/ListEditorView.jsx @@ -15,7 +15,7 @@ */ import React from 'react'; import PropTypes from 'prop-types'; -import Button from 'sdc-ui/lib/react/Button.js'; +import { Button } from 'onap-ui-react'; import classnames from 'classnames'; import ExpandableInput from 'nfvo-components/input/ExpandableInput.jsx'; diff --git a/openecomp-ui/src/nfvo-components/modal/GlobalModal.js b/openecomp-ui/src/nfvo-components/modal/GlobalModal.js index 118740498d..9470490c8a 100644 --- a/openecomp-ui/src/nfvo-components/modal/GlobalModal.js +++ b/openecomp-ui/src/nfvo-components/modal/GlobalModal.js @@ -24,7 +24,7 @@ import { ModalTitle, ModalBody, ModalFooter -} from 'sdc-ui/lib/react'; +} from 'onap-ui-react'; import i18n from 'nfvo-utils/i18n/i18n.js'; import { modalContentComponents } from 'sdc-app/common/modal/ModalContentMapper.js'; import { actionTypes, typeEnum } from './GlobalModalConstants.js'; diff --git a/openecomp-ui/src/nfvo-components/notification/Notifications.js b/openecomp-ui/src/nfvo-components/notification/Notifications.js index d1ece699a8..604549a425 100644 --- a/openecomp-ui/src/nfvo-components/notification/Notifications.js +++ b/openecomp-ui/src/nfvo-components/notification/Notifications.js @@ -15,7 +15,7 @@ */ import React from 'react'; -import { Portal, Notification } from 'sdc-ui/lib/react/'; +import { Portal, Notification } from 'onap-ui-react'; import { connect } from 'react-redux'; import { notificationActions } from './NotificationsConstants.js'; import { CSSTransition, TransitionGroup } from 'react-transition-group'; diff --git a/openecomp-ui/src/nfvo-components/panel/versionController/components/ActionButtons.jsx b/openecomp-ui/src/nfvo-components/panel/versionController/components/ActionButtons.jsx index 8905aa3f44..fb244a80f6 100644 --- a/openecomp-ui/src/nfvo-components/panel/versionController/components/ActionButtons.jsx +++ b/openecomp-ui/src/nfvo-components/panel/versionController/components/ActionButtons.jsx @@ -17,7 +17,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import i18n from 'nfvo-utils/i18n/i18n.js'; import ClickOutsideWrapper from 'nfvo-components/clickOutsideWrapper/ClickOutsideWrapper.jsx'; -import SVGIcon from 'sdc-ui/lib/react/SVGIcon.js'; +import { SVGIcon } from 'onap-ui-react'; import Overlay from 'nfvo-components/overlay/Overlay.jsx'; import Permissions from './Permissions.jsx'; diff --git a/openecomp-ui/src/nfvo-components/panel/versionController/components/Permissions.jsx b/openecomp-ui/src/nfvo-components/panel/versionController/components/Permissions.jsx index 6e0ae8187b..c54275d25e 100644 --- a/openecomp-ui/src/nfvo-components/panel/versionController/components/Permissions.jsx +++ b/openecomp-ui/src/nfvo-components/panel/versionController/components/Permissions.jsx @@ -16,7 +16,7 @@ import React from 'react'; import i18n from 'nfvo-utils/i18n/i18n.js'; -import SVGIcon from 'sdc-ui/lib/react/SVGIcon.js'; +import { SVGIcon } from 'onap-ui-react'; const Contributor = ({ name, role, id, userInfo }) => { const selected = id === userInfo.userId ? 'selected' : ''; diff --git a/openecomp-ui/src/nfvo-components/table/SelectActionTable.jsx b/openecomp-ui/src/nfvo-components/table/SelectActionTable.jsx index ee8a9dca45..1baf0484d2 100644 --- a/openecomp-ui/src/nfvo-components/table/SelectActionTable.jsx +++ b/openecomp-ui/src/nfvo-components/table/SelectActionTable.jsx @@ -1,7 +1,6 @@ import React from 'react'; import i18n from 'nfvo-utils/i18n/i18n.js'; -import SVGIcon from 'sdc-ui/lib/react/SVGIcon.js'; -import Button from 'sdc-ui/lib/react/Button.js'; +import { SVGIcon, Button } from 'onap-ui-react'; import uuid from 'uuid-js'; export default class SelectActionTable extends React.Component { diff --git a/openecomp-ui/src/nfvo-components/table/SelectActionTableRow.jsx b/openecomp-ui/src/nfvo-components/table/SelectActionTableRow.jsx index 1c2c1529f2..27d728f2c8 100644 --- a/openecomp-ui/src/nfvo-components/table/SelectActionTableRow.jsx +++ b/openecomp-ui/src/nfvo-components/table/SelectActionTableRow.jsx @@ -1,5 +1,5 @@ import React from 'react'; -import SVGIcon from 'sdc-ui/lib/react/SVGIcon.js'; +import { SVGIcon } from 'onap-ui-react'; import OverlayTrigger from 'react-bootstrap/lib/OverlayTrigger.js'; import Tooltip from 'react-bootstrap/lib/Tooltip.js'; diff --git a/openecomp-ui/src/nfvo-components/vnfMarketPlace/VnfRepositorySearchBox.jsx b/openecomp-ui/src/nfvo-components/vnfMarketPlace/VnfRepositorySearchBox.jsx index ab8a18b4c6..2c82c2be6c 100644 --- a/openecomp-ui/src/nfvo-components/vnfMarketPlace/VnfRepositorySearchBox.jsx +++ b/openecomp-ui/src/nfvo-components/vnfMarketPlace/VnfRepositorySearchBox.jsx @@ -18,7 +18,7 @@ import React, { Component } from 'react'; import DraggableUploadFileBox from 'nfvo-components/fileupload/DraggableUploadFileBox.jsx'; import Configuration from 'sdc-app/config/Configuration.js'; import i18n from 'nfvo-utils/i18n/i18n.js'; -import SVGIcon from 'sdc-ui/lib/react/SVGIcon.js'; +import { SVGIcon } from 'onap-ui-react'; function VNFBrowse({ onBrowseVNF, isReadOnlyMode }) { if (!Configuration.get('showBrowseVNF')) { diff --git a/openecomp-ui/src/sdc-app/common/activity-log/ActivityLogView.jsx b/openecomp-ui/src/sdc-app/common/activity-log/ActivityLogView.jsx index 4beb29254c..0c62abc0bb 100644 --- a/openecomp-ui/src/sdc-app/common/activity-log/ActivityLogView.jsx +++ b/openecomp-ui/src/sdc-app/common/activity-log/ActivityLogView.jsx @@ -17,7 +17,7 @@ import React, { Component } from 'react'; import OverlayTrigger from 'react-bootstrap/lib/OverlayTrigger.js'; import Tooltip from 'react-bootstrap/lib/Tooltip.js'; import ListEditorView from 'nfvo-components/listEditor/ListEditorView.jsx'; -import SVGIcon from 'sdc-ui/lib/react/SVGIcon.js'; +import { SVGIcon } from 'onap-ui-react'; import i18n from 'nfvo-utils/i18n/i18n.js'; function ActivityLogSortableCellHeader({ isHeader, data, isDes, onSort }) { diff --git a/openecomp-ui/src/sdc-app/common/merge/MergeEditorView.jsx b/openecomp-ui/src/sdc-app/common/merge/MergeEditorView.jsx index 0664952b23..9abe5e12ce 100644 --- a/openecomp-ui/src/sdc-app/common/merge/MergeEditorView.jsx +++ b/openecomp-ui/src/sdc-app/common/merge/MergeEditorView.jsx @@ -16,13 +16,11 @@ import React from 'react'; import i18n from 'nfvo-utils/i18n/i18n.js'; import union from 'lodash/union.js'; -import Button from 'sdc-ui/lib/react/Button.js'; -// import Checkbox from 'sdc-ui/lib/react/Checkbox.js'; +import { Button, SVGIcon, Radio } from 'onap-ui-react'; +// import Checkbox from 'onap-ui-react/Checkbox.js'; import Input from 'nfvo-components/input/validation/Input.jsx'; import GridSection from 'nfvo-components/grid/GridSection.jsx'; import GridItem from 'nfvo-components/grid/GridItem.jsx'; -import SVGIcon from 'sdc-ui/lib/react/SVGIcon.js'; -import Radio from 'sdc-ui/lib/react/Radio.js'; import equal from 'deep-equal'; import { ResolutionTypes } from './MergeEditorConstants.js'; diff --git a/openecomp-ui/src/sdc-app/flows/SequenceDiagram.jsx b/openecomp-ui/src/sdc-app/flows/SequenceDiagram.jsx index ca24964472..8e7c87d613 100644 --- a/openecomp-ui/src/sdc-app/flows/SequenceDiagram.jsx +++ b/openecomp-ui/src/sdc-app/flows/SequenceDiagram.jsx @@ -15,7 +15,7 @@ */ import React, { Component } from 'react'; import PropTypes from 'prop-types'; -import Button from 'sdc-ui/lib/react/Button.js'; +import { Button } from 'onap-ui-react'; import Sequencer from 'dox-sequence-diagram-ui'; import i18n from 'nfvo-utils/i18n/i18n.js'; diff --git a/openecomp-ui/src/sdc-app/onboarding/licenseModel/components/ModalButtons.jsx b/openecomp-ui/src/sdc-app/onboarding/licenseModel/components/ModalButtons.jsx index 4fbbd1a8f0..225fddf554 100644 --- a/openecomp-ui/src/sdc-app/onboarding/licenseModel/components/ModalButtons.jsx +++ b/openecomp-ui/src/sdc-app/onboarding/licenseModel/components/ModalButtons.jsx @@ -17,7 +17,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import i18n from 'nfvo-utils/i18n/i18n.js'; -import Button from 'sdc-ui/lib/react/Button.js'; +import { Button } from 'onap-ui-react'; const ModalButtons = ({ isFormValid, diff --git a/openecomp-ui/src/sdc-app/onboarding/licenseModel/entitlementPools/EntitlementPoolsEditorView.jsx b/openecomp-ui/src/sdc-app/onboarding/licenseModel/entitlementPools/EntitlementPoolsEditorView.jsx index d0e91e382b..d1f9ff30b0 100644 --- a/openecomp-ui/src/sdc-app/onboarding/licenseModel/entitlementPools/EntitlementPoolsEditorView.jsx +++ b/openecomp-ui/src/sdc-app/onboarding/licenseModel/entitlementPools/EntitlementPoolsEditorView.jsx @@ -20,7 +20,6 @@ import i18n from 'nfvo-utils/i18n/i18n.js'; import Validator from 'nfvo-utils/Validator.js'; import Form from 'nfvo-components/input/validation/Form.jsx'; -import Button from 'sdc-ui/lib/react/Button.js'; import ModalButtons from 'sdc-app/onboarding/licenseModel/components/ModalButtons.jsx'; import { @@ -32,8 +31,7 @@ import { thresholdValueValidation } from '../LicenseModelValidations.js'; -import Tabs from 'sdc-ui/lib/react/Tabs.js'; -import Tab from 'sdc-ui/lib/react/Tab.js'; +import { Tabs, Tab, Button } from 'onap-ui-react'; import EntitlementPoolsLimits from './EntitlementPoolsLimits.js'; import { limitType, diff --git a/openecomp-ui/src/sdc-app/onboarding/licenseModel/featureGroups/FeatureGroupEditorView.jsx b/openecomp-ui/src/sdc-app/onboarding/licenseModel/featureGroups/FeatureGroupEditorView.jsx index 2a9af15984..c2551ad093 100644 --- a/openecomp-ui/src/sdc-app/onboarding/licenseModel/featureGroups/FeatureGroupEditorView.jsx +++ b/openecomp-ui/src/sdc-app/onboarding/licenseModel/featureGroups/FeatureGroupEditorView.jsx @@ -16,7 +16,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import Tabs from 'nfvo-components/input/validation/Tabs.jsx'; -import Tab from 'sdc-ui/lib/react/Tab.js'; +import { Tab } from 'onap-ui-react'; import GridSection from 'nfvo-components/grid/GridSection.jsx'; import GridItem from 'nfvo-components/grid/GridItem.jsx'; import { TabsForm as Form } from 'nfvo-components/input/validation/Form.jsx'; diff --git a/openecomp-ui/src/sdc-app/onboarding/licenseModel/licenseAgreement/LicenseAgreementEditorView.jsx b/openecomp-ui/src/sdc-app/onboarding/licenseModel/licenseAgreement/LicenseAgreementEditorView.jsx index b54c0806ef..5acb00ed80 100644 --- a/openecomp-ui/src/sdc-app/onboarding/licenseModel/licenseAgreement/LicenseAgreementEditorView.jsx +++ b/openecomp-ui/src/sdc-app/onboarding/licenseModel/licenseAgreement/LicenseAgreementEditorView.jsx @@ -19,7 +19,7 @@ import GridSection from 'nfvo-components/grid/GridSection.jsx'; import GridItem from 'nfvo-components/grid/GridItem.jsx'; import { TabsForm as Form } from 'nfvo-components/input/validation/Form.jsx'; import Tabs from 'nfvo-components/input/validation/Tabs.jsx'; -import Tab from 'sdc-ui/lib/react/Tab.js'; +import { Tab } from 'onap-ui-react'; import Input from 'nfvo-components/input/validation/Input.jsx'; import InputOptions from 'nfvo-components/input/validation/InputOptions.jsx'; import DualListboxView from 'nfvo-components/input/dualListbox/DualListboxView.jsx'; diff --git a/openecomp-ui/src/sdc-app/onboarding/licenseModel/licenseKeyGroups/LicenseKeyGroupsEditorView.jsx b/openecomp-ui/src/sdc-app/onboarding/licenseModel/licenseKeyGroups/LicenseKeyGroupsEditorView.jsx index 219f2dcd1e..28b8e8a0a8 100644 --- a/openecomp-ui/src/sdc-app/onboarding/licenseModel/licenseKeyGroups/LicenseKeyGroupsEditorView.jsx +++ b/openecomp-ui/src/sdc-app/onboarding/licenseModel/licenseKeyGroups/LicenseKeyGroupsEditorView.jsx @@ -18,10 +18,8 @@ import PropTypes from 'prop-types'; import i18n from 'nfvo-utils/i18n/i18n.js'; import Validator from 'nfvo-utils/Validator.js'; -import Tabs from 'sdc-ui/lib/react/Tabs.js'; -import Tab from 'sdc-ui/lib/react/Tab.js'; +import { Tabs, Tab, Button } from 'onap-ui-react'; -import Button from 'sdc-ui/lib/react/Button.js'; import Form from 'nfvo-components/input/validation/Form.jsx'; //import GridSection from 'nfvo-components/grid/GridSection.jsx'; import { LKG_FORM_NAME, tabIds } from './LicenseKeyGroupsConstants.js'; diff --git a/openecomp-ui/src/sdc-app/onboarding/licenseModel/limits/LimitEditor.jsx b/openecomp-ui/src/sdc-app/onboarding/licenseModel/limits/LimitEditor.jsx index 455daaa826..480f723bd3 100644 --- a/openecomp-ui/src/sdc-app/onboarding/licenseModel/limits/LimitEditor.jsx +++ b/openecomp-ui/src/sdc-app/onboarding/licenseModel/limits/LimitEditor.jsx @@ -6,7 +6,7 @@ import Input from 'nfvo-components/input/validation/Input.jsx'; import GridSection from 'nfvo-components/grid/GridSection.jsx'; import GridItem from 'nfvo-components/grid/GridItem.jsx'; import { LIMITS_FORM_NAME, selectValues } from './LimitEditorConstants.js'; -import Button from 'sdc-ui/lib/react/Button.js'; +import { Button } from 'onap-ui-react'; import Validator from 'nfvo-utils/Validator.js'; import { other as optionInputOther } from 'nfvo-components/input/validation/InputOptions.jsx'; import InputOptions from 'nfvo-components/input/validation/InputOptions.jsx'; diff --git a/openecomp-ui/src/sdc-app/onboarding/licenseModel/overview/summary/ListButtons.jsx b/openecomp-ui/src/sdc-app/onboarding/licenseModel/overview/summary/ListButtons.jsx index d422d5d4b2..a903313af8 100644 --- a/openecomp-ui/src/sdc-app/onboarding/licenseModel/overview/summary/ListButtons.jsx +++ b/openecomp-ui/src/sdc-app/onboarding/licenseModel/overview/summary/ListButtons.jsx @@ -16,8 +16,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { selectedButton } from '../LicenseModelOverviewConstants.js'; -import Tabs from 'sdc-ui/lib/react/Tabs.js'; -import Tab from 'sdc-ui/lib/react/Tab.js'; +import { Tab, Tabs } from 'onap-ui-react'; import i18n from 'nfvo-utils/i18n/i18n.js'; function ListButtons({ onTabSelect, selectedTab, hasOrphans, hasLicensing }) { diff --git a/openecomp-ui/src/sdc-app/onboarding/licenseModel/overview/summary/SummaryCountItem.jsx b/openecomp-ui/src/sdc-app/onboarding/licenseModel/overview/summary/SummaryCountItem.jsx index 144d9bcc1b..5c58615984 100644 --- a/openecomp-ui/src/sdc-app/onboarding/licenseModel/overview/summary/SummaryCountItem.jsx +++ b/openecomp-ui/src/sdc-app/onboarding/licenseModel/overview/summary/SummaryCountItem.jsx @@ -14,7 +14,7 @@ * permissions and limitations under the License. */ import React from 'react'; -import SVGIcon from 'sdc-ui/lib/react/SVGIcon.js'; +import { SVGIcon } from 'onap-ui-react'; function SummaryCountItem({ name, diff --git a/openecomp-ui/src/sdc-app/onboarding/licenseModel/overview/summary/VendorDataView.js b/openecomp-ui/src/sdc-app/onboarding/licenseModel/overview/summary/VendorDataView.js index 62fc2c3cb3..03c445adf1 100644 --- a/openecomp-ui/src/sdc-app/onboarding/licenseModel/overview/summary/VendorDataView.js +++ b/openecomp-ui/src/sdc-app/onboarding/licenseModel/overview/summary/VendorDataView.js @@ -18,7 +18,7 @@ import { connect } from 'react-redux'; import Tooltip from 'react-bootstrap/lib/Tooltip.js'; import OverlayTrigger from 'react-bootstrap/lib/OverlayTrigger.js'; -import SVGIcon from 'sdc-ui/lib/react/SVGIcon.js'; +import { SVGIcon } from 'onap-ui-react'; import ValidationHelper from 'sdc-app/common/helpers/ValidationHelper.js'; import licenseModelOverviewActionHelper from '../licenseModelOverviewActionHelper.js'; import LicenseModelActionHelper from '../../LicenseModelActionHelper.js'; diff --git a/openecomp-ui/src/sdc-app/onboarding/onboard/CatalogItemDetails.jsx b/openecomp-ui/src/sdc-app/onboarding/onboard/CatalogItemDetails.jsx index 4e27c39e91..11c3a1ac7b 100644 --- a/openecomp-ui/src/sdc-app/onboarding/onboard/CatalogItemDetails.jsx +++ b/openecomp-ui/src/sdc-app/onboarding/onboard/CatalogItemDetails.jsx @@ -26,7 +26,7 @@ import { TileInfoLine, TileFooter, TileFooterCell -} from 'sdc-ui/lib/react'; +} from 'onap-ui-react'; import { TooltipWrapper } from './onboardingCatalog/Tooltip.jsx'; const ITEM_TYPE_MAP = { diff --git a/openecomp-ui/src/sdc-app/onboarding/onboard/CatalogList.jsx b/openecomp-ui/src/sdc-app/onboarding/onboard/CatalogList.jsx index b00ceeb48f..85468c9658 100644 --- a/openecomp-ui/src/sdc-app/onboarding/onboard/CatalogList.jsx +++ b/openecomp-ui/src/sdc-app/onboarding/onboard/CatalogList.jsx @@ -15,7 +15,7 @@ */ import React from 'react'; import i18n from 'nfvo-utils/i18n/i18n.js'; -import SVGIcon from 'sdc-ui/lib/react/SVGIcon.js'; +import { SVGIcon } from 'onap-ui-react'; const SoftwareProductListHeader = ({ selectedVendor, onBack }) => ( <div className="vendor-page-header"> diff --git a/openecomp-ui/src/sdc-app/onboarding/onboard/filter/Filter.jsx b/openecomp-ui/src/sdc-app/onboarding/onboard/filter/Filter.jsx index 48f53e0763..4b3b6d6b17 100644 --- a/openecomp-ui/src/sdc-app/onboarding/onboard/filter/Filter.jsx +++ b/openecomp-ui/src/sdc-app/onboarding/onboard/filter/Filter.jsx @@ -20,7 +20,7 @@ import PropTypes from 'prop-types'; import { tabsMapping as onboardTabsMapping } from '../OnboardConstants.js'; import { actionTypes } from './FilterConstants.js'; -import Panel from 'sdc-ui/lib/react/Panel.js'; +import { Panel } from 'onap-ui-react'; import { ItemStatus, ByVendorView, diff --git a/openecomp-ui/src/sdc-app/onboarding/onboard/filter/FilterComponents.jsx b/openecomp-ui/src/sdc-app/onboarding/onboard/filter/FilterComponents.jsx index 6a4760afdf..fb536df8ab 100644 --- a/openecomp-ui/src/sdc-app/onboarding/onboard/filter/FilterComponents.jsx +++ b/openecomp-ui/src/sdc-app/onboarding/onboard/filter/FilterComponents.jsx @@ -21,9 +21,7 @@ import { itemPermissions, itemOnboardingProcedure } from 'sdc-app/common/helpers/ItemsHelperConstants.js'; -import Accordion from 'sdc-ui/lib/react/Accordion.js'; -import Checklist from 'sdc-ui/lib/react/Checklist.js'; -import Checkbox from 'sdc-ui/lib/react/Checkbox.js'; +import { Accordion, Checklist, Checkbox } from 'onap-ui-react'; export const ItemStatus = ({ data, onDataChanged, byVendorView }) => ( <Input diff --git a/openecomp-ui/src/sdc-app/onboarding/onboard/onboardingCatalog/VendorItem.jsx b/openecomp-ui/src/sdc-app/onboarding/onboard/onboardingCatalog/VendorItem.jsx index 76854c29b7..fccba7d2ab 100644 --- a/openecomp-ui/src/sdc-app/onboarding/onboard/onboardingCatalog/VendorItem.jsx +++ b/openecomp-ui/src/sdc-app/onboarding/onboard/onboardingCatalog/VendorItem.jsx @@ -26,7 +26,7 @@ import { TileFooter, TileFooterCell, Button -} from 'sdc-ui/lib/react'; +} from 'onap-ui-react'; import VSPOverlay from './VSPOverlay.jsx'; import { TooltipWrapper } from './Tooltip.jsx'; diff --git a/openecomp-ui/src/sdc-app/onboarding/permissions/PermissionsManager.jsx b/openecomp-ui/src/sdc-app/onboarding/permissions/PermissionsManager.jsx index 6918a8787a..230c15e371 100644 --- a/openecomp-ui/src/sdc-app/onboarding/permissions/PermissionsManager.jsx +++ b/openecomp-ui/src/sdc-app/onboarding/permissions/PermissionsManager.jsx @@ -16,7 +16,7 @@ import React from 'react'; import Form from 'nfvo-components/input/validation/Form.jsx'; import Select from 'nfvo-components/input/SelectInput.jsx'; -import SVGIcon from 'sdc-ui/lib/react/SVGIcon.js'; +import { SVGIcon } from 'onap-ui-react'; import OverlayTrigger from 'react-bootstrap/lib/OverlayTrigger.js'; import Tooltip from 'react-bootstrap/lib/Tooltip.js'; import i18n from 'nfvo-utils/i18n/i18n.js'; diff --git a/openecomp-ui/src/sdc-app/onboarding/revisions/RevisionsView.jsx b/openecomp-ui/src/sdc-app/onboarding/revisions/RevisionsView.jsx index efcce58bd7..74ef733c55 100644 --- a/openecomp-ui/src/sdc-app/onboarding/revisions/RevisionsView.jsx +++ b/openecomp-ui/src/sdc-app/onboarding/revisions/RevisionsView.jsx @@ -17,7 +17,7 @@ import React from 'react'; import Form from 'nfvo-components/input/validation/Form.jsx'; import i18n from 'nfvo-utils/i18n/i18n.js'; import ShowMore from 'react-show-more-text'; -import SVGIcon from 'sdc-ui/lib/react/SVGIcon.js'; +import { SVGIcon } from 'onap-ui-react'; import ListEditorView from 'nfvo-components/listEditor/ListEditorView.jsx'; import ListEditorItemView from 'nfvo-components/listEditor/ListEditorItemView.jsx'; diff --git a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/attachments/SoftwareProductAttachmentsView.jsx b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/attachments/SoftwareProductAttachmentsView.jsx index 2b4d5571f3..7cb5753557 100644 --- a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/attachments/SoftwareProductAttachmentsView.jsx +++ b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/attachments/SoftwareProductAttachmentsView.jsx @@ -16,12 +16,11 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; import accept from 'attr-accept'; -import { SVGIcon, Tab, Tabs } from 'sdc-ui/lib/react'; +import { SVGIcon, Tab, Tabs, Button } from 'onap-ui-react'; import { tabsMapping } from './SoftwareProductAttachmentsConstants.js'; import i18n from 'nfvo-utils/i18n/i18n.js'; import HeatValidation from './validation/HeatValidation.js'; import { onboardingOriginTypes } from 'sdc-app/onboarding/softwareProduct/SoftwareProductConstants.js'; -import Button from 'sdc-ui/lib/react/Button.js'; class HeatScreenView extends Component { static propTypes = { diff --git a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/attachments/setup/components/AddOrDeleteVolumeFiles.js b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/attachments/setup/components/AddOrDeleteVolumeFiles.js index 92a07ae119..4ba8dca411 100644 --- a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/attachments/setup/components/AddOrDeleteVolumeFiles.js +++ b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/attachments/setup/components/AddOrDeleteVolumeFiles.js @@ -14,7 +14,7 @@ * limitations under the License. */ import React from 'react'; -import Button from 'sdc-ui/lib/react/Button.js'; +import { Button } from 'onap-ui-react'; import i18n from 'nfvo-utils/i18n/i18n.js'; const AddOrDeleteVolumeFiles = ({ diff --git a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/attachments/setup/components/ArtifactOrNestedFileList.js b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/attachments/setup/components/ArtifactOrNestedFileList.js index c2bbde4c3d..e4e50fd048 100644 --- a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/attachments/setup/components/ArtifactOrNestedFileList.js +++ b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/attachments/setup/components/ArtifactOrNestedFileList.js @@ -15,8 +15,8 @@ */ import React from 'react'; import i18n from 'nfvo-utils/i18n/i18n.js'; -import Button from 'sdc-ui/lib/react/Button.js'; -import SVGIcon from 'sdc-ui/lib/react/SVGIcon.js'; +import { Button } from 'onap-ui-react'; +import { SVGIcon } from 'onap-ui-react'; import SelectInput from 'nfvo-components/input/SelectInput.jsx'; const NestedList = ({ selected }) => ( diff --git a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/attachments/setup/components/ModuleFile.js b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/attachments/setup/components/ModuleFile.js index 5cc74e80df..590fe74fd9 100644 --- a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/attachments/setup/components/ModuleFile.js +++ b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/attachments/setup/components/ModuleFile.js @@ -14,7 +14,7 @@ * limitations under the License. */ import React from 'react'; -import SVGIcon from 'sdc-ui/lib/react/SVGIcon.js'; +import { SVGIcon } from 'onap-ui-react'; import NameEditInput from './NameEditInput.js'; import SelectWithFileType from './SelectWithFileType'; import { fileTypes } from '../HeatSetupConstants.js'; diff --git a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/attachments/setup/components/SortableModuleFileList.js b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/attachments/setup/components/SortableModuleFileList.js index f52c251361..a5f35acbc2 100644 --- a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/attachments/setup/components/SortableModuleFileList.js +++ b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/attachments/setup/components/SortableModuleFileList.js @@ -19,7 +19,7 @@ import i18n from 'nfvo-utils/i18n/i18n.js'; import SortableListItem from './SortableListItem.js'; import { fileTypes } from '../HeatSetupConstants.js'; -import Button from 'sdc-ui/lib/react/Button.js'; +import { Button } from 'onap-ui-react'; import ModuleFile from './ModuleFile.js'; class SortableModuleFileList extends React.Component { diff --git a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/attachments/validation/HeatValidationView.jsx b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/attachments/validation/HeatValidationView.jsx index c6ee5efd36..6469063380 100644 --- a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/attachments/validation/HeatValidationView.jsx +++ b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/attachments/validation/HeatValidationView.jsx @@ -17,7 +17,7 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; import classNames from 'classnames'; import Collapse from 'react-bootstrap/lib/Collapse.js'; -import SVGIcon from 'sdc-ui/lib/react/SVGIcon.js'; +import { SVGIcon } from 'onap-ui-react'; import i18n from 'nfvo-utils/i18n/i18n.js'; import { mouseActions, diff --git a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/components/loadBalancing/SoftwareProductComponentLoadBalancingRefView.jsx b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/components/loadBalancing/SoftwareProductComponentLoadBalancingRefView.jsx index 4c90fc0be2..7d5fe9ccb3 100644 --- a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/components/loadBalancing/SoftwareProductComponentLoadBalancingRefView.jsx +++ b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/components/loadBalancing/SoftwareProductComponentLoadBalancingRefView.jsx @@ -15,7 +15,7 @@ */ import React from 'react'; import PropTypes from 'prop-types'; -import SVGIcon from 'sdc-ui/lib/react/SVGIcon.js'; +import { SVGIcon } from 'onap-ui-react'; import i18n from 'nfvo-utils/i18n/i18n.js'; import Form from 'nfvo-components/input/validation/Form.jsx'; diff --git a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/components/monitoring/SoftwareProductComponentsMonitoringView.jsx b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/components/monitoring/SoftwareProductComponentsMonitoringView.jsx index 771bca161a..b2545d98af 100644 --- a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/components/monitoring/SoftwareProductComponentsMonitoringView.jsx +++ b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/components/monitoring/SoftwareProductComponentsMonitoringView.jsx @@ -16,7 +16,7 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; import Dropzone from 'react-dropzone'; -import Button from 'sdc-ui/lib/react/Button.js'; +import { Button } from 'onap-ui-react'; import DraggableUploadFileBox from 'nfvo-components/fileupload/DraggableUploadFileBox.jsx'; import { fileTypes, diff --git a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/landingPage/SoftwareProductLandingPageView.jsx b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/landingPage/SoftwareProductLandingPageView.jsx index dcc9645750..e4337c70d1 100644 --- a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/landingPage/SoftwareProductLandingPageView.jsx +++ b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/landingPage/SoftwareProductLandingPageView.jsx @@ -23,7 +23,7 @@ import Configuration from 'sdc-app/config/Configuration.js'; import DraggableUploadFileBox from 'nfvo-components/fileupload/DraggableUploadFileBox.jsx'; import VnfRepositorySearchBox from 'nfvo-components/vnfMarketPlace/VnfRepositorySearchBox.jsx'; -import SVGIcon from 'sdc-ui/lib/react/SVGIcon.js'; +import { SVGIcon } from 'onap-ui-react'; import SoftwareProductComponentsList from 'sdc-app/onboarding/softwareProduct/components/SoftwareProductComponents.js'; const SoftwareProductPropType = PropTypes.shape({ diff --git a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/validation/SoftwareProductValidationView.jsx b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/validation/SoftwareProductValidationView.jsx index a8ea3804b4..fac69616bb 100644 --- a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/validation/SoftwareProductValidationView.jsx +++ b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/validation/SoftwareProductValidationView.jsx @@ -17,8 +17,8 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; import i18n from 'nfvo-utils/i18n/i18n.js'; -import Button from 'sdc-ui/lib/react/Button.js'; -import { Tab, Tabs } from 'sdc-ui/lib/react'; +import { Button } from 'onap-ui-react'; +import { Tab, Tabs } from 'onap-ui-react'; import { tabsMapping } from './SoftwareProductValidationConstants.js'; import VspValidationInputs from './inputs/VspValidationInputs.js'; import VspValidationSetup from './setup/VspValidationSetup.js'; diff --git a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/validation/inputs/VspValidationInputsView.jsx b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/validation/inputs/VspValidationInputsView.jsx index 26a6003b5a..8888c92f6d 100644 --- a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/validation/inputs/VspValidationInputsView.jsx +++ b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/validation/inputs/VspValidationInputsView.jsx @@ -17,7 +17,7 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; import i18n from 'nfvo-utils/i18n/i18n.js'; -import Button from 'sdc-ui/lib/react/Button.js'; +import { Button } from 'onap-ui-react'; import GridSection from 'nfvo-components/grid/GridSection.jsx'; import GridItem from 'nfvo-components/grid/GridItem.jsx'; import Input from 'nfvo-components/input/validation/Input.jsx'; diff --git a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/validationResults/SoftwareProductValidationResultsView.jsx b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/validationResults/SoftwareProductValidationResultsView.jsx index 162d281ee4..2c2cccd711 100644 --- a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/validationResults/SoftwareProductValidationResultsView.jsx +++ b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/validationResults/SoftwareProductValidationResultsView.jsx @@ -15,8 +15,8 @@ */ import React from 'react'; import PropTypes from 'prop-types'; -import Accordion from 'sdc-ui/lib/react/Accordion.js'; -import SVGIcon from 'sdc-ui/lib/react/SVGIcon.js'; +import { Accordion } from 'onap-ui-react'; +import { SVGIcon } from 'onap-ui-react'; import GridSection from 'nfvo-components/grid/GridSection.jsx'; import GridItem from 'nfvo-components/grid/GridItem.jsx'; import i18n from 'nfvo-utils/i18n/i18n.js'; diff --git a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/vnfMarketPlace/VNFImportView.jsx b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/vnfMarketPlace/VNFImportView.jsx index a33e0ede10..0cdca6c342 100644 --- a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/vnfMarketPlace/VNFImportView.jsx +++ b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/vnfMarketPlace/VNFImportView.jsx @@ -19,8 +19,8 @@ import GridSection from 'nfvo-components/grid/GridSection.jsx'; import GridItem from 'nfvo-components/grid/GridItem.jsx'; import ListEditorView from 'nfvo-components/listEditor/ListEditorView.jsx'; import i18n from 'nfvo-utils/i18n/i18n.js'; -import SVGIcon from 'sdc-ui/lib/react/SVGIcon.js'; -import Button from 'sdc-ui/lib/react/Button.js'; +import { SVGIcon } from 'onap-ui-react'; +import { Button } from 'onap-ui-react'; import VNFImportActionHelper from '../vnfMarketPlace/VNFImportActionHelper.js'; function VNFAction({ diff --git a/openecomp-ui/src/sdc-app/onboarding/userNotifications/NotificationsView.jsx b/openecomp-ui/src/sdc-app/onboarding/userNotifications/NotificationsView.jsx index 7f5b334586..23acd50334 100644 --- a/openecomp-ui/src/sdc-app/onboarding/userNotifications/NotificationsView.jsx +++ b/openecomp-ui/src/sdc-app/onboarding/userNotifications/NotificationsView.jsx @@ -19,7 +19,7 @@ import PropTypes from 'prop-types'; import enhanceWithClickOutside from 'react-click-outside'; import classnames from 'classnames'; import { connect } from 'react-redux'; -import SVGIcon from 'sdc-ui/lib/react/SVGIcon.js'; +import { SVGIcon } from 'onap-ui-react'; import Overlay from 'nfvo-components/overlay/Overlay.jsx'; import UserNotifications from 'sdc-app/onboarding/userNotifications/UserNotifications.jsx'; import UserNotificationsActionHelper from 'sdc-app/onboarding/userNotifications/UserNotificationsActionHelper.js'; diff --git a/openecomp-ui/src/sdc-app/onboarding/versionsPage/VersionsPage.jsx b/openecomp-ui/src/sdc-app/onboarding/versionsPage/VersionsPage.jsx index 5a20c49499..6be05658f8 100644 --- a/openecomp-ui/src/sdc-app/onboarding/versionsPage/VersionsPage.jsx +++ b/openecomp-ui/src/sdc-app/onboarding/versionsPage/VersionsPage.jsx @@ -17,8 +17,8 @@ import React from 'react'; import VersionList from './components/VersionList.jsx'; import PermissionsView from './components/PermissionsView.jsx'; import Tree from 'nfvo-components/tree/Tree.jsx'; -import SVGIcon from 'sdc-ui/lib/react/SVGIcon.js'; -import Button from 'sdc-ui/lib/react/Button.js'; +import SVGIcon from 'onap-ui-react/lib/components/SVGIcon.js'; +import { Button } from 'onap-ui-react'; import i18n from 'nfvo-utils/i18n/i18n.js'; const ArchiveRestoreButton = ({ depricateAction, title, isArchived }) => ( diff --git a/openecomp-ui/src/sdc-app/onboarding/versionsPage/components/PermissionsView.jsx b/openecomp-ui/src/sdc-app/onboarding/versionsPage/components/PermissionsView.jsx index 74d88f0b52..e381306e10 100644 --- a/openecomp-ui/src/sdc-app/onboarding/versionsPage/components/PermissionsView.jsx +++ b/openecomp-ui/src/sdc-app/onboarding/versionsPage/components/PermissionsView.jsx @@ -16,7 +16,7 @@ import React from 'react'; import i18n from 'nfvo-utils/i18n/i18n.js'; -import SVGIcon from 'sdc-ui/lib/react/SVGIcon.js'; +import { SVGIcon } from 'onap-ui-react'; import OverlayTrigger from 'react-bootstrap/lib/OverlayTrigger.js'; import Tooltip from 'react-bootstrap/lib/Tooltip.js'; diff --git a/openecomp-ui/src/sdc-app/onboarding/versionsPage/components/VersionList.jsx b/openecomp-ui/src/sdc-app/onboarding/versionsPage/components/VersionList.jsx index f9d6d57801..438e7066a8 100644 --- a/openecomp-ui/src/sdc-app/onboarding/versionsPage/components/VersionList.jsx +++ b/openecomp-ui/src/sdc-app/onboarding/versionsPage/components/VersionList.jsx @@ -18,7 +18,7 @@ import React from 'react'; import OverlayTrigger from 'react-bootstrap/lib/OverlayTrigger.js'; import Tooltip from 'react-bootstrap/lib/Tooltip.js'; import i18n from 'nfvo-utils/i18n/i18n.js'; -import SVGIcon from 'sdc-ui/lib/react/SVGIcon.js'; +import { SVGIcon } from 'onap-ui-react'; const formatTime = time => { if (!time) { diff --git a/openecomp-ui/src/sdc-app/punch-outs.js b/openecomp-ui/src/sdc-app/punch-outs.js index 2f1cf2cd94..7b161e6cda 100644 --- a/openecomp-ui/src/sdc-app/punch-outs.js +++ b/openecomp-ui/src/sdc-app/punch-outs.js @@ -13,7 +13,7 @@ * or implied. See the License for the specific language governing * permissions and limitations under the License. */ -import 'sdc-ui/css/style.css'; +import 'onap-ui-common/lib/style.css'; import 'react-checkbox-tree/lib/react-checkbox-tree.css'; import '../../resources/scss/onboarding.scss'; import 'dox-sequence-diagram-ui/src/main/webapp/res/sdc-sequencer.scss'; diff --git a/openecomp-ui/webpack.config.js b/openecomp-ui/webpack.config.js index 2e8731e271..28ba11bb99 100644 --- a/openecomp-ui/webpack.config.js +++ b/openecomp-ui/webpack.config.js @@ -92,7 +92,7 @@ module.exports = (env, argv) => { ), path.join(__dirname, 'node_modules/react-datepicker/'), path.join(__dirname, 'node_modules/react-select/'), - path.join(__dirname, 'node_modules/sdc-ui/'), + path.join(__dirname, 'node_modules/onap-ui-common/'), path.join(__dirname, 'node_modules/react-checkbox-tree/') ] }, @@ -108,7 +108,7 @@ module.exports = (env, argv) => { __dirname, 'node_modules/dox-sequence-diagram-ui/' ), - path.join(__dirname, 'node_modules/sdc-ui/') + path.join(__dirname, 'node_modules/onap-ui-common/') ] }, { diff --git a/openecomp-ui/yarn.lock b/openecomp-ui/yarn.lock index da7c7e4aed..b936780821 100644 --- a/openecomp-ui/yarn.lock +++ b/openecomp-ui/yarn.lock @@ -7591,6 +7591,25 @@ on-headers@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7" +onap-ui-common@1.0.100: + version "1.0.100" + resolved "https://registry.yarnpkg.com/onap-ui-common/-/onap-ui-common-1.0.100.tgz#c0dae1d3d1c3fd2b866340d27a1179ed10a3a860" + integrity sha512-d+eaYgVgrj9B8/3iVDlkxO2jiE7wXFrvMogxxHsyM8E0Fa7wXGEGwohA4JD5nGydT84dU2vPzwkby7SZNgGpKA== + +onap-ui-react@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/onap-ui-react/-/onap-ui-react-0.1.1.tgz#3640bdb9fb10f85104ad9dd57a9f320b0703abf3" + integrity sha512-hax7WzSMIPll9fHvKVjFbn2dIOh39fWuiy0VQKONq/ccU3f/y08Y6EzJo7rzWcwjt8bp2KDhqNZky0HwIquc6w== + dependencies: + "@storybook/react" "^3.1.5" + http-loader "0.0.1" + onap-ui-common "1.0.100" + prop-types "^15.6.0" + react "15.6.2" + react-dom "15.6.2" + reflect-metadata "^0.1.3" + svg-react-loader "^0.4.4" + once@^1.3.0, once@^1.3.1, once@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" |