Skip to content

Commit 93971a7

Browse files
Merge pull request #242 from RedisInsight/release/1.2.0
Release/1.2.0
2 parents 8868301 + 9c6d18e commit 93971a7

File tree

43 files changed

+298
-85
lines changed

Some content is hidden

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

43 files changed

+298
-85
lines changed

.env

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
NODE_ENV='production'
66
RI_BASE_APP_URL='http://localhost'
77
RI_APP_PORT=5541
8-
RI_APP_VERSION='1.0.0'
8+
RI_APP_VERSION='1.2.0'
99
RI_APP_PREFIX='api'
1010
RI_APP_FOLDER_NAME='.redis-for-vscode'
11-
RI_CDN_PATH='https://s3.us-east-1.amazonaws.com/redisinsight.test/public/zalenski/vscode/web-mini'
11+
RI_CDN_PATH='https://s3.amazonaws.com/redisinsight.download/public/releases/2.64.0/web-mini'
1212
RI_WITHOUT_BACKEND=false
1313
# RI_WITHOUT_BACKEND=true
1414
RI_STDOUT_LOGGER=false

.github/workflows/aws.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ env:
88
AWS_DISTRIBUTION_ID: ${{ secrets.AWS_DISTRIBUTION_ID }}
99
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
1010
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
11-
AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
11+
AWS_DEFAULT_REGION: ${{ vars.AWS_DEFAULT_REGION }}
1212

1313
jobs:
1414
release-private:

.github/workflows/release-prod.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ jobs:
1010
name: Run all tests
1111
uses: ./.github/workflows/tests.yml
1212
secrets: inherit
13+
with:
14+
group_tests: 'without_e2e'
15+
pre_release: true
1316

1417
builds-prod:
1518
name: Create all builds for release

.github/workflows/release-stage.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ jobs:
1010
name: Release stage tests
1111
uses: ./.github/workflows/tests.yml
1212
secrets: inherit
13+
with:
14+
group_tests: 'without_e2e'
15+
pre_release: true
1316

1417
builds:
1518
name: Release stage builds

.github/workflows/tests.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ on:
2222
description: Run group of tests
2323
type: string
2424
default: 'all'
25+
pre_release:
26+
description: Is pre-release
27+
default: false
28+
type: boolean
2529

2630
jobs:
2731
frontend-tests:

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "redis-for-vscode",
3-
"version": "1.0.0",
3+
"version": "1.2.0",
44
"displayName": "Redis for VS Code",
55
"description": "Visually interact with data and build queries in Redis",
66
"license": "SEE LICENSE IN LICENSE",
@@ -44,7 +44,7 @@
4444
"vscode": "^1.87.0"
4545
},
4646
"activationEvents": [
47-
"onStartupFinished"
47+
"onView:ri-sidebar-view"
4848
],
4949
"contributes": {
5050
"viewsContainers": {

scripts/downloadBackend.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ async function downloadRedisBackendArchive(
8282
})
8383
}
8484

85-
function getNormalizedString(string: string) {
86-
return string?.startsWith('D:')
85+
function getNormalizedCIString(string: string) {
86+
return string?.startsWith('D:') && process.env.CI
8787
? upath.normalize(string).replace('D:', '/d')
8888
: string
8989
}
@@ -96,9 +96,9 @@ function unzipRedisServer(redisInsideArchivePath: string, extractDir: string) {
9696

9797
cp.spawnSync('tar', [
9898
'-xf',
99-
getNormalizedString(redisInsideArchivePath),
99+
getNormalizedCIString(redisInsideArchivePath),
100100
'-C',
101-
getNormalizedString(extractDir),
101+
getNormalizedCIString(extractDir),
102102
'--strip-components',
103103
'1',
104104
'api',
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import * as useCliSettingsThunks from 'uiSrc/modules/cli/hooks/cli-settings/useCliSettingsThunks'
2+
import { constants } from 'testSrc/helpers'
3+
import { processCliAction } from 'uiSrc/actions'
4+
5+
vi.spyOn(useCliSettingsThunks, 'addCli')
6+
7+
beforeEach(() => {
8+
vi.stubGlobal('ri', { })
9+
})
10+
11+
describe('processCliAction', () => {
12+
it('should call addCli', () => {
13+
processCliAction(constants.VSCODE_CLI_ACTION)
14+
expect(useCliSettingsThunks.addCli).toBeCalled()
15+
})
16+
})
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
import * as useSelectedKey from 'uiSrc/store/hooks/use-selected-key-store/useSelectedKeyStore'
2+
import { selectKeyAction } from 'uiSrc/actions'
3+
import { constants } from 'testSrc/helpers'
4+
5+
6+
vi.spyOn(useSelectedKey, 'fetchKeyInfo')
7+
8+
9+
beforeEach(() => {
10+
vi.stubGlobal('ri', { })
11+
12+
useSelectedKey.useSelectedKeyStore.setState((state) => ({
13+
...state,
14+
data: constants.KEY_INFO,
15+
}))
16+
})
17+
18+
describe('selectKeyAction', () => {
19+
it('should call fetchKeyInfo', () => {
20+
selectKeyAction(constants.VSCODE_SELECT_KEY_ACTION)
21+
expect(useSelectedKey.fetchKeyInfo).toBeCalled()
22+
})
23+
})

src/webviews/src/components/auto-refresh/AutoRefresh.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,8 @@ const AutoRefresh = React.memo(({
199199
</Tooltip>
200200

201201
<Popover
202+
closeOnEscape
203+
closeOnDocumentClick
202204
repositionOnResize
203205
keepTooltipInside={false}
204206
open={isPopoverOpen}

0 commit comments

Comments
 (0)