From a51eac038c8896b2413d0c57e223d49870fd1079 Mon Sep 17 00:00:00 2001 From: Arielk Date: Sun, 7 Jul 2019 12:56:11 +0300 Subject: upgrade to ONAP-UI Change-Id: Iddc6a62cc0b7981daa5ceb2422b967c95b031422 Issue-ID: SDC-2411 Signed-off-by: Arielk --- openecomp-ui/src/sdc-app/common/activity-log/ActivityLogView.jsx | 2 +- openecomp-ui/src/sdc-app/common/merge/MergeEditorView.jsx | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'openecomp-ui/src/sdc-app/common') 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'; -- cgit 1.2.3-korg