Skip to content

Commit 28b9c33

Browse files
cstnscstns
authored
Merge pull request #6850 from FlowFuse/6527-fix-fe-build-errors
[6527] Fix FrontEnd build warnings
2 parents b0b5cdb + a869510 commit 28b9c33

9 files changed

Lines changed: 367 additions & 341 deletions

File tree

‎frontend/src/pages/admin/Overview.vue‎

Lines changed: 43 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -42,58 +42,62 @@
4242
<div>
4343
<FormHeading>License</FormHeading>
4444
<table class="w-full">
45-
<tr>
46-
<td class="w-40">Type</td>
47-
<td>
48-
<span v-if="!license">FlowFuse Community Edition</span>
49-
<span v-else-if="!license.dev">FlowFuse Enterprise Edition</span>
50-
<span v-else class="font-bold">FlowFuse Development Only</span>
51-
</td>
52-
</tr>
53-
<template v-if="license">
54-
<tr><td class="w-40 font-medium">Organisation</td><td>{{ license.organisation }}</td></tr>
55-
<tr><td class="w-40 font-medium">Tier</td><td>{{ license.tier }}</td></tr>
56-
<tr><td>{{ expired ? 'Expired' : 'Expires' }}</td><td>{{ license.expires }}<br><span class="text-xs">{{ license.expiresAt }}</span></td></tr>
57-
</template>
58-
<tr>
59-
<td class="w-40">Users</td>
60-
<td>{{ stats.userCount }} / {{ stats.maxUsers }}</td>
61-
</tr>
62-
<tr>
63-
<td class="w-40">Teams</td>
64-
<td>{{ stats.teamCount }} / {{ stats.maxTeams }}</td>
65-
</tr>
66-
<template v-if="stats.maxDevices">
45+
<tbody>
6746
<tr>
68-
<td class="w-40">Instances</td>
69-
<td>{{ stats.instanceCount }} / {{ stats.maxInstances }}</td>
70-
</tr>
71-
<tr>
72-
<td class="w-40">Devices</td>
47+
<td class="w-40">Type</td>
7348
<td>
74-
<div>{{ stats.deviceCount }} / {{ stats.maxDevices }}</div>
49+
<span v-if="!license">FlowFuse Community Edition</span>
50+
<span v-else-if="!license.dev">FlowFuse Enterprise Edition</span>
51+
<span v-else class="font-bold">FlowFuse Development Only</span>
7552
</td>
7653
</tr>
77-
</template>
78-
<template v-else>
54+
<template v-if="license">
55+
<tr><td class="w-40 font-medium">Organisation</td><td>{{ license.organisation }}</td></tr>
56+
<tr><td class="w-40 font-medium">Tier</td><td>{{ license.tier }}</td></tr>
57+
<tr><td>{{ expired ? 'Expired' : 'Expires' }}</td><td>{{ license.expires }}<br><span class="text-xs">{{ license.expiresAt }}</span></td></tr>
58+
</template>
7959
<tr>
80-
<td class="w-40">Instances + Devices</td>
81-
<td>{{ stats.instanceCount + stats.deviceCount }} / {{ stats.maxInstances }}</td>
60+
<td class="w-40">Users</td>
61+
<td>{{ stats.userCount }} / {{ stats.maxUsers }}</td>
8262
</tr>
83-
</template>
84-
<template v-if="stats.maxMqttClients">
8563
<tr>
86-
<td class="w-40">Team MQTT Clients</td>
87-
<td>{{ stats.mqttClientCount }} / {{ stats.maxMqttClients }}</td>
64+
<td class="w-40">Teams</td>
65+
<td>{{ stats.teamCount }} / {{ stats.maxTeams }}</td>
8866
</tr>
89-
</template>
67+
<template v-if="stats.maxDevices">
68+
<tr>
69+
<td class="w-40">Instances</td>
70+
<td>{{ stats.instanceCount }} / {{ stats.maxInstances }}</td>
71+
</tr>
72+
<tr>
73+
<td class="w-40">Devices</td>
74+
<td>
75+
<div>{{ stats.deviceCount }} / {{ stats.maxDevices }}</div>
76+
</td>
77+
</tr>
78+
</template>
79+
<template v-else>
80+
<tr>
81+
<td class="w-40">Instances + Devices</td>
82+
<td>{{ stats.instanceCount + stats.deviceCount }} / {{ stats.maxInstances }}</td>
83+
</tr>
84+
</template>
85+
<template v-if="stats.maxMqttClients">
86+
<tr>
87+
<td class="w-40">Team MQTT Clients</td>
88+
<td>{{ stats.mqttClientCount }} / {{ stats.maxMqttClients }}</td>
89+
</tr>
90+
</template>
91+
</tbody>
9092
</table>
9193
</div>
9294
<div>
9395
<FormHeading>Version</FormHeading>
9496
<table class="w-full">
95-
<tr><td class="w-40">Forge Application</td><td>{{ settings['version:forge'] }}</td></tr>
96-
<tr><td>NodeJS</td><td>{{ settings['version:node'] }}</td></tr>
97+
<tbody>
98+
<tr><td class="w-40">Forge Application</td><td>{{ settings['version:forge'] }}</td></tr>
99+
<tr><td>NodeJS</td><td>{{ settings['version:node'] }}</td></tr>
100+
</tbody>
97101
</table>
98102
</div>
99103
</div>

‎frontend/src/pages/admin/Settings/License.vue‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,22 @@
66
<FormHeading>License</FormHeading>
77
<template v-if="license">
88
<table data-el="license-details">
9-
<tr v-if="license.dev"><td class="font-medium p-2 pr-4 align-top" colspan="2" /></tr>
10-
<tr><td class="font-medium p-2 pr-4 align-top">Type</td><td class="p-2"><span v-if="!license.dev">FlowFuse Enterprise Edition</span><span v-else class="font-bold">FlowFuse Development Only</span></td></tr>
11-
<tr><td class="font-medium p-2 pr-4 align-top">License ID</td><td class="p-2">{{ license.id }}</td></tr>
12-
<tr><td class="font-medium p-2 pr-4 align-top">Organisation</td><td class="p-2">{{ license.organisation }}</td></tr>
13-
<tr><td class="font-medium p-2 pr-4 align-top">Tier</td><td class="p-2">{{ license.tier }}</td></tr>
14-
<tr><td class="font-medium p-2 pr-4 align-top">Expires</td><td class="p-2">{{ license.expires }}<br><span class="text-xs">{{ license.expiresAt }}</span></td></tr>
9+
<tbody>
10+
<tr v-if="license.dev"><td class="font-medium p-2 pr-4 align-top" colspan="2" /></tr>
11+
<tr><td class="font-medium p-2 pr-4 align-top">Type</td><td class="p-2"><span v-if="!license.dev">FlowFuse Enterprise Edition</span><span v-else class="font-bold">FlowFuse Development Only</span></td></tr>
12+
<tr><td class="font-medium p-2 pr-4 align-top">License ID</td><td class="p-2">{{ license.id }}</td></tr>
13+
<tr><td class="font-medium p-2 pr-4 align-top">Organisation</td><td class="p-2">{{ license.organisation }}</td></tr>
14+
<tr><td class="font-medium p-2 pr-4 align-top">Tier</td><td class="p-2">{{ license.tier }}</td></tr>
15+
<tr><td class="font-medium p-2 pr-4 align-top">Expires</td><td class="p-2">{{ license.expires }}<br><span class="text-xs">{{ license.expiresAt }}</span></td></tr>
16+
</tbody>
1517
</table>
1618
<details><pre class="break-words">{{ license }}</pre></details>
1719
</template>
1820
<template v-else>
1921
<table>
20-
<tr><td class="font-medium p-2 pr-4 align-top">Type</td><td class="p-2">FlowFuse Community Edition</td></tr>
22+
<tbody>
23+
<tr><td class="font-medium p-2 pr-4 align-top">Type</td><td class="p-2">FlowFuse Community Edition</td></tr>
24+
</tbody>
2125
</table>
2226
</template>
2327
<div class="space-x-4 whitespace-nowrap">
@@ -36,11 +40,13 @@
3640
<template v-if="inspectedLicense">
3741
<FormHeading>2. Check license details</FormHeading>
3842
<table>
39-
<tr v-if="inspectedLicense.dev"><td class="font-medium p-2 pr-4 align-top" colspan="2">Development-mode Only</td></tr>
40-
<tr><td class="font-medium p-2 pr-4 align-top">License ID</td><td class="p-2">{{ inspectedLicense.id }}</td></tr>
41-
<tr><td class="font-medium p-2 pr-4 align-top">Organisation</td><td class="p-2">{{ inspectedLicense.organisation }}</td></tr>
42-
<tr><td class="font-medium p-2 pr-4 align-top">Tier</td><td class="p-2">{{ inspectedLicense.tier }}</td></tr>
43-
<tr><td class="font-medium p-2 pr-4 align-top">Expires</td><td class="p-2">{{ inspectedLicense.expires }}<br><span class="text-xs">{{ inspectedLicense.expiresAt }}</span></td></tr>
43+
<tbody>
44+
<tr v-if="inspectedLicense.dev"><td class="font-medium p-2 pr-4 align-top" colspan="2">Development-mode Only</td></tr>
45+
<tr><td class="font-medium p-2 pr-4 align-top">License ID</td><td class="p-2">{{ inspectedLicense.id }}</td></tr>
46+
<tr><td class="font-medium p-2 pr-4 align-top">Organisation</td><td class="p-2">{{ inspectedLicense.organisation }}</td></tr>
47+
<tr><td class="font-medium p-2 pr-4 align-top">Tier</td><td class="p-2">{{ inspectedLicense.tier }}</td></tr>
48+
<tr><td class="font-medium p-2 pr-4 align-top">Expires</td><td class="p-2">{{ inspectedLicense.expires }}<br><span class="text-xs">{{ inspectedLicense.expiresAt }}</span></td></tr>
49+
</tbody>
4450
</table>
4551
<details><pre class="break-words">{{ inspectedLicense }}</pre></details>
4652
<div class="space-x-4 whitespace-nowrap flex">

‎frontend/src/pages/admin/Users/UserDetails.vue‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,23 @@
3131
</div>
3232
<div class="mb-4">
3333
<table class="table-fixed w-full mb-2">
34-
<tr class="border-b">
35-
<td class="w-1/4 font-medium py-2">Email</td>
36-
<td class="flex">
37-
{{ user.email }}
38-
<div class="ml-3 space-x-1">
39-
<span v-if="user.sso_enabled" class="forge-badge forge-status-safe">sso-enabled</span>
40-
<span v-else-if="user.email_verified" class="forge-badge forge-status-running">verified</span>
41-
<span v-else class="forge-badge forge-status-error">unverified</span>
42-
</div>
43-
</td>
44-
</tr>
45-
<tr class="border-b">
46-
<td class="w-1/4 font-medium py-2">Registered At</td>
47-
<td class="py-1">{{ user.createdAt }}</td>
48-
</tr>
34+
<tbody>
35+
<tr class="border-b">
36+
<td class="w-1/4 font-medium py-2">Email</td>
37+
<td class="flex">
38+
{{ user.email }}
39+
<div class="ml-3 space-x-1">
40+
<span v-if="user.sso_enabled" class="forge-badge forge-status-safe">sso-enabled</span>
41+
<span v-else-if="user.email_verified" class="forge-badge forge-status-running">verified</span>
42+
<span v-else class="forge-badge forge-status-error">unverified</span>
43+
</div>
44+
</td>
45+
</tr>
46+
<tr class="border-b">
47+
<td class="w-1/4 font-medium py-2">Registered At</td>
48+
<td class="py-1">{{ user.createdAt }}</td>
49+
</tr>
50+
</tbody>
4951
</table>
5052
</div>
5153
<FormHeading>Teams</FormHeading>

‎frontend/src/pages/application/DeviceGroup/Settings/Environment.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
>
1010
<template #helptext>
1111
<p>Environment variables entered here will be merged with the environment variables defined in the member devices.</p>
12-
<p>
12+
<div>
1313
The following rules apply:
1414
<ul class="list-disc pl-5">
1515
<li>Values set in the Device take precedence over values set in the Device Group.</li>
1616
<li>Removing a device from the group will remove these variables from the device.</li>
1717
<li>The devices environment variables are never modified, they are only merged at runtime.</li>
1818
</ul>
19-
</p>
19+
</div>
2020
<p>Updating these environment variables will cause devices in the group to be restarted when a change is detected.</p>
2121
</template>
2222
</TemplateSettingsEnvironment>

0 commit comments

Comments
 (0)