Skip to content

Commit

Permalink
Merge pull request #727 from ckpaliwal/issue-5809
Browse files Browse the repository at this point in the history 
Updated carbon library v10 to v11
  • Loading branch information
@ckpaliwal
ckpaliwal authored Jun 11, 2024
2 parents ce3a259 + d4eee08 commit 7221815
Show file tree
Hide file tree
Showing 244 changed files with 9,350 additions and 14,355 deletions.
3 changes: 2 additions & 1 deletion packages/apollo/.eslintrc.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@
"no-unused-vars": [
1,
{
"args": "none"
"args": "none",
"varsIgnorePattern": "React"
}
],
"no-var": 1,
Expand Down
15 changes: 8 additions & 7 deletions packages/apollo/eslint.config.mjs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,18 +85,19 @@ export default [
"no-new": 1,
"no-trailing-spaces": 1,
"no-undef": 2,
"no-unused-vars": [
1,
{
"args": "none"
}
],
"no-unused-vars": "off",
// "no-unused-vars": [
// 1,
// {
// "args": "none"
// }
// ],
"no-var": 1,
"object-curly-spacing": [1, "always"],
"prefer-const": 0,
"quotes": [1, "single"],
"require-atomic-updates": 0,
"semi": [1, "always"],
"semi": [0, "always"],
"space-before-blocks": 1,
"space-in-parens": [1, "never"],
"template-curly-spacing": [1, "never"],
Expand Down
13,180 changes: 4,968 additions & 8,212 deletions packages/apollo/package-lock.json
View file

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions packages/apollo/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@
"version": "0.1.1",
"license": "Apache-2.0",
"dependencies": {
"@carbon/elements": "^10.12.0",
"@carbon/icons": "^10.11.0",
"@carbon/icons-react": "^10.11.0",
"@carbon/colors": "^11.22.0",
"@carbon/elements": "^11.46.0",
"@carbon/icons-react": "^11.43.0",
"@carbon/react": "^1.59.0",
"@carbon/styles": "^1.59.0",
"@emotion/react": "^11.11.4",
"@emotion/styled": "^11.11.5",
"@eslint/js": "^9.2.0",
Expand All @@ -14,8 +16,6 @@
"async": "^3.2.5",
"backoff": "^2.5.0",
"bytes": "^3.1.2",
"carbon-components": "^10.12.0",
"carbon-components-react": "^7.12.0",
"carbon-icons": "^7.0.7",
"classnames": "^2.5.1",
"debug": "^4.3.4",
Expand Down Expand Up @@ -89,7 +89,7 @@
"eslint-plugin-jsx-a11y": "^6.8.0",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-react": "^7.34.1",
"jest": "^26.6.0",
"jest": "^27.0.0",
"lint-staged": "^15.2.2",
"prettier": "^3.2.5",
"pretty-quick": "^1.11.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/apollo/src/App.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
import _ from 'lodash';
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import { Component } from 'react';
import { withTranslation } from 'react-i18next';
import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
Expand Down Expand Up @@ -300,7 +300,7 @@ class App extends Component {
// if using local username/password, send user to our login prompt
if (this.state.authScheme.type === 'couchdb') {
return <Login onLogin={() => {
this.initializeAppData()
this.initializeAppData();
}} />;
}

Expand Down
276 changes: 138 additions & 138 deletions packages/apollo/src/app.scss
View file
Original file line number Diff line number Diff line change
@@ -1,139 +1,139 @@
// Manifest file!
@import './assets/sass/imports.scss';
// // Manifest file!
// @import './assets/sass/imports.scss';

// Component imports
@import './components/AddAnchorPeerModal/addAnchorPeerModal';
@import './components/AddIdentityModal/addIdentityModal';
@import './components/AddUserModal/addUserModal';
@import './components/AuthDetails/authDetails';
@import './components/AuthSetup/authSetup';
@import './components/AuthSetupAddUsers/authSetupAddUsers';
@import './components/AuthSetupAuthentication/authSetupAuthentication';
@import './components/AuthSetupSuccess/authSetupSuccess';
@import './components/BlockchainTooltip/blockchainTooltip';
@import './components/Breadcrumb/breadcrumb';
@import './components/CAAddUserModal/caAddUser';
@import './components/CADetails/caDetails';
@import './components/CAModal/caModal';
@import './components/CertificateAuthority/certificateAuthority';
@import './components/CertificateList/certificateList';
@import './components/Chaincodes/chaincodes';
@import './components/ChaincodeModal/chaincodeModal';
@import './components/ChaincodesPage/chaincodesPage';
@import './components/ChangePasswordModal/changePasswordModal';
@import './components/ChannelACLs/channelAcls';
@import './components/ChannelAnchorPeers/channelAnchorPeers';
@import './components/ChannelBlock/channelBlock';
@import './components/ChannelChaincode/channelChaincode';
@import './components/ChannelConsenterModal/channelConsenterModal';
@import './components/ChannelDetails/channelDetails';
@import './components/ChannelMembers/channelMembers';
@import './components/ChannelOrdererUrl/channelOrdererUrl';
@import './components/Channels/channels';
@import './components/ChannelModal/channelModal';
@import './components/ChannelModal/Wizard/Prerequisites/prerequisites';
@import './components/ChannelModal/Wizard/Review/review';
@import './components/ChannelModal/Wizard/BlockCuttingParams/blockCuttingParams';
@import './components/ComplexityScale/complexityScale';
@import './components/ConfigOverride/configOverride';
@import './components/DeleteCAUser/deleteCAUser';
@import './components/ConnectionProfileModal/connectionProfileModal';
@import './components/GettingStartedModal/gettingStartedModal';
@import './components/GettingStartedModal/ecosystemDiagram';
@import './components/Dropzone/dropzone';
@import './components/EditAuthSettingsModal/editAuthSettingsModal';
@import './components/EditAuthSchemePanel/editAuthSchemePanel';
@import './components/EmailChips/emailChips';
@import './components/ExportModal/exportModal';
@import './components/FileUploader/fileUploader';
@import './components/Form/form';
@import './components/GenerateCertificate/generateCertificate';
@import './components/GenerateMSPModal/generateMSPModal';
@import './components/GenericChips/genericChips';
@import './components/HiddenText/hiddenText';
@import './components/HSMConfig/hsmConfig';
@import './components/Identities/identities';
@import './components/IdentityExpiration/identityExpiration';
@import './components/IdentityModal/identityModal';
@import './components/ImportantBox/importantBox';
@import './components/ImportCAModal/importCAModal';
@import './components/ImportModal/importModal';
@import './components/ImportMspModal/importMspModal';
@import './components/ImportOrdererModal/importOrdererModal';
@import './components/ImportPeerModal/importPeerModal';
@import './components//InstallChaincodeModal/installChaincodeModal';
@import './components/InstallChaincodeModal/installChaincodeModal';
@import './components/InstantiateChaincodeModal/instantiateChaincodeModal';
@import './components/InstantiatedChaincodes/instantiatedChaincodes';
@import './components/ItemContainer/itemContainer';
@import './components/ItemContainerTile/itemContainerTile';
@import './components/ItemContainerTile/ItemTileLabels/itemTileLabels';
@import './components/ItemMenu/itemMenu';
@import './components/JoinChannelModal/joinChannelModal';
@import './components/JoinOSNChannelModal/joinOSNChannelModal';
@import './components/JsonInput/jsonInput';
@import './components/LeftNav/leftNav';
@import './components/LeftNavItem/leftNavItem';
@import './components/LoadingWithContent/loadingWithContent';
@import './components/LogSettings/logSettings';
@import './components/Login/login';
@import './components/Main/main';
@import './components/MigrationPage/migrationPage';
@import './components/AuditLogs/auditLogs';
@import './components/Access/access';
@import './components/MSPDefinitionModal/mSPDefinitionModal';
@import './components/MspDeleteModal/mspDeleteModal';
@import './components/MspDetailsModal/mspDetailsModal';
@import './components/Msps/msps';
@import './components/Mustgather/mustgather';
@import './components/NodeDetails/nodeDetails';
@import './components/Nodes/nodes';
@import './components/NotFound/notFound';
@import './components/Notifications/notifications';
@import './components/OrdererAdmins/ordererAdmins';
@import './components/OrdererConsenterModal/ordererConsenterModal';
@import './components/OrdererDetails/ordererDetails';
@import './components/OrdererMembers/ordererMembers';
@import './components/OrdererModal/ordererModal';
@import './components/Orderers/orderers';
@import './components/OrganizationDetails/organizationDetails';
@import './components/PageContainer/pageContainer';
@import './components/PageHeader/pageHeader';
@import './components/PeerChaincode/peerChaincode';
@import './components/PeerDetails/peerDetails';
@import './components/PeerModal/peerModal';
@import './components/Peers/peers';
@import './components/ProposeChaincodeModal/proposeChaincodeModal';
@import './components/ReallocateModal/reallocateModal';
@import './components/ReleaseNotes/releaseNotes';
@import './components/RequestAccess/requestAccess';
@import './components/ResetPasswordModal/resetPasswordModal';
@import './components/Settings/settings';
@import './components/SidePanel/sidePanel';
@import './components/SidePanelError/sidePanelError';
@import './components/SidePanelInlineConfirmation/sidePanelInlineConfirmation';
@import './components/SidePanelWarning/sidePanelWarning';
@import './components/SignatureAuditLogModal/signatureAuditLogModal';
@import './components/SignatureCollection/signatureCollection';
@import './components/SignatureDetailModal/signatureDetailModal';
@import './components/SignatureNotification/signatureNotification';
@import './components/Stepper/stepper';
@import './components/StickySection/stickySection';
@import './components/SubNavItem/subNavItem';
@import './components/Support/support';
@import './components/Timeline/timeline';
@import './components/TimelineCancelButton/timelineCancelButton';
@import './components/TitleBar/titleBar';
@import './components/TransactionModal/transactionModal';
@import './components/TranslateLink/translateLink';
@import './components/UpdateChannelMspModal/updateChannelMspModal';
@import './components/UsageForm/usageForm';
@import './components/UserDetailsModal/userDetailsModal';
@import './components/UserInfo/userInfo';
@import './components/UserProfile/userProfile';
@import './components/VisibilityToggle/visibilityToggle';
@import './components/WelcomeBanner/welcomeBanner';
@import './components/WelcomeBanner/welcomeBannerTile';
@import './components/WelcomeMessage/welcomeMessage';
@import './components/Wizard/wizard';
@import './components/DeleteAccessModal/deleteAccessModal';
// // Component imports
// @import './components/AddAnchorPeerModal/addAnchorPeerModal';
// @import './components/AddIdentityModal/addIdentityModal';
// @import './components/AddUserModal/addUserModal';
// @import './components/AuthDetails/authDetails';
// @import './components/AuthSetup/authSetup';
// @import './components/AuthSetupAddUsers/authSetupAddUsers';
// @import './components/AuthSetupAuthentication/authSetupAuthentication';
// @import './components/AuthSetupSuccess/authSetupSuccess';
// @import './components/BlockchainTooltip/blockchainTooltip';
// @import './components/Breadcrumb/breadcrumb';
// @import './components/CAAddUserModal/caAddUser';
// @import './components/CADetails/caDetails';
// @import './components/CAModal/caModal';
// @import './components/CertificateAuthority/certificateAuthority';
// @import './components/CertificateList/certificateList';
// @import './components/Chaincodes/chaincodes';
// @import './components/ChaincodeModal/chaincodeModal';
// @import './components/ChaincodesPage/chaincodesPage';
// @import './components/ChangePasswordModal/changePasswordModal';
// @import './components/ChannelACLs/channelAcls';
// @import './components/ChannelAnchorPeers/channelAnchorPeers';
// @import './components/ChannelBlock/channelBlock';
// @import './components/ChannelChaincode/channelChaincode';
// @import './components/ChannelConsenterModal/channelConsenterModal';
// @import './components/ChannelDetails/channelDetails';
// @import './components/ChannelMembers/channelMembers';
// @import './components/ChannelOrdererUrl/channelOrdererUrl';
// @import './components/Channels/channels';
// @import './components/ChannelModal/channelModal';
// @import './components/ChannelModal/Wizard/Prerequisites/prerequisites';
// @import './components/ChannelModal/Wizard/Review/review';
// @import './components/ChannelModal/Wizard/BlockCuttingParams/blockCuttingParams';
// @import './components/ComplexityScale/complexityScale';
// @import './components/ConfigOverride/configOverride';
// @import './components/DeleteCAUser/deleteCAUser';
// @import './components/ConnectionProfileModal/connectionProfileModal';
// @import './components/GettingStartedModal/gettingStartedModal';
// @import './components/GettingStartedModal/ecosystemDiagram';
// @import './components/Dropzone/dropzone';
// @import './components/EditAuthSettingsModal/editAuthSettingsModal';
// @import './components/EditAuthSchemePanel/editAuthSchemePanel';
// @import './components/EmailChips/emailChips';
// @import './components/ExportModal/exportModal';
// @import './components/FileUploader/fileUploader';
// @import './components/Form/form';
// @import './components/GenerateCertificate/generateCertificate';
// @import './components/GenerateMSPModal/generateMSPModal';
// @import './components/GenericChips/genericChips';
// @import './components/HiddenText/hiddenText';
// @import './components/HSMConfig/hsmConfig';
// @import './components/Identities/identities';
// @import './components/IdentityExpiration/identityExpiration';
// @import './components/IdentityModal/identityModal';
// @import './components/ImportantBox/importantBox';
// @import './components/ImportCAModal/importCAModal';
// @import './components/ImportModal/importModal';
// @import './components/ImportMspModal/importMspModal';
// @import './components/ImportOrdererModal/importOrdererModal';
// @import './components/ImportPeerModal/importPeerModal';
// @import './components//InstallChaincodeModal/installChaincodeModal';
// @import './components/InstallChaincodeModal/installChaincodeModal';
// @import './components/InstantiateChaincodeModal/instantiateChaincodeModal';
// @import './components/InstantiatedChaincodes/instantiatedChaincodes';
// @import './components/ItemContainer/itemContainer';
// @import './components/ItemContainerTile/itemContainerTile';
// @import './components/ItemContainerTile/ItemTileLabels/itemTileLabels';
// @import './components/ItemMenu/itemMenu';
// @import './components/JoinChannelModal/joinChannelModal';
// @import './components/JoinOSNChannelModal/joinOSNChannelModal';
// @import './components/JsonInput/jsonInput';
// @import './components/LeftNav/leftNav';
// @import './components/LeftNavItem/leftNavItem';
// @import './components/LoadingWithContent/loadingWithContent';
// @import './components/LogSettings/logSettings';
// @import './components/Login/login';
// @import './components/Main/main';
// @import './components/MigrationPage/migrationPage';
// @import './components/AuditLogs/auditLogs';
// @import './components/Access/access';
// @import './components/MSPDefinitionModal/mSPDefinitionModal';
// @import './components/MspDeleteModal/mspDeleteModal';
// @import './components/MspDetailsModal/mspDetailsModal';
// @import './components/Msps/msps';
// @import './components/Mustgather/mustgather';
// @import './components/NodeDetails/nodeDetails';
// @import './components/Nodes/nodes';
// @import './components/NotFound/notFound';
// @import './components/Notifications/notifications';
// @import './components/OrdererAdmins/ordererAdmins';
// @import './components/OrdererConsenterModal/ordererConsenterModal';
// @import './components/OrdererDetails/ordererDetails';
// @import './components/OrdererMembers/ordererMembers';
// @import './components/OrdererModal/ordererModal';
// @import './components/Orderers/orderers';
// @import './components/OrganizationDetails/organizationDetails';
// @import './components/PageContainer/pageContainer';
// @import './components/PageHeader/pageHeader';
// @import './components/PeerChaincode/peerChaincode';
// @import './components/PeerDetails/peerDetails';
// @import './components/PeerModal/peerModal';
// @import './components/Peers/peers';
// @import './components/ProposeChaincodeModal/proposeChaincodeModal';
// @import './components/ReallocateModal/reallocateModal';
// @import './components/ReleaseNotes/releaseNotes';
// @import './components/RequestAccess/requestAccess';
// @import './components/ResetPasswordModal/resetPasswordModal';
// @import './components/Settings/settings';
// @import './components/SidePanel/sidePanel';
// @import './components/SidePanelError/sidePanelError';
// @import './components/SidePanelInlineConfirmation/sidePanelInlineConfirmation';
// @import './components/SidePanelWarning/sidePanelWarning';
// @import './components/SignatureAuditLogModal/signatureAuditLogModal';
// @import './components/SignatureCollection/signatureCollection';
// @import './components/SignatureDetailModal/signatureDetailModal';
// @import './components/SignatureNotification/signatureNotification';
// @import './components/Stepper/stepper';
// @import './components/StickySection/stickySection';
// @import './components/SubNavItem/subNavItem';
// @import './components/Support/support';
// @import './components/Timeline/timeline';
// @import './components/TimelineCancelButton/timelineCancelButton';
// @import './components/TitleBar/titleBar';
// @import './components/TransactionModal/transactionModal';
// @import './components/TranslateLink/translateLink';
// @import './components/UpdateChannelMspModal/updateChannelMspModal';
// @import './components/UsageForm/usageForm';
// @import './components/UserDetailsModal/userDetailsModal';
// @import './components/UserInfo/userInfo';
// @import './components/UserProfile/userProfile';
// @import './components/VisibilityToggle/visibilityToggle';
// @import './components/WelcomeBanner/welcomeBanner';
// @import './components/WelcomeBanner/welcomeBannerTile';
// @import './components/WelcomeMessage/welcomeMessage';
// @import './components/Wizard/wizard';
// @import './components/DeleteAccessModal/deleteAccessModal';
Loading

0 comments on commit 7221815

Please sign in to comment.