From 04b85943c2b6229e53123b2bee3f86829a3fa1d1 Mon Sep 17 00:00:00 2001 From: Dipyaman Biswas Date: Wed, 11 Oct 2023 12:57:52 +0530 Subject: [PATCH] fix: change URL for License Settings page (#27930) ## Description Change URL for License Settings page to /settings/license from /settings/billing, remove unused parameter from RestartPoll. #### PR fixes following issue(s) Fixes #https://github.com/appsmithorg/cloud-services/issues/1413 #### Type of change > Please delete options that are not relevant. - Chore (housekeeping or task changes that don't impact user perception) > > > ## Testing > #### How Has This Been Tested? > Please describe the tests that you ran to verify your changes. Also list any relevant details for your test configuration. > Delete anything that is not relevant - [x] Manual - [ ] JUnit - [ ] Jest - [ ] Cypress > > #### Test Plan > Add Testsmith test cases links that relate to this PR > > #### Issues raised during DP testing > Link issues raised during DP testing for better visiblity and tracking (copy link from comments dropped on this PR) > > > ## Checklist: #### Dev activity - [ ] My code follows the style guidelines of this project - [ ] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [ ] My changes generate no new warnings - [ ] I have added tests that prove my fix is effective or that my feature works - [ ] New and existing unit tests pass locally with my changes - [ ] PR is being merged under a feature flag #### QA activity: - [ ] [Speedbreak features](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#speedbreakers-) have been covered - [ ] Test plan covers all impacted features and [areas of interest](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#areas-of-interest-) - [ ] Test plan has been peer reviewed by project stakeholders and other QA members - [ ] Manually tested functionality on DP - [ ] We had an implementation alignment call with stakeholders post QA Round 2 - [ ] Cypress test cases have been added and approved by SDET/manual QA - [ ] Added `Test Plan Approved` label after Cypress tests were reviewed - [ ] Added `Test Plan Approved` label after JUnit tests were reviewed --- app/client/src/ce/sagas/SuperUserSagas.tsx | 10 +++------- app/client/src/constants/routes/baseRoutes.ts | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/app/client/src/ce/sagas/SuperUserSagas.tsx b/app/client/src/ce/sagas/SuperUserSagas.tsx index ad907d313c..9df0ffadce 100644 --- a/app/client/src/ce/sagas/SuperUserSagas.tsx +++ b/app/client/src/ce/sagas/SuperUserSagas.tsx @@ -5,10 +5,7 @@ import { ReduxActionErrorTypes, ReduxActionTypes, } from "@appsmith/constants/ReduxActionConstants"; -import { - APPLICATIONS_URL, - WORKSPACE_SETTINGS_BILLING_PAGE_URL, -} from "constants/routes"; +import { APPLICATIONS_URL } from "constants/routes"; import type { User } from "constants/userConstants"; import { call, put, delay, select } from "redux-saga/effects"; import history from "utils/history"; @@ -150,7 +147,7 @@ export function* RestartServerPoll() { yield call(RestryRestartServerPoll); } -export function* RestryRestartServerPoll(isMigration = false) { +export function* RestryRestartServerPoll() { let pollCount = 0; const maxPollCount = RESTART_POLL_TIMEOUT / RESTART_POLL_INTERVAL; while (pollCount < maxPollCount) { @@ -165,8 +162,7 @@ export function* RestryRestartServerPoll(isMigration = false) { response.data?.tenantConfiguration?.migrationStatus === MIGRATION_STATUS.COMPLETED ) { - if (!isMigration) window.location.reload(); - else location.href = WORKSPACE_SETTINGS_BILLING_PAGE_URL; + window.location.reload(); } } catch (e) {} } diff --git a/app/client/src/constants/routes/baseRoutes.ts b/app/client/src/constants/routes/baseRoutes.ts index 583419d6db..4b0a059c63 100644 --- a/app/client/src/constants/routes/baseRoutes.ts +++ b/app/client/src/constants/routes/baseRoutes.ts @@ -28,7 +28,7 @@ export const WORKSPACE_INVITE_USERS_PAGE_URL = `${WORKSPACE_URL}/invite`; export const WORKSPACE_SETTINGS_PAGE_URL = `${WORKSPACE_URL}/settings`; export const WORKSPACE_SETTINGS_GENERAL_PAGE_URL = `${WORKSPACE_URL}/settings/general`; export const WORKSPACE_SETTINGS_MEMBERS_PAGE_URL = `${WORKSPACE_URL}/settings/members`; -export const WORKSPACE_SETTINGS_BILLING_PAGE_URL = `/settings/billing`; +export const WORKSPACE_SETTINGS_LICENSE_PAGE_URL = `/settings/license`; export const matchApplicationPath = match(APPLICATIONS_URL); export const matchTemplatesPath = match(TEMPLATES_PATH);