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 src/lib/core/limit_queue.test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { describe, test, expect } from "vitest";

import { LimitQueue } from "./limit_queue";
import { ArrayQueue } from "./array_queue";
import { LimitQueue } from "@device-ui/lib/core/limit_queue";
import { ArrayQueue } from "@device-ui/lib/core/array_queue";

describe("Limit Queue", () => {
test("Invalid max size", () => {
Expand Down
2 changes: 1 addition & 1 deletion src/lib/core/limit_queue.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Queue } from "./queue";
import { Queue } from "@device-ui/lib/core/queue";

// Limit maximum number of elements in the queue.
export class LimitQueue<T> implements Queue<T> {
Expand Down
4 changes: 2 additions & 2 deletions src/lib/core/state_monitor.test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { describe, test, expect } from "vitest";

import { StateMonitor } from "./state_monitor";
import { ObjectMonitor } from "./object_monitor";
import { StateMonitor } from "@device-ui/lib/core/state_monitor";
import { ObjectMonitor } from "@device-ui/lib/core/object_monitor";

class testObjectMonitor implements ObjectMonitor {
callCount: number = 0;
Expand Down
2 changes: 1 addition & 1 deletion src/lib/core/state_monitor.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ObjectMonitor } from "./object_monitor";
import { ObjectMonitor } from "@device-ui/lib/core/object_monitor";

export class StateMonitor<T> {
// Initialize.
Expand Down
8 changes: 4 additions & 4 deletions src/lib/device/http_config.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Formatter } from "../fmt/formatter";
import { Config } from "./config";
import { HTTPOps } from "./../algo/http_ops";
import { HTTPFetcher } from "./../http/http_fetcher";
import { Formatter } from "@device-ui/lib/fmt/formatter";
import { HTTPOps } from "@device-ui/lib/algo/http_ops";
import { HTTPFetcher } from "@device-ui/lib/http/http_fetcher";
import { Config } from "@device-ui/lib/device/config";

// Read configuration over HTTP.
export class HTTPConfig implements Config {
Expand Down
8 changes: 4 additions & 4 deletions src/lib/device/http_locator.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Fetcher } from "../http/fetcher";
import { HTTPFetcher } from "../http/http_fetcher";
import { Locator } from "./locator";
import { HTTPOps } from "../algo/http_ops";
import { Fetcher } from "@device-ui/lib/http/fetcher";
import { HTTPFetcher } from "@device-ui/lib/http/http_fetcher";
import { HTTPOps } from "@device-ui/lib/algo/http_ops";
import { Locator } from "@device-ui/lib/device/locator";

// Control device locating over HTTP.
export class HTTPLocator implements Locator {
Expand Down
6 changes: 3 additions & 3 deletions src/lib/device/http_rebooter.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Fetcher } from "../http/fetcher";
import { HTTPFetcher } from "../http/http_fetcher";
import { Rebooter } from "./rebooter";
import { Fetcher } from "@device-ui/lib/http/fetcher";
import { HTTPFetcher } from "@device-ui/lib/http/http_fetcher";
import { Rebooter } from "@device-ui/lib/device/rebooter";

// Reboot device over HTTP.
export class HTTPRebooter implements Rebooter {
Expand Down
12 changes: 6 additions & 6 deletions src/lib/device/periodic_data_fetcher.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { ObjectMonitor } from "../core/object_monitor";
import { ArrayQueue } from "../core/array_queue";
import { Formatter } from "../fmt/formatter";
import { Fetcher } from "../http/fetcher";
import { FetchHandler } from "../http/fetch_handler";
import { PeriodicFetcher } from "../http/periodic_fetcher";
import { ObjectMonitor } from "@device-ui/lib/core/object_monitor";
import { ArrayQueue } from "@device-ui/lib/core/array_queue";
import { Formatter } from "@device-ui/lib/fmt/formatter";
import { Fetcher } from "@device-ui/lib/http/fetcher";
import { FetchHandler } from "@device-ui/lib/http/fetch_handler";
import { PeriodicFetcher } from "@device-ui/lib/http/periodic_fetcher";

// Periodically fetches data from the source.
export class PeriodicDataFetcher
Expand Down
4 changes: 2 additions & 2 deletions src/lib/device/telemetry_parser.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { AnalogSensorData } from "./sensor/soil/data_types";
import { SystemTelemetryData } from "./data_types";
import { AnalogSensorData } from "@device-ui/lib/device/sensor/soil/data_types";
import { SystemTelemetryData } from "@device-ui/lib/device/data_types";

export class TelemetryParser {
// Parse sensor data from @p data.
Expand Down
4 changes: 2 additions & 2 deletions src/lib/fmt/json_formatter.test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { describe, test, expect } from "vitest";

import { JSONFormatter } from "./json_formatter";
import { Formatter } from "./formatter";
import { JSONFormatter } from "@device-ui/lib/fmt/json_formatter";
import { Formatter } from "@device-ui/lib/fmt/formatter";

describe("JSONFormatter module", () => {
test("format empty", () => {
Expand Down
2 changes: 1 addition & 1 deletion src/lib/fmt/json_formatter.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Formatter } from "./formatter";
import { Formatter } from "@device-ui/lib/fmt/formatter";

// Format an arbitrary data into JSON.
export class JSONFormatter implements Formatter {
Expand Down
2 changes: 1 addition & 1 deletion src/lib/http/http_fetcher.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Fetcher } from "./fetcher";
import { Fetcher } from "@device-ui/lib/http/fetcher";

export class HTTPFetcher implements Fetcher {
constructor(url: string) {
Expand Down
4 changes: 2 additions & 2 deletions src/lib/http/periodic_fetcher.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Fetcher } from "./fetcher";
import { FetchHandler } from "./fetch_handler";
import { Fetcher } from "@device-ui/lib/http/fetcher";
import { FetchHandler } from "@device-ui/lib/http/fetch_handler";

export class PeriodicFetcher {
constructor(handler: FetchHandler, fetcher: Fetcher, interval: number) {
Expand Down
9 changes: 7 additions & 2 deletions src/lib/system/default_notificator.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
import { Notificator, AlertResult, ConfirmResult } from "./notificator";
import { NotificationSeverity } from "./notification";
import {
Notificator,
AlertResult,
ConfirmResult,
} from "@device-ui/lib/system/notificator";

import { NotificationSeverity } from "@device-ui/lib/system/notification";

// Default browser-based notification.
export class DefaultNotificator implements Notificator {
Expand Down
2 changes: 1 addition & 1 deletion src/lib/system/local_system_clock.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { SystemClock } from "./system_clock";
import { SystemClock } from "@device-ui/lib/system/system_clock";

export class LocalSystemClock implements SystemClock {
// Set the UNIX system time.
Expand Down
6 changes: 3 additions & 3 deletions src/lib/system/monitor_notification_queue.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { NotificationQueue } from "./notification_types";
import { ObjectMonitor } from "../core/object_monitor";
import { Notification } from "./notification";
import { NotificationQueue } from "@device-ui/lib/system/notification_types";
import { ObjectMonitor } from "@device-ui/lib/core/object_monitor";
import { Notification } from "@device-ui/lib/system/notification";

export class MonitorNotificationQueue<T> implements NotificationQueue<T> {
// Initialize.
Expand Down
2 changes: 1 addition & 1 deletion src/lib/system/notification.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
NotificationSeverity,
NotificationModality,
Notification,
} from "./notification";
} from "@device-ui/lib/system/notification";

describe("Notification", () => {
test("Resolve notification multiple times", async () => {
Expand Down
4 changes: 2 additions & 2 deletions src/lib/system/notification_dispatcher.test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { describe, test, expect } from "vitest";

import { NotificationDispatcher } from "./notification_dispatcher";
import { MonitorNotificationQueue } from "./monitor_notification_queue";
import { NotificationDispatcher } from "@device-ui/lib/system/notification_dispatcher";
import { MonitorNotificationQueue } from "@device-ui/lib/system/monitor_notification_queue";

import {
AlertArrayQueue,
Expand Down
8 changes: 4 additions & 4 deletions src/lib/system/notification_dispatcher.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,23 @@ import {
NotificationResult,
AlertResult,
ConfirmResult,
} from "./notificator";
} from "@device-ui/lib/system/notificator";

import {
AlertNotificationQueue,
ConfirmNotificationQueue,
NotificationQueue,
AlertType,
ConfirmType,
} from "./notification_types";
} from "@device-ui/lib/system/notification_types";

import {
NotificationModality,
NotificationSeverity,
Notification,
} from "./notification";
} from "@device-ui/lib/system/notification";

import { SystemClock } from "./system_clock";
import { SystemClock } from "@device-ui/lib/system/system_clock";

export type NotificationDispatcherOpts = {
// Modal or non-modal notification.
Expand Down
10 changes: 5 additions & 5 deletions src/lib/system/notification_types.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Queue } from "../core/queue";
import { LimitQueue } from "../core/limit_queue";
import { ArrayQueue } from "../core/array_queue";
import { Notification } from "./notification";
import { MonitorNotificationQueue } from "./monitor_notification_queue";
import { Queue } from "@device-ui/lib/core/queue";
import { LimitQueue } from "@device-ui/lib/core/limit_queue";
import { ArrayQueue } from "@device-ui/lib/core/array_queue";
import { Notification } from "@device-ui/lib/system/notification";
import { MonitorNotificationQueue } from "@device-ui/lib/system/monitor_notification_queue";

export type AlertType = void;
export type ConfirmType = boolean;
Expand Down
8 changes: 5 additions & 3 deletions src/lib/system/notificator.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { AlertType, ConfirmType } from "./notification_types";

import { NotificationSeverity } from "./notification";
import {
AlertType,
ConfirmType,
} from "@device-ui/lib/system/notification_types";
import { NotificationSeverity } from "@device-ui/lib/system/notification";

export type NotificationResult<T> = {
promise: Promise<T> | null;
Expand Down
2 changes: 1 addition & 1 deletion src/lib/tests/test_config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Config } from "../device/config";
import { Config } from "@device-ui/lib/device/config";

export class TestConfig implements Config {
constructor(private readonly defaults: Record<string, any>) {}
Expand Down
2 changes: 1 addition & 1 deletion src/lib/tests/test_fetcher.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Fetcher } from "../http/fetcher";
import { Fetcher } from "@device-ui/lib/http/fetcher";

export class TestFetcher implements Fetcher {
constructor(private data: Record<string, any>) {}
Expand Down
2 changes: 1 addition & 1 deletion src/lib/tests/test_system_clock.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { SystemClock } from "../system/system_clock";
import { SystemClock } from "@device-ui/lib/system/system_clock";

export class TestSystemClock implements SystemClock {
ts: number = 0;
Expand Down
2 changes: 1 addition & 1 deletion src/ui/preact/app.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import './tokens.css';
@import '@device-ui/ui/preact/tokens.css';

/* CSS Custom Properties */
:root {
Expand Down
6 changes: 3 additions & 3 deletions src/ui/preact/basic_config_component.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Component } from "preact";

import { Config } from "../../lib/device/config";
import { Notificator } from "../../lib/system/notificator";
import { NotificationSeverity } from "../../lib/system/notification";
import { Config } from "@device-ui/lib/device/config";
import { Notificator } from "@device-ui/lib/system/notificator";
import { NotificationSeverity } from "@device-ui/lib/system/notification";

type configState = {
data: Record<string, any> | null;
Expand Down
2 changes: 1 addition & 1 deletion src/ui/preact/dashboard.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import './tokens.css';
@import '@device-ui/ui/preact/tokens.css';

/* Dashboard Grid Container */
.dashboard {
Expand Down
2 changes: 1 addition & 1 deletion src/ui/preact/form_config_component.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import './tokens.css';
@import '@device-ui/ui/preact/tokens.css';

/* CSS Custom Properties */
:root {
Expand Down
4 changes: 2 additions & 2 deletions src/ui/preact/form_config_component.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { BasicConfigComponent } from "./basic_config_component";
import { BasicConfigComponent } from "@device-ui/ui/preact/basic_config_component";

import "./form_config_component.css";
import "@device-ui/ui/preact/form_config_component.css";

// Loading state component.
function ConfigLoading() {
Expand Down
2 changes: 1 addition & 1 deletion src/ui/preact/index.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import './tokens.css';
@import '@device-ui/ui/preact/tokens.css';

/* CSS Custom Properties */
:root {
Expand Down
2 changes: 1 addition & 1 deletion src/ui/preact/markdown_component.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import './tokens.css';
@import '@device-ui/ui/preact/tokens.css';

.modal-backdrop {
position: fixed;
Expand Down
6 changes: 3 additions & 3 deletions src/ui/preact/markdown_component.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Component, JSX } from "preact";

import { ObjectMonitor } from "../../lib/core/object_monitor";
import { StateMonitor } from "../../lib/core/state_monitor";
import { ObjectMonitor } from "@device-ui/lib/core/object_monitor";
import { StateMonitor } from "@device-ui/lib/core/state_monitor";

import "./markdown_component.css";
import "@device-ui/ui/preact/markdown_component.css";

export type MarkdownComponentProps = {
// Monitor to handle the state changes.
Expand Down
17 changes: 9 additions & 8 deletions src/ui/preact/navigation_component.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import { Component, JSX } from "preact";

import { Rebooter } from "../../lib/device/rebooter";
import { Locator } from "../../lib/device/locator";
import { Notificator } from "../../lib/system/notificator";
import { NotificationSeverity } from "../../lib/system/notification";
import { MarkdownComponent } from "./markdown_component";
import { StateMonitor } from "../../lib/core/state_monitor";

import "./dashboard.css";
import { Rebooter } from "@device-ui/lib/device/rebooter";
import { Locator } from "@device-ui/lib/device/locator";
import { Notificator } from "@device-ui/lib/system/notificator";
import { NotificationSeverity } from "@device-ui/lib/system/notification";
import { StateMonitor } from "@device-ui/lib/core/state_monitor";

import { MarkdownComponent } from "@device-ui/ui/preact/markdown_component";

import "@device-ui/ui/preact/dashboard.css";

export type NavigationComponentProps = {
// Rebooter to reboot the device.
Expand Down
2 changes: 1 addition & 1 deletion src/ui/preact/notification_component.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import './tokens.css';
@import '@device-ui/ui/preact/tokens.css';

/* CSS Custom Properties */
:root {
Expand Down
15 changes: 7 additions & 8 deletions src/ui/preact/notification_component.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { render } from "@testing-library/preact";

import { describe, test, expect } from "vitest";

import { MonitorNotificationQueue } from "../../lib/system/monitor_notification_queue";
import { NotificationDispatcher } from "../../lib/system/notification_dispatcher";
import { MonitorNotificationQueue } from "@device-ui/lib/system/monitor_notification_queue";
import { NotificationDispatcher } from "@device-ui/lib/system/notification_dispatcher";

import {
AlertNotification,
Expand All @@ -12,19 +12,18 @@ import {
ConfirmArrayQueue,
AlertLimitNotificationQueue,
ConfirmLimitNotificationQueue,
} from "../../lib/system/notification_types";
} from "@device-ui/lib/system/notification_types";

import {
Notification,
NotificationSeverity,
NotificationModality,
} from "../../lib/system/notification";
} from "@device-ui/lib/system/notification";

import { TestSystemClock } from "../../lib/tests/test_system_clock";
import { TestSystemClock } from "@device-ui/lib/tests/test_system_clock";
import { ObjectMonitor } from "@device-ui/lib/core/object_monitor";

import { ObjectMonitor } from "../../lib/core/object_monitor";

import { NotificationComponent } from "./notification_component";
import { NotificationComponent } from "@device-ui/ui/preact/notification_component";

class testObjectMonitor implements ObjectMonitor {
callCount: number = 0;
Expand Down
10 changes: 5 additions & 5 deletions src/ui/preact/notification_component.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ import {
ConfirmNotification,
AlertMonitorNotificationQueue,
ConfirmMonitorNotificationQueue,
} from "../../lib/system/notification_types";
} from "@device-ui/lib/system/notification_types";

import {
NotificationSeverity,
NotificationModality,
} from "../../lib/system/notification";
} from "@device-ui/lib/system/notification";

import { ObjectMonitor } from "../../lib/core/object_monitor";
import { SystemClock } from "../../lib/system/system_clock";
import { ObjectMonitor } from "@device-ui/lib/core/object_monitor";
import { SystemClock } from "@device-ui/lib/system/system_clock";

import "./notification_component.css";
import "@device-ui/ui/preact/notification_component.css";

type notificationComponentState = {
timestamp: number;
Expand Down
2 changes: 1 addition & 1 deletion src/ui/preact/sensor/soil/analog_sensor_component.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '../../tokens.css';
@import '@device-ui/ui/preact/tokens.css';

:root {
/* Status Colors - domain-specific, stays sensor-specific */
Expand Down
Loading