Skip to content

Commit 1e7b922

Browse files
authored
Merge branch 'main' into latest
2 parents 3110a8e + 7a3805b commit 1e7b922

34 files changed

Lines changed: 691 additions & 318 deletions

File tree

.ai/rules/pull-requests.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ alwaysApply: true
66

77
## Creating a PR
88

9+
### Labels
10+
11+
When creating PRs with AI assistance, always add the **"AI-Made"** label.
12+
913
### PR Title
1014

1115
Include issue number at the start:

.cursor/mcp.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../mcp.json

.storybook/helpers/styles.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,6 @@ export const StyledContainer = styled(PageBody)`
1111
theme.semantic.color.background.neutral100};
1212
border: 2px solid
1313
${({ theme }: { theme: Theme }) => theme.semantic.color.border.neutral500};
14+
align-items: center;
15+
justify-content: center;
1416
`

.storybook/preview.tsx

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
import React from 'react'
22
import type { Parameters, Preview } from '@storybook/react-vite'
33
import { withThemeFromJSXProvider } from '@storybook/addon-themes'
4-
import {
5-
createGlobalStyle,
6-
ThemeProvider as StyledThemeProvider,
7-
} from 'styled-components'
8-
import { CommonStyles, themeDark, themeLight, themeOld } from '@redis-ui/styles'
4+
import { ThemeProvider as StyledThemeProvider } from 'styled-components'
5+
import { CommonStyles, themeDark, themeLight } from '@redis-ui/styles'
96
import 'modern-normalize/modern-normalize.css'
107
import '@redis-ui/styles/normalized-styles.css'
118
import '@redis-ui/styles/fonts.css'
@@ -14,8 +11,6 @@ import { RootStoryLayout } from './RootStoryLayout'
1411
import { StoryContextProvider } from './Story.context'
1512
import { useStoryContext } from 'storybook/internal/preview-api'
1613
import { TooltipProvider } from '@redis-ui/components'
17-
import { type Theme } from 'uiSrc/components/base/theme/types'
18-
// import { store } from 'uiSrc/utils/test-utils'
1914
import { Provider } from 'react-redux'
2015
import { store } from 'uiSrc/slices/store'
2116
import Router from 'uiSrc/Router'
@@ -51,13 +46,6 @@ const parameters: Parameters = {
5146
},
5247
}
5348

54-
const GlobalStoryStyles = createGlobalStyle`
55-
.sb-show-main, .docs-story {
56-
background: ${({ theme }: { theme: Theme }) => theme.globals.body.bgColor};
57-
color: ${({ theme }: { theme: Theme }) => theme.components.typography.colors.primary};
58-
}
59-
`
60-
6149
const preview: Preview = {
6250
parameters,
6351
decorators: [
@@ -82,11 +70,9 @@ const preview: Preview = {
8270
themes: {
8371
light: themeLight,
8472
dark: themeDark,
85-
obsolete: themeOld,
8673
},
8774
defaultTheme: 'light',
8875
Provider: StyledThemeProvider,
89-
GlobalStyles: GlobalStoryStyles,
9076
}),
9177
],
9278
}

.vscode/settings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,8 @@
55
},
66
"[typescript]": {
77
"editor.defaultFormatter": "esbenp.prettier-vscode"
8+
},
9+
"[typescriptreact]": {
10+
"editor.defaultFormatter": "esbenp.prettier-vscode"
811
}
912
}
Lines changed: 9 additions & 0 deletions
Loading
Lines changed: 14 additions & 0 deletions
Loading
Lines changed: 22 additions & 0 deletions
Loading

redisinsight/ui/src/components/base/icons/iconRegistry.tsx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ import RedisBloomDark from 'uiSrc/assets/img/modules/RedisBloomDark.svg?react'
101101
import RedisBloomLight from 'uiSrc/assets/img/modules/RedisBloomLight.svg?react'
102102
import RedisGears2Dark from 'uiSrc/assets/img/modules/RedisGears2Dark.svg?react'
103103
import RedisGears2Light from 'uiSrc/assets/img/modules/RedisGears2Light.svg?react'
104+
import RedisGears2Svg from 'uiSrc/assets/img/modules/RedisGears2.svg?react'
104105
import RedisGearsDark from 'uiSrc/assets/img/modules/RedisGearsDark.svg?react'
105106
import RedisGearsLight from 'uiSrc/assets/img/modules/RedisGearsLight.svg?react'
106107
import RedisGraphDark from 'uiSrc/assets/img/modules/RedisGraphDark.svg?react'
@@ -113,7 +114,9 @@ import RedisTimeSeriesDark from 'uiSrc/assets/img/modules/RedisTimeSeriesDark.sv
113114
import RedisTimeSeriesLight from 'uiSrc/assets/img/modules/RedisTimeSeriesLight.svg?react'
114115
import UnknownDark from 'uiSrc/assets/img/modules/UnknownDark.svg?react'
115116
import UnknownLight from 'uiSrc/assets/img/modules/UnknownLight.svg?react'
117+
import UnknownSvg from 'uiSrc/assets/img/modules/Unknown.svg?react'
116118
import FormatterSvg from 'uiSrc/assets/img/icons/formatter.svg?react'
119+
import VectorSetSvg from 'uiSrc/assets/img/icons/vector_sets.svg?react'
117120

118121
// Import options icons
119122
import ActiveActiveDark from 'uiSrc/assets/img/options/Active-ActiveDark.svg?react'
@@ -266,6 +269,7 @@ export const RedisBloomDarkIcon = createIconComponent(RedisBloomDark)
266269
export const RedisBloomLightIcon = createIconComponent(RedisBloomLight)
267270
export const RedisGears2DarkIcon = createIconComponent(RedisGears2Dark)
268271
export const RedisGears2LightIcon = createIconComponent(RedisGears2Light)
272+
export const RedisGears2Icon = createIconComponent(RedisGears2Svg)
269273
export const RedisGearsDarkIcon = createIconComponent(RedisGearsDark)
270274
export const RedisGearsLightIcon = createIconComponent(RedisGearsLight)
271275
export const RedisGraphDarkIcon = createIconComponent(RedisGraphDark)
@@ -285,6 +289,8 @@ export const RedisTimeSeriesLightIcon =
285289
createIconComponent(RedisTimeSeriesLight)
286290
export const UnknownDarkIcon = createIconComponent(UnknownDark)
287291
export const UnknownLightIcon = createIconComponent(UnknownLight)
292+
export const UnknownModuleIcon = createIconComponent(UnknownSvg)
293+
export const VectorSetIcon = createIconComponent(VectorSetSvg)
288294

289295
// Options icons
290296
export const ActiveActiveDarkIcon = createIconComponent(ActiveActiveDark)

redisinsight/ui/src/components/database-list-modules/DatabaseListModules.spec.tsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ import {
66
} from 'uiSrc/slices/interfaces'
77
import { fireEvent, render, act } from 'uiSrc/utils/test-utils'
88
import { AdditionalRedisModule } from 'apiSrc/modules/database/models/additional.redis.module'
9-
import DatabaseListModules, { Props } from './DatabaseListModules'
9+
import { DatabaseListModules } from './DatabaseListModules'
10+
import { DatabaseListModulesProps } from './DatabaseListModules.types'
1011

11-
const mockedProps = mock<Props>()
12+
const mockedProps = mock<DatabaseListModulesProps>()
1213

1314
const modulesMock: AdditionalRedisModule[] = [
1415
{ name: RedisDefaultModules.AI },
@@ -41,7 +42,7 @@ describe('DatabaseListModules', () => {
4142

4243
const module = queryByTestId(`${term}_module`)
4344

44-
await act(() => {
45+
await act(async () => {
4546
module && fireEvent.click(module)
4647
})
4748

0 commit comments

Comments
 (0)