diff --git a/Dockerfile b/Dockerfile index 223e9d0..47331d2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,5 @@ # Used in the build stage of the pipeline to create a frontend docker image FROM nginx:alpine -RUN rm /etc/nginx/conf.d/default.conf COPY nginx.conf /etc/nginx/nginx.conf -COPY /build /usr/share/nginx/html \ No newline at end of file +COPY /build /usr/share/nginx/html diff --git a/indexV2.html b/indexV2.html new file mode 100644 index 0000000..45dc87b --- /dev/null +++ b/indexV2.html @@ -0,0 +1,20 @@ + + + + + + + Adaptive Dashboard + + + + + +
+ + + diff --git a/package-lock.json b/package-lock.json index 001a981..3610bee 100644 --- a/package-lock.json +++ b/package-lock.json @@ -46,7 +46,7 @@ "mui-tel-input": "^7.0.0", "notistack": "^3.0.1", "openweathermap-ts": "^1.2.10", - "protobuf-ts": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#dev", + "protobuf-ts": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#master", "query-string": "^9.2.1", "react": "^18.3.1", "react-beautiful-dnd": "^13.1.1", @@ -11830,7 +11830,7 @@ }, "node_modules/protobuf-ts": { "version": "1.0.0", - "resolved": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#e61049af5dd297179d5a88650cf40edb2eef8b4d", + "resolved": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#d6a992e46192a8ab8195235357318dc297738064", "dependencies": { "protobufjs": "^6.8.8" } diff --git a/package.json b/package.json index af59848..76ac48b 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "mui-tel-input": "^7.0.0", "notistack": "^3.0.1", "openweathermap-ts": "^1.2.10", - "protobuf-ts": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#dev", + "protobuf-ts": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#master", "query-string": "^9.2.1", "react": "^18.3.1", "react-beautiful-dnd": "^13.1.1", diff --git a/src/bin/BinVisualizerV2.tsx b/src/bin/BinVisualizerV2.tsx index cd812e6..8eee39e 100644 --- a/src/bin/BinVisualizerV2.tsx +++ b/src/bin/BinVisualizerV2.tsx @@ -1539,7 +1539,7 @@ export default function BinVisualizer(props: Props) { ) : ( - {fullScreenHandler.enter()}}> + fullScreenHandler.enter()}> )} diff --git a/src/pbHelpers/AddressTypes/I2C.ts b/src/pbHelpers/AddressTypes/I2C.ts index d2f1733..b6bf585 100644 --- a/src/pbHelpers/AddressTypes/I2C.ts +++ b/src/pbHelpers/AddressTypes/I2C.ts @@ -18,8 +18,7 @@ export const I2C: AddressTypeExtension = { [quack.ComponentType.COMPONENT_TYPE_SEN5X, 0x68], [quack.ComponentType.COMPONENT_TYPE_AIRFLOW, 0x6b], [quack.ComponentType.COMPONENT_TYPE_GRAIN_CABLE, 0x70], - [quack.ComponentType.COMPONENT_TYPE_DRAGER_GAS_DONGLE, 0x6c], - [quack.ComponentType.COMPONENT_TYPE_TEMP_HUMIDITY, 0x43] + [quack.ComponentType.COMPONENT_TYPE_DRAGER_GAS_DONGLE, 0x6c] ]); const offset = offsets.get(componentType); diff --git a/src/pbHelpers/ComponentType.tsx b/src/pbHelpers/ComponentType.tsx index c030cef..860e2aa 100644 --- a/src/pbHelpers/ComponentType.tsx +++ b/src/pbHelpers/ComponentType.tsx @@ -40,10 +40,7 @@ import { VPD, Weight, CapacitorCable, - AnalogPressure, - Plenum, - AmbientOnewire, - AmbientI2C + AnalogPressure } from "pbHelpers/ComponentTypes"; //import { multilineGrainCableData } from "pbHelpers/ComponentTypes/GrainCable"; //import { multilineCapCableData } from "./ComponentTypes/CapacitorCable"; @@ -64,7 +61,6 @@ import { LineData, Point } from "charts/measurementCharts/MultiLineGraph"; import moment, { Moment } from "moment"; import { avg } from "utils"; import { Airflow } from "./ComponentTypes/Airflow"; -import { TempHumidity } from "./ComponentTypes/TempHumidity"; const COMPONENT_TYPE_MAP = new Map([ [quack.ComponentType.COMPONENT_TYPE_INVALID, Invalid], @@ -102,12 +98,7 @@ const COMPONENT_TYPE_MAP = new Map([ [quack.ComponentType.COMPONENT_TYPE_VIBRATION_CHAIN, VibrationCable], [quack.ComponentType.COMPONENT_TYPE_DRAGER_GAS_DONGLE, dragerGasDongle], [quack.ComponentType.COMPONENT_TYPE_AIRFLOW, Airflow], - [quack.ComponentType.COMPONENT_TYPE_TEMP_HUMIDITY, TempHumidity], - [quack.ComponentType.COMPONENT_TYPE_ANALOG_PRESSURE, AnalogPressure], - [quack.ComponentType.COMPONENT_TYPE_PLENUM, Plenum], - [quack.ComponentType.COMPONENT_TYPE_AMBIENT_ONEWIRE, AmbientOnewire], - [quack.ComponentType.COMPONENT_TYPE_AMBIENT_I2C, AmbientI2C], - + [quack.ComponentType.COMPONENT_TYPE_ANALOG_PRESSURE, AnalogPressure] ]); export interface Subtype { diff --git a/src/pbHelpers/ComponentTypes/AmbientI2C.ts b/src/pbHelpers/ComponentTypes/AmbientI2C.ts deleted file mode 100644 index 7a2cbf9..0000000 --- a/src/pbHelpers/ComponentTypes/AmbientI2C.ts +++ /dev/null @@ -1,79 +0,0 @@ -import TemperatureHumidityDarkIcon from "assets/components/temperatureHumidityDark.png"; -import TemperatureHumidityLightIcon from "assets/components/temperatureHumidityLight.png"; -import { convertedUnitMeasurement } from "models/UnitMeasurement"; -import { - AreaChartData, - ComponentTypeExtension, - GraphFilters, - LineChartData, - simpleAreaChartData, - simpleLineChartData, - simpleMeasurements, - simpleSummaries, - Summary, - unitMeasurementSummaries -} from "pbHelpers/ComponentType"; -import { describeMeasurement } from "pbHelpers/MeasurementDescriber"; -import { pond } from "protobuf-ts/pond"; -import { quack } from "protobuf-ts/quack"; - -export function AmbientI2C(subtype: number = 0): ComponentTypeExtension { - let temperature = describeMeasurement( - quack.MeasurementType.MEASUREMENT_TYPE_TEMPERATURE, - quack.ComponentType.COMPONENT_TYPE_AMBIENT_I2C, - subtype - ); - let humidity = describeMeasurement( - quack.MeasurementType.MEASUREMENT_TYPE_PERCENT, - quack.ComponentType.COMPONENT_TYPE_AMBIENT_I2C, - subtype - ); - return { - type: quack.ComponentType.COMPONENT_TYPE_AMBIENT_I2C, - subtypes: [], - friendlyName: "Ambient I2C", - description: "Measures temperature and humidity", - isController: false, - isSource: true, - isCalibratable: true, - addressTypes: [quack.AddressType.ADDRESS_TYPE_I2C], - interactionResultTypes: [], - states: [], - measurements: simpleMeasurements(temperature, humidity), - measurementSummary: async function(measurement: quack.Measurement): Promise> { - return simpleSummaries(measurement, temperature, humidity); - }, - unitMeasurementSummary: ( - measurements: convertedUnitMeasurement - ): Summary[] => { - return unitMeasurementSummaries( - measurements, - quack.ComponentType.COMPONENT_TYPE_AMBIENT_I2C, - subtype - ); - }, - areaChartData: ( - measurement: pond.UnitMeasurementsForComponent, - smoothingAverages?: number, - filters?: GraphFilters - ): AreaChartData => { - return simpleAreaChartData(measurement, smoothingAverages, filters); - }, - lineChartData: ( - measurement: pond.UnitMeasurementsForComponent, - smoothingAverages?: number, - filters?: GraphFilters - ): LineChartData => { - return simpleLineChartData( - quack.ComponentType.COMPONENT_TYPE_AMBIENT_I2C, - measurement, - smoothingAverages, - filters - ); - }, - minMeasurementPeriodMs: 1000, - icon: (theme?: "light" | "dark"): string | undefined => { - return theme === "light" ? TemperatureHumidityDarkIcon : TemperatureHumidityLightIcon; - } - }; -} diff --git a/src/pbHelpers/ComponentTypes/AmbientOnewire.ts b/src/pbHelpers/ComponentTypes/AmbientOnewire.ts deleted file mode 100644 index 4fd394a..0000000 --- a/src/pbHelpers/ComponentTypes/AmbientOnewire.ts +++ /dev/null @@ -1,79 +0,0 @@ -import TemperatureHumidityDarkIcon from "assets/components/temperatureHumidityDark.png"; -import TemperatureHumidityLightIcon from "assets/components/temperatureHumidityLight.png"; -import { convertedUnitMeasurement } from "models/UnitMeasurement"; -import { - AreaChartData, - ComponentTypeExtension, - GraphFilters, - LineChartData, - simpleAreaChartData, - simpleLineChartData, - simpleMeasurements, - simpleSummaries, - Summary, - unitMeasurementSummaries -} from "pbHelpers/ComponentType"; -import { describeMeasurement } from "pbHelpers/MeasurementDescriber"; -import { pond } from "protobuf-ts/pond"; -import { quack } from "protobuf-ts/quack"; - -export function AmbientOnewire(subtype: number = 0): ComponentTypeExtension { - let temperature = describeMeasurement( - quack.MeasurementType.MEASUREMENT_TYPE_TEMPERATURE, - quack.ComponentType.COMPONENT_TYPE_AMBIENT_ONEWIRE, - subtype - ); - let humidity = describeMeasurement( - quack.MeasurementType.MEASUREMENT_TYPE_PERCENT, - quack.ComponentType.COMPONENT_TYPE_AMBIENT_ONEWIRE, - subtype - ); - return { - type: quack.ComponentType.COMPONENT_TYPE_AMBIENT_ONEWIRE, - subtypes: [], - friendlyName: "Onewire Ambient", - description: "Measures temperature and humidity", - isController: false, - isSource: true, - isCalibratable: true, - addressTypes: [quack.AddressType.ADDRESS_TYPE_CONFIGURABLE_PIN_ARRAY], - interactionResultTypes: [], - states: [], - measurements: simpleMeasurements(temperature, humidity), - measurementSummary: async function(measurement: quack.Measurement): Promise> { - return simpleSummaries(measurement, temperature, humidity); - }, - unitMeasurementSummary: ( - measurements: convertedUnitMeasurement - ): Summary[] => { - return unitMeasurementSummaries( - measurements, - quack.ComponentType.COMPONENT_TYPE_AMBIENT_ONEWIRE, - subtype - ); - }, - areaChartData: ( - measurement: pond.UnitMeasurementsForComponent, - smoothingAverages?: number, - filters?: GraphFilters - ): AreaChartData => { - return simpleAreaChartData(measurement, smoothingAverages, filters); - }, - lineChartData: ( - measurement: pond.UnitMeasurementsForComponent, - smoothingAverages?: number, - filters?: GraphFilters - ): LineChartData => { - return simpleLineChartData( - quack.ComponentType.COMPONENT_TYPE_AMBIENT_ONEWIRE, - measurement, - smoothingAverages, - filters - ); - }, - minMeasurementPeriodMs: 1000, - icon: (theme?: "light" | "dark"): string | undefined => { - return theme === "light" ? TemperatureHumidityDarkIcon : TemperatureHumidityLightIcon; - } - }; -} diff --git a/src/pbHelpers/ComponentTypes/DragerGasDongle.ts b/src/pbHelpers/ComponentTypes/DragerGasDongle.ts index 1a13bbf..648b01d 100644 --- a/src/pbHelpers/ComponentTypes/DragerGasDongle.ts +++ b/src/pbHelpers/ComponentTypes/DragerGasDongle.ts @@ -226,7 +226,6 @@ export function dragerGasDongle(subtype: number = 0): ComponentTypeExtension { smoothingAverages, filters ); - console.log(chartData) } return chartData; }, diff --git a/src/pbHelpers/ComponentTypes/Plenum.ts b/src/pbHelpers/ComponentTypes/Plenum.ts deleted file mode 100644 index 687d6fd..0000000 --- a/src/pbHelpers/ComponentTypes/Plenum.ts +++ /dev/null @@ -1,84 +0,0 @@ -import TemperatureHumidityDarkIcon from "assets/components/temperatureHumidityDark.png"; -import TemperatureHumidityLightIcon from "assets/components/temperatureHumidityLight.png"; -import { convertedUnitMeasurement } from "models/UnitMeasurement"; -import { - AreaChartData, - ComponentTypeExtension, - GraphFilters, - LineChartData, - simpleAreaChartData, - simpleLineChartData, - simpleMeasurements, - simpleSummaries, - Summary, - unitMeasurementSummaries -} from "pbHelpers/ComponentType"; -import { describeMeasurement } from "pbHelpers/MeasurementDescriber"; -import { pond } from "protobuf-ts/pond"; -import { quack } from "protobuf-ts/quack"; - -export function Plenum(subtype: number = 0): ComponentTypeExtension { - let temperature = describeMeasurement( - quack.MeasurementType.MEASUREMENT_TYPE_TEMPERATURE, - quack.ComponentType.COMPONENT_TYPE_PLENUM, - subtype - ); - let humidity = describeMeasurement( - quack.MeasurementType.MEASUREMENT_TYPE_PERCENT, - quack.ComponentType.COMPONENT_TYPE_PLENUM, - subtype - ); - let pressure = describeMeasurement( - quack.MeasurementType.MEASUREMENT_TYPE_PRESSURE, - quack.ComponentType.COMPONENT_TYPE_PLENUM, - subtype - ); - return { - type: quack.ComponentType.COMPONENT_TYPE_PLENUM, - subtypes: [], - friendlyName: "Plenum", - description: "Measures temperature, humidity and pressure", - isController: false, - isSource: true, - isCalibratable: true, - addressTypes: [quack.AddressType.ADDRESS_TYPE_CONFIGURABLE_PIN_ARRAY], - interactionResultTypes: [], - states: [], - measurements: simpleMeasurements(temperature, humidity, pressure), - measurementSummary: async function(measurement: quack.Measurement): Promise> { - return simpleSummaries(measurement, temperature, humidity, pressure); - }, - unitMeasurementSummary: ( - measurements: convertedUnitMeasurement - ): Summary[] => { - return unitMeasurementSummaries( - measurements, - quack.ComponentType.COMPONENT_TYPE_PLENUM, - subtype - ); - }, - areaChartData: ( - measurement: pond.UnitMeasurementsForComponent, - smoothingAverages?: number, - filters?: GraphFilters - ): AreaChartData => { - return simpleAreaChartData(measurement, smoothingAverages, filters); - }, - lineChartData: ( - measurement: pond.UnitMeasurementsForComponent, - smoothingAverages?: number, - filters?: GraphFilters - ): LineChartData => { - return simpleLineChartData( - quack.ComponentType.COMPONENT_TYPE_PLENUM, - measurement, - smoothingAverages, - filters - ); - }, - minMeasurementPeriodMs: 1000, - icon: (theme?: "light" | "dark"): string | undefined => { - return theme === "light" ? TemperatureHumidityDarkIcon : TemperatureHumidityLightIcon; - } - }; -} diff --git a/src/pbHelpers/ComponentTypes/TempHumidity.ts b/src/pbHelpers/ComponentTypes/TempHumidity.ts deleted file mode 100644 index 50542ed..0000000 --- a/src/pbHelpers/ComponentTypes/TempHumidity.ts +++ /dev/null @@ -1,85 +0,0 @@ -import TemperatureHumidityDarkIcon from "assets/components/temperatureHumidityDark.png"; -import TemperatureHumidityLightIcon from "assets/components/temperatureHumidityLight.png"; -import { convertedUnitMeasurement } from "models/UnitMeasurement"; -import { - AreaChartData, - ComponentTypeExtension, - GraphFilters, - LineChartData, - simpleAreaChartData, - simpleLineChartData, - simpleMeasurements, - simpleSummaries, - Summary, - unitMeasurementSummaries -} from "pbHelpers/ComponentType"; -import { describeMeasurement } from "pbHelpers/MeasurementDescriber"; -import { pond } from "protobuf-ts/pond"; -import { quack } from "protobuf-ts/quack"; - -export function TempHumidity(subtype: number = 0): ComponentTypeExtension { - let temperature = describeMeasurement( - quack.MeasurementType.MEASUREMENT_TYPE_TEMPERATURE, - quack.ComponentType.COMPONENT_TYPE_TEMP_HUMIDITY, - subtype - ); - let humidity = describeMeasurement( - quack.MeasurementType.MEASUREMENT_TYPE_PERCENT, - quack.ComponentType.COMPONENT_TYPE_TEMP_HUMIDITY, - subtype - ); - return { - type: quack.ComponentType.COMPONENT_TYPE_TEMP_HUMIDITY, - subtypes: [ - { - key: quack.TempHumiditySubtype.TEMP_HUMIDITY_SUBTYPE_HDC302, - value: "TEMP_HUMIDITY_SUBTYPE_HDC302", - friendlyName: "HDC302" - } - ], - friendlyName: "Temperature/Humidity", - description: "Measures the temperature and humidity", - isController: false, - isSource: true, - isCalibratable: true, - addressTypes: [quack.AddressType.ADDRESS_TYPE_I2C], - interactionResultTypes: [], - states: [], - measurements: simpleMeasurements(temperature, humidity), - measurementSummary: async function(measurement: quack.Measurement): Promise> { - return simpleSummaries(measurement, temperature, humidity); - }, - unitMeasurementSummary: ( - measurements: convertedUnitMeasurement - ): Summary[] => { - return unitMeasurementSummaries( - measurements, - quack.ComponentType.COMPONENT_TYPE_TEMP_HUMIDITY, - subtype - ); - }, - areaChartData: ( - measurement: pond.UnitMeasurementsForComponent, - smoothingAverages?: number, - filters?: GraphFilters - ): AreaChartData => { - return simpleAreaChartData(measurement, smoothingAverages, filters); - }, - lineChartData: ( - measurement: pond.UnitMeasurementsForComponent, - smoothingAverages?: number, - filters?: GraphFilters - ): LineChartData => { - return simpleLineChartData( - quack.ComponentType.COMPONENT_TYPE_TEMP_HUMIDITY, - measurement, - smoothingAverages, - filters - ); - }, - minMeasurementPeriodMs: 1000, - icon: (theme?: "light" | "dark"): string | undefined => { - return theme === "light" ? TemperatureHumidityDarkIcon : TemperatureHumidityLightIcon; - } - }; -} diff --git a/src/pbHelpers/ComponentTypes/index.ts b/src/pbHelpers/ComponentTypes/index.ts index 8bb37ac..39b1560 100644 --- a/src/pbHelpers/ComponentTypes/index.ts +++ b/src/pbHelpers/ComponentTypes/index.ts @@ -30,6 +30,3 @@ export * from "./VPD"; export * from "./Weight"; export * from "./CapacitorCable"; export * from "./AnalogPressure"; -export * from "./Plenum"; -export * from "./AmbientOnewire"; -export * from "./AmbientI2C"; diff --git a/src/pbHelpers/DeviceAvailability.ts b/src/pbHelpers/DeviceAvailability.ts index ba49393..da39022 100644 --- a/src/pbHelpers/DeviceAvailability.ts +++ b/src/pbHelpers/DeviceAvailability.ts @@ -65,8 +65,7 @@ const DefaultAvailability: DeviceAvailabilityMap = new Map { - console.log(response) let rUsers: User[] = []; or(response.data, { users: [] }).users.forEach((user: any) => { rUsers.push(User.any(user));