Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UX Enhancement for Middleware Override Workflow #9547

Closed
wants to merge 21 commits into from
Closed

UX Enhancement for Middleware Override Workflow #9547

Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
75a4796
prefilled middleware
saikiranpatil Dec 10, 2024
4effcf0
add fine message text in create location form
saikiranpatil Dec 10, 2024
3c91720
Add fine text facility confiuration page
saikiranpatil Dec 10, 2024
4d2cf0d
corrected mispelled address word
saikiranpatil Dec 10, 2024
937e6fd
added resolved middleware text at location management
saikiranpatil Dec 10, 2024
6c38aa9
Fixed typo in CSS class name
saikiranpatil Dec 10, 2024
6fa2c55
added (fetched from facility) badge in location management page
saikiranpatil Dec 12, 2024
e5d881e
used shadcn label component in formfeild, changed color of message to…
saikiranpatil Dec 12, 2024
d7e4a45
minor changes
saikiranpatil Dec 12, 2024
be5285d
used shadcn badge in location management page
saikiranpatil Dec 15, 2024
58b7805
Merge branch 'develop' into issues/8335/middleware-override-workflow
saikiranpatil Dec 16, 2024
33ae347
updated useQuery
saikiranpatil Dec 16, 2024
b9b0ed0
changed useTanstackuseQuery to useQuery
saikiranpatil Dec 18, 2024
c28d3a0
used react forms in facility configuration page
saikiranpatil Dec 18, 2024
c3d564c
minor changes
saikiranpatil Dec 18, 2024
94d23b6
Merge branch 'develop' into issues/8335/middleware-override-workflow
saikiranpatil Dec 24, 2024
9aca644
used useMutation and shadcn button in faciility configuration page
saikiranpatil Dec 24, 2024
d4db3f6
Merge branch 'develop' into issues/8335/middleware-override-workflow
saikiranpatil Dec 25, 2024
ccf886f
used shadcn buttons in location management page
saikiranpatil Dec 28, 2024
f7ed5cb
Merge branch 'develop' into issues/8335/middleware-override-workflow
saikiranpatil Dec 28, 2024
ad2e5ce
Merge branch 'develop' into issues/8335/middleware-override-workflow
saikiranpatil Dec 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
236 changes: 43 additions & 193 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
"@googlemaps/typescript-guards": "^2.0.3",
"@headlessui/react": "^2.2.0",
"@hello-pangea/dnd": "^17.0.0",
"@hookform/resolvers": "^3.9.1",
"@pnotify/core": "^5.2.0",
"@pnotify/mobile": "^5.2.0",
"@radix-ui/react-dialog": "^1.1.4",
Expand Down Expand Up @@ -95,6 +96,7 @@
"react-copy-to-clipboard": "^5.1.0",
"react-dom": "18.3.1",
"react-google-recaptcha": "^3.1.0",
"react-hook-form": "^7.54.1",
"react-i18next": "^15.1.3",
"react-infinite-scroll-component": "^6.1.0",
"react-pdf": "^9.2.1",
Expand Down Expand Up @@ -152,7 +154,7 @@
"vite-plugin-checker": "^0.8.0",
"vite-plugin-pwa": "^0.20.5",
"vite-plugin-static-copy": "^2.0.0",
"zod": "^3.23.8"
"zod": "^3.24.1"
},
"browserslist": {
"production": [
Expand Down
17 changes: 5 additions & 12 deletions src/components/Assets/AssetType/HL7Monitor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,20 +100,13 @@ const HL7Monitor = (props: HL7MonitorProps) => {
label={
<div className="flex flex-row gap-1">
<p>Middleware Hostname</p>
{resolvedMiddleware?.source != "asset" && (
<div className="tooltip">
<CareIcon
icon="l-info-circle"
className="tooltip text-indigo-500 hover:text-indigo-600"
/>
<span className="tooltip-text w-56 whitespace-normal">
Middleware hostname sourced from asset{" "}
{resolvedMiddleware?.source}
</span>
</div>
)}
</div>
}
message={
resolvedMiddleware?.source != "asset"
? `Middleware hostname sourced from asset ${resolvedMiddleware?.source}`
: undefined
}
placeholder={resolvedMiddleware?.hostname}
value={middlewareHostname}
onChange={(e) => setMiddlewareHostname(e.value)}
Expand Down
22 changes: 8 additions & 14 deletions src/components/CameraFeed/ConfigureCamera.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,22 +152,16 @@ export default function ConfigureCamera(props: Props) {
label={
<div className="flex flex-row gap-1">
<p>{t("middleware_hostname")}</p>
{!!props.asset.resolved_middleware &&
props.asset.resolved_middleware.source != "asset" && (
<div className="tooltip">
<CareIcon
icon="l-info-circle"
className="tooltip text-indigo-500 hover:text-indigo-600"
/>
<span className="tooltip-text w-56 whitespace-normal">
{t("middleware_hostname_sourced_from", {
source: props.asset.resolved_middleware?.source,
})}
</span>
</div>
)}
</div>
}
message={
!!props.asset.resolved_middleware &&
props.asset.resolved_middleware.source != "asset"
? t("middleware_hostname_sourced_from", {
source: props.asset.resolved_middleware?.source,
})
: undefined
}
placeholder={
props.asset.resolved_middleware?.hostname ??
t("middleware_hostname_example")
Expand Down
2 changes: 1 addition & 1 deletion src/components/Common/AuthorizedButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import AuthorizedChild from "@/CAREUI/misc/AuthorizedChild";
import { AuthorizedElementProps } from "@/Utils/AuthorizeFor";

export const AuthorizedButton: React.FC<
AuthorizedElementProps & ButtonProps
AuthorizedElementProps & ButtonProps & { variant?: string }
> = ({ authorizeFor = () => true, ...props }) => {
return (
<AuthorizedChild authorizeFor={authorizeFor}>
Expand Down
Loading
Loading