openstack
/
tripleo-ui
Code Issues Proposed changes

Merge "Update Manage Roles link to be Inline Button"

This commit is contained in:
Zuul 2018-03-20 11:51:18 +00:00 committed by Gerrit Code Review
parent 266dda15f6 355f64532b
commit dfcb9aa678
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/js/components/deployment_plan/RolesStep.js
View File

@ -28,6 +28,7 @@ import {
getTotalAssignedNodesCount getTotalAssignedNodesCount
} from '../../selectors/nodesAssignment'; } from '../../selectors/nodesAssignment';
import { InlineLoader } from '../ui/Loader'; import { InlineLoader } from '../ui/Loader';
import { Link } from 'react-router-dom';
import NodesActions from '../../actions/NodesActions'; import NodesActions from '../../actions/NodesActions';
import Roles from '../roles/Roles'; import Roles from '../roles/Roles';
import RolesActions from '../../actions/RolesActions'; import RolesActions from '../../actions/RolesActions';
@ -41,6 +42,10 @@ const messages = defineMessages({
id: 'RolesStep.loadingParameters', id: 'RolesStep.loadingParameters',
defaultMessage: 'Loading Parameters...' defaultMessage: 'Loading Parameters...'
}, },
manageRoles: {
id: 'RolesStep.manageRoles',
defaultMessage: 'Manage Roles'
},
nodesAvailableToAssign: { nodesAvailableToAssign: {
id: 'RolesStep.nodesAvailableToAssign', id: 'RolesStep.nodesAvailableToAssign',
defaultMessage: defaultMessage:
@ -100,6 +105,12 @@ const RolesStep = ({
fetchNodes={fetchNodes} fetchNodes={fetchNodes}
loaded={rolesLoaded && nodesLoaded && flavorsLoaded} loaded={rolesLoaded && nodesLoaded && flavorsLoaded}
/> />
<Link
className="btn btn-default"
to={`/plans/${currentPlanName}/select-roles`}
>
<FormattedMessage {...messages.manageRoles} />
</Link>
</div> </div>
); );
}; };

16
src/js/components/roles/NodesAssignment.js
View File

@ -15,9 +15,7 @@
*/ */
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { defineMessages, FormattedMessage } from 'react-intl';
import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePropTypes from 'react-immutable-proptypes';
import { Link } from 'react-router-dom';
import React from 'react'; import React from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { startCase } from 'lodash'; import { startCase } from 'lodash';
@ -32,14 +30,6 @@ import { getRoles } from '../../selectors/roles';
import NodesAssignmentForm from './NodesAssignmentForm'; import NodesAssignmentForm from './NodesAssignmentForm';
import ParametersActions from '../../actions/ParametersActions'; import ParametersActions from '../../actions/ParametersActions';
import RoleCard from './RoleCard'; import RoleCard from './RoleCard';
import FloatingToolbar from '../ui/FloatingToolbar';
const messages = defineMessages({
manageRolesLink: {
id: 'NodesAssignment.manageRolesLink',
defaultMessage: 'Manage Roles'
}
});
const NodesAssignment = ({ const NodesAssignment = ({
assignedNodesCountsByRole, assignedNodesCountsByRole,
@ -72,12 +62,6 @@ const NodesAssignment = ({
); );
})} })}
</div> </div>
<FloatingToolbar bottom right>
<Link to={`/plans/${currentPlanName}/select-roles`}>
<span className="pficon pficon-maintenance" />{' '}
<FormattedMessage {...messages.manageRolesLink} />
</Link>
</FloatingToolbar>
</NodesAssignmentForm> </NodesAssignmentForm>
); );
}; };