From c2f7817596443c35a467ff62a5d73eaf1b57e03d Mon Sep 17 00:00:00 2001 From: rithviknishad Date: Tue, 2 Jul 2024 14:38:35 +0530 Subject: [PATCH 1/4] Adds support for editing preset name fixes #7856 --- .../Facility/Consultations/LiveFeed.tsx | 36 +++++++++++-------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/src/Components/Facility/Consultations/LiveFeed.tsx b/src/Components/Facility/Consultations/LiveFeed.tsx index 621a0baf0aa..a2d4eb9ee99 100644 --- a/src/Components/Facility/Consultations/LiveFeed.tsx +++ b/src/Components/Facility/Consultations/LiveFeed.tsx @@ -25,6 +25,7 @@ import { FieldLabel } from "../../Form/FormFields/FormField"; import useFullscreen from "../../../Common/hooks/useFullscreen"; import ReactPlayer from "react-player"; import { isIOS } from "../../../Utils/utils"; +import TextFormField from "../../Form/FormFields/TextFormField"; const LiveFeed = (props: any) => { const middlewareHostname = props.middlewareHostname; @@ -39,7 +40,7 @@ const LiveFeed = (props: any) => { ); const [videoStartTime, setVideoStartTime] = useState(null); const [bed, setBed] = useState({}); - const [preset, setNewPreset] = useState(""); + const [presetName, setPresetName] = useState(""); const [loading, setLoading] = useState(); const dispatch: any = useDispatch(); const [page, setPage] = useState({ @@ -145,7 +146,7 @@ const LiveFeed = (props: any) => { const updatePreset = async (currentPreset: any) => { const data = { bed_id: bed.id, - preset_name: preset, + preset_name: presetName, }; const response = await dispatch( partialUpdateAssetBed( @@ -187,7 +188,7 @@ const LiveFeed = (props: any) => { }, []); useEffect(() => { - setNewPreset(toUpdate?.meta?.preset_name); + setPresetName(toUpdate?.meta?.preset_name); setBed(toUpdate?.bed_object); }, [toUpdate]); @@ -334,23 +335,30 @@ const LiveFeed = (props: any) => { setToUpdate(null)} onConfirm={() => updatePreset(toUpdate)} > -
- Bed - setBed(selected as BedModel)} - selected={bed} - error="" - multiple={false} - location={cameraAsset.location_id} - facility={cameraAsset.facility_id} +
+ setPresetName(value)} /> +
+ Bed + setBed(selected as BedModel)} + selected={bed} + error="" + multiple={false} + location={cameraAsset.location_id} + facility={cameraAsset.facility_id} + /> +
)} From 591faa0b3bff078529f59b3606ed7a3b33a4effa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 4 Jul 2024 12:59:06 +0530 Subject: [PATCH 2/4] Bump glob from 10.3.15 to 10.4.2 (#8088) Bumps [glob](https://github.com/isaacs/node-glob) from 10.3.15 to 10.4.2. - [Changelog](https://github.com/isaacs/node-glob/blob/main/changelog.md) - [Commits](https://github.com/isaacs/node-glob/compare/v10.3.15...v10.4.2) --- updated-dependencies: - dependency-name: glob dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Khavin Shankar --- package-lock.json | 42 ++++++++++++++++++++++++------------------ package.json | 2 +- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/package-lock.json b/package-lock.json index b0027f9c7be..9a75b4473af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31,7 +31,7 @@ "echarts-for-react": "^3.0.2", "eslint-mdx": "^3.1.5", "events": "^3.3.0", - "glob": "^10.3.15", + "glob": "^10.4.2", "hi-profiles": "^1.0.6", "i18next": "^23.11.4", "i18next-browser-languagedetector": "^7.2.1", @@ -13772,15 +13772,16 @@ "dev": true }, "node_modules/glob": { - "version": "10.3.15", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.15.tgz", - "integrity": "sha512-0c6RlJt1TICLyvJYIApxb8GsXoai0KUP7AxKKAtsYXdgJR1mGEUa7DgwShbdk1nly0PYoZj01xd4hzbq3fsjpw==", + "version": "10.4.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.2.tgz", + "integrity": "sha512-GwMlUF6PkPo3Gk21UxkCohOv0PLcIXVtKyLlpEI28R/cO/4eNOdmLk3CMW1wROV/WR/EsZOWAfBbBOqYvs88/w==", "dependencies": { "foreground-child": "^3.1.0", - "jackspeak": "^2.3.6", - "minimatch": "^9.0.1", - "minipass": "^7.0.4", - "path-scurry": "^1.11.0" + "jackspeak": "^3.1.2", + "minimatch": "^9.0.4", + "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", + "path-scurry": "^1.11.1" }, "bin": { "glob": "dist/esm/bin.mjs" @@ -15439,9 +15440,9 @@ } }, "node_modules/jackspeak": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz", - "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.0.tgz", + "integrity": "sha512-JVYhQnN59LVPFCEcVa2C3CrEKYacvjRfqIQl+h8oi91aLYQVWRYbxjPcv1bUiUy/kLmQaANrYfNMCO3kuEDHfw==", "dependencies": { "@isaacs/cliui": "^8.0.2" }, @@ -18160,9 +18161,9 @@ } }, "node_modules/minipass": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.0.tgz", - "integrity": "sha512-oGZRv2OT1lO2UF1zUcwdTb3wqUwI0kBGTgt/T7OdSj6M6N5m3o5uPf0AIW6lVxGGoiWUR7e2AwTE+xiwK8WQig==", + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", "engines": { "node": ">=16 || 14 >=14.17" } @@ -18959,6 +18960,11 @@ "node": ">=6" } }, + "node_modules/package-json-from-dist": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz", + "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==" + }, "node_modules/pako": { "version": "0.2.9", "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz", @@ -19056,15 +19062,15 @@ "dev": true }, "node_modules/path-scurry": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.0.tgz", - "integrity": "sha512-LNHTaVkzaYaLGlO+0u3rQTz7QrHTFOuKyba9JMTQutkmtNew8dw8wOD7mTU/5fCPZzCWpfW0XnQKzY61P0aTaw==", + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", + "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", "dependencies": { "lru-cache": "^10.2.0", "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" }, "engines": { - "node": ">=16 || 14 >=14.17" + "node": ">=16 || 14 >=14.18" }, "funding": { "url": "https://github.com/sponsors/isaacs" diff --git a/package.json b/package.json index e23c97fd517..e970d29e40d 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "echarts-for-react": "^3.0.2", "eslint-mdx": "^3.1.5", "events": "^3.3.0", - "glob": "^10.3.15", + "glob": "^10.4.2", "hi-profiles": "^1.0.6", "i18next": "^23.11.4", "i18next-browser-languagedetector": "^7.2.1", From 2495297f842fa3190a9942747864d993206f61f7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 4 Jul 2024 13:10:12 +0530 Subject: [PATCH 3/4] Bump react-dnd-scrolling from 1.3.7 to 1.3.8 (#8089) Bumps [react-dnd-scrolling](https://github.com/TechStark/react-dnd-scrolling) from 1.3.7 to 1.3.8. - [Release notes](https://github.com/TechStark/react-dnd-scrolling/releases) - [Changelog](https://github.com/TechStark/react-dnd-scrolling/blob/main/CHANGELOG.md) - [Commits](https://github.com/TechStark/react-dnd-scrolling/compare/v1.3.7...v1.3.8) --- updated-dependencies: - dependency-name: react-dnd-scrolling dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Khavin Shankar --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9a75b4473af..93346b978e6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -43,7 +43,7 @@ "react-copy-to-clipboard": "^5.1.0", "react-dnd": "^16.0.1", "react-dnd-html5-backend": "^16.0.1", - "react-dnd-scrolling": "^1.3.7", + "react-dnd-scrolling": "^1.3.8", "react-dom": "18.3.1", "react-google-recaptcha": "^3.1.0", "react-i18next": "^13.0.1", @@ -20025,9 +20025,9 @@ } }, "node_modules/react-dnd-scrolling": { - "version": "1.3.7", - "resolved": "https://registry.npmjs.org/react-dnd-scrolling/-/react-dnd-scrolling-1.3.7.tgz", - "integrity": "sha512-iLMziS6A4fxiCBpheb+B5T3I8SnZtAeAJszADLavkCvCX+gWt0ElL7Z895c1xLZOlFTWvHPfeCMYtP5ELqV8zQ==", + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/react-dnd-scrolling/-/react-dnd-scrolling-1.3.8.tgz", + "integrity": "sha512-XcvmrTsQrPNry7jkY8RkNAZ2HZIiLiUzOSUltkW6eOhNjkKfivnPEhkj9hZf1JP4C32zxDsjN26xoBy7puZXoA==", "dependencies": { "hoist-non-react-statics": "3.x", "lodash.throttle": "^4.1.1", diff --git a/package.json b/package.json index e970d29e40d..59fd5cd89e8 100644 --- a/package.json +++ b/package.json @@ -83,7 +83,7 @@ "react-copy-to-clipboard": "^5.1.0", "react-dnd": "^16.0.1", "react-dnd-html5-backend": "^16.0.1", - "react-dnd-scrolling": "^1.3.7", + "react-dnd-scrolling": "^1.3.8", "react-dom": "18.3.1", "react-google-recaptcha": "^3.1.0", "react-i18next": "^13.0.1", From 4459776535ed35191aa86a9f8261290d10fa67bc Mon Sep 17 00:00:00 2001 From: Rithvik Nishad Date: Thu, 4 Jul 2024 14:07:48 +0530 Subject: [PATCH 4/4] Fixes vertical alignment of patients age in patients list page (#8110) * Fixes vertical alignment of patients age in patients list page * visual improvements * reverted space fix --- src/Components/Patient/ManagePatients.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Components/Patient/ManagePatients.tsx b/src/Components/Patient/ManagePatients.tsx index eaa1ff7af20..c02efc5c737 100644 --- a/src/Components/Patient/ManagePatients.tsx +++ b/src/Components/Patient/ManagePatients.tsx @@ -517,11 +517,11 @@ export const PatientManager = () => {
{patient.name} - + {formatPatientAge(patient, true)}