Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for Next Button is inactive state while updating Orderer Organization #526

Merged
merged 3 commits into from
Sep 12, 2023
Merged

Fix for Next Button is inactive state while updating Orderer Organization #526

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ddef320
Updated logic for noAdminError
Sep 11, 2023
3f951be
Merge branch 'hyperledger-labs:main' into back-button-issue
selvaprakash92 Sep 12, 2023
a035e1e
updated the lint warning
Sep 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions ...es/apollo/src/components/ChannelModal/Wizard/OrdererOrganizations/OrdererOrganizations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,21 @@
import SidePanelWarning from '../../../SidePanelWarning/SidePanelWarning';

const SCOPE = 'channelModal';

let hasAdmin = false;
// This is step "channel_orderer_organizations"
//
// this panel allows selecting the orderer orgs in the config-block and which one's get the admin role
// (only used for osn admin nodes)
export class OrdererOrganizations extends Component {
componentDidMount() {
this.props.updateState(SCOPE, {
noAdminError: 'no_admin_error',
noOrderersError: false
});
if(!hasAdmin)

Check warning on line 37 in packages/apollo/src/components/ChannelModal/Wizard/OrdererOrganizations/OrdererOrganizations.js

View workflow job for this annotation

GitHub Actions / Lint 

Expected space(s) after "if"

Check warning on line 37 in packages/apollo/src/components/ChannelModal/Wizard/OrdererOrganizations/OrdererOrganizations.js

View workflow job for this annotation

GitHub Actions / Lint 

Expected space(s) after "if"
dshuffma-ibm marked this conversation as resolved.
Show resolved Hide resolved
{
this.props.updateState(SCOPE, {
noAdminError: 'no_admin_error',
noOrderersError: false
});
}

}

// user added a new msp/org
Expand Down Expand Up @@ -99,7 +103,7 @@
};

checkAdminCount(selected_ordering_orgs) {
let hasAdmin = false;
hasAdmin = false;
if (selected_ordering_orgs) {
selected_ordering_orgs.forEach(org => {
if (org.msp_id !== '' && org.roles.includes('admin')) {
Expand Down
Loading