tabshift/payload
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: use href for locale switching, warns user before leaving (#7215)

Browse Source 
Opts to use links instead of router.replace when switching locales. The
main benefit is now the user will be warned if they have changes and
want to switch locales. Before it would switch locales and they would
lose any unsaved changes in the locale they came from.
This commit is contained in:
Jarrod Flesch
2024-07-18 12:59:27 -04:00
committed by GitHub
parent 0ada3df220
commit 448186f374
3 changed files with 27 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
test/helpers.ts
View File

@@ -30,20 +30,20 @@ type LoginArgs = {
const random = (min: number, max: number) => Math.floor(Math.random() * (max - min + 1)) + min
const networkConditions = {
'Slow 3G': {
download: ((500 * 1000) / 8) * 0.8,
upload: ((500 * 1000) / 8) * 0.8,
latency: 400 * 5,
},
'Fast 3G': {
download: ((1.6 * 1000 * 1000) / 8) * 0.9,
upload: ((750 * 1000) / 8) * 0.9,
latency: 1000,
upload: ((750 * 1000) / 8) * 0.9,
},
'Slow 3G': {
download: ((500 * 1000) / 8) * 0.8,
latency: 400 * 5,
upload: ((500 * 1000) / 8) * 0.8,
},
'Slow 4G': {
download: ((4 * 1000 * 1000) / 8) * 0.8,
upload: ((3 * 1000 * 1000) / 8) * 0.8,
latency: 1000,
upload: ((3 * 1000 * 1000) / 8) * 0.8,
},
}
@@ -53,10 +53,10 @@ const networkConditions = {
* @param serverURL
*/
export async function ensureAutoLoginAndCompilationIsDone({
page,
serverURL,
customAdminRoutes,
customRoutes,
page,
serverURL,
}: {
customAdminRoutes?: Config['admin']['routes']
customRoutes?: Config['routes']
@@ -65,7 +65,7 @@ export async function ensureAutoLoginAndCompilationIsDone({
}): Promise<void> {
const {
admin: {
routes: { login: loginRoute, createFirstUser: createFirstUserRoute },
routes: { createFirstUser: createFirstUserRoute, login: loginRoute },
},
routes: { admin: adminRoute },
} = getAdminRoutes({ customAdminRoutes, customRoutes })
@@ -97,8 +97,8 @@ export async function ensureAutoLoginAndCompilationIsDone({
*/
export async function throttleTest({
context,
page,
delay,
page,
}: {
context: BrowserContext
delay: 'Fast 3G' | 'Slow 3G' | 'Slow 4G'
@@ -108,9 +108,9 @@ export async function throttleTest({
await cdpSession.send('Network.emulateNetworkConditions', {
downloadThroughput: networkConditions[delay].download,
uploadThroughput: networkConditions[delay].upload,
latency: networkConditions[delay].latency,
offline: false,
uploadThroughput: networkConditions[delay].upload,
})
await page.route('**/*', async (route) => {
@@ -123,7 +123,7 @@ export async function throttleTest({
}
export async function firstRegister(args: FirstRegisterArgs): Promise<void> {
const { page, serverURL, customAdminRoutes, customRoutes } = args
const { customAdminRoutes, customRoutes, page, serverURL } = args
const {
routes: { admin: adminRoute },
@@ -139,11 +139,11 @@ export async function firstRegister(args: FirstRegisterArgs): Promise<void> {
}
export async function login(args: LoginArgs): Promise<void> {
const { page, serverURL, data = devUser, customAdminRoutes, customRoutes } = args
const { customAdminRoutes, customRoutes, data = devUser, page, serverURL } = args
const {
admin: {
routes: { login: loginRoute, createFirstUser: createFirstUserRoute },
routes: { createFirstUser: createFirstUserRoute, login: loginRoute },
},
routes: { admin: adminRoute },
} = getAdminRoutes({ customAdminRoutes, customRoutes })
@@ -236,7 +236,7 @@ export async function openDocControls(page: Page): Promise<void> {
export async function changeLocale(page: Page, newLocale: string) {
await page.locator('.localizer >> button').first().click()
await page
.locator(`.localizer .popup.popup--active .popup-button-list button`, {
.locator(`.localizer .popup.popup--active .popup-button-list__button`, {
hasText: newLocale,
})
.first()
@@ -349,8 +349,8 @@ export function describeIfInCIOrHasLocalstack(): jest.Describe {
type AdminRoutes = Config['admin']['routes']
export function getAdminRoutes({
customRoutes,
customAdminRoutes,
customRoutes,
}: {
customAdminRoutes?: AdminRoutes
customRoutes?: Config['routes']