Skip to content

Commit 60eda73

Browse files
Steve-MclSteve-Mcl
committed
Merge branch 'main' into ui-notifiacation-improvements
2 parents 05cf599 + 3f83d45 commit 60eda73

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+2837
-240
lines changed

‎.github/workflows/build-and-test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
pull_request:
44
jobs:
55
build:
6-
uses: 'flowfuse/github-actions-workflows/.github/workflows/build_node_package.yml@v0.29.0'
6+
uses: 'flowfuse/github-actions-workflows/.github/workflows/build_node_package.yml@v0.31.0'
77
with:
88
node: '[
99
{"version": "18", "tests": true, "lint": true},

‎.github/workflows/publish-private.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66

77
jobs:
88
build:
9-
uses: 'flowfuse/github-actions-workflows/.github/workflows/build_node_package.yml@v0.29.0'
9+
uses: 'flowfuse/github-actions-workflows/.github/workflows/build_node_package.yml@v0.31.0'
1010
with:
1111
node: '[
1212
{"version": "18", "tests": true, "lint": true},
@@ -16,7 +16,7 @@ jobs:
1616
needs: build
1717
if: |
1818
github.ref == 'refs/heads/main'
19-
uses: 'flowfuse/github-actions-workflows/.github/workflows/publish_node_package.yml@v0.29.0'
19+
uses: 'flowfuse/github-actions-workflows/.github/workflows/publish_node_package.yml@v0.31.0'
2020
with:
2121
package_name: node-red-dashboard
2222
publish_package: true

‎cypress/fixtures/flows/dashboard-chart-bar-stacked.json‎

Lines changed: 214 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,214 @@
1+
[
2+
{
3+
"id": "stacked-bar-chart",
4+
"type": "ui-chart",
5+
"z": "9524c548fb0b956c",
6+
"group": "dashboard-ui-group",
7+
"name": "sales stacked",
8+
"label": "sales stacked",
9+
"order": 3,
10+
"chartType": "bar",
11+
"category": "location",
12+
"categoryType": "property",
13+
"xAxisLabel": "",
14+
"xAxisProperty": "year",
15+
"xAxisPropertyType": "property",
16+
"xAxisType": "category",
17+
"xAxisFormat": "",
18+
"xAxisFormatType": "auto",
19+
"yAxisLabel": "",
20+
"yAxisProperty": "sales_millions",
21+
"ymin": "",
22+
"ymax": "",
23+
"action": "append",
24+
"stackSeries": true,
25+
"pointShape": "circle",
26+
"pointRadius": 4,
27+
"showLegend": false,
28+
"removeOlder": 1,
29+
"removeOlderUnit": "3600",
30+
"removeOlderPoints": "",
31+
"colors": [
32+
"#1f77b4",
33+
"#aec7e8",
34+
"#ff7f0e",
35+
"#2ca02c",
36+
"#98df8a",
37+
"#d62728",
38+
"#ff9896",
39+
"#9467bd",
40+
"#c5b0d5"
41+
],
42+
"textColor": [
43+
"#666666"
44+
],
45+
"textColorDefault": true,
46+
"gridColor": [
47+
"#e5e5e5"
48+
],
49+
"gridColorDefault": true,
50+
"width": 6,
51+
"height": "4",
52+
"className": "",
53+
"x": 1660,
54+
"y": 740,
55+
"wires": [
56+
[]
57+
]
58+
},
59+
60+
{
61+
"id": "e7490f641158dc11",
62+
"type": "inject",
63+
"z": "9524c548fb0b956c",
64+
"name": "",
65+
"props": [
66+
{
67+
"p": "payload"
68+
},
69+
{
70+
"p": "topic",
71+
"vt": "str"
72+
}
73+
],
74+
"repeat": "",
75+
"crontab": "",
76+
"once": true,
77+
"onceDelay": 0.1,
78+
"topic": "",
79+
"payload": "[]",
80+
"payloadType": "json",
81+
"x": 1450,
82+
"y": 820,
83+
"wires": [
84+
[
85+
"stacked-bar-chart"
86+
]
87+
]
88+
},
89+
{
90+
"id": "5247f541ca20264a",
91+
"type": "ui-button",
92+
"z": "9524c548fb0b956c",
93+
"group": "dashboard-ui-group",
94+
"name": "stack 2023",
95+
"label": "stack 2023",
96+
"order": 0,
97+
"width": 0,
98+
"height": 0,
99+
"emulateClick": true,
100+
"tooltip": "",
101+
"color": "",
102+
"bgcolor": "",
103+
"className": "",
104+
"icon": "",
105+
"iconPosition": "left",
106+
"payload": "[{\"location\":\"New York\",\"sales_millions\":2.31,\"year\":2023},{\"location\":\"Los Angeles\",\"sales_millions\":2.32,\"year\":2023}]",
107+
"payloadType": "json",
108+
"topic": "topic",
109+
"topicType": "msg",
110+
"buttonColor": "",
111+
"textColor": "",
112+
"iconColor": "",
113+
"x": 1430,
114+
"y": 740,
115+
"wires": [
116+
[
117+
"stacked-bar-chart"
118+
]
119+
]
120+
},
121+
{
122+
"id": "7e6189da9f4da319",
123+
"type": "ui-button",
124+
"z": "9524c548fb0b956c",
125+
"group": "dashboard-ui-group",
126+
"name": "stack 2024",
127+
"label": "stack 2024",
128+
"order": 0,
129+
"width": 0,
130+
"height": 0,
131+
"emulateClick": true,
132+
"tooltip": "",
133+
"color": "",
134+
"bgcolor": "",
135+
"className": "",
136+
"icon": "",
137+
"iconPosition": "left",
138+
"payload": "[{\"location\":\"New York\",\"sales_millions\":2.41,\"year\":2024},{\"location\":\"Los Angeles\",\"sales_millions\":2.42,\"year\":2024}]",
139+
"payloadType": "json",
140+
"topic": "topic",
141+
"topicType": "msg",
142+
"buttonColor": "",
143+
"textColor": "",
144+
"iconColor": "",
145+
"x": 1430,
146+
"y": 780,
147+
"wires": [
148+
[
149+
"stacked-bar-chart"
150+
]
151+
]
152+
},
153+
154+
155+
156+
157+
{
158+
"id": "dashboard-ui-group",
159+
"type": "ui-group",
160+
"name": "Group 1",
161+
"page": "dashboard-ui-page-1",
162+
"width": "12",
163+
"height": "1",
164+
"order": -1,
165+
"showTitle": true,
166+
"className": "",
167+
"visible": "true",
168+
"disabled": "false"
169+
},
170+
{
171+
"id": "dashboard-ui-page-1",
172+
"type": "ui-page",
173+
"name": "Page 1",
174+
"ui": "dashboard-ui-base",
175+
"path": "/page1",
176+
"icon": "",
177+
"layout": "grid",
178+
"theme": "dashboard-ui-theme",
179+
"order": -1,
180+
"className": "",
181+
"visible": "true",
182+
"disabled": false
183+
},
184+
{
185+
"id": "dashboard-ui-base",
186+
"type": "ui-base",
187+
"name": "UI Name",
188+
"path": "/dashboard",
189+
"includeClientData": true,
190+
"acceptsClientConfig": [
191+
"ui-notification",
192+
"ui-control"
193+
]
194+
},
195+
{
196+
"id": "dashboard-ui-theme",
197+
"type": "ui-theme",
198+
"name": "Default",
199+
"colors": {
200+
"surface": "#ffffff",
201+
"primary": "#6771f4",
202+
"bgPage": "#e5dcdc",
203+
"groupBg": "#ffffff",
204+
"groupOutline": "#d39292"
205+
},
206+
"sizes": {
207+
"pagePadding": "6px",
208+
"groupGap": "12px",
209+
"groupBorderRadius": "4px",
210+
"widgetGap": "6px",
211+
"density": "default"
212+
}
213+
}
214+
]

0 commit comments

Comments
 (0)