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

Align frontend runtime libraries with Kiali application v1.73 #261

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 7 additions & 8 deletions plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,13 @@
"pre-commit": "yarn run pretty-quick --staged --no-restage --bail --pattern \"**/*.{ts,tsx,scss,json}\" && npm run lint:precommit"
},
"dependencies": {
"@openshift-console/dynamic-plugin-sdk": "^0.0.19",
"@openshift-console/dynamic-plugin-sdk": "0.0.18",
"@patternfly/patternfly": "4.224.2",
"@patternfly/react-charts": "6.94.18",
"@patternfly/react-core": "4.276.6",
"@patternfly/react-table": "4.112.39",
"@patternfly/react-tokens": "4.94.6",
"@patternfly/react-topology": "4.91.27",
"axios": "^0.21.4",
"axios": "^1.6.7",
"bootstrap-slider-without-jquery": "10.0.0",
"cy-node-html-label": "2.0.0",
"cytoscape": "3.15.5",
Expand All @@ -61,29 +60,29 @@
"react-virtualized": "9.x",
"redux": "4.0.3",
"redux-persist": "5.10.0",
"redux-persist-transform-filter": "0.0.18",
"redux-persist-transform-filter": "^0.0.22",
"redux-thunk": "2.4.1",
"regression": "^2.0.1",
"reselect": "4.0.0",
"screenfull": "5.0.2",
"tippy.js": "3.4.1",
"typesafe-actions": "^4.2.1",
"typestyle": "^2.4.0",
"victory": "36.3.0",
"victory-box-plot": "^36.6.7",
"visibilityjs": "2.0.2"
},
"devDependencies": {
"@babel/core": "^7.16.0",
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
"@badeball/cypress-cucumber-preprocessor": "^19.2.0",
"@bahmutov/cypress-esbuild-preprocessor": "^2.2.0",
"@openshift-console/dynamic-plugin-sdk-webpack": "^0.0.10",
"@openshift-console/dynamic-plugin-sdk-webpack": "0.0.9",
"@types/cytoscape": "3.14.0",
"@types/enzyme": "3.10.5",
"@types/jest": "23.3.10",
"@types/js-yaml": "^4.0.5",
"@types/lodash-es": "4.17.x",
"@types/node": "12.12.14",
"@types/node": "^18.17.14",
"@types/react": "^17.0.1",
"@types/react-dom": "^17.0.1",
"@types/react-redux": "7.1.7",
Expand All @@ -93,7 +92,7 @@
"@typescript-eslint/eslint-plugin": "^5.3.0",
"@typescript-eslint/parser": "^5.3.0",
"@wojtekmaj/enzyme-adapter-react-17": "^0.6.7",
"axios-mock-adapter": "1.16.0",
"axios-mock-adapter": "^1.22.0",
"babel-loader": "^9.1.2",
"babel-preset-react-app": "^10.0.1",
"css-loader": "^6.5.1",
Expand Down
4 changes: 2 additions & 2 deletions plugin/src/kiali/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
Copy of Kiali frontend source code
Kiali frontend source originated from:
* git ref: v1.73
* git commit: 05eecc1f81990aa38fa855aa400caf0398c5499a
* GitHub URL: https://github.com/kiali/kiali/tree/05eecc1f81990aa38fa855aa400caf0398c5499a/frontend/src
* git commit: 1ac06a5ad1b2e4a04e2da057b00b4d1c96a85f93
* GitHub URL: https://github.com/kiali/kiali/tree/1ac06a5ad1b2e4a04e2da057b00b4d1c96a85f93/frontend/src
16 changes: 1 addition & 15 deletions plugin/src/kiali/pages/ServiceDetails/ServiceNetwork.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -165,21 +165,7 @@ export class ServiceNetwork extends React.Component<Props> {
</Tooltip>
) : undefined}
</div>
<div>
({port.protocol}
{port.istioProtocol !== '' && <>,{port.istioProtocol}</>}){' '}
<span style={{ marginLeft: '5px' }}>
{port.tlsMode === 'istio' ? (
<>
<KialiIcon.MtlsLock /> mTLS
</>
) : (
<>
<KialiIcon.MtlsUnlock /> No mTLS{' '}
</>
)}
</span>
</div>
<div>({port.protocol})</div>
</div>
);
})}
Expand Down
Loading
Loading