Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor fixes #93

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ GEM
ast (~> 2.4.1)
racc
pg (1.5.3)
polaris_view_components (1.1.0)
polaris_view_components (1.4.0)
rails (>= 5.0.0)
view_component (>= 3.0.0, < 4.0.0)
prophet-rb (0.5.0)
Expand Down
4 changes: 3 additions & 1 deletion app/models/summary/monthly.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ def summarize
summary[month][:user_churn] = churn
end

summary
summary.keep_if do |month, data|
data[:payments] > 0
end
end

private
Expand Down
4 changes: 3 additions & 1 deletion app/views/imports/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@
<%= render "api_credentials_banner" %>
<% end %>

<%= render "table", imports: @imports %>
<%= polaris_card(sectioned: false) do %>
<%= render "table", imports: @imports %>
<% end %>

<% end %>

Expand Down
2 changes: 1 addition & 1 deletion app/views/summarys/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<%= render "app_filter", selected_app: @selected_app, app_titles: @app_titles %>

<%= polaris_card do %>
<%= polaris_card(sectioned: false) do %>
<%= render controller_name, rows: @summaries %>
<% end %>

Expand Down
4 changes: 3 additions & 1 deletion config/initializers/rack_timeout.rb
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
Rails.application.config.middleware.insert_before Rack::Runtime, Rack::Timeout, service_timeout: 27
if Rails.env.production?
Rails.application.config.middleware.insert_before Rack::Runtime, Rack::Timeout, service_timeout: 27
end
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"debounce": "^1.2.1",
"esbuild": "^0.19.2",
"globe.gl": "^2.29.2",
"polaris-view-components": "^1.1.0"
"polaris-view-components": "^1.3.0"
},
"scripts": {
"build": "esbuild app/javascript/*.* --bundle --minify --outdir=app/assets/builds --public-path=/assets"
Expand Down
12 changes: 6 additions & 6 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.19.2.tgz#1205014625790c7ff0e471644a878a65d1e34ab0"
integrity sha512-tcuhV7ncXBqbt/Ybf0IyrMcwVOAPDckMK9rXNHtF17UTK18OKLpg08glminN06pt2WCoALhXdLfSPbVvK/6fxw==

"@hotwired/stimulus@^3.2.1":
"@hotwired/stimulus@^3.2.1", "@hotwired/stimulus@^3.2.2":
version "3.2.2"
resolved "https://registry.yarnpkg.com/@hotwired/stimulus/-/stimulus-3.2.2.tgz#071aab59c600fed95b97939e605ff261a4251608"
integrity sha512-eGeIqNOQpXoPAIP7tC1+1Yc1yl1xnwYqg+3mzqxyrbE5pg5YFBZcA6YoTiByJB6DKAEsiWtl6tjTJS4IYtbB7A==
Expand Down Expand Up @@ -403,12 +403,12 @@ lodash-es@4:
resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee"
integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==

polaris-view-components@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/polaris-view-components/-/polaris-view-components-1.1.0.tgz#92d35287aa75fe80715d6ffee7eb214232f13d29"
integrity sha512-pjHxPrYV9w42Cj86gVOKLzzUCteoSe5wsdIDyKDEtoUQ7GX3yTbQGCDXwhFKy4plHiGzQdJU44ABI2q0JEBTDw==
polaris-view-components@^1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/polaris-view-components/-/polaris-view-components-1.3.0.tgz#babba153a056b71fdebc8118a4be26ecb8ba2dd1"
integrity sha512-x07MPuNhA3fmP4UsufhsVMAFjot0ynmEj4d6pHvvgomhv4b6k/w3rteCnYE8fswAs+PurWjTtkY7YHgIIQdQMQ==
dependencies:
"@hotwired/stimulus" "^3.2.1"
"@hotwired/stimulus" "^3.2.2"
"@rails/request.js" "^0.0.8"

polished@4:
Expand Down
Loading