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: 1 addition & 1 deletion rust/agama-storage-client/src/service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ impl MessageHandler<message::zfcp::GetIssues> for Service {
return Ok(vec![]);
};

let raw_json = proxy.system().await?;
let raw_json = proxy.issues().await?;
Ok(try_from_string(&raw_json)?)
}
}
Expand Down
5 changes: 5 additions & 0 deletions rust/package/agama.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Mar 16 12:39:37 UTC 2026 - José Iván López González <jlopez@suse.com>

- Fix method for getting zFCP issues (gh#agama-project/agama#3287).

-------------------------------------------------------------------
Mon Mar 16 06:50:07 UTC 2026 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>

Expand Down
8 changes: 7 additions & 1 deletion web/package/agama-web-ui.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Mar 16 12:40:42 UTC 2026 - José Iván López González <jlopez@suse.com>

- Prevent error when there is no zFCP config
(gh#agama-project/agama#3287).

-------------------------------------------------------------------
Mon Mar 16 10:53:53 UTC 2026 - Ancor Gonzalez Sosa <ancor@suse.com>

Expand All @@ -9,7 +15,7 @@ Mon Mar 16 10:53:53 UTC 2026 - Ancor Gonzalez Sosa <ancor@suse.com>
Fri Mar 13 15:54:03 UTC 2026 - Ancor Gonzalez Sosa <ancor@suse.com>

- Sync system schema with the backend (related to the fix for
bsc#1258486).
bsc#1258486).

-------------------------------------------------------------------
Mon Mar 9 19:44:43 UTC 2026 - David Diaz <dgonzalez@suse.com>
Expand Down
21 changes: 11 additions & 10 deletions web/src/components/storage/zfcp/ZFCPDevicesTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ import { _, N_ } from "~/i18n";
import { useCheckLunScan } from "~/hooks/model/system/zfcp";
import { useAddDevices, useRemoveDevices, useConfig } from "~/hooks/model/config/zfcp";
import type { ZFCP as System } from "~/model/system";
import type { Config } from "~/model/config/zfcp";
import type { ZFCP as Config } from "~/model/config";
import type { CheckLunScanFn } from "~/hooks/model/system/zfcp";
import type { AddDevicesFn, RemoveDevicesFn } from "~/hooks/model/config/zfcp";

Expand Down Expand Up @@ -211,19 +211,14 @@ const FiltersToolbar = ({
*/
const buildActions = (
device: System.Device,
config: Config,
config: Config.Device | null,
addDevices: AddDevicesFn,
removeDevices: RemoveDevicesFn,
checkLunScan: CheckLunScanFn,
) => {
const deviceConfig = config.devices?.find(
(c) => c.channel === device.channel && c.wwpn === device.wwpn && device.lun === c.lun,
);

const failedActivate =
deviceConfig && (deviceConfig.active === undefined || deviceConfig.active) && !device.active;
const failedActivate = config && (config.active === undefined || config.active) && !device.active;

const failedDeactivate = deviceConfig && deviceConfig.active === false && device.active;
const failedDeactivate = config && config.active === false && device.active;

const actions = [
{
Expand Down Expand Up @@ -389,6 +384,12 @@ export default function ZFCPDevicesTable({ devices }: ZFCPDevicesTableProps): Re
const sortingKey = columns[state.sortedBy.index].sortingKey;
const sortedDevices = sortCollection(filteredDevices, state.sortedBy.direction, sortingKey);

const deviceConfig = (device: System.Device): Config.Device | null => {
return config?.devices?.find(
(c) => c.channel === device.channel && c.wwpn === device.wwpn && device.lun === c.lun,
);
};

return (
<Content>
<FiltersToolbar
Expand All @@ -410,7 +411,7 @@ export default function ZFCPDevicesTable({ devices }: ZFCPDevicesTableProps): Re
sortedBy={state.sortedBy}
updateSorting={onSortingChange}
itemActions={(device: System.Device) =>
buildActions(device, config, addDevices, removeDevices, checkLunScan)
buildActions(device, deviceConfig(device), addDevices, removeDevices, checkLunScan)
}
itemActionsLabel={(d: System.Device) => `Actions for ${d.lun}`}
emptyState={
Expand Down
Loading