diff options
author | svishnev <shlomo-stanisla.vishnevetskiy@amdocs.com> | 2018-04-17 11:32:22 +0300 |
---|---|---|
committer | Einav Keidar <einavw@amdocs.com> | 2018-04-17 09:07:36 +0000 |
commit | 04783c44c22de7ef4abe183c5f19b4136305e5f8 (patch) | |
tree | c952ad9e4b39b3ed55348bbe80574c8ddd102130 /openecomp-ui/src/sdc-app | |
parent | 60969e02c6c8a78d8ffe9e597727c552c8be4e64 (diff) |
sdc-ui buttons fix
Issue-ID: SDC-1237
Change-Id: I4912c7f9e81849ff68a4a5d432bf844f97cf031e
Signed-off-by: svishnev <shlomo-stanisla.vishnevetskiy@amdocs.com>
Diffstat (limited to 'openecomp-ui/src/sdc-app')
5 files changed, 21 insertions, 11 deletions
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" |