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.

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

Upgrading React 17 and Material UI 5 of DevPortal #544

Closed
wants to merge 65 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
b89de57
can use npm start
thisaltennakoon Jan 24, 2024
038b611
Removed react-hot-loader and changed web-pack config
thisaltennakoon Jan 24, 2024
ef4a0aa
[WSO2 Release] [Jenkins #704] [Release 9.0.491] prepare for next deve…
wso2-jenkins-bot Jan 10, 2024
981ec81
Fix REST API document styling issue
thisaltennakoon Feb 4, 2024
5e0f988
Fix the postman collection download issue
Tharanidk Sep 15, 2023
f78ea7f
Ran first codemod
thisaltennakoon Jan 27, 2024
2ab5c58
Ran second codemod
thisaltennakoon Jan 28, 2024
095c32b
Ran thired codemod
thisaltennakoon Jan 28, 2024
9f62428
Removed react-hot-loader
thisaltennakoon Jan 28, 2024
e0abdd5
Removed withStyles error
thisaltennakoon Jan 28, 2024
3e2a05f
Fixed loading issue when generating OAuth & APIKey tokens
thisaltennakoon Jan 30, 2024
38282f8
Fixed Change Password not working issue
thisaltennakoon Jan 30, 2024
7a5d4c0
Fixed create application wizard not loading issue
thisaltennakoon Jan 31, 2024
3349160
Fixed part of the GraphQL ui error
thisaltennakoon Jan 31, 2024
e8cb9df
Fixed graphql ui loading issue
thisaltennakoon Jan 31, 2024
251a48b
[working] React 18 upgrade
thisaltennakoon Jan 27, 2024
5f01feb
Removed CopyToClipboard
thisaltennakoon Jan 28, 2024
217c983
Revert "Removed CopyToClipboard"
thisaltennakoon Feb 1, 2024
8a0497e
Removed CopyToClipboard and added a new way
thisaltennakoon Feb 1, 2024
38bee79
Fix styling issue in tryout consoles
thisaltennakoon Feb 1, 2024
db0dcfe
Fixed Log out popper issue
thisaltennakoon Feb 3, 2024
1418198
Fixed Try out button size issue
thisaltennakoon Feb 3, 2024
fb51783
Create package-lock.json
thisaltennakoon Feb 4, 2024
3cbdf05
Fixed star colours not visible issue
thisaltennakoon Feb 4, 2024
7c5993d
Fixed tryout pop up issue
thisaltennakoon Feb 4, 2024
a234145
FIxed API placement issue
thisaltennakoon Feb 4, 2024
bd11145
Fixed postman collection downloading issue
thisaltennakoon Feb 5, 2024
202630b
Fixed view definition button issue
thisaltennakoon Feb 5, 2024
7fcbd7e
Fixed nested commenting issue
thisaltennakoon Feb 5, 2024
df322be
Fixed API key text field size issue
thisaltennakoon Feb 5, 2024
2059e4e
Code refine
thisaltennakoon Feb 5, 2024
e76c4ab
Fixed formatting issue
thisaltennakoon Feb 5, 2024
a204b55
Removed unit tests related to Commenting
thisaltennakoon Feb 5, 2024
d329e73
Merge branch 'main' into material-ui-bump-devPortal-9
thisaltennakoon Feb 5, 2024
55bfcc4
Code reformat
thisaltennakoon Feb 5, 2024
4f267e3
Corrected Autocomplete import
thisaltennakoon Feb 5, 2024
659dc58
Merge branch 'wso2:main' into material-ui-bump-devPortal-9
thisaltennakoon Feb 8, 2024
4a202f7
Merge branch 'material-ui-bump-devPortal-9' of https://github.com/thi…
thisaltennakoon Feb 8, 2024
e2e6baa
Fix AutoComplete not working issue
thisaltennakoon Feb 8, 2024
dd7c5ec
FIx styling issues
thisaltennakoon Feb 8, 2024
1916909
Fixed button color changes
thisaltennakoon Feb 9, 2024
f086f07
Fixed styling changes
thisaltennakoon Feb 9, 2024
b8893ce
Fix styling issue in Subscription & Key Generation Wizard
thisaltennakoon Feb 9, 2024
ffb8030
Partially Fix styling issue in Application info bar
thisaltennakoon Feb 9, 2024
384ac04
Fix styling issue in Application info bar
thisaltennakoon Feb 9, 2024
c25ff69
Partially Fix styling issue in Application info bar
thisaltennakoon Feb 9, 2024
0e0b4a6
Fix styling issue in Application info bar
thisaltennakoon Feb 9, 2024
940c4e7
Fixed styling issues
thisaltennakoon Feb 10, 2024
5eb871b
Fix styling issue in Subscription & Key Generation Wizard
thisaltennakoon Feb 9, 2024
9cb9e30
Fix styling issue in Subscription & Key Generation Wizard
thisaltennakoon Feb 10, 2024
3f531ef
Merge branch 'material-ui-bump-devPortal-9' of https://github.com/thi…
thisaltennakoon Feb 10, 2024
633f956
Delete package-lock.json
thisaltennakoon Feb 12, 2024
fba6a51
Create package-lock.json
thisaltennakoon Feb 12, 2024
df65a87
Create package-lock.json
thisaltennakoon Feb 12, 2024
905423d
Update package.json
thisaltennakoon Feb 12, 2024
ad39ef3
Update package.json
thisaltennakoon Feb 13, 2024
b385c20
Update package.json
thisaltennakoon Feb 13, 2024
e86ba26
Update package.json
thisaltennakoon Feb 13, 2024
32a04c8
Update package.json
thisaltennakoon Feb 13, 2024
b69e88e
Update package.json
thisaltennakoon Feb 13, 2024
0eab5fc
Fixed build issues
thisaltennakoon Feb 13, 2024
486d0c9
Fixed build issues
thisaltennakoon Feb 13, 2024
1ae7e67
Update package-lock.json
thisaltennakoon Feb 13, 2024
9c2db6b
Merge branch 'wso2:main' into material-ui-bump-devPortal-11
thisaltennakoon Feb 13, 2024
1fd47ab
Create package-lock.json
thisaltennakoon Feb 13, 2024
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
15 changes: 13 additions & 2 deletions portals/devportal/src/main/webapp/babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ module.exports = {
'@babel/plugin-syntax-dynamic-import',
'@babel/plugin-proposal-class-properties',
'dynamic-import-node',
'@babel/plugin-transform-private-methods',
],
},
production: {
Expand All @@ -41,7 +42,12 @@ module.exports = {
],
'@babel/preset-react',
],
plugins: ['@babel/plugin-syntax-dynamic-import', '@babel/plugin-proposal-class-properties'],
plugins: [
'@babel/plugin-syntax-dynamic-import',
'@babel/plugin-proposal-class-properties',
'@babel/plugin-proposal-nullish-coalescing-operator',
'@babel/plugin-proposal-logical-assignment-operators',
],
},
development: {
presets: [
Expand All @@ -53,7 +59,12 @@ module.exports = {
],
'@babel/preset-react',
],
plugins: ['@babel/plugin-syntax-dynamic-import', '@babel/plugin-proposal-class-properties','react-hot-loader/babel'],
plugins: [
'@babel/plugin-syntax-dynamic-import',
'@babel/plugin-proposal-class-properties',
'@babel/plugin-proposal-nullish-coalescing-operator',
'@babel/plugin-proposal-logical-assignment-operators',
],
},
},
};
9 changes: 7 additions & 2 deletions portals/devportal/src/main/webapp/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,13 @@ module.exports = {
'^.+\\.jsx$': 'babel-jest',
'^.+\\.js$': 'babel-jest',
},
testPathIgnorePatterns: ['<rootDir>/node_modules/', '<rootDir>/source/Tests/Integration/'],
transformIgnorePatterns: ['<rootDir>/node_modules/'],
testPathIgnorePatterns: [
'<rootDir>/node_modules/',
'<rootDir>/source/Tests/Integration/',
],
transformIgnorePatterns: [
'<rootDir>/node_modules/(?!@ngrx|(?!deck.gl)|ng-dynamic)',
],

// Automatically clear mock calls and instances between every test
clearMocks: true,
Expand Down
61,472 changes: 21,893 additions & 39,579 deletions portals/devportal/src/main/webapp/package-lock.json

Large diffs are not rendered by default.

57 changes: 33 additions & 24 deletions portals/devportal/src/main/webapp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"node": ">=16.0.0"
},
"scripts": {
"test:ci": "jest --silent",
"test:ci": "jest --silent --passWithNoTests",
"test:integration": "jest -c source/Tests/Integration/jest.config.js",
"test:coverage": "jest --coverage",
"build:prod": "rimraf site/public/dist/ && npm rum i18n && cross-env NODE_ENV=production NODE_OPTIONS=--max_old_space_size=4096 webpack --mode production --stats=errors-only",
Expand All @@ -27,14 +27,18 @@
"license": "Apache-2.0",
"dependencies": {
"@asyncapi/react-component": "^0.24.23",
"@emotion/react": "^11.11.3",
"@emotion/styled": "^11.11.0",
"@hapi/joi": "^17.1.1",
"@material-ui/core": "^4.11.3",
"@material-ui/icons": "^4.11.2",
"@material-ui/lab": "^4.0.0-alpha.61",
"@mdi/js": "^6.9.96",
"@mdi/react": "^1.6.1",
"@mui/icons-material": "^5.15.6",
"@mui/lab": "^5.0.0-alpha.162",
"@mui/material": "^5.15.6",
"@mui/styles": "^5.15.6",
"@stoplight/elements": "^7.7.9",
"@ui5/webcomponents-icons": "^1.9.3",
"ajv": "^8.12.0",
"async-mutex": "^0.4.0",
"autosuggest-highlight": "^3.3.4",
"axios": "^0.27.2",
Expand All @@ -46,34 +50,34 @@
"dayjs": "^1.11.7",
"downshift": "^6.1.12",
"fs-react": "0.0.4",
"graphiql": "^1.11.5",
"graphiql-explorer": "^0.9.0",
"graphiql": "^3.0.5",
"graphiql-explorer-continue": "0.8.2",
"graphiql-subscriptions-fetcher": "0.0.2",
"graphql": "^15.6.1",
"graphql-to-postman": "0.0.12",
"graphql": "^16.8.0",
"graphql-to-postman": "0.1.0",
"graphql-ws": "^5.14.0",
"html-react-parser": "^4.2.2",
"js-file-download": "^0.4.12",
"jss-rtl": "^0.3.0",
"lodash": "^4.17.21",
"lodash.clonedeep": "^4.5.0",
"lodash.isplainobject": "^4.0.6",
"lodash.merge": "^4.6.2",
"material-design-icons": "^3.0.1",
"material-ui-chip-input": "^2.0.0-beta.2",
"mui-datatables": "^3.8.5",
"mui-datatables": "^4.3.0",
"openapi-to-postmanv2": "^4.16.0",
"prop-types": "^15.8.1",
"qs": "^6.11.0",
"query-string": "^7.1.3",
"random-material-color": "^1.0.5",
"rc-notification": "^4.6.1",
"react": "^16.14.0",
"react": "^17.0.0",
"react-app-polyfill": "^3.0.0",
"react-autosuggest": "^10.1.0",
"react-copy-to-clipboard": "^5.1.0",
"react-dom": "^16.14.0",
"react-dom": "^17.0.0",
"react-helmet": "^6.1.0",
"react-hot-toast": "^2.4.0",
"react-html-parser": "^2.0.2",
"react-intl": "v5.25.1",
"react-loadable": "^5.5.0",
"react-markdown": "^8.0.5",
Expand All @@ -83,33 +87,38 @@
"react-tagcloud": "^2.3.1",
"remark-gfm": "^3.0.1",
"sanitize-html": "^2.8.1",
"stream-browserify": "^3.0.0",
"subscriptions-transport-ws": "^0.11.0",
"swagger-client": "^3.18.5",
"swagger-ui-react": "^3.52.5",
"swagger2-postman2-converter": "0.0.3"
},
"devDependencies": {
"@babel/core": "^7.12.16",
"@babel/core": "^7.22.15",
"@babel/plugin-proposal-class-properties": "^7.12.13",
"@babel/plugin-proposal-logical-assignment-operators": "^7.20.7",
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
"@babel/plugin-transform-private-methods": "^7.22.5",
"@babel/preset-env": "^7.12.16",
"@babel/preset-react": "^7.12.13",
"@babel/register": "^7.12.13",
"@iconify/icons-simple-icons": "^1.0.52",
"@iconify/react": "^1.1.3",
"@webpack-cli/serve": "^1.3.1",
"babel-eslint": "^10.0.3",
"babel-jest": "^24.8.0",
"babel-jest": "^29.6.4",
"babel-loader": "^8.0.6",
"babel-plugin-dynamic-import-node": "^2.2.0",
"babel-plugin-react-intl": "^4.0.1",
"babel-plugin-react-intl-auto": "^1.7.0",
"buffer": "^6.0.3",
"chai": "^4.0.2",
"clean-webpack-plugin": "^4.0.0",
"cross-env": "^7.0.0",
"crypto-browserify": "^3.12.0",
"css-loader": "^3.4.1",
"enzyme": "^3.8.0",
"enzyme-adapter-react-16": "^1.7.1",
"eslint": "^7.20.0",
"eslint-config-airbnb": "^18.0.1",
"eslint-plugin-import": "^2.22.1",
Expand All @@ -122,24 +131,24 @@
"extract-react-intl-messages-compact": "^1.0.3",
"fs-react": "0.0.4",
"html-webpack-plugin": "^4.5.2",
"jest": "^24.8.0",
"less": "^2.7.2",
"less-loader": "^4.0.4",
"jest": "^29.6.4",
"less": "^4.2.0",
"less-loader": "^11.1.3",
"mocha": "^7.0.0",
"mock-local-storage": "^1.0.5",
"prettier": "^2.5.1",
"react-hot-loader": "^4.13.0",
"react-test-renderer": "^16.7.0",
"process": "^0.11.10",
"react-test-renderer": "^17.0.0",
"rimraf": "^3.0.2",
"sinon": "^7.2.2",
"style-loader": "^0.18.1",
"swagger2-postman2-converter": "0.0.3",
"underscore-template-loader": "^1.1.0",
"unused-files-webpack-plugin": "^3.4.0",
"webpack": "^4.46.0",
"webpack": "^5.88.1",
"webpack-bundle-analyzer": "^3.2.0",
"webpack-cli": "^4.5.0",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^3.11.2",
"webpack-manifest-plugin": "^2.2.0"
"webpack-manifest-plugin": "^5.0.0"
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"Apis.Details.APIConsole.APIConsole.download.postman": "Postman collection",
"Apis.Details.APIConsole.APIConsole.download.swagger": "Swagger ( /swagger.json )",
"Apis.Details.ApiCOnsole.generate.test.key": "GET TEST KEY ",
"Apis.Details.ApiCOnsole.generate.test.key": "GET TEST KEY",
"Apis.Details.ApiConsole.AdvertiseDetailsPanel.adv.auth.header": "Authorization Header",
"Apis.Details.ApiConsole.AdvertiseDetailsPanel.adv.auth.header.value": "Authorization Header Value",
"Apis.Details.ApiConsole.AdvertiseDetailsPanel.authentication.heading": "Authentication",
Expand Down Expand Up @@ -337,7 +337,7 @@
"Applications.Details.SubscriptionTableData.update.business.plan": "Current Business Plan : ",
"Applications.Details.SubscriptionTableData.update.business.plan.name": "Business Plan",
"Applications.Details.SubscriptionTableData.update.subscription": "Update Subscription",
"Applications.Details.SubscriptionTableData.update.throttling.policy.blocked": "Subscription is in BLOCKED state. You need to unblock the subscription inorder to edit the tier",
"Applications.Details.SubscriptionTableData.update.throttling.policy.blocked": "Subscription is in BLOCKED state. You need to unblock the subscription in order to edit the tier",
"Applications.Details.SubscriptionTableData.update.throttling.policy.helper": "Assign a new Business plan to the existing subscription",
"Applications.Details.SubscriptionTableData.update.throttling.policy.onHold": "Subscription is currently ON_HOLD state. You need to get approval to the subscription before editing the tier",
"Applications.Details.SubscriptionTableData.update.throttling.policy.rejected": "Subscription is currently REJECTED state. You need to get approval to the subscription before editing the tier",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
const Configurations = {
"custom": {
"landingPage": {
"active": false
}
}
};

This file was deleted.

Loading
Loading