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

EPMRPP-98939 || Merge develop to org #4177

Merged
merged 2 commits into from
Jan 31, 2025
Merged

EPMRPP-98939 || Merge develop to org #4177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d64409d
EPMRPP-98939 || Merge develop to org
BlazarQSO Jan 29, 2025
983b5c7
EPMRPP-98939 || fix dependencies
BlazarQSO Jan 29, 2025
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
2 changes: 1 addition & 1 deletion app/.eslintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parser": "babel-eslint",
"parser": "@babel/eslint-parser",
"extends": [
"airbnb",
// "plugin:jsx-a11y/recommended",
Expand Down
7,427 changes: 3,754 additions & 3,673 deletions app/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

102 changes: 51 additions & 51 deletions app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"@formatjs/intl-relativetimeformat": "4.5.1",
"@formatjs/intl-utils": "1.6.0",
"@reportportal/ui-kit": "^0.0.1-alpha.40",
"axios": "1.6.4",
"axios": "1.7.9",
"c3": "0.7.20",
"chart.js": "2.9.4",
"chartjs-plugin-datalabels": "0.6.0",
Expand All @@ -44,13 +44,13 @@
"fetch-jsonp": "1.1.3",
"framer-motion": "8.5.5",
"history": "4.7.2",
"html-react-parser": "5.1.1",
"html-react-parser": "^5.2.2",
"intl": "1.2.5",
"intl-locales-supported": "1.8.4",
"marked": "0.7.0",
"marked-lts": "npm:[email protected]",
"mime-types": "2.1.35",
"moment": "2.29.4",
"moment": "^2.30.1",
"path-browserify": "^1.0.1",
"perf-cascade": "2.5.4",
"prop-types": "15.8.1",
Expand All @@ -73,13 +73,13 @@
"react-ga4": "1.4.1",
"react-grid-layout": "0.17.1",
"react-intl": "5.25.1",
"react-lazyload": "3.2.0",
"react-lazyload": "^3.2.1",
"react-popper": "1.3.11",
"react-redux": "8.1.3",
"react-reflex": "4.0.9",
"react-syntax-highlighter": "15.5.0",
"react-syntax-highlighter": "^15.6.1",
"react-tracking": "9.2.1",
"react-transition-group": "4.4.2",
"react-transition-group": "^4.4.5",
"rebound": "0.1.0",
"redux": "4.2.1",
"redux-devtools-extension": "2.13.9",
Expand All @@ -91,79 +91,79 @@
"reset-css": "2.2.1",
"semver-diff": "3.1.1",
"simplemde": "1.11.2",
"swagger-ui-react": "5.17.12",
"swagger-ui-react": "5.18.2",
"video.js": "7.17.0"
},
"devDependencies": {
"@babel/core": "7.23.3",
"@babel/node": "7.22.19",
"@babel/core": "^7.26.0",
"@babel/eslint-parser": "^7.26.5",
"@babel/node": "^7.26.0",
"@babel/plugin-proposal-class-properties": "7.18.6",
"@babel/plugin-proposal-decorators": "7.23.3",
"@babel/plugin-transform-private-methods": "7.23.3",
"@babel/plugin-transform-private-property-in-object": "7.23.3",
"@babel/plugin-transform-runtime": "7.23.3",
"@babel/plugin-proposal-decorators": "^7.25.9",
"@babel/plugin-transform-private-methods": "^7.25.9",
"@babel/plugin-transform-private-property-in-object": "^7.25.9",
"@babel/plugin-transform-runtime": "^7.25.9",
"@babel/polyfill": "7.12.1",
"@babel/preset-env": "7.23.3",
"@babel/preset-react": "7.23.3",
"@cfaester/enzyme-adapter-react-18": "0.7.1",
"@pmmmwh/react-refresh-webpack-plugin": "0.5.10",
"@babel/preset-env": "^7.26.0",
"@babel/preset-react": "^7.26.3",
"@cfaester/enzyme-adapter-react-18": "^0.8.0",
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.15",
"@sowtame/webpack-subresource-integrity": "2.0.0",
"@types/jest": "24.9.0",
"axios-mock-adapter": "1.17.0",
"babel-eslint": "10.0.3",
"@types/jest": "^29.5.14",
"axios-mock-adapter": "^2.1.0",
"babel-loader": "8.2.3",
"babel-plugin-react-intl": "4.1.20",
"buffer": "6.0.3",
"circular-dependency-plugin": "5.2.2",
"clean-webpack-plugin": "2.0.2",
"compression-webpack-plugin": "9.2.0",
"clean-webpack-plugin": "^4.0.0",
"compression-webpack-plugin": "^11.1.0",
"css-hot-loader": "1.4.4",
"css-loader": "7.1.2",
"css-minimizer-webpack-plugin": "7.0.0",
"enzyme": "3.11.0",
"enzyme-to-json": "3.4.2",
"enzyme-to-json": "^3.6.2",
"eslint": "7.32.0",
"eslint-config-airbnb": "18.2.1",
"eslint-config-prettier": "6.4.0",
"eslint-import-resolver-webpack": "0.11.1",
"eslint-config-prettier": "^6.15.0",
"eslint-import-resolver-webpack": "^0.13.10",
"eslint-loader": "4.0.2",
"eslint-plugin-babel": "5.3.0",
"eslint-plugin-babel": "^5.3.1",
"eslint-plugin-import": "2.22.1",
"eslint-plugin-jsx-a11y": "6.8.0",
"eslint-plugin-prettier": "3.1.1",
"eslint-plugin-react": "7.33.2",
"eslint-plugin-jsx-a11y": "^6.10.2",
"eslint-plugin-prettier": "^3.4.1",
"eslint-plugin-react": "^7.37.4",
"eslint-plugin-react-hooks": "^4.6.0",
"html-webpack-plugin": "5.5.0",
"husky": "3.0.8",
"html-webpack-plugin": "^5.6.3",
"husky": "^3.1.0",
"identity-obj-proxy": "3.0.0",
"jest": "29.7.0",
"jest-environment-jsdom": "29.7.0",
"jest-junit": "9.0.0",
"jest-junit": "^16.0.0",
"lint-staged": "9.4.2",
"mini-css-extract-plugin": "2.9.1",
"postcss": "8.4.47",
"postcss-loader": "8.1.1",
"prettier": "1.19.1",
"mini-css-extract-plugin": "^2.9.2",
"postcss": "^8.5.1",
"postcss-loader": "^8.1.1",
"prettier": "^1.19.1",
"raw-loader": "4.0.2",
"react-intl-translations-manager": "5.0.3",
"react-refresh": "0.14.0",
"regenerator-runtime": "0.13.3",
"sass": "1.80.1",
"sass-loader": "16.0.2",
"react-refresh": "^0.16.0",
"regenerator-runtime": "^0.14.1",
"sass": "^1.83.4",
"sass-loader": "^16.0.4",
"sass-resources-loader": "2.2.5",
"slnodejs": "6.1.533",
"style-loader": "3.3.4",
"stylelint": "13.13.1",
"stylelint-config-recommended-scss": "4.3.0",
"slnodejs": "^6.1.1006",
"style-loader": "^4.0.0",
"stylelint": "^13.13.1",
"stylelint-config-recommended-scss": "^4.3.0",
"stylelint-declaration-use-variable": "^1.7.3",
"stylelint-prettier": "1.1.1",
"stylelint-scss": "3.21.0",
"stylelint-prettier": "^1.2.0",
"stylelint-scss": "^3.21.0",
"svg-inline-loader": "0.8.2",
"terser-webpack-plugin": "5.3.0",
"webpack": "^5.88.2",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.15.1",
"webpack-merge": "^5.9.0",
"terser-webpack-plugin": "^5.3.11",
"webpack": "^5.97.1",
"webpack-cli": "^6.0.1",
"webpack-dev-server": "^5.2.0",
"webpack-merge": "^6.0.1",
"webpack-notifier": "^1.15.0",
"webpack-subresource-integrity": "5.1.0",
"why-did-you-update": "1.0.8"
Expand Down
11 changes: 8 additions & 3 deletions ...ts/integrations/containers/integrationInfoContainer/instancesSection/instancesSection.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import {
removePluginAction,
addIntegrationAction,
removeProjectIntegrationsByTypeAction,
enabledPluginSelector,
} from 'controllers/plugins';
import { showModalAction } from 'controllers/modal';
import {
Expand Down Expand Up @@ -115,8 +116,9 @@ const messages = defineMessages({
});

@connect(
(state) => ({
(state, ownProps) => ({
userRoles: userRolesSelector(state),
isEnabled: enabledPluginSelector(state, ownProps.instanceType),
}),
{
showModalAction,
Expand All @@ -138,6 +140,8 @@ export class InstancesSection extends Component {
addIntegrationAction: PropTypes.func.isRequired,
removePluginAction: PropTypes.func.isRequired,
userRoles: userRolesType,
userRole: PropTypes.string.isRequired,
isEnabled: PropTypes.bool.isRequired,
tracking: PropTypes.shape({
trackEvent: PropTypes.func,
getTrackingData: PropTypes.func,
Expand Down Expand Up @@ -292,6 +296,7 @@ export class InstancesSection extends Component {
userRoles,
isGlobal,
pluginDetails: { metadata },
isEnabled,
} = this.props;
const isProjectIntegrationsExists = !!projectIntegrations.length;
const disabled = !canUpdateSettings(userRoles);
Expand All @@ -318,7 +323,7 @@ export class InstancesSection extends Component {
onItemClick={onItemClick}
isGlobal={isGlobal}
/>
{this.multiple && !disabled && (
{this.multiple && !disabled && isEnabled && (
<div className={cx('add-integration-button')}>
<GhostButton icon={PlusIcon} onClick={this.addIntegrationClickHandler}>
{formatMessage(messages.addIntegrationButtonTitle)}
Expand Down Expand Up @@ -352,7 +357,7 @@ export class InstancesSection extends Component {
{formatMessage(messages.noGlobalIntegrationMessage)}
</p>
)}
{(this.multiple || !globalIntegrations.length) && !disabled && isGlobal && (
{(this.multiple || !globalIntegrations.length) && !disabled && isGlobal && isEnabled && (
<div className={cx('add-integration-button')}>
<GhostButton icon={PlusIcon} onClick={this.addIntegrationClickHandler}>
{formatMessage(messages.addIntegrationButtonTitle)}
Expand Down
4 changes: 4 additions & 0 deletions app/src/controllers/log/attachments/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ export const FILE_MODAL_IDS_MAP = {
[FILE_TYPES.XML]: ATTACHMENT_CODE_MODAL_ID,
[FILE_TYPES.JAVASCRIPT]: ATTACHMENT_CODE_MODAL_ID,
[FILE_TYPES.JSON]: ATTACHMENT_CODE_MODAL_ID,
[FILE_TYPES.TXT]: ATTACHMENT_CODE_MODAL_ID,
[FILE_TYPES.PLAIN]: ATTACHMENT_CODE_MODAL_ID,
[FILE_TYPES.CSS]: ATTACHMENT_CODE_MODAL_ID,
[FILE_TYPES.PHP]: ATTACHMENT_CODE_MODAL_ID,
[FILE_TYPES.HAR]: ATTACHMENT_HAR_FILE_MODAL_ID,
Expand Down Expand Up @@ -99,6 +101,8 @@ export const FILE_ACTIONS_MAP = {
FILE_TYPES.PHP,
FILE_TYPES.HAR,
FILE_TYPES.IMAGE,
FILE_TYPES.TXT,
FILE_TYPES.PLAIN,
],
};

Expand Down
1 change: 1 addition & 0 deletions app/src/controllers/plugins/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ export { isPluginSupportsCommonCommand } from './uiExtensions/utils';
export {
pluginsSelector,
pluginByNameSelector,
enabledPluginSelector,
availablePluginsSelector,
availableGroupedPluginsSelector,
createNamedIntegrationsSelector,
Expand Down
2 changes: 2 additions & 0 deletions app/src/controllers/plugins/selectors.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ export const publicPluginsSelector = (state) => {
export const pluginByNameSelector = (state, name) =>
pluginsSelector(state).find((plugin) => plugin.name === name);

export const enabledPluginSelector = (state, name) => pluginByNameSelector(state, name).enabled;

export const notificationPluginsSelector = createSelector(pluginsSelector, (plugins) => {
return plugins.filter((item) => item.groupType === NOTIFICATION_GROUP_TYPE);
});
Expand Down
4 changes: 2 additions & 2 deletions app/src/pages/inside/logsPage/logsGrid/nestedStepHeader/nestedStepHeader.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,8 @@ export class NestedStepHeader extends Component {
status={data.status}
itemNumber={data.number}
timing={{
start: data.startTime,
end: data.endTime,
start: new Date(data.startTime).getTime(),
end: new Date(data.endTime).getTime(),
approxTime: data.approximateDuration,
}}
/>
Expand Down
2 changes: 1 addition & 1 deletion app/webpack/base.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const path = require('path');
const HtmlWebpackPlugin = require('html-webpack-plugin');
const webpack = require('webpack');
const WebpackNotifierPlugin = require('webpack-notifier');
const CleanWebpackPlugin = require('clean-webpack-plugin');
const { CleanWebpackPlugin } = require('clean-webpack-plugin');
const ModuleFederationPlugin = require('webpack/lib/container/ModuleFederationPlugin');
const pjson = require('../package.json');

Expand Down
3 changes: 1 addition & 2 deletions app/webpack/dev.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,14 +85,13 @@ module.exports = () => {
},
hot: true,
historyApiFallback: true,
https: false,
host: '0.0.0.0',
port: 3000,
proxy: [
{
context: ['/composite', '/api/', '/uat/'],
target: process.env.PROXY_PATH,
bypass(req) {
onProxyReq: (proxyReq, req) => {
console.log(`proxy url: ${req.url}`);
},
},
Expand Down
2 changes: 1 addition & 1 deletion app/webpack/sealights.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const path = require('path');
const HtmlWebpackPlugin = require('html-webpack-plugin');
const webpack = require('webpack');
const WebpackNotifierPlugin = require('webpack-notifier');
const CleanWebpackPlugin = require('clean-webpack-plugin');
const { CleanWebpackPlugin } = require('clean-webpack-plugin');
const MiniCssExtractPlugin = require('mini-css-extract-plugin');
const CompressionPlugin = require('compression-webpack-plugin');

Expand Down
Loading