diff options
3 files changed, 15 insertions, 8 deletions
diff --git a/openecomp-ui/src/sdc-app/onboarding/onboard/OnboardActionHelper.js b/openecomp-ui/src/sdc-app/onboarding/onboard/OnboardActionHelper.js index 2826e324b3..8443fe950b 100644 --- a/openecomp-ui/src/sdc-app/onboarding/onboard/OnboardActionHelper.js +++ b/openecomp-ui/src/sdc-app/onboarding/onboard/OnboardActionHelper.js @@ -21,10 +21,7 @@ import VersionsPageActionHelper from 'sdc-app/onboarding/versionsPage/VersionsPa import { itemTypes } from 'sdc-app/onboarding/versionsPage/VersionsPageConstants.js'; import PermissionsActionHelper from 'sdc-app/onboarding/permissions/PermissionsActionHelper.js'; import { actionTypes as filterActionTypes } from './filter/FilterConstants.js'; -import { - versionStatus, - itemStatus -} from 'sdc-app/common/helpers/ItemsHelperConstants.js'; +import { versionStatus } from 'sdc-app/common/helpers/ItemsHelperConstants.js'; const OnboardActionHelper = { resetOnboardStore(dispatch) { @@ -43,8 +40,7 @@ const OnboardActionHelper = { deltaData: activeTab === tabsMapping.WORKSPACE ? { - versionStatus: versionStatus.DRAFT, - itemStatus: itemStatus.ACTIVE + versionStatus: versionStatus.DRAFT } : { versionStatus: versionStatus.CERTIFIED diff --git a/openecomp-ui/src/sdc-app/onboarding/onboard/workspace/WorkspaceViewWithFilter.jsx b/openecomp-ui/src/sdc-app/onboarding/onboard/workspace/WorkspaceViewWithFilter.jsx index eec59622b3..afc68e1a64 100644 --- a/openecomp-ui/src/sdc-app/onboarding/onboard/workspace/WorkspaceViewWithFilter.jsx +++ b/openecomp-ui/src/sdc-app/onboarding/onboard/workspace/WorkspaceViewWithFilter.jsx @@ -17,6 +17,7 @@ import React from 'react'; import DetailsCatalogView from '../DetailsCatalogView.jsx'; import i18n from 'nfvo-utils/i18n/i18n.js'; import { tabsMapping } from 'sdc-app/onboarding/onboard/OnboardConstants.js'; +import { tabsMapping as catalogTabsMappping } from '../onboardingCatalog/OnboardingCatalogConstants.js'; const WorkspaceView = props => { let { @@ -27,6 +28,7 @@ const WorkspaceView = props => { onSelectSoftwareProduct, searchValue, onMigrate, + catalogActiveTab, filteredItems: { vspList, vlmList } } = props; @@ -39,8 +41,16 @@ const WorkspaceView = props => { VLMList={vlmList} VSPList={vspList} users={users} - onAddVLM={onAddLicenseModelClick} - onAddVSP={onAddSoftwareProductClick} + onAddVLM={ + catalogActiveTab === catalogTabsMappping.ACTIVE + ? onAddLicenseModelClick + : false + } + onAddVSP={ + catalogActiveTab === catalogTabsMappping.ACTIVE + ? onAddSoftwareProductClick + : false + } onSelectVLM={(item, users) => onSelectLicenseModel(item, users, tabsMapping.WORKSPACE) } diff --git a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/details/SoftwareProductDetailsView.jsx b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/details/SoftwareProductDetailsView.jsx index 12b1eadc86..1b384636e6 100644 --- a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/details/SoftwareProductDetailsView.jsx +++ b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/details/SoftwareProductDetailsView.jsx @@ -98,6 +98,7 @@ class GeneralSection extends React.Component { <Input data-test-id="vsp-name" label={i18n('Name')} + disabled type="text" value={this.props.name} isRequired={true} |