Skip to content
This repository has been archived by the owner on Jan 23, 2025. It is now read-only.

Commit

Permalink
Populate data
Browse files Browse the repository at this point in the history 
Signed-off-by: 1998-felix <[email protected]>
  • Loading branch information
@felixgateru @dborovcanin
felixgateru authored and dborovcanin committed Mar 13, 2024
1 parent 9e62031 commit f367626
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 50 deletions.
4 changes: 2 additions & 2 deletions cmd/ui/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ const envPrefixGoogle = "MG_GOOGLE_"

type config struct {
LogLevel string `env:"MG_UI_LOG_LEVEL" envDefault:"debug"`
Port string `env:"MG_UI_PORT" envDefault:"9097"`
Port string `env:"MG_UI_PORT" envDefault:"9095"`
InstanceID string `env:"MG_UI_INSTANCE_ID" envDefault:""`
HTTPAdapterURL string `env:"MG_HTTP_ADAPTER_URL" envDefault:"http://localhost:8008"`
ReaderURL string `env:"MG_READER_URL" envDefault:"http://localhost:9011"`
ThingsURL string `env:"MG_THINGS_URL" envDefault:"http://localhost:9000"`
UsersURL string `env:"MG_USERS_URL" envDefault:"http://localhost:9002"`
HostURL string `env:"MG_UI_HOST_URL" envDefault:"http://localhost:9097"`
HostURL string `env:"MG_UI_HOST_URL" envDefault:"http://localhost:9095"`
BootstrapURL string `env:"MG_BOOTSTRAP_URL" envDefault:"http://localhost:9013"`
DomainsURL string `env:"MG_DOMAINS_URL" envDefault:"http://localhost:8189"`
InvitationsURL string `env:"MG_INVITATIONS_URL" envDefault:"http://localhost:9020"`
Expand Down
8 changes: 4 additions & 4 deletions internal/postgres/postgres.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ var (
// Config defines the options that are used when connecting to the PostgresSQL instance.
type Config struct {
Host string `env:"MG_UI_DB_HOST" envDefault:"localhost"`
Port string `env:"MG_UI_DB_PORT" envDefault:"6007"`
User string `env:"MG_UI_DB_USER" envDefault:"magistrala"`
Pass string `env:"MG_UI_DB_PASS" envDefault:"magistrala"`
Name string `env:"MG_UI_DB_NAME" envDefault:"ui"`
Port string `env:"MG_UI_DB_PORT" envDefault:"5432"`
User string `env:"MG_UI_DB_USER" envDefault:"magistrala-ui"`
Pass string `env:"MG_UI_DB_PASS" envDefault:"magistrala-ui"`
Name string `env:"MG_UI_DB_NAME" envDefault:"dashboards"`
SSLMode string `env:"MG_UI_DB_SSL_MODE" envDefault:"disable"`
SSLCert string `env:"MG_UI_DB_SSL_CERT" envDefault:""`
SSLKey string `env:"MG_UI_DB_SSL_KEY" envDefault:""`
Expand Down
55 changes: 11 additions & 44 deletions ui/web/static/js/charts.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,17 +245,14 @@ class TimeSeriesBarChart extends Echart {
channel: '${this.chartData.channel}',
publisher: '${this.chartData.thing}',
name: '${this.chartData.valueName}',
from: '${this.chartData.startTime / 1000}',
to: '${this.chartData.stopTime / 1000}',
from: ${this.chartData.startTime / 1000},
to: ${this.chartData.stopTime / 1000},
aggregation: '${this.chartData.aggregationType}',
limit: 100,
interval : '${this.chartData.updateInterval}'
}
const xAxisArray = [];
const yAxisArray = [];
async function fetchDataAndUpdate() {
async function fetchDataAndUpdate() {
try {
const apiEndpoint = "/data?channel=" + chartData.channel +
"&publisher=" + chartData.publisher +
Expand All @@ -265,7 +262,6 @@ class TimeSeriesBarChart extends Echart {
"&aggregation=" + chartData.aggregation +
"&limit=" + chartData.limit +
"&interval=" + chartData.interval;
console.log('Fetching data from:', apiEndpoint);
const response = await fetch(apiEndpoint);
Expand All @@ -274,52 +270,23 @@ class TimeSeriesBarChart extends Echart {
}
const data = await response.json();
console.log("Data fetched:", data);
let previousTimestamp = chartData.from;
let endTimestamp = chartData.to;
let stepSize = 2000;
let currentTimestamp;
while (currentTimestamp <= endTimestamp) {
let messageIndex = data.messages.length - 1;
let isempty= true;
while (messageIndex >= 0 && (data.messages[messageIndex].time) >= previousTimestamp) {
const item = data.messages[messageIndex];
if ((item.time) <= currentTimestamp) {
const date = new Date(item.time);
xAxisArray.push(date.toLocaleTimeString());
yAxisArray.push(item.value);
isempty=false;
}
messageIndex--;
}
if (isempty) {
const date = new Date(currentTimestamp);
xAxisArray.push(date.toLocaleTimeString());
yAxisArray.push("-");
}
previousTimestamp = currentTimestamp;
currentTimestamp += stepSize * 1e3;
}
const xAxisArray = [];
const yAxisArray = [];
updateChart();
data.messages.forEach((message) => {
xAxisArray.push(new Date(message.time).toLocaleTimeString());
yAxisArray.push(message.value);
});
updateChart(xAxisArray, yAxisArray);
} catch (error) {
console.error("Error fetching data:", error);
// Handle the error (e.g., display an error message)
} finally {
// Schedule the next update
setTimeout(fetchDataAndUpdate, 5000);
}
}
function updateChart() {
function updateChart(xAxisArray, yAxisArray) {
const option = barChart.getOption();
console.log('x axis array:', xAxisArray);
console.log('y axis array:', yAxisArray);
option.series[0].data = yAxisArray;
option.xAxis[0].data = xAxisArray;
barChart.setOption(option);
}
Expand Down

0 comments on commit f367626

Please sign in to comment.