) => {
+ const yearValue = Number(state.form.year_of_birth);
+ if (!state.form.year_of_birth) return;
+ let errorMessage = "";
+ if (yearValue > maxYear) {
+ errorMessage = `Cannot be greater than ${maxYear}`;
+ } else if (yearValue < 1900) {
+ errorMessage = `Cannot be smaller than 1900`;
}
dispatch({
- type: "set_form",
- form: { ...state.form, [e.name]: e.value },
+ type: "set_error",
+ errors: {
+ ...state.errors,
+ [e.target.name]: errorMessage,
+ },
});
};
@@ -115,6 +131,11 @@ const TransferPatientDialog = (props: Props) => {
errors[field] = `Cannot be greater than ${maxYear}`;
invalidForm = true;
}
+
+ if (parseInt(state.form[field] || "0") < 1900) {
+ errors[field] = `Cannot be smaller than 1900`;
+ invalidForm = true;
+ }
return;
default:
return;
@@ -193,9 +214,8 @@ const TransferPatientDialog = (props: Props) => {
label="Year of birth"
labelClassName="text-sm"
value={state.form.year_of_birth}
- min="1900"
- max={maxYear}
onChange={handleChange}
+ onBlur={handleOnBlur}
placeholder="Enter year of birth"
error={state.errors.year_of_birth}
/>
diff --git a/src/components/Facility/models.tsx b/src/components/Facility/models.tsx
index 79272ac3de7..a984efe6283 100644
--- a/src/components/Facility/models.tsx
+++ b/src/components/Facility/models.tsx
@@ -391,7 +391,10 @@ export const NursingPlotFields = [
] as const satisfies (keyof DailyRoundsModel)[];
export type NursingPlotRes = {
- nursing: any[];
+ nursing: Array<{
+ procedure: string;
+ description: string;
+ }>;
};
export const RoutineFields = [
diff --git a/src/components/Notifications/NotificationsList.tsx b/src/components/Notifications/NotificationsList.tsx
index 17033d67623..f9b65b35201 100644
--- a/src/components/Notifications/NotificationsList.tsx
+++ b/src/components/Notifications/NotificationsList.tsx
@@ -244,7 +244,10 @@ export default function NotificationsList({
const handleSubscribeClick = () => {
const status = isSubscribed;
- if (status === "NotSubscribed" || status === "SubscribedOnAnotherDevice") {
+ if (!navigator.serviceWorker) {
+ return;
+ }
+ if (["NotSubscribed", "SubscribedOnAnotherDevice"].includes(status)) {
if (Notification.permission === "denied") {
Warn({
msg: t("notification_permission_denied"),
@@ -286,49 +289,47 @@ export default function NotificationsList({
let manageResults: any = null;
- const unsubscribe = () => {
- navigator.serviceWorker.ready
- .then(function (reg) {
- setIsSubscribing(true);
- reg.pushManager
- .getSubscription()
- .then(function (subscription) {
- subscription
- ?.unsubscribe()
- .then(async function (_successful) {
- const data = {
- pf_endpoint: "",
- pf_p256dh: "",
- pf_auth: "",
- };
-
- await request(routes.updateUserPnconfig, {
- pathParams: { username: username },
- body: data,
- });
-
- Warn({
- msg: t("unsubscribed_successfully"),
- });
-
- setIsSubscribed("NotSubscribed");
- setIsSubscribing(false);
- })
- .catch(function (_e) {
- Error({
- msg: t("unsubscribe_failed"),
- });
- });
- })
- .catch(function (_e) {
- Error({ msg: t("subscription_error") });
+ const unsubscribe = async () => {
+ try {
+ const reg = await navigator.serviceWorker.ready;
+
+ if (!reg.pushManager) {
+ Error({ msg: t("unsubscribe_failed") });
+ return;
+ }
+
+ setIsSubscribing(true);
+
+ const subscription = await reg.pushManager.getSubscription();
+
+ if (subscription) {
+ try {
+ await subscription.unsubscribe();
+
+ await request(routes.updateUserPnconfig, {
+ pathParams: { username },
+ body: {
+ pf_endpoint: "",
+ pf_p256dh: "",
+ pf_auth: "",
+ },
});
- })
- .catch(function (_e) {
- Sentry.captureException(_e);
- });
- };
+ setIsSubscribed("NotSubscribed");
+ Warn({
+ msg: t("unsubscribed_successfully"),
+ });
+ } catch (e) {
+ Error({ msg: t("unsubscribe_failed") });
+ }
+ }
+ } catch (e) {
+ Sentry.captureException(e);
+ Error({ msg: t("subscription_error") });
+ } finally {
+ setIsSubscribing(false);
+ }
+ };
async function subscribe() {
setIsSubscribing(true);
try {
diff --git a/src/components/Patient/DailyRounds.tsx b/src/components/Patient/DailyRounds.tsx
index d9bcb1366d5..4e8573d6273 100644
--- a/src/components/Patient/DailyRounds.tsx
+++ b/src/components/Patient/DailyRounds.tsx
@@ -59,6 +59,7 @@ import request from "@/Utils/request/request";
import { formatDateTime } from "@/Utils/utils";
import { scrollTo } from "@/Utils/utils";
+import RangeAutocompleteFormField from "../Form/FormFields/RangeAutocompleteFormField";
import TextFormField from "../Form/FormFields/TextFormField";
export const DailyRounds = (props: any) => {
@@ -702,6 +703,31 @@ export const DailyRounds = (props: any) => {
},
]}
/>
+
+
)}
@@ -774,17 +800,22 @@ export const DailyRounds = (props: any) => {
{
value: 0,
className: "text-danger-500",
- label: "Low",
+ label: t("SPO2_LEVEL_SEVERE_HYPOXEMIA"),
},
{
- value: 90,
- className: "text-primary-500",
- label: "Normal",
+ value: 86,
+ className: "text-danger-500",
+ label: t("SPO2_LEVEL_MODERATE_HYPOXEMIA"),
},
{
- value: 100,
- className: "text-danger-500",
- label: "High",
+ value: 91,
+ className: "text-warning-400",
+ label: t("SPO2_LEVEL_MILD_HYPOXEMIA"),
+ },
+ {
+ value: 95,
+ className: "text-primary-500",
+ label: t("SPO2_LEVEL_NORMAL"),
},
]}
/>
@@ -819,7 +850,6 @@ export const DailyRounds = (props: any) => {
/>
)}
-
{state.form.rounds_type === "COMMUNITY_NURSES_LOG" && (
diff --git a/src/components/Patient/PatientRegister.tsx b/src/components/Patient/PatientRegister.tsx
index 5cc958d44de..2a15416e337 100644
--- a/src/components/Patient/PatientRegister.tsx
+++ b/src/components/Patient/PatientRegister.tsx
@@ -22,6 +22,7 @@ import TransferPatientDialog from "@/components/Facility/TransferPatientDialog";
import {
DistrictModel,
DupPatientModel,
+ FacilityModel,
WardModel,
} from "@/components/Facility/models";
import {
@@ -51,6 +52,7 @@ import {
PatientMeta,
PatientModel,
} from "@/components/Patient/models";
+import { UserModel } from "@/components/Users/models";
import useAppHistory from "@/hooks/useAppHistory";
import useAuthUser from "@/hooks/useAuthUser";
@@ -67,7 +69,7 @@ import {
} from "@/common/constants";
import countryList from "@/common/static/countries.json";
import { statusType, useAbortableEffect } from "@/common/utils";
-import { validatePincode } from "@/common/validation";
+import { validateName, validatePincode } from "@/common/validation";
import { PLUGIN_Component } from "@/PluginEngine";
import { RestoreDraftButton } from "@/Utils/AutoSave";
@@ -421,6 +423,10 @@ export const PatientRegister = (props: PatientRegisterProps) => {
switch (field) {
case "address":
case "name":
+ if (!validateName(form[field])) {
+ errors[field] = "Please enter valid name";
+ }
+ return;
case "gender":
errors[field] = RequiredFieldValidator()(form[field]);
return;
@@ -814,31 +820,12 @@ export const PatientRegister = (props: PatientRegisterProps) => {
return ;
}
- const PatientRegisterAuth = () => {
- const showAllFacilityUsers = ["DistrictAdmin", "StateAdmin"];
- if (
- !showAllFacilityUsers.includes(authUser.user_type) &&
- authUser.home_facility_object?.id === facilityId
- ) {
- return true;
- }
- if (
- authUser.user_type === "DistrictAdmin" &&
- authUser.district === facilityObject?.district
- ) {
- return true;
- }
- if (
- authUser.user_type === "StateAdmin" &&
- authUser.state === facilityObject?.state
- ) {
- return true;
- }
-
- return false;
- };
-
- if (!isLoading && facilityId && facilityObject && !PatientRegisterAuth()) {
+ if (
+ !isLoading &&
+ facilityId &&
+ facilityObject &&
+ !patientRegisterAuth(authUser, facilityObject, facilityId)
+ ) {
return ;
}
@@ -1713,3 +1700,31 @@ export const PatientRegister = (props: PatientRegisterProps) => {
);
};
+
+export function patientRegisterAuth(
+ authUser: UserModel,
+ facilityObject: FacilityModel | undefined,
+ facilityId: string,
+) {
+ const showAllFacilityUsers = ["DistrictAdmin", "StateAdmin"];
+ if (
+ !showAllFacilityUsers.includes(authUser.user_type) &&
+ authUser.home_facility_object?.id === facilityId
+ ) {
+ return true;
+ }
+ if (
+ authUser.user_type === "DistrictAdmin" &&
+ authUser.district === facilityObject?.district
+ ) {
+ return true;
+ }
+ if (
+ authUser.user_type === "StateAdmin" &&
+ authUser.state === facilityObject?.state
+ ) {
+ return true;
+ }
+
+ return false;
+}
diff --git a/vite.config.mts b/vite.config.mts
index 3f6df95c290..3fc64d66829 100644
--- a/vite.config.mts
+++ b/vite.config.mts
@@ -1,14 +1,17 @@
+import { ValidateEnv } from "@julr/vite-plugin-validate-env";
+import react from "@vitejs/plugin-react-swc";
+import DOMPurify from "dompurify";
import fs from "fs";
+import { JSDOM } from "jsdom";
+import { marked } from "marked";
+import { createRequire } from "node:module";
import path from "path";
import { defineConfig, loadEnv } from "vite";
-import { createRequire } from "node:module";
-import { VitePWA } from "vite-plugin-pwa";
-import react from "@vitejs/plugin-react-swc";
import checker from "vite-plugin-checker";
+import { VitePWA } from "vite-plugin-pwa";
import { viteStaticCopy } from "vite-plugin-static-copy";
-import DOMPurify from "dompurify";
-import { JSDOM } from "jsdom";
-import { marked } from "marked";
+import { z } from "zod";
+
import { treeShakeCareIcons } from "./plugins/treeShakeCareIcons";
const pdfWorkerPath = path.join(
@@ -100,6 +103,29 @@ export default defineConfig(({ mode }) => {
),
},
plugins: [
+ ValidateEnv({
+ validator: "zod",
+ schema: {
+ REACT_CARE_API_URL: z.string().url(),
+
+ REACT_SENTRY_DSN: z.string().url().optional(),
+ REACT_SENTRY_ENVIRONMENT: z.string().optional(),
+
+ REACT_PLAUSIBLE_SITE_DOMAIN: z
+ .string()
+ .regex(/^[a-zA-Z0-9][a-zA-Z0-9-_.]*\.[a-zA-Z]{2,}$/)
+ .optional()
+ .describe("Domain name without protocol (e.g., sub.domain.com)"),
+
+ REACT_PLAUSIBLE_SERVER_URL: z.string().url().optional(),
+ REACT_CDN_URLS: z
+ .string()
+ .optional()
+ .transform((val) => val?.split(" "))
+ .pipe(z.array(z.string().url()).optional())
+ .describe("Optional: Space-separated list of CDN URLs"),
+ },
+ }),
viteStaticCopy({
targets: [
{