summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsvishnev <shlomo-stanisla.vishnevetskiy@amdocs.com>2018-04-17 11:32:22 +0300
committerEinav Keidar <einavw@amdocs.com>2018-04-17 09:07:36 +0000
commit04783c44c22de7ef4abe183c5f19b4136305e5f8 (patch)
treec952ad9e4b39b3ed55348bbe80574c8ddd102130
parent60969e02c6c8a78d8ffe9e597727c552c8be4e64 (diff)
sdc-ui buttons fix
Issue-ID: SDC-1237 Change-Id: I4912c7f9e81849ff68a4a5d432bf844f97cf031e Signed-off-by: svishnev <shlomo-stanisla.vishnevetskiy@amdocs.com>
-rw-r--r--openecomp-ui/package.json2
-rw-r--r--openecomp-ui/resources/scss/components/_validationForm.scss1
-rw-r--r--openecomp-ui/resources/scss/modules/_softwareProductAttachmentPage.scss2
-rw-r--r--openecomp-ui/src/nfvo-components/fileupload/DraggableUploadFileBox.jsx2
-rw-r--r--openecomp-ui/src/nfvo-components/input/validation/ValidationButtons.jsx5
-rw-r--r--openecomp-ui/src/nfvo-components/modal/GlobalModal.js3
-rw-r--r--openecomp-ui/src/nfvo-components/panel/versionController/VersionController.jsx10
-rw-r--r--openecomp-ui/src/sdc-app/onboarding/licenseModel/entitlementPools/EntitlementPoolsEditorView.jsx4
-rw-r--r--openecomp-ui/src/sdc-app/onboarding/licenseModel/licenseKeyGroups/LicenseKeyGroupsEditorView.jsx4
-rw-r--r--openecomp-ui/src/sdc-app/onboarding/licenseModel/limits/LimitEditor.jsx5
-rw-r--r--openecomp-ui/src/sdc-app/onboarding/onboard/filter/FilterComponents.jsx16
-rw-r--r--openecomp-ui/src/sdc-app/onboarding/softwareProduct/attachments/SoftwareProductAttachmentsView.jsx3
-rw-r--r--openecomp-ui/yarn.lock6
13 files changed, 37 insertions, 26 deletions
diff --git a/openecomp-ui/package.json b/openecomp-ui/package.json
index 6cd9f724ad..824a814c60 100644
--- a/openecomp-ui/package.json
+++ b/openecomp-ui/package.json
@@ -53,7 +53,7 @@
"react-show-more": "^1.1.1",
"react-sortable": "^1.2.0",
"redux": "^3.7.2",
- "sdc-ui": "1.6.27",
+ "sdc-ui": "1.6.32",
"uuid-js": "^0.7.5",
"validator": "^4.3.0"
},
diff --git a/openecomp-ui/resources/scss/components/_validationForm.scss b/openecomp-ui/resources/scss/components/_validationForm.scss
index e1adb5650f..52408f5952 100644
--- a/openecomp-ui/resources/scss/components/_validationForm.scss
+++ b/openecomp-ui/resources/scss/components/_validationForm.scss
@@ -95,6 +95,7 @@ form {
text-align: right;
button:first-child {
margin-right: 15px;
+ min-width: 120px;
}
.svg-icon {
height: 14px;
diff --git a/openecomp-ui/resources/scss/modules/_softwareProductAttachmentPage.scss b/openecomp-ui/resources/scss/modules/_softwareProductAttachmentPage.scss
index ad98ec0595..81a109c97f 100644
--- a/openecomp-ui/resources/scss/modules/_softwareProductAttachmentPage.scss
+++ b/openecomp-ui/resources/scss/modules/_softwareProductAttachmentPage.scss
@@ -40,9 +40,7 @@
}
.proceed-to-validation-btn {
- width: 191px;
margin-right: 30px;
- height: 36px;
}
.go-to-overview-btn {
width: 191px;
diff --git a/openecomp-ui/src/nfvo-components/fileupload/DraggableUploadFileBox.jsx b/openecomp-ui/src/nfvo-components/fileupload/DraggableUploadFileBox.jsx
index 0d47d859d9..2dfbf3ab9c 100644
--- a/openecomp-ui/src/nfvo-components/fileupload/DraggableUploadFileBox.jsx
+++ b/openecomp-ui/src/nfvo-components/fileupload/DraggableUploadFileBox.jsx
@@ -46,7 +46,7 @@ class DraggableUploadFileBox extends Component {
<Button
type="button"
data-test-id={dataTestId}
- btnType="outline"
+ btnType="secondary"
onClick={onClick}
disabled={isReadOnlyMode}>
{i18n('Select File')}
diff --git a/openecomp-ui/src/nfvo-components/input/validation/ValidationButtons.jsx b/openecomp-ui/src/nfvo-components/input/validation/ValidationButtons.jsx
index e460f68a98..9530b6521d 100644
--- a/openecomp-ui/src/nfvo-components/input/validation/ValidationButtons.jsx
+++ b/openecomp-ui/src/nfvo-components/input/validation/ValidationButtons.jsx
@@ -63,12 +63,13 @@ class ValidationButtons extends React.Component {
<div>
<Button
type="submit"
+ btnType="primary"
data-test-id="form-submit-button"
disabled={!this.state.isValid}>
{submitBtn}
</Button>
<Button
- btnType="outline"
+ btnType="secondary"
type="reset"
data-test-id="form-close-button">
{closeBtn}
@@ -76,7 +77,7 @@ class ValidationButtons extends React.Component {
</div>
) : (
<Button
- btnType="outline"
+ btnType="primary"
type="reset"
data-test-id="form-close-button">
{i18n('Close')}
diff --git a/openecomp-ui/src/nfvo-components/modal/GlobalModal.js b/openecomp-ui/src/nfvo-components/modal/GlobalModal.js
index 3f19bd76a3..3a80e734ea 100644
--- a/openecomp-ui/src/nfvo-components/modal/GlobalModal.js
+++ b/openecomp-ui/src/nfvo-components/modal/GlobalModal.js
@@ -57,6 +57,7 @@ const ModalFooter = ({
<Button
data-test-id="sdc-modal-confirm-button"
color={typeClass[type]}
+ btnType="primary"
onClick={() => {
onConfirmed();
onClose();
@@ -67,7 +68,7 @@ const ModalFooter = ({
<Button
{...myPropsForNoConfirmed}
data-test-id="sdc-modal-cancel-button"
- btnType="outline"
+ btnType="secondary"
color={typeClass[type]}
onClick={
onDeclined
diff --git a/openecomp-ui/src/nfvo-components/panel/versionController/VersionController.jsx b/openecomp-ui/src/nfvo-components/panel/versionController/VersionController.jsx
index c9c5789622..5fe0892e59 100644
--- a/openecomp-ui/src/nfvo-components/panel/versionController/VersionController.jsx
+++ b/openecomp-ui/src/nfvo-components/panel/versionController/VersionController.jsx
@@ -64,11 +64,11 @@ class VersionController extends React.Component {
} = this.props;
return (
<div className="version-controller-bar">
- <div
- className={`vc-container ${
- candidateInProcess ? 'disabled' : ''
- }`}>
- <div className="version-status-container">
+ <div className="vc-container">
+ <div
+ className={`version-status-container ${
+ candidateInProcess ? 'disabled' : ''
+ }`}>
<VersionSelector
viewableVersions={viewableVersions}
version={version}
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 46eda622b5..350dc0b9f8 100644
--- a/openecomp-ui/src/sdc-app/onboarding/licenseModel/entitlementPools/EntitlementPoolsEditorView.jsx
+++ b/openecomp-ui/src/sdc-app/onboarding/licenseModel/entitlementPools/EntitlementPoolsEditorView.jsx
@@ -427,7 +427,7 @@ class EntitlementPoolsEditorView extends React.Component {
<GridSection className="license-model-modal-buttons entitlement-pools-editor-buttons">
{!this.state.selectedLimit && (
<Button
- btnType="default"
+ btnType="primary"
disabled={!this.props.isFormValid || isReadOnlyMode}
onClick={() => this.submit()}
type="reset">
@@ -436,7 +436,7 @@ class EntitlementPoolsEditorView extends React.Component {
)}
<Button
btnType={
- this.state.selectedLimit ? 'default' : 'outline'
+ this.state.selectedLimit ? 'primary' : 'secondary'
}
onClick={() => this.props.onCancel()}
type="reset">
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 a820f28dfd..b53ce8f0a9 100644
--- a/openecomp-ui/src/sdc-app/onboarding/licenseModel/licenseKeyGroups/LicenseKeyGroupsEditorView.jsx
+++ b/openecomp-ui/src/sdc-app/onboarding/licenseModel/licenseKeyGroups/LicenseKeyGroupsEditorView.jsx
@@ -445,7 +445,7 @@ class LicenseKeyGroupsEditorView extends React.Component {
<GridSection className="license-model-modal-buttons license-key-group-editor-buttons">
{!this.state.selectedLimit && (
<Button
- btnType="default"
+ btnType="primary"
disabled={!this.props.isFormValid || isReadOnlyMode}
onClick={() => this.submit()}
type="reset">
@@ -454,7 +454,7 @@ class LicenseKeyGroupsEditorView extends React.Component {
)}
<Button
btnType={
- this.state.selectedLimit ? 'default' : 'outline'
+ this.state.selectedLimit ? 'primary' : 'secondary'
}
onClick={() => this.props.onCancel()}
type="reset">
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 0d1d4eaf10..455daaa826 100644
--- a/openecomp-ui/src/sdc-app/onboarding/licenseModel/limits/LimitEditor.jsx
+++ b/openecomp-ui/src/sdc-app/onboarding/licenseModel/limits/LimitEditor.jsx
@@ -301,15 +301,14 @@ class LimitEditor extends React.Component {
</GridSection>
<GridSection className="limit-editor-buttons">
<Button
- btnType="outline"
+ btnType="primary"
disabled={!isFormValid || isReadOnlyMode}
onClick={() => this.submit()}
type="reset">
{i18n('Save')}
</Button>
<Button
- btnType="outline"
- color="gray"
+ btnType="secondary"
onClick={onCancel}
type="reset">
{i18n('Cancel')}
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 65ec733fd5..b114941a3c 100644
--- a/openecomp-ui/src/sdc-app/onboarding/onboard/filter/FilterComponents.jsx
+++ b/openecomp-ui/src/sdc-app/onboarding/onboard/filter/FilterComponents.jsx
@@ -38,14 +38,21 @@ export const ItemStatus = ({ data, onDataChanged, byVendorView }) => (
</Input>
);
-const FilterList = ({ title, items, groupKey, onDataChanged, data }) => {
+const FilterList = ({
+ title,
+ items,
+ groupKey,
+ onDataChanged,
+ data,
+ dataTestId
+}) => {
let onChange = value => {
let obj = {};
obj[groupKey] = { ...data[groupKey], ...value };
onDataChanged(obj);
};
return (
- <Accordion title={title}>
+ <Accordion defaultExpanded dataTestId={dataTestId} title={title}>
<Checklist items={items} onChange={onChange} />
</Accordion>
);
@@ -73,13 +80,14 @@ export const EntityType = ({ data, onDataChanged }) => {
},
{
label: i18n('VLM'),
- dataTestId: 'catalog-ilter-type-vlm',
+ dataTestId: 'catalog-filter-type-vlm',
value: 'vlm',
checked: data.itemType && data.itemType.vlm
}
];
return (
<FilterList
+ dataTestId="catalog-filter-entity-type"
title={i18n('ENTITY TYPE')}
items={items}
onDataChanged={onDataChanged}
@@ -107,6 +115,7 @@ export const Permissions = ({ data, onDataChanged }) => {
return (
<FilterList
+ dataTestId="catalog-filter-permissions"
title={i18n('PERMISSIONS')}
items={items}
onDataChanged={onDataChanged}
@@ -135,6 +144,7 @@ export const OnboardingProcedure = ({ data, onDataChanged }) => {
return (
<FilterList
+ dataTestId="catalog-filter-onboarding-procedure"
title={i18n('ONBOARDING PROCEDURE')}
items={items}
onDataChanged={onDataChanged}
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 2007493d48..08145be9c7 100644
--- a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/attachments/SoftwareProductAttachmentsView.jsx
+++ b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/attachments/SoftwareProductAttachmentsView.jsx
@@ -62,6 +62,7 @@ class HeatScreenView extends Component {
{activeTab === tabsMapping.SETUP &&
candidateInProcess && (
<Button
+ size="default"
data-test-id="proceed-to-validation-btn"
disabled={!isValidationAvailable}
className="proceed-to-validation-btn"
@@ -83,7 +84,7 @@ class HeatScreenView extends Component {
{activeTab === tabsMapping.VALIDATION &&
softwareProductId && (
<Button
- btnType="outline"
+ btnType="secondary"
data-test-id="go-to-overview"
disabled={this.props.goToOverview !== true}
className="go-to-overview-btn"
diff --git a/openecomp-ui/yarn.lock b/openecomp-ui/yarn.lock
index ac8d75704b..2ef15afba4 100644
--- a/openecomp-ui/yarn.lock
+++ b/openecomp-ui/yarn.lock
@@ -9459,9 +9459,9 @@ scss-tokenizer@^0.2.3:
js-base64 "^2.1.8"
source-map "^0.4.2"
-sdc-ui@1.6.27:
- version "1.6.27"
- resolved "https://registry.yarnpkg.com/sdc-ui/-/sdc-ui-1.6.27.tgz#d4ade66b5792355fe5758e2b7231a11c1d4c137f"
+sdc-ui@1.6.32:
+ version "1.6.32"
+ resolved "https://registry.yarnpkg.com/sdc-ui/-/sdc-ui-1.6.32.tgz#ce05f10a6923fa5c3865d17e3f34b7751681ee3f"
dependencies:
"@angular/common" "~2.4.8"
"@angular/core" "~2.4.8"