diff --git a/src/main/frontend/handler/plugin.cljs b/src/main/frontend/handler/plugin.cljs index 9fb0e882ab..5e68567969 100644 --- a/src/main/frontend/handler/plugin.cljs +++ b/src/main/frontend/handler/plugin.cljs @@ -163,7 +163,7 @@ (defn get-enabled-plugins-if-setting-schema [] - (when-let [plugins (seq (state/get-enabled?-installed-plugins false nil true))] + (when-let [plugins (seq (state/get-all-enabled?-installed-plugins nil true))] (filter #(has-setting-schema? (:id %)) plugins))) (defn setup-install-listener! diff --git a/src/main/frontend/state.cljs b/src/main/frontend/state.cljs index 499491989f..1a55772880 100644 --- a/src/main/frontend/state.cljs +++ b/src/main/frontend/state.cljs @@ -1764,6 +1764,13 @@ Similar to re-frame subscriptions" (when-let [id (and id (keyword id))] (get-in @state [:plugin/installed-plugins id]))) +(defn get-all-enabled?-installed-plugins + ([enabled? include-unpacked?] + (filterv + #(and (if include-unpacked? true (:iir %)) + (if-not (boolean? enabled?) true (= (not enabled?) (boolean (get-in % [:settings :disabled]))))) + (vals (:plugin/installed-plugins @state))))) + (defn get-enabled?-installed-plugins ([theme?] (get-enabled?-installed-plugins theme? true false)) ([theme? enabled? include-unpacked?]