Skip to content
Merged
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
6 changes: 3 additions & 3 deletions apps/dashboard/app/(app)/apis/[apiId]/api-id-navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ const CreateKeyDialog = dynamic(

const KeysTableActionPopover = dynamic(
() =>
import(
"./keys/[keyAuthId]/_components/components/table/components/actions/keys-table-action.popover"
).then((mod) => mod.KeysTableActionPopover),
import("@/components/logs/table-action.popover").then((mod) => ({
default: mod.TableActionPopover,
})),
{
ssr: false,
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { ConfirmPopover } from "@/components/confirmation-popover";
import type { ActionComponentProps } from "@/components/logs/table-action.popover";
import type { KeyDetails } from "@/lib/trpc/routers/api/keys/query-api-keys/schema";
import { zodResolver } from "@hookform/resolvers/zod";
import { TriangleWarning2 } from "@unkey/icons";
import { Button, DialogContainer, FormCheckbox } from "@unkey/ui";
import { useRef, useState } from "react";
import { Controller, FormProvider, useForm } from "react-hook-form";
import { z } from "zod";
import type { ActionComponentProps } from "../keys-table-action.popover";
import { useDeleteKey } from "./hooks/use-delete-key";
import { KeyInfo } from "./key-info";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { revalidate } from "@/app/actions";
import { ConfirmPopover } from "@/components/confirmation-popover";
import type { ActionComponentProps } from "@/components/logs/table-action.popover";
import type { KeyDetails } from "@/lib/trpc/routers/api/keys/query-api-keys/schema";
import { zodResolver } from "@hookform/resolvers/zod";
import { Button, DialogContainer, FormCheckbox } from "@unkey/ui";
import { useRef, useState } from "react";
import { Controller, FormProvider, useForm } from "react-hook-form";
import { z } from "zod";
import type { ActionComponentProps } from "../keys-table-action.popover";
import { useUpdateKeyStatus } from "./hooks/use-update-key-status";
import { KeyInfo } from "./key-info";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import {
type CreditsFormValues,
creditsSchema,
} from "@/app/(app)/apis/[apiId]/_components/create-key/create-key.schema";
import type { ActionComponentProps } from "@/components/logs/table-action.popover";
import { toast } from "@/components/ui/toaster";
import { usePersistedForm } from "@/hooks/use-persisted-form";
import { trpc } from "@/lib/trpc/client";
Expand All @@ -11,7 +12,6 @@ import { zodResolver } from "@hookform/resolvers/zod";
import { Button, DialogContainer } from "@unkey/ui";
import { useEffect } from "react";
import { FormProvider } from "react-hook-form";
import type { ActionComponentProps } from "../../keys-table-action.popover";
import { useEditCredits } from "../hooks/use-edit-credits";
import { KeyInfo } from "../key-info";
import { getKeyLimitDefaults } from "./utils";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ import {
type ExpirationFormValues,
expirationSchema,
} from "@/app/(app)/apis/[apiId]/_components/create-key/create-key.schema";
import type { ActionComponentProps } from "@/components/logs/table-action.popover";
import { usePersistedForm } from "@/hooks/use-persisted-form";
import type { KeyDetails } from "@/lib/trpc/routers/api/keys/query-api-keys/schema";
import { zodResolver } from "@hookform/resolvers/zod";
import { Button, DialogContainer } from "@unkey/ui";
import { useEffect } from "react";
import { FormProvider } from "react-hook-form";
import type { ActionComponentProps } from "../../keys-table-action.popover";
import { useEditExpiration } from "../hooks/use-edit-expiration";
import { KeyInfo } from "../key-info";
import { getKeyExpirationDefaults } from "./utils";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { ExternalIdField } from "@/app/(app)/apis/[apiId]/_components/create-key/components/external-id-field";
import { ConfirmPopover } from "@/components/confirmation-popover";
import type { ActionComponentProps } from "@/components/logs/table-action.popover";
import type { KeyDetails } from "@/lib/trpc/routers/api/keys/query-api-keys/schema";
import { Button, DialogContainer } from "@unkey/ui";
import { useRef, useState } from "react";
import type { ActionComponentProps } from "../../keys-table-action.popover";
import { useEditExternalId } from "../hooks/use-edit-external-id";
import { KeyInfo } from "../key-info";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { nameSchema } from "@/app/(app)/apis/[apiId]/_components/create-key/create-key.schema";
import type { ActionComponentProps } from "@/components/logs/table-action.popover";
import { usePersistedForm } from "@/hooks/use-persisted-form";
import type { KeyDetails } from "@/lib/trpc/routers/api/keys/query-api-keys/schema";
import { zodResolver } from "@hookform/resolvers/zod";
import { Button, DialogContainer, FormInput } from "@unkey/ui";
import { useEffect } from "react";
import { FormProvider } from "react-hook-form";
import { z } from "zod";
import type { ActionComponentProps } from "../keys-table-action.popover";
import { useEditKeyName } from "./hooks/use-edit-key";
import { KeyInfo } from "./key-info";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ import {
type MetadataFormValues,
metadataSchema,
} from "@/app/(app)/apis/[apiId]/_components/create-key/create-key.schema";
import type { ActionComponentProps } from "@/components/logs/table-action.popover";
import { usePersistedForm } from "@/hooks/use-persisted-form";
import type { KeyDetails } from "@/lib/trpc/routers/api/keys/query-api-keys/schema";
import { zodResolver } from "@hookform/resolvers/zod";
import { Button, DialogContainer } from "@unkey/ui";
import { useEffect } from "react";
import { FormProvider } from "react-hook-form";
import type { ActionComponentProps } from "../../keys-table-action.popover";
import { useEditMetadata } from "../hooks/use-edit-metadata";
import { KeyInfo } from "../key-info";
import { getKeyMetadataDefaults } from "./utils";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ import {
type RatelimitFormValues,
ratelimitSchema,
} from "@/app/(app)/apis/[apiId]/_components/create-key/create-key.schema";
import type { ActionComponentProps } from "@/components/logs/table-action.popover";
import { usePersistedForm } from "@/hooks/use-persisted-form";
import type { KeyDetails } from "@/lib/trpc/routers/api/keys/query-api-keys/schema";
import { zodResolver } from "@hookform/resolvers/zod";
import { Button, DialogContainer } from "@unkey/ui";
import { useEffect } from "react";
import { FormProvider } from "react-hook-form";
import type { ActionComponentProps } from "../../keys-table-action.popover";
import { useEditRatelimits } from "../hooks/use-edit-ratelimits";
import { KeyInfo } from "../key-info";
import { getKeyRatelimitsDefaults } from "./utils";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { MAX_KEYS_FETCH_LIMIT } from "@/app/(app)/authorization/roles/components/upsert-role/components/assign-key/hooks/use-fetch-keys";
import { type MenuItem, TableActionPopover } from "@/components/logs/table-action.popover";
import { toast } from "@/components/ui/toaster";
import { trpc } from "@/lib/trpc/client";
import type { KeyDetails } from "@/lib/trpc/routers/api/keys/query-api-keys/schema";
Expand Down Expand Up @@ -26,7 +27,6 @@ import { EditRatelimits } from "./components/edit-ratelimits";
import { KeyRbacDialog } from "./components/edit-rbac";
import { MAX_PERMS_FETCH_LIMIT } from "./components/edit-rbac/components/assign-permission/hooks/use-fetch-keys-permissions";
import { MAX_ROLES_FETCH_LIMIT } from "./components/edit-rbac/components/assign-role/hooks/use-fetch-keys-roles";
import { KeysTableActionPopover, type MenuItem } from "./keys-table-action.popover";

export const getKeysTableActionItems = (
key: KeyDetails,
Expand Down Expand Up @@ -195,5 +195,5 @@ type KeysTableActionsProps = {
export const KeysTableActions = ({ keyData }: KeysTableActionsProps) => {
const trpcUtils = trpc.useUtils();
const items = getKeysTableActionItems(keyData, trpcUtils);
return <KeysTableActionPopover items={items} />;
return <TableActionPopover items={items} />;
};
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { ActionComponentProps } from "@/app/(app)/apis/[apiId]/keys/[keyAuthId]/_components/components/table/components/actions/keys-table-action.popover";
import { ConfirmPopover } from "@/components/confirmation-popover";
import type { ActionComponentProps } from "@/components/logs/table-action.popover";
import type { Permission } from "@/lib/trpc/routers/authorization/permissions/query";
import { zodResolver } from "@hookform/resolvers/zod";
import { TriangleWarning2 } from "@unkey/icons";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
"use client";
import type { MenuItem } from "@/app/(app)/apis/[apiId]/keys/[keyAuthId]/_components/components/table/components/actions/keys-table-action.popover";
import { KeysTableActionPopover } from "@/app/(app)/apis/[apiId]/keys/[keyAuthId]/_components/components/table/components/actions/keys-table-action.popover";
import { type MenuItem, TableActionPopover } from "@/components/logs/table-action.popover";
import { toast } from "@/components/ui/toaster";
import type { Permission } from "@/lib/trpc/routers/authorization/permissions/query";
import { Clone, PenWriting3, Trash } from "@unkey/icons";
Expand Down Expand Up @@ -49,5 +48,5 @@ export const PermissionsTableActions = ({ permission }: PermissionsTableActionsP

const menuItems = getPermissionsTableActionItems(permission);

return <KeysTableActionPopover items={menuItems} />;
return <TableActionPopover items={menuItems} />;
};
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { ActionComponentProps } from "@/app/(app)/apis/[apiId]/keys/[keyAuthId]/_components/components/table/components/actions/keys-table-action.popover";
import { ConfirmPopover } from "@/components/confirmation-popover";
import type { ActionComponentProps } from "@/components/logs/table-action.popover";
import type { RoleBasic } from "@/lib/trpc/routers/authorization/roles/query";
import { zodResolver } from "@hookform/resolvers/zod";
import { TriangleWarning2 } from "@unkey/icons";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
"use client";

import {
KeysTableActionPopoverDefaultTrigger,
type MenuItem,
} from "@/app/(app)/apis/[apiId]/keys/[keyAuthId]/_components/components/table/components/actions/keys-table-action.popover";
TableActionPopoverDefaultTrigger,
} from "@/components/logs/table-action.popover";
import { toast } from "@/components/ui/toaster";
import { trpc } from "@/lib/trpc/client";
import type { RoleBasic } from "@/lib/trpc/routers/authorization/roles/query";
Expand All @@ -14,12 +15,9 @@ import { DeleteRole } from "./components/delete-role";
import { EditRole } from "./components/edit-role";

const KeysTableActionPopover = dynamic(
() =>
import(
"@/app/(app)/apis/[apiId]/keys/[keyAuthId]/_components/components/table/components/actions/keys-table-action.popover"
).then((mod) => mod.KeysTableActionPopover),
() => import("@/components/logs/table-action.popover").then((mod) => mod.TableActionPopover),
{
loading: KeysTableActionPopoverDefaultTrigger,
loading: TableActionPopoverDefaultTrigger,
},
);

Expand Down

This file was deleted.

Loading