{isPending && (
diff --git a/src/pages/UsersPage/components/UserListItem.tsx b/src/pages/UsersPage/components/UserListItem.tsx
index a6ca7c9..c8a481b 100644
--- a/src/pages/UsersPage/components/UserListItem.tsx
+++ b/src/pages/UsersPage/components/UserListItem.tsx
@@ -35,13 +35,13 @@ const UserListItem = ({
const navigate = useNavigate();
const doClick = () => {
- navigate(`${user.id}`);
+ navigate(`${user.id}?tab=1`);
};
return (
diff --git a/src/pages/UsersPage/components/UserTasksCard.tsx b/src/pages/UsersPage/components/UserTasksCard.tsx
index c83edb8..aeaeff1 100644
--- a/src/pages/UsersPage/components/UserTasksCard.tsx
+++ b/src/pages/UsersPage/components/UserTasksCard.tsx
@@ -49,7 +49,7 @@ const UserTasksCard = ({
}, [error, incompleteTasks, t]);
return (
-
navigate(`/app/users/${userId}/tasks`)} data-testid={testId}>
+
navigate(`/app/users/${userId}/tasks?tab=1`)} data-testid={testId}>
{
await userEvent.click(screen.getByTestId('card-user-tasks'));
// ASSERT
- expect(mockNavigate).toHaveBeenCalledWith(`/app/users/1/tasks`);
+ expect(mockNavigate).toHaveBeenCalledWith(`/app/users/1/tasks?tab=1`);
});
});
diff --git a/src/utils/__tests__/numbers.test.ts b/src/utils/__tests__/numbers.test.ts
new file mode 100644
index 0000000..b576a0c
--- /dev/null
+++ b/src/utils/__tests__/numbers.test.ts
@@ -0,0 +1,80 @@
+import { describe, expect, it } from 'vitest';
+
+import { toNumberBetween } from 'utils/numbers';
+
+describe('numbers', () => {
+ it('should convert to number successfully', () => {
+ // ARRANGE
+ const value: string = '1';
+ const result = toNumberBetween(value, 0, 2, 0);
+
+ // ASSERT
+ expect(result).toBe(1);
+ });
+
+ it('should convert boolean to number successfully', () => {
+ // ARRANGE
+ const falseValue: boolean = false;
+ const trueValue: boolean = true;
+ const falseResult = toNumberBetween(falseValue, 0, 2, 1);
+ const trueResult = toNumberBetween(trueValue, 0, 2, 0);
+
+ // ASSERT
+ expect(falseResult).toBe(0);
+ expect(trueResult).toBe(1);
+ });
+
+ it('should convert number to number successfully', () => {
+ // ARRANGE
+ const value: number = 1;
+ const result = toNumberBetween(value, 0, 2, 0);
+
+ // ASSERT
+ expect(result).toBe(1);
+ });
+
+ it('should convert string to default', () => {
+ // ARRANGE
+ const value: string = 'a';
+ const result = toNumberBetween(value, 0, 2, 0);
+
+ // ASSERT
+ expect(result).toBe(0);
+ });
+
+ it('should return min when number equal to min', () => {
+ // ARRANGE
+ const value: string = '10';
+ const result = toNumberBetween(value, 10, 20, 15);
+
+ // ASSERT
+ expect(result).toBe(10);
+ });
+
+ it('should return default when number less than min', () => {
+ // ARRANGE
+ const value: string = '0';
+ const result = toNumberBetween(value, 10, 20, 10);
+
+ // ASSERT
+ expect(result).toBe(10);
+ });
+
+ it('should return max when number equal to max', () => {
+ // ARRANGE
+ const value: string = '20';
+ const result = toNumberBetween(value, 10, 20, 10);
+
+ // ASSERT
+ expect(result).toBe(20);
+ });
+
+ it('should return default when number greater than max', () => {
+ // ARRANGE
+ const value: string = '500';
+ const result = toNumberBetween(value, 10, 20, 10);
+
+ // ASSERT
+ expect(result).toBe(10);
+ });
+});
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index a81489c..fd000cd 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -26,3 +26,10 @@ export enum StorageKeys {
export const DEFAULT_SETTINGS: Settings = {
theme: 'light',
};
+
+/**
+ * URL search parameter, i.e. query string, keys.
+ */
+export enum SearchParam {
+ tab = 'tab',
+}
diff --git a/src/utils/numbers.ts b/src/utils/numbers.ts
new file mode 100644
index 0000000..1e34ed5
--- /dev/null
+++ b/src/utils/numbers.ts
@@ -0,0 +1,37 @@
+import isNaN from 'lodash/isNaN';
+import toNumber from 'lodash/toNumber';
+
+/**
+ * Converts the supplied `value` to a `number`.
+ *
+ * If type conversion
+ * fails, returns the supplied default value, `defaultValue`.
+ *
+ * If value exceeds the `minimum` or `maxaximum`, returns the supplied default
+ * value.
+ * @param value - The value to be converted.
+ * @param minimum - The minimum allowed value.
+ * @param maximum - The maximum allowed value.
+ * @param defaultValue - The default value.
+ * @returns {number} The resulting `number` value after type conversion and
+ * validation.
+ */
+export const toNumberBetween = (
+ value: boolean | number | string | null,
+ minimum: number,
+ maximum: number,
+ defaultValue: number,
+): number => {
+ // convert value to a number
+ const numVal = toNumber(value);
+ // if result is not a number (NaN), return default
+ if (isNaN(numVal)) {
+ return defaultValue;
+ }
+ // if result is outside the boundaries, return default
+ if (numVal < minimum || numVal > maximum) {
+ return defaultValue;
+ }
+ // otherwise return result
+ return numVal;
+};