-
Edited By
+
+ {t("edited_by")}
+
{editRecord.edited_by.username}
@@ -125,7 +129,7 @@ export const AssetServiceEditModal = (props: {
- Serviced On
+ {t("serviced_on")}
-
Notes
+
+ {t("notes")}
+
{editRecord.note || "-"}
@@ -151,7 +157,7 @@ export const AssetServiceEditModal = (props: {
editRecord ? setEditRecord(undefined) : props.handleClose();
}}
>
- {editRecord ? "Back" : "Close"}
+ {editRecord ? t("back") : t("close")}
@@ -163,12 +169,12 @@ export const AssetServiceEditModal = (props: {
- Update record for asset
+ {t("update_record_for_asset")}
{props.asset?.name}
@@ -178,19 +184,31 @@ export const AssetServiceEditModal = (props: {
className="col-span-6 sm:col-span-3"
data-testid="asset-last-serviced-on-input"
>
-
Serviced On
-
{
- setForm({
- ...form,
- serviced_on: dayjs(date).format("YYYY-MM-DD"),
- });
+ if (
+ dayjs(date.value).format("YYYY-MM-DD") >
+ new Date(
+ props.service_record.created_date
+ ).toLocaleDateString("en-ca")
+ ) {
+ Notification.Error({
+ msg: `Service date can't be after ${formatDate(
+ props.service_record.created_date
+ )} (Creation date)`,
+ });
+ } else {
+ setForm({
+ ...form,
+ serviced_on: dayjs(date.value).format("YYYY-MM-DD"),
+ });
+ }
}}
- max={new Date(props.service_record.created_date)}
/>
@@ -198,8 +216,8 @@ export const AssetServiceEditModal = (props: {
{
setForm({ ...form, note: e.value });
@@ -210,7 +228,7 @@ export const AssetServiceEditModal = (props: {
diff --git a/src/Components/Auth/Login.tsx b/src/Components/Auth/Login.tsx
index cb7ea7f08f8..dd6a42d3983 100644
--- a/src/Components/Auth/Login.tsx
+++ b/src/Components/Auth/Login.tsx
@@ -1,10 +1,9 @@
import { useEffect, useState } from "react";
-import { useDispatch } from "react-redux";
-import { postForgotPassword, postLogin } from "../../Redux/actions";
+import request from "../../Utils/request/request";
+import routes from "../../Redux/api";
import { useTranslation } from "react-i18next";
import ReCaptcha from "react-google-recaptcha";
import * as Notification from "../../Utils/Notifications.js";
-import { get } from "lodash";
import LegendInput from "../../CAREUI/interactive/LegendInput";
import LanguageSelectorLogin from "../Common/LanguageSelectorLogin";
import CareIcon from "../../CAREUI/icons/CareIcon";
@@ -25,7 +24,6 @@ export const Login = (props: { forgot?: boolean }) => {
custom_logo_alt,
custom_description,
} = useConfig();
- const dispatch: any = useDispatch();
const initForm: any = {
username: "",
password: "",
@@ -90,37 +88,35 @@ export const Login = (props: { forgot?: boolean }) => {
};
}, []);
- const handleSubmit = (e: any) => {
+ const handleSubmit = async (e: any) => {
e.preventDefault();
const valid = validateData();
if (valid) {
// replaces button with spinner
setLoading(true);
- dispatch(postLogin(valid)).then((resp: any) => {
- const res = get(resp, "data", null);
- const statusCode = get(resp, "status", "");
- if (res && statusCode === 429) {
- setCaptcha(true);
- // captcha displayed set back to login button
- setLoading(false);
- } else if (res && statusCode === 200) {
- localStorage.setItem(LocalStorageKeys.accessToken, res.access);
- localStorage.setItem(LocalStorageKeys.refreshToken, res.refresh);
-
- if (
- window.location.pathname === "/" ||
- window.location.pathname === "/login"
- ) {
- window.location.href = "/facility";
- } else {
- window.location.href = window.location.pathname.toString();
- }
+ const { res, data } = await request(routes.login, {
+ body: { ...valid },
+ });
+ if (res && res.status === 429) {
+ setCaptcha(true);
+ // captcha displayed set back to login button
+ setLoading(false);
+ } else if (res && res.status === 200 && data) {
+ localStorage.setItem(LocalStorageKeys.accessToken, data.access);
+ localStorage.setItem(LocalStorageKeys.refreshToken, data.refresh);
+ if (
+ window.location.pathname === "/" ||
+ window.location.pathname === "/login"
+ ) {
+ window.location.href = "/facility";
} else {
- // error from server set back to login button
- setLoading(false);
+ window.location.href = window.location.pathname.toString();
}
- });
+ } else {
+ // error from server set back to login button
+ setLoading(false);
+ }
}
};
@@ -146,26 +142,22 @@ export const Login = (props: { forgot?: boolean }) => {
return form;
};
- const handleForgetSubmit = (e: any) => {
+ const handleForgetSubmit = async (e: any) => {
e.preventDefault();
const valid = validateForgetData();
if (valid) {
setLoading(true);
- dispatch(postForgotPassword(valid)).then((resp: any) => {
- setLoading(false);
- const res = resp && resp.data;
- if (res && res.status === "OK") {
- Notification.Success({
- msg: t("password_sent"),
- });
- } else if (res && res.data) {
- setErrors(res.data);
- } else {
- Notification.Error({
- msg: t("something_wrong"),
- });
- }
+ const { res, error } = await request(routes.forgotPassword, {
+ body: { ...valid },
});
+ setLoading(false);
+ if (res && res.statusText === "OK") {
+ Notification.Success({
+ msg: t("password_sent"),
+ });
+ } else if (res && error) {
+ setErrors(error);
+ }
}
};
diff --git a/src/Components/Auth/ResetPassword.tsx b/src/Components/Auth/ResetPassword.tsx
index 08dd1da44a0..2f02737f6de 100644
--- a/src/Components/Auth/ResetPassword.tsx
+++ b/src/Components/Auth/ResetPassword.tsx
@@ -1,7 +1,6 @@
import { useEffect, useState } from "react";
-import { useDispatch } from "react-redux";
+import request from "../../Utils/request/request.js";
import * as Notification from "../../Utils/Notifications.js";
-import { postResetPassword, checkResetToken } from "../../Redux/actions";
import { navigate } from "raviger";
import { useTranslation } from "react-i18next";
import { LocalStorageKeys } from "../../Common/constants";
@@ -9,9 +8,9 @@ import { Cancel, Submit } from "../Common/components/ButtonV2";
import TextFormField from "../Form/FormFields/TextFormField";
import { validateRule } from "../Users/UserAdd";
import { validatePassword } from "../../Common/validation.js";
+import routes from "../../Redux/api.js";
export const ResetPassword = (props: any) => {
- const dispatch: any = useDispatch();
const initForm: any = {
password: "",
confirm: "",
@@ -65,36 +64,37 @@ export const ResetPassword = (props: any) => {
return form;
};
- const handleSubmit = (e: any) => {
+ const handleSubmit = async (e: any) => {
e.preventDefault();
const valid = validateData();
if (valid) {
valid.token = props.token;
- dispatch(postResetPassword(valid)).then((resp: any) => {
- const res = resp && resp.data;
- if (res && res.status === "OK") {
- localStorage.removeItem(LocalStorageKeys.accessToken);
- Notification.Success({
- msg: t("password_reset_success"),
- });
- navigate("/login");
- } else if (res && res.data) {
- setErrors(res.data);
- } else {
- Notification.Error({
- msg: t("password_reset_failure"),
- });
- }
+ const { res, error } = await request(routes.resetPassword, {
+ body: { ...valid },
});
+ if (res && res.statusText === "OK") {
+ localStorage.removeItem(LocalStorageKeys.accessToken);
+ Notification.Success({
+ msg: t("password_reset_success"),
+ });
+ navigate("/login");
+ } else if (res && error) {
+ setErrors(error);
+ }
}
};
useEffect(() => {
- if (props.token) {
- dispatch(checkResetToken({ token: props.token })).then((resp: any) => {
- const res = resp && resp.data;
- if (!res || res.status !== "OK") navigate("/invalid-reset");
+ const checkResetToken = async () => {
+ const { res } = await request(routes.checkResetToken, {
+ body: { token: props.token },
});
+ if (!res || res.statusText !== "OK") {
+ navigate("/invalid-reset");
+ }
+ };
+ if (props.token) {
+ checkResetToken();
} else {
navigate("/invalid-reset");
}
diff --git a/src/Components/Common/DateInputV2.tsx b/src/Components/Common/DateInputV2.tsx
index bcebd4e0055..7036d5c8bfb 100644
--- a/src/Components/Common/DateInputV2.tsx
+++ b/src/Components/Common/DateInputV2.tsx
@@ -1,4 +1,4 @@
-import { MutableRefObject, useEffect, useRef, useState } from "react";
+import { MutableRefObject, useEffect, useState } from "react";
import {
addMonths,
addYears,
@@ -60,7 +60,6 @@ const DateInputV2: React.FC
= ({
const [displayValue, setDisplayValue] = useState(
value ? dayjs(value).format("DDMMYYYY") : ""
);
- const popover = useRef(null);
const decrement = () => {
switch (type) {
@@ -241,7 +240,6 @@ const DateInputV2: React.FC = ({
onBlur={() => {
setIsOpen?.(false);
}}
- ref={popover}
static
className={classNames(
"cui-dropdown-base absolute mt-0.5 w-72 divide-y-0 p-4",
@@ -252,10 +250,6 @@ const DateInputV2: React.FC = ({
{
- popover.current?.focus();
- e.preventDefault();
- }}
className="cui-input-base bg-gray-50"
value={
displayValue.replace(
diff --git a/src/Components/Common/GLocationPicker.tsx b/src/Components/Common/GLocationPicker.tsx
index 5356d28fa2a..fc121b8519f 100644
--- a/src/Components/Common/GLocationPicker.tsx
+++ b/src/Components/Common/GLocationPicker.tsx
@@ -7,14 +7,6 @@ import CareIcon from "../../CAREUI/icons/CareIcon";
import useConfig from "../../Common/hooks/useConfig";
import { Popover } from "@headlessui/react";
-const render = (status: Status) => {
- if (status === "LOADING") {
- return ;
- }
-
- return {status}
;
-};
-
interface GLocationPickerProps {
lat: number;
lng: number;
@@ -67,22 +59,37 @@ const GLocationPicker = ({
setCenter(m?.getCenter()?.toJSON());
};
+ const render = (status: Status) => {
+ switch (status) {
+ case Status.LOADING:
+ return ;
+ case Status.SUCCESS:
+ return (
+
+ );
+ default:
+ return {status}
;
+ }
+ };
+
return (
-
-
-
+
);
};
@@ -149,7 +156,9 @@ const Map: React.FC = ({
places.length > 0 &&
places[0].geometry?.location
) {
- handleOnChange(places[0].geometry.location);
+ const selectedLocation = places[0].geometry.location;
+ handleOnChange(selectedLocation);
+ map?.setCenter(selectedLocation);
}
});
}
diff --git a/src/Components/ExternalResult/FacilitiesSelectDialogue.tsx b/src/Components/ExternalResult/FacilitiesSelectDialogue.tsx
index 763d92f2d1f..7239e0b912d 100644
--- a/src/Components/ExternalResult/FacilitiesSelectDialogue.tsx
+++ b/src/Components/ExternalResult/FacilitiesSelectDialogue.tsx
@@ -34,7 +34,7 @@ const FacilitiesSelectDialog = (props: Props) => {
diff --git a/src/Components/Facility/AssetCreate.tsx b/src/Components/Facility/AssetCreate.tsx
index 156d738857a..beafe8d33c8 100644
--- a/src/Components/Facility/AssetCreate.tsx
+++ b/src/Components/Facility/AssetCreate.tsx
@@ -37,7 +37,8 @@ import useVisibility from "../../Utils/useVisibility";
import { validateEmailAddress } from "../../Common/validation";
import { dateQueryString, parsePhoneNumber } from "../../Utils/utils.js";
import dayjs from "../../Utils/dayjs";
-import DateInputV2 from "../Common/DateInputV2.js";
+import DateFormField from "../Form/FormFields/DateFormField.js";
+import { t } from "i18next";
const Loading = lazy(() => import("../Common/Loading"));
@@ -404,7 +405,7 @@ const AssetCreate = (props: AssetProps) => {
if (locations.length === 0) {
return (
{
- You need at least a location to create an assest.
+ {t("you_need_at_least_a_location_to_create_an_assest")}
@@ -440,7 +441,8 @@ const AssetCreate = (props: AssetProps) => {
onClick={() => setIsScannerActive(false)}
className="btn btn-default mb-2"
>
-