Skip to content
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
2 changes: 2 additions & 0 deletions front/css/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -2675,6 +2675,8 @@ table.dataTable tbody > tr.selected
background: var(--skel-section);
}

#pluginsPage .skel-table-box, .plugin-content .skel-table-box { background: var(--skel-bg); }

/* Panel-toned backgrounds */
.skel-overview-body, .skel-overview-header, .skel-plugin-body,
.skel-detail-info-panel, .skel-detail-form {
Expand Down
21 changes: 11 additions & 10 deletions front/plugins/_publisher_mqtt/mqtt.py
Original file line number Diff line number Diff line change
Expand Up @@ -150,19 +150,20 @@ def initialize_message(self):
"device_class": "timestamp"
})

# prepare mac for "connections"
if self.mac != "":
connections_snippet = [
["mac", self.mac]
]
else:
connections_snippet = []

# Handle 'binary_sensor' or 'sensor' types
if self.sensorType in ['binary_sensor', 'sensor']:
self.topic = f'homeassistant/{self.sensorType}/{self.deviceId}/{self.sensorName}/config'
self.state_topic = f'{topic_root}/{self.sensorType}/{self.deviceId}/state'
self.unique_id = f'{self.deviceId}_sensor_{self.sensorName}'

if self.mac != "":
connections_snippet = [
["mac", self.mac]
]
else:
connections_snippet = []

# Update the message dictionary, expanding it without overwriting
self.message.update({
"name": self.sensorName,
Expand All @@ -172,8 +173,7 @@ def initialize_message(self):
"device": {
"identifiers": [f"{self.deviceId}_sensor"],
"manufacturer": "NetAlertX",
"name": self.deviceName,
"connections": connections_snippet
"name": self.deviceName
},
"icon": f'mdi:{self.icon}'
})
Expand All @@ -198,7 +198,8 @@ def initialize_message(self):
"identifiers": [f"{self.deviceId}_sensor", self.unique_id],
"manufacturer": "NetAlertX",
"model": self.model or "Unknown", # Use model if available, else set to 'Unknown'
"name": self.deviceName
"name": self.deviceName,
"connections": connections_snippet
}
}

Expand Down
4 changes: 2 additions & 2 deletions front/pluginsCore.php
Original file line number Diff line number Diff line change
Expand Up @@ -630,7 +630,7 @@ function generateDataTable(prefix, tableType, colDefinitions) {

return `
<div id="${tableType.toLowerCase()}Target_${prefix}" class="tab-pane ${tableType == "Objects" ? "active":""}" style="position:relative;">
<div id="skel-${tableType.toLowerCase()}Target_${prefix}" class="skel-plugins-tab-pane" style="position:absolute;top:0;left:0;right:0;z-index:1;background:inherit;">${skelHtml}</div>
<div id="skel-${tableType.toLowerCase()}Target_${prefix}" class="skel-plugins-tab-pane" style="position:absolute;top:0;left:0;right:0;z-index:1">${skelHtml}</div>
<table id="${tableType.toLowerCase()}Table_${prefix}" class="display table table-striped table-stretched" data-my-dbtable="Plugins_${tableType}">
<thead><tr>${headersHtml}</tr></thead>
</table>
Expand Down Expand Up @@ -668,7 +668,7 @@ function buildDT(tableId, gqlField, countId, badgeId) {
// Fade out the skeleton only after the first draw so there is no gap
// between the skeleton disappearing and the table rows appearing.
initComplete: function() {
$(skelId).fadeOut(250, function() { $(this).remove(); });
$(skelId).fadeOut(50, function() { $(this).remove(); });
},
createdRow: function(row, data) {
$(row).attr('data-my-index', data.index);
Expand Down
Loading