From ddef32047634f0766dce4735b94e53f524da7c5f Mon Sep 17 00:00:00 2001 From: Prakash P S Date: Mon, 11 Sep 2023 19:54:31 +0530 Subject: [PATCH 1/2] Updated logic for noAdminError Signed-off-by: Prakash P S --- .../OrdererOrganizations/OrdererOrganizations.js | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/packages/apollo/src/components/ChannelModal/Wizard/OrdererOrganizations/OrdererOrganizations.js b/packages/apollo/src/components/ChannelModal/Wizard/OrdererOrganizations/OrdererOrganizations.js index 3d427a85..b4d11a31 100644 --- a/packages/apollo/src/components/ChannelModal/Wizard/OrdererOrganizations/OrdererOrganizations.js +++ b/packages/apollo/src/components/ChannelModal/Wizard/OrdererOrganizations/OrdererOrganizations.js @@ -27,17 +27,21 @@ import Form from '../../../Form/Form'; 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) + { + this.props.updateState(SCOPE, { + noAdminError: 'no_admin_error', + noOrderersError: false + }); + } + } // user added a new msp/org @@ -99,7 +103,7 @@ export class OrdererOrganizations extends Component { }; 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')) { From a035e1edb8212fe85a25681605117d529897f054 Mon Sep 17 00:00:00 2001 From: Prakash P S Date: Tue, 12 Sep 2023 21:36:58 +0530 Subject: [PATCH 2/2] updated the lint warning Signed-off-by: Prakash P S --- .../Wizard/OrdererOrganizations/OrdererOrganizations.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo/src/components/ChannelModal/Wizard/OrdererOrganizations/OrdererOrganizations.js b/packages/apollo/src/components/ChannelModal/Wizard/OrdererOrganizations/OrdererOrganizations.js index b4d11a31..1f0dacae 100644 --- a/packages/apollo/src/components/ChannelModal/Wizard/OrdererOrganizations/OrdererOrganizations.js +++ b/packages/apollo/src/components/ChannelModal/Wizard/OrdererOrganizations/OrdererOrganizations.js @@ -34,7 +34,7 @@ let hasAdmin = false; // (only used for osn admin nodes) export class OrdererOrganizations extends Component { componentDidMount() { - if(!hasAdmin) + if (!hasAdmin) { this.props.updateState(SCOPE, { noAdminError: 'no_admin_error',