monkeytypegame/monkeytype
1
1
Fork 0
mirror of https://github.com/monkeytypegame/monkeytype.git synced 2024-09-20 07:16:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(config): some settings sometimes being reset on refresh

Browse source
This commit is contained in:
Miodec 2024-08-16 01:11:59 +02:00
parent f25536a218
commit cd3b95b387
2 changed files with 75 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
frontend/__tests__/utils/config.spec.ts
View file

@ -36,6 +36,50 @@ describe("config.ts", () => {
expect(result.time).toEqual(120);
expect(result.accountChart).toEqual(["off", "off", "off", "off"]);
});
it("should not convert legacy values if current values are already present", () => {
const testCases = [
{
given: { showLiveAcc: true, timerStyle: "mini", liveAccStyle: "off" },
expected: { liveAccStyle: "off" },
},
{
given: {
showLiveBurst: true,
timerStyle: "mini",
liveBurstStyle: "off",
},
expected: { liveBurstStyle: "off" },
},
{
given: { quickTab: true, quickRestart: "enter" },
expected: { quickRestart: "enter" },
},
{
given: { swapEscAndTab: true, quickRestart: "enter" },
expected: { quickRestart: "enter" },
},
{
given: { alwaysShowCPM: true, typingSpeedUnit: "wpm" },
expected: { typingSpeedUnit: "wpm" },
},
{
given: { showTimerProgress: true, timerStyle: "mini" },
expected: { timerStyle: "mini" },
},
];
//WHEN
testCases.forEach((test) => {
const description = `given: ${JSON.stringify(
test.given
)}, expected: ${JSON.stringify(test.expected)} `;
const result = migrateConfig(test.given);
expect(result, description).toEqual(
expect.objectContaining(test.expected)
);
});
});
it("should convert legacy values", () => {
const testCases = [
{ given: { quickTab: true }, expected: { quickRestart: "tab" } },

44
frontend/src/ts/utils/config.ts
View file

@ -30,7 +30,7 @@ function replaceLegacyValues(
configObj: ConfigSchemas.PartialConfig
): ConfigSchemas.PartialConfig {
//@ts-expect-error
if (configObj.quickTab === true) {
if (configObj.quickTab === true && configObj.quickRestart === undefined) {
configObj.quickRestart = "tab";
}
@ -38,13 +38,19 @@ function replaceLegacyValues(
configObj.smoothCaret = configObj.smoothCaret ? "medium" : "off";
}
//@ts-expect-error
if (configObj.swapEscAndTab === true) {
if (
//@ts-expect-error
configObj.swapEscAndTab === true &&
configObj.quickRestart === undefined
) {
configObj.quickRestart = "esc";
}
//@ts-expect-error
if (configObj.alwaysShowCPM === true) {
if (
//@ts-expect-error
configObj.alwaysShowCPM === true &&
configObj.typingSpeedUnit === undefined
) {
configObj.typingSpeedUnit = "cpm";
}
@ -57,13 +63,19 @@ function replaceLegacyValues(
configObj.playSoundOnError = configObj.playSoundOnError ? "1" : "off";
}
//@ts-expect-error
if (configObj.showTimerProgress === false) {
if (
//@ts-expect-error
configObj.showTimerProgress === false &&
configObj.timerStyle === undefined
) {
configObj.timerStyle = "off";
}
//@ts-expect-error
if (configObj.showLiveWpm === true) {
if (
//@ts-expect-error
configObj.showLiveWpm === true &&
configObj.liveSpeedStyle === undefined
) {
let val: ConfigSchemas.LiveSpeedAccBurstStyle = "mini";
if (configObj.timerStyle !== "bar" && configObj.timerStyle !== "off") {
val = configObj.timerStyle as ConfigSchemas.LiveSpeedAccBurstStyle;
@ -71,8 +83,11 @@ function replaceLegacyValues(
configObj.liveSpeedStyle = val;
}
//@ts-expect-error
if (configObj.showLiveBurst === true) {
if (
//@ts-expect-error
configObj.showLiveBurst === true &&
configObj.liveBurstStyle === undefined
) {
let val: ConfigSchemas.LiveSpeedAccBurstStyle = "mini";
if (configObj.timerStyle !== "bar" && configObj.timerStyle !== "off") {
val = configObj.timerStyle as ConfigSchemas.LiveSpeedAccBurstStyle;
@ -80,8 +95,11 @@ function replaceLegacyValues(
configObj.liveBurstStyle = val;
}
//@ts-expect-error
if (configObj.showLiveAcc === true) {
if (
//@ts-expect-error
configObj.showLiveAcc === true &&
configObj.liveAccStyle === undefined
) {
let val: ConfigSchemas.LiveSpeedAccBurstStyle = "mini";
if (configObj.timerStyle !== "bar" && configObj.timerStyle !== "off") {
val = configObj.timerStyle as ConfigSchemas.LiveSpeedAccBurstStyle;