Skip to content

Add disconnected symbol for Image #216

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

Open
abigailalexander wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add disconnected symbol for Image #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 25 additions & 6 deletions src/ui/widgets/DynamicImage/demoImage.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ describe("DemoImageComponent", () => {
});

fireEvent.error(getByRole("img")); // move to second URL
fireEvent.error(getByRole("img")); // move to default URL
fireEvent.error(getByRole("img")); // no more URLs → warning

expect(showWarningMock).toHaveBeenCalledWith(
Expand All @@ -136,6 +137,7 @@ describe("DemoImageComponent", () => {
);

fireEvent.error(screen.getByRole("img")); // → b
fireEvent.error(screen.getByRole("img")); // → default
fireEvent.error(screen.getByRole("img")); // → warning + reset

// Trigger again → should start sequence again from second URL
Expand Down Expand Up @@ -172,7 +174,7 @@ describe("buildMjpgPvUrls", () => {
expect(result).toEqual([]);
});

it("returns empty array if endpoints are empty", () => {
it("returns empty array if endpoints empty", () => {
const result = buildMjpgPvUrls([], "TEST:PV");
expect(result).toEqual([]);
});
Expand All @@ -183,30 +185,47 @@ describe("buildMjpgPvUrls", () => {
"TEST:PV"
);

expect(result).toEqual(["http://a/TEST:PV", "http://b/TEST:PV"]);
expect(result).toEqual([
"http://a/TEST:PV",
"http://b/TEST:PV",
"/images/disconnectedImage.svg"
]);
});

it("removes pva:// prefix from pvName", () => {
const result = buildMjpgPvUrls(["http://a"], "pva://TEST:PV");

expect(result).toEqual(["http://a/TEST:PV"]);
expect(result).toEqual([
"http://a/TEST:PV",
"/images/disconnectedImage.svg"
]);
});

it("replaces :ARRAY suffix with :OUTPUT", () => {
const result = buildMjpgPvUrls(["http://a"], "TEST:PV:ARRAY");

expect(result).toEqual(["http://a/TEST:PV:OUTPUT"]);
expect(result).toEqual([
"http://a/TEST:PV:OUTPUT",
"/images/disconnectedImage.svg"
]);
});

it("handles both prefix removal and suffix replacement together", () => {
const result = buildMjpgPvUrls(["http://a"], "pva://TEST:PV:ARRAY");

expect(result).toEqual(["http://a/TEST:PV:OUTPUT"]);
expect(result).toEqual([
"http://a/TEST:PV:OUTPUT",
"/images/disconnectedImage.svg"
]);
});

it("builds urls for multiple endpoints", () => {
const result = buildMjpgPvUrls(["http://a", "http://b"], "TEST:PV");

expect(result).toEqual(["http://a/TEST:PV", "http://b/TEST:PV"]);
expect(result).toEqual([
"http://a/TEST:PV",
"http://b/TEST:PV",
"/images/disconnectedImage.svg"
]);
});
});
3 changes: 2 additions & 1 deletion src/ui/widgets/DynamicImage/demoImage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,8 @@ export const buildMjpgPvUrls = (
?.filter(x => x != null)
?.map((endpoint, i) => `${endpoint}/${trimmedPvName}`);

return additionalPvData ?? [];
additionalPvData.push("/images/disconnectedImage.svg");
return additionalPvData ?? ["/images/disconnectedImage.svg"];
};

const DemoImageWidgetProps = {
Expand Down
Loading