cleanup as per review comments

frontend/src/metabase/admin/settings/components/SettingsSetting.jsx

@@ -21,8 +21,8 @@ const SETTING_WIDGET_MAP = {
 };
 
 const updatePlaceholderForEnvironmentVars = (props) => {
-    if (props && props.setting && props.setting.envsetting){
-        return assocIn(props, ["setting", "placeholder"], "Using " + props.setting.envname) 
+    if (props && props.setting && props.setting.is_env_setting){
+        return assocIn(props, ["setting", "placeholder"], "Using " + props.setting.env_name) 
     }
     return props
 }

src/metabase/models/setting.clj

@@ -369,19 +369,19 @@
 
 
 (defn- user-facing-info [setting]
-  (let [k (:name setting)
-        v (get k)
-        set-by-env (not (nil? (env-var-value setting)))]
-    {:key         k
-     :value       (when (and (not= v (env-var-value setting))
-                             (not= v (:default setting)))
-                    v)
-     :envsetting  set-by-env
-     :envname   (env-var-name setting)
-     :description (:description setting)
-     :default     (or (when (env-var-value setting)
-                        (format "Using $%s" (env-var-name setting)))
-                      (:default setting))}))
+  (let [k         (:name setting)
+        v         (get k)
+        env-value (env-var-value setting)]
+    {:key            k
+     :value          (when (and (not= v env-value)
+                                (not= v (:default setting)))
+                       v)
+     :is_env_setting (boolean env-value)
+     :env_name       (env-var-name setting)
+     :description    (:description setting)
+     :default        (or (when env-value
+                           (format "Using $%s" env-value))
+                         (:default setting))}))
 
 (defn all
   "Return a sequence of Settings maps in a format suitable for consumption by the frontend.