Skip to content

Commit

Permalink
[FIXES]: general fixes (#516)
Browse files Browse the repository at this point in the history
* fix(components): multiselect not working inside modal

* fix(dashboard): fix conditional of rejected and approved reviews chart

* fix(webclient): add scroll in runbooks section

* chore(version): update to version 1.31.1
  • Loading branch information
rogefm authored Oct 22, 2024
1 parent eb25da2 commit e65e7df
Show file tree
Hide file tree
Showing 6 changed files with 127 additions and 65 deletions.
179 changes: 120 additions & 59 deletions webapp/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion webapp/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "webapp",
"version": "1.31.0",
"version": "1.31.1",
"scripts": {
"ancient": "clojure -Sdeps '{:deps {com.github.liquidz/antq {:mvn/version \"RELEASE\"}}}' -m antq.core",
"genversion": "npx genversion src/webapp/version.js",
Expand Down
2 changes: 0 additions & 2 deletions webapp/src/webapp/components/modal.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,8 @@
(let [modal (rf/subscribe [:modal-radix])]
(fn []
(if (:open? @modal)

[:> Dialog.Root {:open (:open? @modal)
:on-open-change #(rf/dispatch [:modal->set-status %])}

[:> Dialog.Content {:maxWidth "916px"
:maxHeight "calc(100vh - 96px)"
:on-escape-key-down #(rf/dispatch [:modal->close])
Expand Down
3 changes: 2 additions & 1 deletion webapp/src/webapp/components/multiselect.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
{"fontSize" "16px"})))
"menuPortal" (fn [style]
(clj->js (into (js->clj style)
{"z-index" "60"})))
{"pointer-events" "auto"
"z-index" "60"})))
"control" (fn [style]
(clj->js (into (js->clj style)
{"borderRadius" "6px"})))
Expand Down
4 changes: 3 additions & 1 deletion webapp/src/webapp/dashboard/review_chart.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@
status (:status review)
update-fn (fnil inc 0)]
(update acc date (fnil (fn [m]
(update m (if (= status "APPROVED") :approved :rejected) update-fn))
(update m (cond
(= status "APPROVED") :approved
(= status "REJECTED") :rejected) update-fn))
{:approved 0 :rejected 0}))))
{}
reviews))
Expand Down
2 changes: 1 addition & 1 deletion webapp/src/webapp/webclient/panel.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@
:onDragEnd #(.setItem js/localStorage "editor-horizontal-pane-sizes" (str %))
:vertical true}
(if (= (:status @selected-template) :ready)
[:section {:class "relative h-full p-3"}
[:section {:class "relative h-full p-3 overflow-auto"}
[runbooks-form/main {:runbook @selected-template
:preselected-connection (:name current-connection)
:selected-connections (filter #(:selected %) (:data @run-connections-list))}]]
Expand Down

0 comments on commit e65e7df

Please sign in to comment.