getNum => deprecatedSetNum
This commit is contained in:
parent
394b44eb15
commit
4d8aa61a61
|
@ -9,7 +9,7 @@ jest.mock("../session", () => ({
|
|||
Session: {
|
||||
fetchStoredToken: jest.fn(() => mockAuth)
|
||||
.mockImplementationOnce(() => { }),
|
||||
getNum: () => undefined,
|
||||
deprecatedGetNum: () => undefined,
|
||||
deprecatedGetBool: () => undefined,
|
||||
getAll: () => undefined,
|
||||
clear: mockClear
|
||||
|
|
|
@ -19,7 +19,7 @@ jest.mock("axios", () => ({
|
|||
jest.mock("../../session", () => ({
|
||||
Session: {
|
||||
fetchStoredToken: jest.fn(),
|
||||
getNum: () => undefined,
|
||||
deprecatedGetNum: () => undefined,
|
||||
deprecatedGetBool: () => undefined,
|
||||
getAll: () => undefined
|
||||
}
|
||||
|
|
|
@ -50,12 +50,12 @@ export class FarmDesigner extends React.Component<Props, Partial<State>> {
|
|||
}
|
||||
|
||||
getBotOriginQuadrant = (): BotOriginQuadrant => {
|
||||
const value = Session.getNum(NumericSetting.bot_origin_quadrant);
|
||||
const value = Session.deprecatedGetNum(NumericSetting.bot_origin_quadrant);
|
||||
return isBotOriginQuadrant(value) ? value : 2;
|
||||
}
|
||||
|
||||
getZoomLevel = (): number => {
|
||||
return Session.getNum(NumericSetting.zoom_level) || 1;
|
||||
return Session.deprecatedGetNum(NumericSetting.zoom_level) || 1;
|
||||
}
|
||||
|
||||
state: State = {
|
||||
|
@ -80,13 +80,13 @@ export class FarmDesigner extends React.Component<Props, Partial<State>> {
|
|||
|
||||
updateBotOriginQuadrant = (payload: BotOriginQuadrant) => () => {
|
||||
this.setState({ bot_origin_quadrant: payload });
|
||||
Session.setNum(NumericSetting.bot_origin_quadrant, payload);
|
||||
Session.deprecatedSetNum(NumericSetting.bot_origin_quadrant, payload);
|
||||
}
|
||||
|
||||
updateZoomLevel = (zoomIncrement: number) => () => {
|
||||
const payload = Math.round((this.getZoomLevel() + zoomIncrement) * 10) / 10;
|
||||
this.setState({ zoom_level: payload });
|
||||
Session.setNum(NumericSetting.zoom_level, payload);
|
||||
Session.deprecatedSetNum(NumericSetting.zoom_level, payload);
|
||||
}
|
||||
|
||||
childComponent(props: Props) {
|
||||
|
|
|
@ -7,10 +7,10 @@ const mockStorj: Dictionary<number | boolean> = {};
|
|||
jest.mock("../../session", () => {
|
||||
return {
|
||||
Session: {
|
||||
getNum: (k: string) => {
|
||||
deprecatedGetNum: (k: string) => {
|
||||
return mockStorj[k];
|
||||
},
|
||||
setNum: (k: string, v: number) => {
|
||||
deprecatedSetNum: (k: string, v: number) => {
|
||||
mockStorj[k] = v;
|
||||
},
|
||||
deprecatedGetBool: (k: string) => {
|
||||
|
|
|
@ -10,7 +10,7 @@ const mockStorj: Dictionary<number | boolean> = {};
|
|||
jest.mock("../../../session", () => {
|
||||
return {
|
||||
Session: {
|
||||
getNum: (k: string) => {
|
||||
deprecatedGetNum: (k: string) => {
|
||||
return mockStorj[k];
|
||||
},
|
||||
setNum: (k: string, v: number) => {
|
||||
|
|
|
@ -13,7 +13,7 @@ import { Session, safeNumericSetting } from "../../session";
|
|||
const LogSetting = (props: LogSettingProps) => {
|
||||
const { label, setting, toolTip, value, setFilterLevel } = props;
|
||||
const updateMinFilterLevel = (name: keyof LogsState, level: number) => {
|
||||
const currentLevel = Session.getNum(safeNumericSetting(name + "_log")) || 0;
|
||||
const currentLevel = Session.deprecatedGetNum(safeNumericSetting(name + "_log")) || 0;
|
||||
if (currentLevel < level) { setFilterLevel(name)(level); }
|
||||
};
|
||||
return <fieldset>
|
||||
|
|
|
@ -24,9 +24,9 @@ export class Logs extends React.Component<LogsProps, Partial<LogsState>> {
|
|||
componentDidCatch(x: Error, y: React.ErrorInfo) { catchErrors(x, y); }
|
||||
|
||||
initialize = (name: NumberConfigKey, defaultValue: number): number => {
|
||||
const currentValue = Session.getNum(safeNumericSetting(name));
|
||||
const currentValue = Session.deprecatedGetNum(safeNumericSetting(name));
|
||||
if (isUndefined(currentValue)) {
|
||||
Session.setNum(safeNumericSetting(name), defaultValue);
|
||||
Session.deprecatedSetNum(safeNumericSetting(name), defaultValue);
|
||||
return defaultValue;
|
||||
} else {
|
||||
return currentValue;
|
||||
|
@ -49,12 +49,12 @@ export class Logs extends React.Component<LogsProps, Partial<LogsState>> {
|
|||
case 0:
|
||||
return () => {
|
||||
this.setState({ [name]: 1 });
|
||||
Session.setNum(safeNumericSetting(name + "_log"), 1);
|
||||
Session.deprecatedSetNum(safeNumericSetting(name + "_log"), 1);
|
||||
};
|
||||
default:
|
||||
return () => {
|
||||
this.setState({ [name]: 0 });
|
||||
Session.setNum(safeNumericSetting(name + "_log"), 0);
|
||||
Session.deprecatedSetNum(safeNumericSetting(name + "_log"), 0);
|
||||
};
|
||||
}
|
||||
}
|
||||
|
@ -62,7 +62,7 @@ export class Logs extends React.Component<LogsProps, Partial<LogsState>> {
|
|||
setFilterLevel = (name: keyof LogsState) => {
|
||||
return (value: number) => {
|
||||
this.setState({ [name]: value });
|
||||
Session.setNum(safeNumericSetting(name + "_log"), value);
|
||||
Session.deprecatedSetNum(safeNumericSetting(name + "_log"), value);
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
@ -3,10 +3,10 @@ const mockStorj: Dictionary<number | boolean> = {};
|
|||
jest.mock("../../session", () => {
|
||||
return {
|
||||
Session: {
|
||||
getNum: (k: string) => {
|
||||
deprecatedGetNum: (k: string) => {
|
||||
return mockStorj[k];
|
||||
},
|
||||
setNum: (k: string, v: number) => {
|
||||
deprecatedSetNum: (k: string, v: number) => {
|
||||
mockStorj[k] = v;
|
||||
},
|
||||
deprecatedGetBool: (k: string) => {
|
||||
|
|
|
@ -12,7 +12,7 @@ import { isNumber } from "lodash";
|
|||
const logFilter = (log: Log): Log | undefined => {
|
||||
const type = (log.meta || {}).type;
|
||||
const { verbosity } = log.meta;
|
||||
const filterLevel = Session.getNum(safeNumericSetting(type + "_log"));
|
||||
const filterLevel = Session.deprecatedGetNum(safeNumericSetting(type + "_log"));
|
||||
const filterLevelCompare = isNumber(filterLevel) ? filterLevel : 1;
|
||||
const displayLog = verbosity
|
||||
? verbosity <= filterLevelCompare
|
||||
|
|
|
@ -61,12 +61,12 @@ export namespace Session {
|
|||
|
||||
/** Extract numeric settings from `localStorage`. Returns `undefined` when
|
||||
* none are found. */
|
||||
export function getNum(key: NumberConfigKey): number | undefined {
|
||||
export function deprecatedGetNum(key: NumberConfigKey): number | undefined {
|
||||
return getNumViaRedux(key);
|
||||
}
|
||||
|
||||
/** Set a numeric value in `localStorage`. */
|
||||
export function setNum(key: NumberConfigKey, val: number): void {
|
||||
export function deprecatedSetNum(key: NumberConfigKey, val: number): void {
|
||||
setNumViaRedux(key, val);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue