osism 0.20250824.0__tar.gz → 0.20250824.1__tar.gz

osism-0.20250824.1/AUTHORS

@@ -0,0 +1 @@
+Christian Berendt <berendt@osism.tech>

osism-0.20250824.1/ChangeLog

@@ -0,0 +1,7 @@
+CHANGES
+=======
+
+v0.20250824.1
+-------------
+
+* frontend: improve baremetal nodes layout (#1672)

{osism-0.20250824.0/osism.egg-info → osism-0.20250824.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: osism
-Version: 0.20250824.0
+Version: 0.20250824.1
 Summary: OSISM manager interface
 Home-page: https://github.com/osism/python-osism
 Author: OSISM GmbH

{osism-0.20250824.0 → osism-0.20250824.1}/frontend/app/nodes/page.tsx

@@ -2,7 +2,7 @@
 
 import { useState } from "react";
 import { useQuery } from "@tanstack/react-query";
-import { RefreshCw, Search, AlertCircle } from "lucide-react";
+import { RefreshCw, Search, AlertCircle, ArrowUpDown } from "lucide-react";
 import api from "@/lib/api";
 import { BaremetalNode } from "@/lib/types";
 
@@ -11,6 +11,7 @@ export default function NodesPage() {
   const [filterProvisionState, setFilterProvisionState] = useState("all");
   const [filterPowerState, setFilterPowerState] = useState("all");
   const [filterMaintenance, setFilterMaintenance] = useState("all");
+  const [sortDirection, setSortDirection] = useState<"asc" | "desc">("asc");
 
   const { data, isLoading, error, refetch, isRefetching } = useQuery({
     queryKey: ["baremetal-nodes"],
@@ -18,23 +19,38 @@ export default function NodesPage() {
     refetchInterval: 60000,
   });
 
-  const filteredNodes = data?.nodes.filter((node: BaremetalNode) => {
-    const matchesSearch = searchTerm === "" || 
-      (node.name && node.name.toLowerCase().includes(searchTerm.toLowerCase())) ||
-      (node.uuid && node.uuid.toLowerCase().includes(searchTerm.toLowerCase()));
-    
-    const matchesProvisionState = filterProvisionState === "all" || 
-      node.provision_state === filterProvisionState;
-    
-    const matchesPowerState = filterPowerState === "all" || 
-      node.power_state === filterPowerState;
+  const filteredAndSortedNodes = data?.nodes
+    .filter((node: BaremetalNode) => {
+      const matchesSearch = searchTerm === "" || 
+        (node.name && node.name.toLowerCase().includes(searchTerm.toLowerCase())) ||
+        (node.uuid && node.uuid.toLowerCase().includes(searchTerm.toLowerCase()));
+      
+      const matchesProvisionState = filterProvisionState === "all" || 
+        node.provision_state === filterProvisionState;
+      
+      const matchesPowerState = filterPowerState === "all" || 
+        node.power_state === filterPowerState;
 
-    const matchesMaintenance = filterMaintenance === "all" ||
-      (filterMaintenance === "maintenance" && node.maintenance === true) ||
-      (filterMaintenance === "active" && node.maintenance === false);
+      const matchesMaintenance = filterMaintenance === "all" ||
+        (filterMaintenance === "maintenance" && node.maintenance === true) ||
+        (filterMaintenance === "active" && node.maintenance === false);
 
-    return matchesSearch && matchesProvisionState && matchesPowerState && matchesMaintenance;
-  });
+      return matchesSearch && matchesProvisionState && matchesPowerState && matchesMaintenance;
+    })
+    .sort((a: BaremetalNode, b: BaremetalNode) => {
+      const nameA = a.name || a.uuid || '';
+      const nameB = b.name || b.uuid || '';
+      
+      if (sortDirection === "asc") {
+        return nameA.localeCompare(nameB);
+      } else {
+        return nameB.localeCompare(nameA);
+      }
+    });
+
+  const toggleSortDirection = () => {
+    setSortDirection(prev => prev === "asc" ? "desc" : "asc");
+  };
 
   const uniqueProvisionStates = data ? 
     [...new Set(data.nodes.map(n => n.provision_state).filter((state): state is string => Boolean(state)))] : [];
@@ -169,41 +185,40 @@ export default function NodesPage() {
             </div>
           </div>
         </div>
-      ) : filteredNodes && filteredNodes.length > 0 ? (
+      ) : filteredAndSortedNodes && filteredAndSortedNodes.length > 0 ? (
         <div className="bg-white shadow overflow-hidden sm:rounded-md">
+          <div className="px-4 py-3 bg-gray-50 border-b border-gray-200">
+            <div className="flex items-center">
+              <button
+                onClick={toggleSortDirection}
+                className="flex items-center text-sm font-medium text-gray-700 hover:text-gray-900"
+              >
+                Name
+                <ArrowUpDown className="ml-1 h-4 w-4" />
+                <span className="ml-1 text-xs text-gray-500">
+                  ({sortDirection === "asc" ? "A-Z" : "Z-A"})
+                </span>
+              </button>
+            </div>
+          </div>
           <ul className="divide-y divide-gray-200">
-            {filteredNodes.map((node: BaremetalNode, index) => (
+            {filteredAndSortedNodes.map((node: BaremetalNode, index) => (
               <li key={node.uuid || `node-${index}`}>
                 <div className="px-4 py-4 sm:px-6">
                   <div className="flex items-center justify-between">
                     <div className="flex-1">
-                      <div className="flex items-center">
-                        <p className="text-sm font-medium text-gray-900">
-                          {node.name || node.uuid}
-                        </p>
-                        {node.maintenance && (
-                          <span className="ml-2 px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-yellow-100 text-yellow-800">
-                            Maintenance
-                          </span>
-                        )}
-                      </div>
-                      <div className="mt-2 sm:flex sm:justify-between">
-                        <div className="sm:flex">
-                          <p className="flex items-center text-sm text-gray-500">
-                            UUID: {node.uuid}
+                      <div className="flex items-center justify-between">
+                        <div className="flex items-center">
+                          <p className="text-sm font-medium text-gray-900">
+                            {node.name || node.uuid}
                           </p>
-                          {node.driver && (
-                            <p className="mt-2 flex items-center text-sm text-gray-500 sm:mt-0 sm:ml-6">
-                              Driver: {node.driver}
-                            </p>
-                          )}
-                          {node.resource_class && (
-                            <p className="mt-2 flex items-center text-sm text-gray-500 sm:mt-0 sm:ml-6">
-                              Resource Class: {node.resource_class}
-                            </p>
+                          {node.maintenance && (
+                            <span className="ml-2 px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-yellow-100 text-yellow-800">
+                              Maintenance
+                            </span>
                           )}
                         </div>
-                        <div className="mt-2 flex items-center text-sm sm:mt-0">
+                        <div className="flex items-center gap-2">
                           <span className={`px-2 inline-flex text-xs leading-5 font-semibold rounded-full ${
                             node.power_state === "power on" 
                               ? "bg-green-100 text-green-800"
@@ -211,7 +226,7 @@ export default function NodesPage() {
                           }`}>
                             Power: {node.power_state || "unknown"}
                           </span>
-                          <span className={`ml-2 px-2 inline-flex text-xs leading-5 font-semibold rounded-full ${
+                          <span className={`px-2 inline-flex text-xs leading-5 font-semibold rounded-full ${
                             node.provision_state === "active"
                               ? "bg-blue-100 text-blue-800"
                               : node.provision_state === "available"
@@ -226,6 +241,26 @@ export default function NodesPage() {
                           </span>
                         </div>
                       </div>
+                      <div className="mt-2 grid grid-cols-1 gap-x-4 gap-y-2 sm:grid-cols-2 lg:grid-cols-4">
+                        <p className="flex items-center text-sm text-gray-500">
+                          UUID: {node.uuid}
+                        </p>
+                        {node.driver && (
+                          <p className="flex items-center text-sm text-gray-500">
+                            Driver: {node.driver}
+                          </p>
+                        )}
+                        {node.created_at && (
+                          <p className="flex items-center text-sm text-gray-500">
+                            Created: {new Date(node.created_at).toLocaleString()}
+                          </p>
+                        )}
+                        {node.updated_at && (
+                          <p className="flex items-center text-sm text-gray-500">
+                            Updated: {new Date(node.updated_at).toLocaleString()}
+                          </p>
+                        )}
+                      </div>
                       {node.last_error && (
                         <div className="mt-2">
                           <p className="text-sm text-red-600">
@@ -250,7 +285,7 @@ export default function NodesPage() {
 
       {data && (
         <div className="mt-4 text-sm text-gray-600">
-          Showing {filteredNodes?.length || 0} of {data.count} nodes
+          Showing {filteredAndSortedNodes?.length || 0} of {data.count} nodes
         </div>
       )}
     </div>

{osism-0.20250824.0 → osism-0.20250824.1}/frontend/lib/types.ts

@@ -3,7 +3,7 @@ export interface BaremetalNode {
   name: string | null;
   power_state: string | null;
   provision_state: string | null;
-  maintenance: boolean;
+  maintenance: boolean | null;
   instance_uuid: string | null;
   driver: string | null;
   resource_class: string | null;

{osism-0.20250824.0 → osism-0.20250824.1}/osism/tasks/openstack.py

@@ -84,20 +84,21 @@ def get_baremetal_nodes():
     # Convert generator to list and extract relevant fields
     node_list = []
     for node in nodes:
+        # OpenStack SDK returns Resource objects, not dicts - use attribute access
         node_info = {
-            "uuid": node.get("uuid"),
-            "name": node.get("name"),
-            "power_state": node.get("power_state"),
-            "provision_state": node.get("provision_state"),
-            "maintenance": node.get("maintenance"),
-            "instance_uuid": node.get("instance_uuid"),
-            "driver": node.get("driver"),
-            "resource_class": node.get("resource_class"),
-            "properties": node.get("properties", {}),
-            "extra": node.get("extra", {}),
-            "last_error": node.get("last_error"),
-            "created_at": node.get("created_at"),
-            "updated_at": node.get("updated_at"),
+            "uuid": getattr(node, "uuid", None) or getattr(node, "id", None),
+            "name": getattr(node, "name", None),
+            "power_state": getattr(node, "power_state", None),
+            "provision_state": getattr(node, "provision_state", None),
+            "maintenance": getattr(node, "maintenance", None),
+            "instance_uuid": getattr(node, "instance_uuid", None),
+            "driver": getattr(node, "driver", None),
+            "resource_class": getattr(node, "resource_class", None),
+            "properties": getattr(node, "properties", {}),
+            "extra": getattr(node, "extra", {}),
+            "last_error": getattr(node, "last_error", None),
+            "created_at": getattr(node, "created_at", None),
+            "updated_at": getattr(node, "updated_at", None),
         }
         node_list.append(node_info)
 

{osism-0.20250824.0 → osism-0.20250824.1/osism.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: osism
-Version: 0.20250824.0
+Version: 0.20250824.1
 Summary: OSISM manager interface
 Home-page: https://github.com/osism/python-osism
 Author: OSISM GmbH

osism-0.20250824.1/osism.egg-info/pbr.json

@@ -0,0 +1 @@
+{"git_version": "2d93840", "is_release": false}

osism-0.20250824.0/AUTHORS

@@ -1 +0,0 @@
-renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

osism-0.20250824.0/ChangeLog

@@ -1,7 +0,0 @@
-CHANGES
-=======
-
-v0.20250824.0
--------------
-
-* chore(deps): update dependency websockets to v15 (#1667)

osism-0.20250824.0/osism.egg-info/pbr.json

@@ -1 +0,0 @@
-{"git_version": "0dfd880", "is_release": false}