Skip to content

refactor: update provisioners page to match the new design #17232

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

Merged
merged 6 commits into from
Apr 4, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
FMT
  • Loading branch information
BrunoQuaresma committed Apr 4, 2025
commit 0c9fd674f583db7c3dbec6b1c4787479ca1f96a1
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
import type { ProvisionerJob } from "api/typesGenerated";
import { Avatar } from "components/Avatar/Avatar";
import { Badge } from "components/Badge/Badge";
import { Button } from "components/Button/Button";
import { TableCell, TableRow } from "components/Table/Table";
import {
ChevronDownIcon,
ChevronRightIcon,
TriangleAlertIcon,
} from "lucide-react";
import { type FC, useState } from "react";
import { cn } from "utils/cn";
import { relativeTime } from "utils/time";
import { CancelJobButton } from "./CancelJobButton";
import { JobStatusIndicator } from "modules/provisioners/JobStatusIndicator";
import {
ProvisionerTag,
ProvisionerTags,
ProvisionerTruncateTags,
} from "modules/provisioners/ProvisionerTags";
import { Button } from "components/Button/Button";
import { type FC, useState } from "react";
import { cn } from "utils/cn";
import { relativeTime } from "utils/time";
import { CancelJobButton } from "./CancelJobButton";

type JobRowProps = {
job: ProvisionerJob;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ import { Button } from "components/Button/Button";
import { EmptyState } from "components/EmptyState/EmptyState";
import { Link } from "components/Link/Link";
import { Loader } from "components/Loader/Loader";
import {
SettingsHeader,
SettingsHeaderDescription,
SettingsHeaderTitle,
} from "components/SettingsHeader/SettingsHeader";
import {
Table,
TableBody,
Expand All @@ -16,11 +21,6 @@ import { Helmet } from "react-helmet-async";
import { docs } from "utils/docs";
import { pageTitle } from "utils/page";
import { JobRow } from "./JobRow";
import {
SettingsHeader,
SettingsHeaderTitle,
SettingsHeaderDescription,
} from "components/SettingsHeader/SettingsHeader";

type OrganizationProvisionerJobsPageViewProps = {
jobs: ProvisionerJob[] | undefined;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { Meta, StoryObj } from "@storybook/react";
import { LastConnectionHead } from "./LastConnectionHead";
import { userEvent } from "@storybook/test";
import { LastConnectionHead } from "./LastConnectionHead";

const meta: Meta<typeof LastConnectionHead> = {
title: "pages/OrganizationProvisionersPage/LastConnectionHead",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import type { FC } from "react";
import {
Tooltip,
TooltipContent,
TooltipProvider,
TooltipTrigger,
TooltipContent,
} from "components/Tooltip/Tooltip";
import { InfoIcon } from "lucide-react";
import type { FC } from "react";

export const LastConnectionHead: FC = () => {
return (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { buildInfo } from "api/queries/buildInfo";
import { provisionerDaemons } from "api/queries/organizations";
import { EmptyState } from "components/EmptyState/EmptyState";
import { useEmbeddedMetadata } from "hooks/useEmbeddedMetadata";
import { useDashboard } from "modules/dashboard/useDashboard";
import { useOrganizationSettings } from "modules/management/OrganizationSettingsLayout";
import { RequirePermission } from "modules/permissions/RequirePermission";
Expand All @@ -9,8 +11,6 @@ import { useQuery } from "react-query";
import { useParams } from "react-router-dom";
import { pageTitle } from "utils/page";
import { OrganizationProvisionersPageView } from "./OrganizationProvisionersPageView";
import { useEmbeddedMetadata } from "hooks/useEmbeddedMetadata";
import { buildInfo } from "api/queries/buildInfo";

const OrganizationProvisionersPage: FC = () => {
const { organization: organizationName } = useParams() as {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ import { EmptyState } from "components/EmptyState/EmptyState";
import { Link } from "components/Link/Link";
import { Loader } from "components/Loader/Loader";
import { Paywall } from "components/Paywall/Paywall";
import {
SettingsHeader,
SettingsHeaderDescription,
SettingsHeaderTitle,
} from "components/SettingsHeader/SettingsHeader";
import {
Table,
TableBody,
Expand All @@ -15,13 +20,8 @@ import {
import { SquareArrowOutUpRightIcon } from "lucide-react";
import type { FC } from "react";
import { docs } from "utils/docs";
import { ProvisionerRow } from "./ProvisionerRow";
import { LastConnectionHead } from "./LastConnectionHead";
import {
SettingsHeader,
SettingsHeaderTitle,
SettingsHeaderDescription,
} from "components/SettingsHeader/SettingsHeader";
import { ProvisionerRow } from "./ProvisionerRow";

interface OrganizationProvisionersPageViewProps {
showPaywall: boolean | undefined;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import type { Meta, StoryObj } from "@storybook/react";
import { ProvisionerKey } from "./ProvisionerKey";
import { userEvent } from "@storybook/test";
import {
ProvisionerKeyNameBuiltIn,
ProvisionerKeyNamePSK,
ProvisionerKeyNameUserAuth,
} from "api/typesGenerated";
import { ProvisionerKey } from "./ProvisionerKey";

const meta: Meta<typeof ProvisionerKey> = {
title: "pages/OrganizationProvisionersPage/ProvisionerKey",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import type {
ProvisionerDaemon,
ProvisionerDaemonStatus,
} from "api/typesGenerated";
import { Button } from "components/Button/Button";
import {
StatusIndicator,
StatusIndicatorDot,
Expand All @@ -15,12 +16,11 @@ import {
ProvisionerTags,
ProvisionerTruncateTags,
} from "modules/provisioners/ProvisionerTags";
import { useState, type FC } from "react";
import { ProvisionerKey } from "pages/OrganizationSettingsPage/OrganizationProvisionersPage/ProvisionerKey";
import { type FC, useState } from "react";
import { cn } from "utils/cn";
import { relativeTime } from "utils/time";
import { ProvisionerVersion } from "./ProvisionerVersion";
import { ProvisionerKey } from "pages/OrganizationSettingsPage/OrganizationProvisionersPage/ProvisionerKey";
import { Button } from "components/Button/Button";

const variantByStatus: Record<
ProvisionerDaemonStatus,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { Meta, StoryObj } from "@storybook/react";
import { expect, userEvent, within } from "@storybook/test";
import { MockBuildInfo, MockProvisioner } from "testHelpers/entities";
import { ProvisionerVersion } from "./ProvisionerVersion";
import { userEvent, within, expect } from "@storybook/test";

const meta: Meta<typeof ProvisionerVersion> = {
title: "pages/OrganizationProvisionersPage/ProvisionerVersion",
Expand Down