Skip to content

#RI-4969 - rename cloudId url parameter #2604

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

Merged
merged 1 commit into from
Sep 21, 2023
Merged

#RI-4969 - rename cloudId url parameter #2604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion redisinsight/ui/src/components/global-url-handler/GlobalUrlHandler.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ beforeEach(() => {
store.clearActions()
})

const fromUrl = 'redisinsight://databases/connect?redisUrl=redis://default:password@localhost:6379&databaseAlias=My Name&redirect=workbench?guidePath=/quick-guides/document/introduction.md&cloudId=1232&subscriptionType=fixed&planMemoryLimit=30&memoryLimitMeasurementUnit=mb&free=true&target=_blank'
const fromUrl = 'redisinsight://databases/connect?redisUrl=redis://default:password@localhost:6379&databaseAlias=My Name&redirect=workbench?guidePath=/quick-guides/document/introduction.md&cloudBdbId=1232&subscriptionType=fixed&planMemoryLimit=30&memoryLimitMeasurementUnit=mb&free=true&target=_blank'

describe('GlobalUrlHandler', () => {
beforeEach(() => {
Expand Down Expand Up @@ -84,6 +84,8 @@ describe('GlobalUrlHandler', () => {
const fromParams = new URLSearchParams(actionUrl.search)
// @ts-ignore
const urlProperties = Object.fromEntries(fromParams) || {}
urlProperties.cloudId = urlProperties.cloudBdbId
delete urlProperties.cloudBdbId

expect(store.getActions()).toEqual([
setUrlProperties(urlProperties),
Expand Down Expand Up @@ -115,6 +117,8 @@ describe('GlobalUrlHandler', () => {
const fromParams = new URLSearchParams(actionUrl.search)
// @ts-ignore
const urlProperties = Object.fromEntries(fromParams) || {}
urlProperties.cloudId = urlProperties.cloudBdbId
delete urlProperties.cloudBdbId

const expectedActions = [
setUrlProperties(urlProperties),
Expand Down Expand Up @@ -159,6 +163,8 @@ describe('GlobalUrlHandler', () => {
const fromParams = new URLSearchParams(actionUrl.search)
// @ts-ignore
const urlProperties = Object.fromEntries(fromParams) || {}
urlProperties.cloudId = urlProperties.cloudBdbId
delete urlProperties.cloudBdbId

const expectedActions = [
setUrlProperties(urlProperties),
Expand Down
5 changes: 5 additions & 0 deletions redisinsight/ui/src/components/global-url-handler/GlobalUrlHandler.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@ const GlobalUrlHandler = () => {

// @ts-ignore
const urlProperties = Object.fromEntries(fromParams) || {}

// rename cloudBdbId to cloudId
urlProperties.cloudId = urlProperties.cloudBdbId
delete urlProperties.cloudBdbId

dispatch(setUrlProperties(urlProperties))
dispatch(setFromUrl(null))

Expand Down