fix can_handle

Author: nickolas-deboom

…tch/profiles/window-covering-modular.yml …tter-switch/profiles/window-covering.ymldrivers/SmartThings/matter-switch/profiles/window-covering-modular.yml renamed to drivers/SmartThings/matter-switch/profiles/window-covering.yml drivers/SmartThings/matter-switch/profiles/window-covering-modular.yml renamed to drivers/SmartThings/matter-switch/profiles/window-covering.yml

@@ -1,4 +1,4 @@
-name: window-covering-modular
+name: window-covering
 components:
 - id: main
   capabilities:

drivers/SmartThings/matter-switch/src/sub_drivers/closures/can_handle.lua

@@ -1,15 +1,27 @@
 -- Copyright © 2026 SmartThings, Inc.
 -- Licensed under the Apache License, Version 2.0
 
-return function(opts, driver, device, ...)
-  local device_lib = require "st.device"
-  local fields = require "switch_utils.fields"
-  local switch_utils = require "switch_utils.utils"
-  if device.network_type == device_lib.NETWORK_TYPE_CHILD then
-    device = device:get_parent_device()
+return function(opts, driver, device, ib)
+  local capabilities = require "st.capabilities"
+  local supported_capabilities = {
+    capabilities.windowShade,
+    capabilities.windowShadeLevel,
+    capabilities.windowShadePreset,
+    capabilities.windowShadeTiltLevel
+  }
+  -- MatterMessageDispatcher handles all events through a MATTER typed device.
+  -- Therefore, find and check if an endpoint-mapped EDGE_CHILD device exists,
+  -- Note: parameter ib should always be populated here by MatterMessageDispatcher.
+  if opts and opts.dispatcher_class == "MatterMessageDispatcher" then
+    local switch_utils = require "switch_utils.utils"
+    if ib and ib.info_block and ib.info_block.endpoint_id then
+      device = switch_utils.find_child(device, ib.info_block.endpoint_id) or device
+    end
   end
-  if #switch_utils.get_endpoints_by_device_type(device, fields.DEVICE_TYPE_ID.WINDOW_COVERING) > 0 then
-    return true, require("sub_drivers.closures")
+  for _, capability in ipairs(supported_capabilities) do
+    if device:supports_capability(capability) then
+      return true, require("sub_drivers.closures")
+    end
   end
   return false
 end

drivers/SmartThings/matter-switch/src/switch_utils/device_configuration.lua

@@ -180,7 +180,7 @@ function WindowCoveringDeviceConfiguration.assign_profile_for_window_covering_ep
   end
 
   table.insert(optional_supported_component_capabilities, {"main", main_component_capabilities})
-  return "window-covering-modular", optional_supported_component_capabilities
+  return "window-covering", optional_supported_component_capabilities
 end
 
 

drivers/SmartThings/matter-switch/src/test/test_matter_window_covering.lua

@@ -12,7 +12,7 @@ local WindowCovering = clusters.WindowCovering
 local mock_device = test.mock_device.build_test_matter_device(
   {
     label = "Matter Window Covering",
-    profile = t_utils.get_profile_definition("window-covering-modular.yml"),
+    profile = t_utils.get_profile_definition("window-covering.yml"),
     manufacturer_info = {vendor_id = 0x0000, product_id = 0x0000},
     matter_version = {hardware = 1, software = 1},
     endpoints = {
@@ -59,7 +59,7 @@ local mock_device = test.mock_device.build_test_matter_device(
 )
 
 local mock_child = test.mock_device.build_test_child_device({
-  profile = t_utils.get_profile_definition("window-covering-modular.yml"),
+  profile = t_utils.get_profile_definition("window-covering.yml"),
   device_network_id = string.format("%s:%d", mock_device.id, 20),
   parent_device_id = mock_device.id,
   parent_assigned_child_key = string.format("%d", 20)
@@ -106,7 +106,7 @@ local function test_init()
   mock_device:expect_device_create({
     type = "EDGE_CHILD",
     label = "Matter Window Covering 2",
-    profile = "window-covering-modular",
+    profile = "window-covering",
     parent_device_id = mock_device.id,
     parent_assigned_child_key = string.format("%d", 20)
   })
@@ -129,10 +129,10 @@ local function update_profile()
   test.socket.matter:__queue_receive({mock_device.id, clusters.PowerSource.attributes.AttributeList:build_test_report_data(
     mock_device, 10, {uint32(clusters.PowerSource.attributes.BatPercentRemaining.ID)}
   )})
-  mock_child:expect_metadata_update({ profile = "window-covering-modular", optional_component_capabilities = {{"main", {"windowShadeLevel", "windowShadeTiltLevel"}}} })
-  mock_device:expect_metadata_update({ profile = "window-covering-modular", optional_component_capabilities = {{"main", {"windowShadeLevel", "windowShadeTiltLevel", "battery"}}} })
+  mock_child:expect_metadata_update({ profile = "window-covering", optional_component_capabilities = {{"main", {"windowShadeLevel", "windowShadeTiltLevel"}}} })
+  mock_device:expect_metadata_update({ profile = "window-covering", optional_component_capabilities = {{"main", {"windowShadeLevel", "windowShadeTiltLevel", "battery"}}} })
   test.wait_for_events()
-  local updated_device_profile = t_utils.get_profile_definition("window-covering-modular.yml",
+  local updated_device_profile = t_utils.get_profile_definition("window-covering.yml",
     {enabled_optional_capabilities = {{"main", {"windowShadeLevel", "windowShadeTiltLevel"}}}}
   )
   test.socket.device_lifecycle:__queue_receive(mock_child:generate_info_changed({ profile = updated_device_profile }))
@@ -142,7 +142,7 @@ local function update_profile()
   end
   test.socket.matter:__expect_send({mock_device.id, subscribe_request})
   test.wait_for_events()
-  updated_device_profile = t_utils.get_profile_definition("window-covering-modular.yml",
+  updated_device_profile = t_utils.get_profile_definition("window-covering.yml",
     {enabled_optional_capabilities = {{"main", {"windowShadeLevel", "windowShadeTiltLevel", "battery"}}}}
   )
   test.socket.device_lifecycle:__queue_receive(mock_device:generate_info_changed({ profile = updated_device_profile }))