Skip to content

Commit 4a587ca

Browse files
authored
Merge pull request #1891 from thfries/ui_small_fixes_and_improvements
UI small fixes and improvements
2 parents ae8dc01 + 91fe377 commit 4a587ca

File tree

5 files changed

+6
-5
lines changed

5 files changed

+6
-5
lines changed

ui/modules/api.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ export async function callDittoREST(method,
370370
throw new Error('An error occurred: ' + response.status);
371371
}
372372
}
373-
if (response.status !== 204) {
373+
if (response.status !== 204 && response.status !== 202) {
374374
if (returnHeaders) {
375375
return response;
376376
} else {

ui/modules/connections/connections.html

+2-1
Original file line numberDiff line numberDiff line change
@@ -168,10 +168,11 @@ <h6>Connection Logs <span class="badge rounded-pill bg-info" id="badgeConnection
168168
</div>
169169
<table-filter id="tableFilterConnectionLogs"></table-filter>
170170
<div class="table-wrap">
171-
<table class="table table-striped table-hover table-sm">
171+
<table class="table table-striped table-hover table-sm" style="table-layout: fixed;">
172172
<thead>
173173
<tr>
174174
<th>Timestamp</th>
175+
<th>Category</th>
175176
<th>Type</th>
176177
<th>Level</th>
177178
</tr>

ui/modules/connections/connectionsCRUD.ts

-2
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,6 @@ function onConnectionEditorInput() {
9696

9797
function onConnectionEditorChangeAnnotation() {
9898
hasErrors = connectionEditor.getSession().getAnnotations().filter((a) => a.type === 'error').length > 0;
99-
incomingEditor.setReadOnly(hasErrors);
100-
outgoingEditor.setReadOnly(hasErrors);
10199
}
102100

103101
function onUpdateConnectionClick() {

ui/modules/connections/connectionsMonitor.ts

+2
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ export async function ready() {
6565
Utils.getAllElementsById(dom);
6666

6767
connectionLogDetail = Utils.createAceEditor('connectionLogDetail', 'ace/mode/json', true);
68+
connectionLogDetail.session.setUseWrapMode(true);
6869
connectionStatusDetail = Utils.createAceEditor('connectionStatusDetail', 'ace/mode/json', true);
6970

7071
// Status --------------
@@ -162,6 +163,7 @@ function fillConnectionLogsTable() {
162163
Utils.addTableRow(
163164
dom.tbodyConnectionLogs,
164165
Utils.formatDate(entry.timestamp, true), false, null,
166+
entry.category,
165167
entry.type,
166168
entry.level
167169
);

ui/modules/things/messagesIncoming.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ function onSelectThingUpdateMessageContentSelect() {
125125
function onMessage(messageData) {
126126
messages.push(messageData);
127127

128-
const filteredMessage = dom.tableFilterMessagesIncoming.filterItems([messageData]);
128+
const filteredMessage = dom.tableFilterMessagesIncoming.filterItems(messages);
129129

130130
if (filteredMessage.length > 0) {
131131
filteredMessages.push(filteredMessage[0]);

0 commit comments

Comments
 (0)