Skip to content

[dashboard] Fix display of billing period boundaries by using only UTC times #14088

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

Merged
merged 2 commits into from
Oct 24, 2022
Merged

[dashboard] Fix display of billing period boundaries by using only UTC times #14088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11a3161
[dashboard] Fix display of billing period boundaries by using only UT…
jankeromnes Oct 21, 2022
637c84d
[dashboard] Fix display of billing period boundaries by using only UT…
easyCZ Oct 24, 2022
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
33 changes: 19 additions & 14 deletions components/dashboard/src/components/UsageBasedBillingConfig.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import { getGitpodService } from "../service/service";
import DropDown from "../components/DropDown";
import Modal from "../components/Modal";
import Alert from "./Alert";
import dayjs from "dayjs";

const BASE_USAGE_LIMIT_FOR_STRIPE_USERS = 1000;

Expand All @@ -43,9 +44,9 @@ export default function UsageBasedBillingConfig({ attributionId }: Props) {
const [billingError, setBillingError] = useState<string | undefined>();

const localStorageKey = `pendingStripeSubscriptionFor${attributionId}`;
const billingPeriodFrom = new Date(new Date().toISOString().slice(0, 7) + "-01"); // First day of this month: YYYY-MM-01T00:00:00.000Z
const billingPeriodTo = new Date(billingPeriodFrom.getUTCFullYear(), billingPeriodFrom.getMonth() + 1); // First day of next month
billingPeriodTo.setMilliseconds(billingPeriodTo.getMilliseconds() - 1); // Last millisecond of this month
const now = dayjs().utc(true);
const billingPeriodFrom = now.startOf("month");
const billingPeriodTo = now.endOf("month");

useEffect(() => {
if (!attributionId) {
Expand Down Expand Up @@ -176,7 +177,7 @@ export default function UsageBasedBillingConfig({ attributionId }: Props) {
const response = await getGitpodService().server.listUsage({
attributionId,
order: Ordering.ORDERING_DESCENDING,
from: billingPeriodFrom.getTime(),
from: billingPeriodFrom.toDate().getTime(),
to: Date.now(),
});
setCurrentUsage(response.creditsUsed);
Expand Down Expand Up @@ -253,12 +254,8 @@ export default function UsageBasedBillingConfig({ attributionId }: Props) {
<div className="flex-grow">
<div className="uppercase text-sm text-gray-400 dark:text-gray-500">Current Period</div>
<div className="text-sm font-medium text-gray-500 dark:text-gray-400">
<span className="font-semibold">
{billingPeriodFrom.toLocaleString("default", { month: "long" })}{" "}
{billingPeriodFrom.getFullYear()}
</span>{" "}
({billingPeriodFrom.toLocaleString("default", { month: "short", day: "numeric" })} -{" "}
{billingPeriodTo.toLocaleString("default", { month: "short", day: "numeric" })})
<span className="font-semibold">{`${billingPeriodFrom.format("MMMM YYYY")}`}</span>{" "}
{`(${billingPeriodFrom.format("MMM D")}` + ` - ${billingPeriodTo.format("MMM D")})`}
</div>
</div>
<div>
Expand All @@ -279,7 +276,8 @@ export default function UsageBasedBillingConfig({ attributionId }: Props) {
<Check className="m-0.5 w-5 h-5" />
<div className="flex flex-col">
<span>
{currency === "EUR" ? "€" : "$"}0.36 for 10 credits or 1 hour of Standard workspace usage.{" "}
{currency === "EUR" ? "€" : "$"}0.36 for 10 credits or 1 hour of Standard workspace
usage.{" "}
<a
className="gp-link"
href="https://www.gitpod.io/docs/configure/billing/usage-based-billing"
Expand Down Expand Up @@ -330,7 +328,10 @@ export default function UsageBasedBillingConfig({ attributionId }: Props) {
<Check className="m-0.5 w-5 h-5" />
<div className="flex flex-col">
<span className="font-bold">Pay-as-you-go after 1,000 credits</span>
<span>{currency === "EUR" ? "€" : "$"}0.36 for 10 credits or 1 hour of Standard workspace usage.</span>
<span>
{currency === "EUR" ? "€" : "$"}0.36 for 10 credits or 1 hour of Standard
workspace usage.
</span>
</div>
</div>
<div className="mt-5 flex flex-col">
Expand Down Expand Up @@ -373,7 +374,10 @@ export default function UsageBasedBillingConfig({ attributionId }: Props) {
<span className="font-bold text-gray-500 dark:text-gray-400">
Pay-as-you-go after 1,000 credits
</span>
<span>{currency === "EUR" ? "€" : "$"}0.36 for 10 credits or 1 hour of Standard workspace usage.</span>
<span>
{currency === "EUR" ? "€" : "$"}0.36 for 10 credits or 1 hour of
Standard workspace usage.
</span>
</div>
</div>
</>
Expand All @@ -386,7 +390,8 @@ export default function UsageBasedBillingConfig({ attributionId }: Props) {
<Check className="m-0.5 w-5 h-5 text-orange-500" />
<div className="flex flex-col">
<span>
{currency === "EUR" ? "€" : "$"}0.36 for 10 credits or 1 hour of Standard workspace usage.{" "}
{currency === "EUR" ? "€" : "$"}0.36 for 10 credits or 1 hour of
Standard workspace usage.{" "}
<a
className="gp-link"
href="https://www.gitpod.io/docs/configure/billing/usage-based-billing"
Expand Down
2 changes: 2 additions & 0 deletions components/dashboard/src/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,12 @@ import { StartWorkspaceModalContextProvider } from "./workspaces/start-workspace
import { BrowserRouter } from "react-router-dom";
import dayjs from "dayjs";
import relativeTime from "dayjs/plugin/relativeTime";
import utc from "dayjs/plugin/utc";

import "./index.css";

dayjs.extend(relativeTime);
dayjs.extend(utc);

ReactDOM.render(
<React.StrictMode>
Expand Down