Merge pull request #17215 from yrudman/remove-temporary-tokens-from-e…

…xpression-after-substitution

Fixed error with dialog expression when virtual column involved

lib/miq_expression/subst_mixin.rb

@@ -71,6 +71,7 @@ def exp_replace_qs_tokens(exp, tokens)
         end
         exp[key]["value"] = value # Replace the exp value with the proper qs value
       end
+      exp.delete(:token)
     end
   end
 

spec/lib/miq_expression/subst_mixin_spec.rb

@@ -0,0 +1,12 @@
+RSpec.describe MiqExpression::SubstMixin do
+  let(:test_class) { Class.new { include MiqExpression::SubstMixin } }
+  let(:test_obj) { test_class.new }
+
+  describe "#exp_replace_qs_tokens" do
+    it "removes :token key from passed expression" do
+      exp = {"and" => [{"=" => {"field" => "Vm-active", "value" => "true"}, :token => 1}, {"=" => {"field" => "Vm-archived", "value" => "true"}, :token => 2}]}
+      test_obj.exp_replace_qs_tokens(exp, {})
+      expect(exp).to eq("and" => [{"=" => {"field" => "Vm-active", "value" => "true"}}, {"=" => {"field" => "Vm-archived", "value" => "true"}}])
+    end
+  end
+end