From 97d60de92aaf89aca3e00abdf455532787235aef Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 17 Apr 2023 16:06:27 +0200
Subject: [PATCH] FIX: ensures explorer is using default values when provided
 (#240)

---
 .../discourse/components/param-input.hbs      | 12 +++++++-
 .../discourse/components/param-input.js       | 10 +++----
 spec/system/explorer_spec.rb                  | 29 +++++++++++++++++++
 3 files changed, 45 insertions(+), 6 deletions(-)
 create mode 100644 spec/system/explorer_spec.rb

diff --git a/assets/javascripts/discourse/components/param-input.hbs b/assets/javascripts/discourse/components/param-input.hbs
index 80aa942..bfe06f3 100644
--- a/assets/javascripts/discourse/components/param-input.hbs
+++ b/assets/javascripts/discourse/components/param-input.hbs
@@ -7,12 +7,14 @@
         @nameProperty="name"
         @content={{this.boolTypes}}
         @onChange={{this.updateNullableBoolValue}}
+        name={{@info.identifier}}
       />
     {{else}}
       <Input
         @type="checkbox"
         @checked={{this.boolvalue}}
         {{on "change" this.updateBoolValue}}
+        name={{@info.identifier}}
       />
     {{/if}}
     <span class="param-name">{{@info.identifier}}</span>
@@ -22,6 +24,7 @@
       @type="number"
       @value={{this.value}}
       {{on "change" this.updateValue}}
+      name={{@info.identifier}}
     />
     <span class="param-name">{{@info.identifier}}</span>
 
@@ -30,6 +33,7 @@
       @value={{this.value}}
       @type="text"
       @onChange={{this.updateValue}}
+      name={{@info.identifier}}
     />
     <span class="param-name">{{@info.identifier}}</span>
 
@@ -38,6 +42,7 @@
       @value={{this.value}}
       @options={{(hash maximum=1)}}
       @onChange={{this.updateValue}}
+      name={{@info.identifier}}
     />
     <span class="param-name">{{@info.identifier}}</span>
 
@@ -45,11 +50,16 @@
     <EmailGroupUserChooser
       @value={{this.value}}
       @onChange={{this.updateValue}}
+      name={{@info.identifier}}
     />
     <span class="param-name">{{@info.identifier}}</span>
 
   {{else}}
-    <TextField @value={{this.value}} @onChange={{this.updateValue}} />
+    <TextField
+      @value={{this.value}}
+      @onChange={{this.updateValue}}
+      name={{@info.identifier}}
+    />
     <span class="param-name">{{@info.identifier}}</span>
   {{/if}}
 </div>
\ No newline at end of file
diff --git a/assets/javascripts/discourse/components/param-input.js b/assets/javascripts/discourse/components/param-input.js
index 81f672b..dfca0f8 100644
--- a/assets/javascripts/discourse/components/param-input.js
+++ b/assets/javascripts/discourse/components/param-input.js
@@ -69,13 +69,13 @@ export default class ParamInput extends Component {
       }
     } else {
       // if no parsed params then get and set default values
-      const params = this.args.params;
+      const defaultValue = this.args.info.default;
       this.value =
         this.args.info.type === "category_id"
-          ? this.dasherizeCategoryId(params[identifier])
-          : params[identifier];
-      this.boolValue = params[identifier] !== "false";
-      this.nullableBoolValue = params[identifier];
+          ? this.dasherizeCategoryId(defaultValue)
+          : defaultValue;
+      this.boolValue = defaultValue !== "false";
+      this.nullableBoolValue = defaultValue;
     }
   }
 
diff --git a/spec/system/explorer_spec.rb b/spec/system/explorer_spec.rb
new file mode 100644
index 0000000..5aaeeb5
--- /dev/null
+++ b/spec/system/explorer_spec.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+RSpec.describe "Explorer", type: :system, js: true do
+  fab!(:current_user) { Fabricate(:admin) }
+  fab!(:group) { Fabricate(:group, name: "group") }
+  fab!(:group_user) { Fabricate(:group_user, user: current_user, group: group) }
+
+  before { SiteSetting.data_explorer_enabled = true }
+
+  context "with a query using a default param" do
+    fab!(:query_1) do
+      Fabricate(
+        :query,
+        name: "My default param query",
+        description: "Test default param query",
+        sql: "-- [params]\n-- string :limit = 42\n\nSELECT * FROM users LIMIT :limit",
+        user: current_user,
+      )
+    end
+    fab!(:query_group_1) { Fabricate(:query_group, query: query_1, group: group) }
+
+    it "pre-fills the field with the default param" do
+      sign_in(current_user)
+      visit("/g/group/reports/#{query_1.id}")
+
+      expect(page).to have_field("limit", with: 42)
+    end
+  end
+end