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.

Sign up for GitHub

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

Jump to bottom

Do not show usage alerts when no billing info #1544

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Do not show usage alerts when no billing info #1544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions spec/routes/web/project/billing_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,7 @@ def billing_record(begin_time, end_time)
before do
UsageAlert.create_with_id(project_id: project.id, user_id: user.id, name: "alert-1", limit: 100)
UsageAlert.create_with_id(project_id: project_wo_permissions.id, user_id: user.id, name: "alert-2", limit: 100)
expect(Stripe::Customer).to receive(:retrieve).with(billing_info.stripe_id).at_least(:once)
end

it "can list usage alerts" do
Expand Down
215 changes: 107 additions & 108 deletions views/project/billing.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,113 @@
</table>
</div>
</div>
<!-- Usage alerts -->
<div>
<div class="md:flex md:items-center md:justify-between pb-1 lg:pb-2">
<div class="min-w-0 flex-1">
<h3 class="text-2xl font-bold leading-7 text-gray-900 sm:truncate sm:text-2xl sm:tracking-tight">
Usage Alerts
</h3>
</div>
</div>
<div class="grid gap-6">
<div class="overflow-hidden rounded-lg shadow ring-1 ring-black ring-opacity-5 bg-white divide-y divide-gray-200">
<!-- Add usage alert -->
<div class="px-4 py-5 sm:p-6">
<form action="<%= "#{@project_data[:path]}/usage-alert" %>" role="form" method="POST">
<%== csrf_tag("#{@project_data[:path]}/usage-alert") %>
<div class="space-y-4">
<div>
<h2 class="text-lg font-medium leading-6 text-gray-900">Add new usage alert</h2>
<p class="mt-1 text-sm text-gray-500">
Usage alerts will be sent to your email address. If you want to send alerts to specific email
addresses, you need to log in with that email address.
<br/>
<br/>
Please note that alerts are only for informational purposes and no action is taken automatically.
</p>
</div>
<div class="grid grid-cols-12 gap-6">
<div class="col-span-5 sm:col-span-3">
<%== render(
"components/form/text",
locals: {
name: "alert_name",
label: "Alert Name",
type: "text",
attributes: {
required: true,
placeholder: "Alert Name"
},
extra_class: "pr-3"
}
) %>
</div>
<div class="col-span-5 sm:col-span-3">
<%== render(
"components/form/text",
locals: {
name: "limit",
label: "Limit",
type: "number",
attributes: {
required: true,
placeholder: "100"
},
extra_class: "pr-3"
}
) %>
</div>
<div class="col-span-2 sm:col-span-3 flex justify-begin items-end">
<%== render("components/form/submit_button", locals: { text: "Add" }) %>
</div>
</div>
</div>
</form>

</div>
<!-- List alerts -->
<% if @usage_alerts.count > 0 %>
<table class="min-w-full divide-y divide-gray-300">
<thead class="bg-gray-50">
<tr>
<th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-4">Name</th>
<th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-4">Limit</th>
<th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-4">E-mail</th>
<th scope="col" class="py-3.5 pl-3 pr-4 sm:pr-4">
<span class="sr-only">Remove</span>
</th>
</tr>
</thead>
<tbody class="divide-y divide-gray-200 bg-white">
<% @usage_alerts.each do |alert| %>
<tr id="alert-<%= alert[:ubid]%>" class="whitespace-nowrap text-sm font-medium">
<td class="py-4 pl-4 pr-3 text-gray-900 sm:pl-6" scope="row"><%= alert[:name] %></td>
<td class="py-4 pl-4 pr-3 text-gray-900 sm:pl-6" scope="row"><%= alert[:limit] %></td>
<td class="py-4 pl-4 pr-3 text-gray-900 sm:pl-6" scope="row"><%= alert[:email] %></td>
<td class="py-4 pl-3 pr-4 text-right sm:pr-6">
<%== render(
"components/delete_button",
locals: {
text: "Remove",
url: "#{@project_data[:path]}/usage-alert/#{alert[:ubid]}",
confirmation: alert[:name],
redirect: "#{@project_data[:path]}/billing"
}
) %>
</td>
</tr>
<% end %>
</tbody>
</table>
<% else %>
<div class="text-center p-4">
No usage alerts...
</div>
<% end %>
</div>
</div>
</div>
</div>
<% else %>
<form action="<%= "#{@project_data[:path]}/billing" %>" method="POST">
Expand All @@ -301,111 +408,3 @@
) %>
</form>
<% end %>
<br/>
<!-- Usage alerts -->
<div>
<div class="md:flex md:items-center md:justify-between pb-1 lg:pb-2">
<div class="min-w-0 flex-1">
<h3 class="text-2xl font-bold leading-7 text-gray-900 sm:truncate sm:text-2xl sm:tracking-tight">
Usage Alerts
</h3>
</div>
</div>
<div class="grid gap-6">
<div class="overflow-hidden rounded-lg shadow ring-1 ring-black ring-opacity-5 bg-white divide-y divide-gray-200">
<!-- Add usage alert -->
<div class="px-4 py-5 sm:p-6">
<form action="<%= "#{@project_data[:path]}/usage-alert" %>" role="form" method="POST">
<%== csrf_tag("#{@project_data[:path]}/usage-alert") %>
<div class="space-y-4">
<div>
<h2 class="text-lg font-medium leading-6 text-gray-900">Add new usage alert</h2>
<p class="mt-1 text-sm text-gray-500">
Usage alerts will be sent to your email address. If you want to send alerts to specific email
addresses, you need to log in with that email address.
<br/>
<br/>
Please note that alerts are only for informational purposes and no action is taken automatically.
</p>
</div>
<div class="grid grid-cols-12 gap-6">
<div class="col-span-5 sm:col-span-3">
<%== render(
"components/form/text",
locals: {
name: "alert_name",
label: "Alert Name",
type: "text",
attributes: {
required: true,
placeholder: "Alert Name"
},
extra_class: "pr-3"
}
) %>
</div>
<div class="col-span-5 sm:col-span-3">
<%== render(
"components/form/text",
locals: {
name: "limit",
label: "Limit",
type: "number",
attributes: {
required: true,
placeholder: "100"
},
extra_class: "pr-3"
}
) %>
</div>
<div class="col-span-2 sm:col-span-3 flex justify-begin items-end">
<%== render("components/form/submit_button", locals: { text: "Add" }) %>
</div>
</div>
</div>
</form>

</div>
<!-- List alerts -->
<% if @usage_alerts.count > 0 %>
<table class="min-w-full divide-y divide-gray-300">
<thead class="bg-gray-50">
<tr>
<th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-4">Name</th>
<th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-4">Limit</th>
<th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-4">E-mail</th>
<th scope="col" class="py-3.5 pl-3 pr-4 sm:pr-4">
<span class="sr-only">Remove</span>
</th>
</tr>
</thead>
<tbody class="divide-y divide-gray-200 bg-white">
<% @usage_alerts.each do |alert| %>
<tr id="alert-<%= alert[:ubid]%>" class="whitespace-nowrap text-sm font-medium">
<td class="py-4 pl-4 pr-3 text-gray-900 sm:pl-6" scope="row"><%= alert[:name] %></td>
<td class="py-4 pl-4 pr-3 text-gray-900 sm:pl-6" scope="row"><%= alert[:limit] %></td>
<td class="py-4 pl-4 pr-3 text-gray-900 sm:pl-6" scope="row"><%= alert[:email] %></td>
<td class="py-4 pl-3 pr-4 text-right sm:pr-6">
<%== render(
"components/delete_button",
locals: {
text: "Remove",
url: "#{@project_data[:path]}/usage-alert/#{alert[:ubid]}",
confirmation: alert[:name],
redirect: "#{@project_data[:path]}/billing"
}
) %>
</td>
</tr>
<% end %>
</tbody>
</table>
<% else %>
<div class="text-center p-4">
No usage alerts...
</div>
<% end %>
</div>
</div>
</div>