Merge pull request #140 from plotly/pattern_match_output_fix

Single wildcards output fix

Author: waralex

src/handler/processors/callback.jl

@@ -1,11 +1,14 @@
+function split_single_callback_id(callback_id::AbstractString)
+    parts = rsplit(callback_id, ".")
+    return (id = parts[1], property = parts[2])
+end
 function split_callback_id(callback_id::AbstractString)
     if startswith(callback_id, "..")
         result = []
-        append!.(Ref(result), split_callback_id.(split(callback_id[3:end-2], "...", keepempty = false)))
+        push!.(Ref(result), split_single_callback_id.(split(callback_id[3:end-2], "...", keepempty = false)))
         return result
     end
-    parts = rsplit(callback_id, ".")
-    return [(id = parts[1], property = parts[2])]
+    return split_single_callback_id(callback_id)
 end
 
 input_to_arg(input) = get(input, :value, nothing)
@@ -50,8 +53,7 @@ function process_callback_call(app, callback_id, outputs, inputs, state)
     return Dict(:response=>response, :multi=>true)
 end
 
-outputs_to_vector(out::Vector) = out
-outputs_to_vector(out) = [out]
+outputs_to_vector(out, is_multi) = is_multi ? out : [out]
 
 function process_callback(request::HTTP.Request, state::HandlerState)
     app = state.app
@@ -61,11 +63,14 @@ function process_callback(request::HTTP.Request, state::HandlerState)
     inputs = get(params, :inputs, [])
     state = get(params, :state, [])
     output = Symbol(params[:output])
-    outputs_list = outputs_to_vector(get(params, :outputs, split_callback_id(params[:output])))
-    changedProps = get(params, :changedPropIds, [])
-    context = CallbackContext(response, outputs_list, inputs, state, changedProps)
 
     try
+        is_multi = is_multi_out(app.callbacks[output])
+        outputs_list = outputs_to_vector(
+                get(params, :outputs, split_callback_id(params[:output])),
+                is_multi)
+        changedProps = get(params, :changedPropIds, [])
+        context = CallbackContext(response, outputs_list, inputs, state, changedProps)
         cb_result = with_callback_context(context) do
             process_callback_call(app, output, outputs_list, inputs, state)
         end

test/callbacks.jl

@@ -382,7 +382,7 @@ end
 
 end
 
-@testset "pattern-match ALL" begin
+@testset "pattern-match ALL single out" begin
     app = dash()
     app.layout = html_div() do
             dcc_input(id = (type="test", index = 1), value="initial value", type = "text"),
@@ -412,10 +412,8 @@ end
     request = (
         output = string(out_key),
         outputs = [
-           [
                 (id = (index=1, type="test-out"), property = "children"),
                 (id = (index=2, type="test-out"), property = "children")
-            ]
         ],
         changedPropIds = [changed_key],
         inputs = [
@@ -435,6 +433,58 @@ end
     @test resp_obj.response.var"{\"index\":1,\"type\":\"test-out\"}".children =="test 1"
     @test resp_obj.response.var"{\"index\":2,\"type\":\"test-out\"}".children =="test"
 
+end
+@testset "pattern-match ALL multi out" begin
+    app = dash()
+    app.layout = html_div() do
+            dcc_input(id = (type="test", index = 1), value="initial value", type = "text"),
+            dcc_input(id = (type="test", index = 2), value="initial value", type = "text"),
+            html_div(id = (type = "test-out", index = 1)),
+            html_div(id = (type = "test-out", index = 2))
+        end
+
+    first_key = """{"index":1,"type":"test"}.value"""
+    changed_key = """{"index":2,"type":"test"}.value"""
+    callback!(app, [Output((type = "test-out", index = ALL), "children")], Input((type="test", index = ALL), "value")) do value
+        context = callback_context()
+        @test haskey(context.inputs, first_key)
+        @test context.inputs[first_key] == "test 1"
+        @test haskey(context.inputs, changed_key)
+        @test context.inputs[changed_key] == "test"
+        @test length(context.triggered) == 1
+        @test context.triggered[1].prop_id == changed_key
+        @test context.triggered[1].value == "test"
+        return [value]
+    end
+    @test length(app.callbacks) == 1
+    out_key = Symbol("""..{"index":["ALL"],"type":"test-out"}.children..""")
+    @test haskey(app.callbacks, out_key)
+
+    handler = Dash.make_handler(app)
+    request = (
+        output = string(out_key),
+        outputs = [[
+                (id = (index=1, type="test-out"), property = "children"),
+                (id = (index=2, type="test-out"), property = "children")
+        ]],
+        changedPropIds = [changed_key],
+        inputs = [
+            [
+                (id = (index=1, type="test"), property = "value", value = "test 1"),
+                (id = (index=2, type="test"), property = "value", value = "test")
+            ]
+        ]
+    )
+    test_json = JSON2.write(request)
+    request = HTTP.Request("POST", "/_dash-update-component", [], Vector{UInt8}(test_json))
+    response = HTTP.handle(handler, request)
+    @test response.status == 200
+    resp_obj = JSON2.read(String(response.body))
+    @test in(:multi, keys(resp_obj))
+
+    @test resp_obj.response.var"{\"index\":1,\"type\":\"test-out\"}".children =="test 1"
+    @test resp_obj.response.var"{\"index\":2,\"type\":\"test-out\"}".children =="test"
+
 end
 
 @testset "invalid multi out" begin