bug fixes in UI and history

hiveot · Jul 9, 2024 · c75b29e · c75b29e
1 parent ae70fdf
commit c75b29e
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/bindings/hiveoview/src/views/history/historyPage.gohtml b/bindings/hiveoview/src/views/history/historyPage.gohtml
@@ -9,9 +9,10 @@
 	<div
 					hx-trigger="intersect once"
 					hx-swap="outerHTML"
-					hx-get="">reloading page fragment...</div>
-{{else}}
+					hx-get="">reloading page fragment...
+	</div>
 
+{{else}}
 
 <main class="container-fluid">
 
@@ -23,8 +24,10 @@
         {{else}}
 					hx-get="/history/{{.ThingID}}/{{.Key}}?time={{.Timestamp}}"
         {{end}}
+				hx-target="#historyPage"
+				hx-swap="innerHTML"
 				class="h-panel container-fluid"
->
+	>
 	<ul class="h-grid-table history-header" style="grid-column-gap: 10px;  align-items: baseline">
 		<label for="histDeviceName">History of:</label>
 		<input id="histDeviceName" readonly

diff --git a/bindings/hiveoview/src/views/history/historyTable.gohtml b/bindings/hiveoview/src/views/history/historyTable.gohtml
@@ -13,7 +13,7 @@
 			{{range .Values}}
 					<li>
 						<div>{{.GetUpdated "WT"}}</div>
-						<div>{{.DataAsText}} {{$.Aff.Data.Unit}}</div>
+						<div>{{.DataAsText}} {{$.Aff.Data.UnitSymbol}}</div>
 					</li>
 			{{end}}
 	</ul>

diff --git a/bindings/owserver/service/PublishNodeTDs.go b/bindings/owserver/service/PublishNodeTDs.go
@@ -44,7 +44,11 @@ func CreateTDFromNode(node *eds.OneWireNode) (tdoc *thing.TD) {
 			prop := tdoc.AddProperty(attrID, propType, title, dataType)
 			unit := attrInfo.Unit
 			if attr.Unit != "" {
-				unit, _ = UnitNameVocab[attr.Unit]
+				unitID, found := UnitNameVocab[attr.Unit]
+				if found {
+					unitInfo := vocab.UnitClassesMap[unitID]
+					unit = unitInfo.Symbol
+				}
 			}
 			prop.Unit = unit
 			// non-sensors are attributes. Writable attributes are configuration.

diff --git a/lib/buckets/CursorCache.go b/lib/buckets/CursorCache.go
@@ -145,11 +145,13 @@ func (cc *CursorCache) GetCursorsByOwner(ownerID string) []*CursorInfo {
 
 // Release releases the cursor and removes the cursor from the tracker
 // If a bucket was included it will be closed as well.
-func (cc *CursorCache) Release(cursorKey string, clientID string) error {
+func (cc *CursorCache) Release(clientID string, cursorKey string) error {
+	slog.Info("Release", "cursorKey", cursorKey)
 	cc.mux.Lock()
 	defer cc.mux.Unlock()
 	ci, found := cc.cursorsByKey[cursorKey]
 	if !found {
+		slog.Error("Release. Cursor not found", "clientID", clientID, "cursorKey", cursorKey)
 		return nil
 	}
 	if ci.OwnerID != clientID {

diff --git a/services/history/service/ReadHistory.go b/services/history/service/ReadHistory.go
@@ -27,7 +27,7 @@ func (svc *ReadHistory) GetCursor(
 		return nil, fmt.Errorf("missing thingID")
 	}
 	thingAddr := args.ThingID
-	slog.Debug("GetCursor for bucket: ", "addr", thingAddr)
+	slog.Info("GetCursor for bucket: ", "addr", thingAddr)
 	bucket := svc.bucketStore.GetBucket(thingAddr)
 	cursor, err := bucket.Cursor()
 	//