Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@diamondlightsource/cs-web-lib",
"type": "module",
"version": "0.10.18",
"version": "0.10.19",
"description": "Control system web library",
"main": "./dist/index.cjs",
"scripts": {
Expand Down
16 changes: 4 additions & 12 deletions src/ui/widgets/ByteMonitor/byteMonitor.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,6 @@ import { PvDatum } from "../../../redux/csState";
import { vi } from "vitest";
import { createMockStyle } from "../../../test-utils/styleTestUtils";

vi.mock("../../hooks/useStyle", () => ({
useStyle: vi.fn(() =>
createMockStyle({
customColors: {
onColor: "rgb(155, 160, 209)",
offColor: "rgba(0, 0, 0, 1)",
borderColor: "rgba(150, 150, 150, 1)"
}
})
)
}));

vi.mock("../../hooks/useStyle", () => ({
useStyle: vi.fn(props =>
createMockStyle({
Expand All @@ -42,6 +30,10 @@ const ByteMonitorRenderer = (byteMonitorProps: any): ReactTestRendererJSON => {
};

describe("<ByteMonitorComponent />", (): void => {
beforeEach(() => {
vi.clearAllMocks();
});

test("default properties are added to bytemonitor component", (): void => {
const byteMonitorProps = {
pvData: [
Expand Down
10 changes: 0 additions & 10 deletions src/ui/widgets/DataBrowser/dataBrowser.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,16 +45,6 @@ vi.mock("@mui/material", () => ({
))
}));

vi.mock("../../hooks/useStyle", () => ({
useStyle: vi.fn(() =>
createMockStyle({
colors: {
color: "rgba(255,255,0,1)",
backgroundColor: "rgba(127,0,127,1)"
}
})
)
}));
vi.mock("../../hooks/useStyle", () => ({
useStyle: vi.fn(props =>
createMockStyle({
Expand Down
2 changes: 1 addition & 1 deletion src/ui/widgets/LinearMeter/linearMeter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -361,4 +361,4 @@ export const LinearMeter = (
props: InferWidgetProps<typeof LinearMeterWidgetProps>
): JSX.Element => <Widget baseWidget={LinearMeterComponent} {...props} />;

registerWidget(LinearMeter, LinearMeterProps, widgetName);
registerWidget(LinearMeter, LinearMeterWidgetProps, widgetName);
3 changes: 2 additions & 1 deletion src/ui/widgets/StripChart/stripChart.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,8 @@ export const StripChartComponent = (

// If we're passed an empty array fill in defaults
const localAxes = useMemo(
() => (axes.length > 0 ? [...(axes as Axes)] : [newAxis({ xAxis: false })]),
() =>
axes?.length > 0 ? [...(axes as Axes)] : [newAxis({ xAxis: false })],
[axes]
);
// Convert start time into milliseconds period
Expand Down
2 changes: 1 addition & 1 deletion src/ui/widgets/Thermometer/thermometer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export const ThermometerComponent = (
): JSX.Element => {
const svgRef = useRef<SVGSVGElement>(null);
const [style, newProps] = useStyle(
{ foregroundColor: props.fillColor },
{ ...props, foregroundColor: props.fillColor },
widgetName,
props.class
);
Expand Down
Loading