Skip to content

Commit ff1acd6

Browse files
committed
Merge branch 'main' into feature/RI-3470_Formatters_improvements
# Conflicts: # redisinsight/ui/src/components/inline-item-editor/InlineItemEditor.tsx
2 parents 8351ae4 + 1fddc0d commit ff1acd6

File tree

114 files changed

+3453
-214
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+3453
-214
lines changed

jest.config.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ module.exports = {
1616
'rehype-stringify': '<rootDir>/redisinsight/__mocks__/rehypeStringify.js',
1717
'unist-util-visit': '<rootDir>/redisinsight/__mocks__/unistUtilsVisit.js',
1818
'react-children-utilities': '<rootDir>/redisinsight/__mocks__/react-children-utilities.js',
19+
d3: '<rootDir>/node_modules/d3/dist/d3.min.js',
1920
},
2021
setupFiles: [
2122
'<rootDir>/redisinsight/ui/src/setup-env.ts',
@@ -38,6 +39,11 @@ module.exports = {
3839
transformIgnorePatterns: [
3940
'node_modules/(?!(monaco-editor|react-monaco-editor)/)',
4041
],
42+
// TODO: add tests for plugins
43+
modulePathIgnorePatterns: [
44+
'<rootDir>/redisinsight/ui/src/packages',
45+
'<rootDir>/redisinsight/ui/src/mocks',
46+
],
4147
coverageThreshold: {
4248
global: {
4349
statements: 70,

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@
110110
"@testing-library/user-event": "^14.4.3",
111111
"@types/axios": "^0.14.0",
112112
"@types/classnames": "^2.2.11",
113+
"@types/d3": "^7.4.0",
113114
"@types/date-fns": "^2.6.0",
114115
"@types/detect-port": "^1.3.0",
115116
"@types/electron-store": "^3.2.0",
@@ -216,6 +217,7 @@
216217
"buffer": "^6.0.3",
217218
"classnames": "^2.3.1",
218219
"connection-string": "^4.3.2",
220+
"d3": "^7.6.1",
219221
"date-fns": "^2.16.1",
220222
"detect-port": "^1.3.0",
221223
"electron-context-menu": "^3.1.0",
Lines changed: 25 additions & 0 deletions
Loading
Lines changed: 17 additions & 0 deletions
Loading
Lines changed: 17 additions & 0 deletions
Loading
Lines changed: 20 additions & 0 deletions
Loading
Lines changed: 25 additions & 0 deletions
Loading
Lines changed: 17 additions & 0 deletions
Loading
Lines changed: 17 additions & 0 deletions
Loading

redisinsight/ui/src/components/action-bar/styles.module.scss

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,6 @@
22
.euiPopoverTitle {
33
text-transform: none !important;
44
}
5-
6-
.euiButton {
7-
min-width: 93px !important;
8-
9-
&:focus {
10-
text-decoration: none !important;
11-
}
12-
}
135
}
146

157
.container {

0 commit comments

Comments
 (0)