diff options
Diffstat (limited to 'openecomp-ui/src/nfvo-components/panel/versionController')
| -rw-r--r-- | openecomp-ui/src/nfvo-components/panel/versionController/VersionController.jsx | 10 | ||||
| -rw-r--r-- | openecomp-ui/src/nfvo-components/panel/versionController/components/ActionButtons.jsx | 8 |
2 files changed, 10 insertions, 8 deletions
diff --git a/openecomp-ui/src/nfvo-components/panel/versionController/VersionController.jsx b/openecomp-ui/src/nfvo-components/panel/versionController/VersionController.jsx index fdc86d417d..57fa86f561 100644 --- a/openecomp-ui/src/nfvo-components/panel/versionController/VersionController.jsx +++ b/openecomp-ui/src/nfvo-components/panel/versionController/VersionController.jsx @@ -43,8 +43,8 @@ class VersionController extends React.Component { render() { let {version = {}, viewableVersions = [], onVersionSwitching, onMoreVersionsClick, callVCAction, onSave, isReadOnlyMode, itemPermission, - isFormDataValid, onClose, onManagePermissions, permissions = {}, userInfo, usersList, itemName, - onOpenCommentCommitModal, onOpenRevisionsModal, isManual, candidateInProcess} = this.props; + isFormDataValid, onClose, onManagePermissions, permissions = {}, userInfo, usersList, itemName, + onOpenCommentCommitModal, onOpenRevisionsModal, isManual, candidateInProcess, isArchived} = this.props; return ( <div className='version-controller-bar'> <div className={`vc-container ${candidateInProcess ? 'disabled' : ''}`}> @@ -54,12 +54,13 @@ class VersionController extends React.Component { version={version} onVersionSwitching={onVersionSwitching} onMoreVersionsClick={() => onMoreVersionsClick({itemName, users: usersList})}/> - </div> + {isArchived && <div className='depricated-item-status'>{i18n('Archived')}</div>} + </div> <div className='save-submit-cancel-container'> <ActionButtons onSubmit={callVCAction ? () => this.submit(callVCAction, version) : undefined} onRevert={callVCAction ? () => this.revert(callVCAction, version) : undefined} onOpenRevisionsModal={onOpenRevisionsModal} - onSave={onSave ? () => onSave() : undefined} + onSave={onSave ? () => onSave() : undefined} permissions={permissions} userInfo={userInfo} onManagePermissions={onManagePermissions} @@ -71,6 +72,7 @@ class VersionController extends React.Component { onCommit={callVCAction ? (comment) => this.commit(callVCAction, version, comment) : undefined} isFormDataValid={isFormDataValid} itemPermissions={itemPermission} + isArchived={isArchived} isReadOnlyMode={isReadOnlyMode || candidateInProcess} isManual={isManual} /> <div className='vc-separator'></div> 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 88ea9c6e3a..b5750817ba 100644 --- a/openecomp-ui/src/nfvo-components/panel/versionController/components/ActionButtons.jsx +++ b/openecomp-ui/src/nfvo-components/panel/versionController/components/ActionButtons.jsx @@ -1,5 +1,5 @@ /*! - * Copyright © 2016-2017 European Support Limited + * Copyright © 2016-2018 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -54,7 +54,7 @@ const SubmitButton = ({onClick, disabled}) => ( ); -const ActionButtons = ({isReadOnlyMode, onSubmit, onRevert, onSave, isFormDataValid, onClickPermissions, onSync, onCommit, +const ActionButtons = ({isReadOnlyMode, onSubmit, onRevert, onSave, isFormDataValid, onClickPermissions, onSync, onCommit, isArchived, onOpenCommentCommitModal, showPermissions, onClosePermissions, permissions, onManagePermissions, userInfo, onOpenRevisionsModal, isManual, itemPermissions: {isCertified, isCollaborator, isDirty, isOutOfSync, isUpToDate}}) => ( <div className='action-buttons'> @@ -67,7 +67,7 @@ const ActionButtons = ({isReadOnlyMode, onSubmit, onRevert, onSave, isFormDataVa </Overlay> } </EnhancedClickOutsideWrapper> - {isCollaborator && <div className='collaborator-action-buttons'> + {isCollaborator && !isArchived && <div className='collaborator-action-buttons'> <Separator /> {onSave && <div className='vc-save-section'> <VCButton dataTestId='vc-save-btn' onClick={() => onSave()} @@ -83,7 +83,7 @@ const ActionButtons = ({isReadOnlyMode, onSubmit, onRevert, onSave, isFormDataVa <VCButton dataTestId='vc-revert-btn' onClick={onOpenRevisionsModal} name='version-controller-revert' tooltipText={i18n('Revert')} disabled={isReadOnlyMode || isOutOfSync} /> } - {onSubmit && + {onSubmit && <div className='vc-submit-section'> <Separator /> <SubmitButton onClick={onSubmit} |