Skip to content
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.

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

MG-93 - Add support for creating charts #103

Merged
merged 9 commits into from
Feb 2, 2024
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
8 changes: 4 additions & 4 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,6 +1,6 @@
{
"devDependencies": {
"prettier": "^3.1.0",
"prettier": "^3.2.4",
"prettier-plugin-go-template": "^0.0.15"
}
}
85 changes: 85 additions & 0 deletions ui/charts.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
// Copyright (c) Abstract Machines
// SPDX-License-Identifier: Apache-2.0

package ui

type Item struct {
Id int `json:"id"`
Title string `json:"title"`
Content string `json:"content"`
Image string `json:"image"`
Widget string `json:"widget"`
}

func CreateItem() []Item {
items := []Item{
{
Title: "Time Series Line Chart",
Content: "This is simple cartesian axis time series line chart",
Image: "https://www.jqueryscript.net/images/Simple-Canvas-Based-Line-Chart-Plugin-For-jQuery-Topup.jpg",
Widget: "lineChart",
},
{
Title: "Time Series Bar Chart",
Content: "This is simple cartesian axis time series bar chart",
Image: "https://sigma-docs-screenshots.s3.us-west-2.amazonaws.com/Workbooks/Visualizations/Build+a+Bar+Chart/bar-chart.png",
Widget: "barChart",
},
{
Title: "Simple Analogue Gauge",
Content: "This is a radial analogue gauge",
Image: "https://www.infragistics.com/products/indigo-design/help/images/[email protected]",
Widget: "gauge",
},
{
Title: "Pie Chart",
Content: "This is a pie chart",
Image: "https://earthly.dev/blog/generated/assets/images/stop-using-pie-charts/pie-chart-800-a835136f5.png",
Widget: "pieChart",
},
{
Title: "Donut Chart",
Content: "This is a donut chart",
Image: "https://media.geeksforgeeks.org/wp-content/uploads/20230322231450/Rplot07.png",
Widget: "donut",
},
{
Title: "Speed Gauge",
Content: "This is an analogue speed gauge",
Image: "https://community-openhab-org.s3.dualstack.eu-central-1.amazonaws.com/original/3X/5/b/5b953b24910ffe51767d97af48d8d6c9125039a8.png",
Widget: "speedGauge",
},
{
Title: "Range Chart",
Content: "This is a range chart",
Image: "https://storage.googleapis.com/studio_v_0_0_2/HVUMTI2S/_desktop_preview_1655159666002.png",
Widget: "stackedLineChart",
},
{
Title: "Area Line Chart",
Content: "This is a stacked area line chart",
Image: "https://i.stack.imgur.com/vTgJy.gif",
Widget: "areaLineChart",
},
{
Title: "Temperature Gauge",
Content: "This is an analogue temperature gauge",
Image: "https://storage.googleapis.com/support-forums-api/attachment/thread-7015968-5764838897040940014.png",
Widget: "tempGauge",
},
{
Title: "Bar and Line Chart",
Content: "This is a dynamic data bar and line chart",
Image: "https://i.stack.imgur.com/tYgjo.png",
Widget: "dynamicDataChart",
},
{
Title: "Horizontal Bar Chart",
Content: "This is a horizontal bar chart",
Image: "https://datavizproject.com/wp-content/uploads/types/Bar-Chart-Horizontal.png",
Widget: "horizontalBarChart",
},
}

return items
}
80 changes: 0 additions & 80 deletions ui/jsonObject.go

This file was deleted.

21 changes: 18 additions & 3 deletions ui/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ import (
)

const (
templateDir = "ui/web/templates"
templatesDir = "ui/web/templates"
chartTemplatesDir = "ui/web/templates/charts"
enabled = "enabled"
statePending = "pending"
statusAll = "all"
Expand Down Expand Up @@ -125,11 +126,22 @@ var (
"invitations",

"dashboard",
}

// Modals
chartTemplates = []string{
"linechartmodal",
"gaugemodal",
"barchartmodal",
"piechartmodal",
"donutmodal",
"speedgaugemodal",
"tempgaugemodal",
"stackedlinechartmodal",
"arealinechartmodal",
"horizontalbarchartmodal",
"dynamicdatachartmodal",
}

ErrToken = errors.New("failed to create token")
ErrTokenRefresh = errors.New("failed to refresh token")
ErrFailedCreate = errors.New("failed to create entity")
Expand Down Expand Up @@ -2443,7 +2455,10 @@ func parseTemplates(mfsdk sdk.SDK, templates []string) (tpl *template.Template,

var tmplFiles []string
for _, value := range templates {
tmplFiles = append(tmplFiles, templateDir+"/"+value+".html")
tmplFiles = append(tmplFiles, templatesDir+"/"+value+".html")
}
for _, value := range chartTemplates {
tmplFiles = append(tmplFiles, chartTemplatesDir+"/"+value+".html")
}
tpl, err = tpl.ParseFiles(tmplFiles...)
if err != nil {
Expand Down
14 changes: 13 additions & 1 deletion ui/web/static/js/dashboards.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ function initGrid() {

function saveLayout() {
const itemData = grid.getItems().map((item) => ({
innerHTML: item.getElement().innerHTML,
innerHTML: item._element.innerHTML,
widgetID: item._element.children[1].children[0].id,
widgetScript: item._element.children[2].innerHTML,
}));

const gridState = {
Expand Down Expand Up @@ -63,6 +65,11 @@ function loadLayout(savedLayout) {
const newItem = document.createElement("div");
newItem.className = "item";
newItem.innerHTML = itemData.innerHTML.trim();
var scriptTag = document.createElement("script");
scriptTag.type = "text/javascript";
scriptTag.defer = true;
scriptTag.innerHTML = itemData.widgetScript;
newItem.appendChild(scriptTag);
const item = grid.add(newItem);
});

Expand Down Expand Up @@ -92,6 +99,11 @@ function editGrid(grid) {
const newItem = document.createElement("div");
newItem.className = "item";
newItem.innerHTML = itemData.innerHTML.trim();
var scriptTag = document.createElement("script");
scriptTag.type = "text/javascript";
scriptTag.defer = true;
scriptTag.innerHTML = itemData.widgetScript;
newItem.appendChild(scriptTag);
const item = grid.add(newItem);
});
grid.layout(gridState.layout);
Expand Down
Loading