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

Copy network id to clipboard from network view #398

Merged
merged 2 commits into from
May 9, 2024
Merged

Copy network id to clipboard from network view #398

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
18dcba6
allow copy network id in network page
sinamics May 9, 2024
707c401
add id to org network
sinamics May 9, 2024
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 src/components/networkByIdPage/networkQrCode.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const urlBuilder = (networkId: string) => {
};

const NetworkQrCode = ({ networkId }: IProps) => {
const t = useTranslations("networkById");
const t = useTranslations();
const [themeRGBColor, setThemeRGBColor] = useState("");
const { theme } = useTheme();

Expand All @@ -28,15 +28,15 @@ const NetworkQrCode = ({ networkId }: IProps) => {
text={urlBuilder(networkId)}
onCopy={() =>
toast.success(
t("copyToClipboard.success", {
t("commonToast.copyToClipboard.success", {
element: urlBuilder(networkId),
}),
{
id: "copyNwid",
},
)
}
title={t("copyToClipboard.title")}
title={t("commonToast.copyToClipboard.title")}
>
<QRCodeSVG
value={urlBuilder(networkId)}
Expand Down
27 changes: 18 additions & 9 deletions src/components/networkByIdPage/table/memberEditCell.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ interface IProp {
}

const MemberEditCell = ({ nwid, central = false, organizationId }: IProp) => {
const c = useTranslations("commonTable");
const t = useTranslations("networkById");
const t = useTranslations();

const handleApiError = useTrpcApiErrorHandler();
const handleApiSuccess = useTrpcApiSuccessHandler();
Expand All @@ -42,7 +41,9 @@ const MemberEditCell = ({ nwid, central = false, organizationId }: IProp) => {
onError: handleApiError,
onSuccess: handleApiSuccess({
actions: [refetchNetworkById],
toastMessage: t("networkMembersTable.toastMessages.memberNameUpdated"),
toastMessage: t(
"networkById.networkMembersTable.toastMessages.memberNameUpdated",
),
}),
});

Expand Down Expand Up @@ -122,7 +123,7 @@ const MemberEditCell = ({ nwid, central = false, organizationId }: IProp) => {
<Input
useTooltip
ref={inputRef}
placeholder={t("networkMembersTable.tableRow.updateName")}
placeholder={t("networkById.networkMembersTable.tableRow.updateName")}
name="networkName"
onChange={(e) => setValue(e.target.value)}
onBlur={onBlur}
Expand All @@ -140,7 +141,11 @@ const MemberEditCell = ({ nwid, central = false, organizationId }: IProp) => {
const has6plane = networkById?.network?.v6AssignMode?.["6plane"];

if (!original.ipAssignments?.length && !hasRfc4193 && !has6plane) {
return <p className="text-gray-500">{c("header.ipAssignments.notAssigned")}</p>;
return (
<p className="text-gray-500">
{t("commonTable.header.ipAssignments.notAssigned")}
</p>
);
}

const rfc4193Ip = hasRfc4193 ? toRfc4193Ip(nwid, original?.id) : undefined;
Expand All @@ -150,8 +155,10 @@ const MemberEditCell = ({ nwid, central = false, organizationId }: IProp) => {
return hasIp ? (
<CopyToClipboard
text={ip}
onCopy={() => toast.success(t("copyToClipboard.success", { element: ip }))}
title={t("copyToClipboard.title")}
onCopy={() =>
toast.success(t("commonToast.copyToClipboard.success", { element: ip }))
}
title={t("commonToast.copyToClipboard.title")}
>
<div className="cursor-pointer">
<div className="badge badge-ghost rounded-md">{ip}</div>
Expand Down Expand Up @@ -181,10 +188,12 @@ const MemberEditCell = ({ nwid, central = false, organizationId }: IProp) => {
text={assignedIp}
onCopy={() =>
toast.success(
t("copyToClipboard.success", { element: assignedIp }),
t("commonToast.copyToClipboard.success", {
element: assignedIp,
}),
)
}
title={t("copyToClipboard.title")}
title={t("commonToast.copyToClipboard.title")}
>
<div className="cursor-pointer">{assignedIp}</div>
</CopyToClipboard>
Expand Down
38 changes: 31 additions & 7 deletions src/components/networkPage/centralNetworkTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ import { useTranslations } from "next-intl";
import { CentralMemberEntity } from "~/types/central/members";
import { getLocalStorageItem, setLocalStorageItem } from "~/utils/localstorage";
import TableFooter from "~/components/shared/tableFooter";
import { CopyToClipboard } from "react-copy-to-clipboard";
import toast from "react-hot-toast";
import CopyIcon from "~/icons/copy";

// import { makeNetworkData } from "../../utils/fakeData";
const TruncateText = ({ text }: { text: string }) => {
Expand Down Expand Up @@ -43,7 +46,8 @@ export const CentralNetworkTable = ({ tableData = [] }) => {
]);

const router = useRouter();
const t = useTranslations("commonTable");
const t = useTranslations();

const [globalFilter, setGlobalFilter] = useState("");
const [sorting, setSorting] = useState<SortingState>(initialSortingState);

Expand All @@ -53,20 +57,40 @@ export const CentralNetworkTable = ({ tableData = [] }) => {
() => [
columnHelper.accessor("name", {
cell: (info) => info.getValue(),
header: () => <span>{t("header.name")}</span>,
header: () => <span>{t("commonTable.header.name")}</span>,
}),
columnHelper.accessor("description", {
size: 300,
cell: (info) => <TruncateText text={info.getValue()} />,
header: () => <span>{t("header.description")}</span>,
header: () => <span>{t("commonTable.header.description")}</span>,
}),
columnHelper.accessor("nwid", {
cell: (info) => info.getValue(),
header: () => <span>{t("header.networkId")}</span>,
// cell: (info) => info.getValue(),
header: () => <span>{t("commonTable.header.networkId")}</span>,
// footer: (info) => info.column.id,
cell: ({ row: { original } }) => {
return (
<div onClick={(e) => e.stopPropagation()}>
<CopyToClipboard
text={original.nwid}
onCopy={() => {
toast.success(
t("commonToast.copyToClipboard.success", { element: original.nwid }),
);
}}
title={t("commonToast.copyToClipboard.title")}
>
<div className="cursor-pointer flex items-center justify-center">
{original.nwid}
<CopyIcon />
</div>
</CopyToClipboard>
</div>
);
},
}),
columnHelper.accessor("totalMemberCount", {
header: () => <span>{t("header.members")}</span>,
header: () => <span>{t("commonTable.header.members")}</span>,
cell: (info) => info.getValue(),
}),
],
Expand Down Expand Up @@ -130,7 +154,7 @@ export const CentralNetworkTable = ({ tableData = [] }) => {
value={globalFilter ?? ""}
onChange={(value) => setGlobalFilter(String(value))}
className="font-lg border-block border p-2 shadow"
placeholder={t("search.networkSearchPlaceholder")}
placeholder={t("commonTable.search.networkSearchPlaceholder")}
/>
</div>
<div className="overflow-auto rounded-lg border border-base-200/50">
Expand Down
45 changes: 34 additions & 11 deletions src/components/networkPage/networkTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ import { getLocalStorageItem, setLocalStorageItem } from "~/utils/localstorage";
import TableFooter from "../shared/tableFooter";
import { useModalStore } from "~/utils/store";
import NetworkOptionsModal from "./networkOptionsModal";
import { CopyToClipboard } from "react-copy-to-clipboard";
import toast from "react-hot-toast";
import CopyIcon from "~/icons/copy";

const LOCAL_STORAGE_KEY = "networkTableSorting";

Expand All @@ -40,8 +43,8 @@ const TruncateText = ({ text }: { text: string }) => {
};
export const NetworkTable = ({ tableData = [] }) => {
const router = useRouter();
const t = useTranslations("networks");
const ct = useTranslations("commonTable");
const t = useTranslations();

const { callModal } = useModalStore((state) => state);

// Load initial state from localStorage or set to default
Expand All @@ -65,27 +68,47 @@ export const NetworkTable = ({ tableData = [] }) => {
() => [
columnHelper.accessor("name", {
cell: (info) => info.getValue(),
header: () => <span>{ct("header.name")}</span>,
header: () => <span>{t("commonTable.header.name")}</span>,
}),
columnHelper.accessor("description", {
size: 300,
cell: (info) => <TruncateText text={info.getValue()} />,
header: () => <span>{ct("header.description")}</span>,
header: () => <span>{t("commonTable.header.description")}</span>,
}),
columnHelper.accessor("nwid", {
cell: (info) => info.getValue(),
header: () => <span>{ct("header.networkId")}</span>,
// cell: (info) => info.getValue(),
header: () => <span>{t("commonTable.header.networkId")}</span>,
// footer: (info) => info.column.id,
cell: ({ row: { original } }) => {
return (
<div onClick={(e) => e.stopPropagation()}>
<CopyToClipboard
text={original.nwid}
onCopy={() => {
toast.success(
t("commonToast.copyToClipboard.success", { element: original.nwid }),
);
}}
title={t("commonToast.copyToClipboard.title")}
>
<div className="cursor-pointer flex items-center justify-center">
{original.nwid}
<CopyIcon />
</div>
</CopyToClipboard>
</div>
);
},
}),
columnHelper.accessor("members", {
header: () => <span>{ct("header.members")}</span>,
header: () => <span>{t("commonTable.header.members")}</span>,
cell: ({ row: { original } }) => {
if (!Array.isArray(original.networkMembers)) return <span>0</span>;
return <span>{original.networkMembers.length}</span>;
},
}),
columnHelper.accessor("action", {
header: () => <span>{ct("header.actions")}</span>,
header: () => <span>{t("commonTable.header.actions")}</span>,
id: "action",
cell: ({ row: { original } }) => {
return (
Expand All @@ -97,7 +120,7 @@ export const NetworkTable = ({ tableData = [] }) => {
title: (
<p>
<span>
{t.rich("networkActionModal.modalTitle", {
{t.rich("networks.networkActionModal.modalTitle", {
span: (children) => (
<span className="text-primary">{children}</span>
),
Expand All @@ -112,7 +135,7 @@ export const NetworkTable = ({ tableData = [] }) => {
}}
className="btn btn-outline btn-xs rounded-sm"
>
{ct("cell.Options")}
{t("commonTable.cell.Options")}
</button>
</div>
);
Expand Down Expand Up @@ -178,7 +201,7 @@ export const NetworkTable = ({ tableData = [] }) => {
value={globalFilter ?? ""}
onChange={(value) => setGlobalFilter(String(value))}
className="font-lg border-block border p-2 shadow"
placeholder={ct("search.networkSearchPlaceholder")}
placeholder={t("commonTable.search.networkSearchPlaceholder")}
/>
</div>
<div className="overflow-auto rounded-lg border border-base-200/50">
Expand Down
44 changes: 34 additions & 10 deletions src/components/organization/networkTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ import { useTranslations } from "next-intl";
import { CentralMemberEntity } from "~/types/central/members";
import { getLocalStorageItem, setLocalStorageItem } from "~/utils/localstorage";
import TableFooter from "~/components/shared/tableFooter";
import { CopyToClipboard } from "react-copy-to-clipboard";
import toast from "react-hot-toast";
import CopyIcon from "~/icons/copy";

// import { makeNetworkData } from "../../utils/fakeData";
const TruncateText = ({ text }: { text: string }) => {
Expand Down Expand Up @@ -47,7 +50,8 @@ export const OrganizationNetworkTable = ({ tableData = [] }) => {
]);

const router = useRouter();
const t = useTranslations("commonTable");
const t = useTranslations();

const [globalFilter, setGlobalFilter] = useState("");
const [sorting, setSorting] = useState<SortingState>(initialSortingState);

Expand All @@ -57,20 +61,40 @@ export const OrganizationNetworkTable = ({ tableData = [] }) => {
() => [
columnHelper.accessor("name", {
cell: (info) => <span className="truncate">{info.getValue()}</span>,
header: () => <span>{t("header.name")}</span>,
header: () => <span>{t("commonTable.header.name")}</span>,
}),
columnHelper.accessor("description", {
size: 300,
cell: (info) => <TruncateText text={info.getValue()} />,
header: () => <span>{t("header.description")}</span>,
header: () => <span>{t("commonTable.header.description")}</span>,
}),
columnHelper.accessor("nwid", {
// cell: (info) => info.getValue(),
header: () => <span>{t("commonTable.header.networkId")}</span>,
// footer: (info) => info.column.id,
cell: ({ row: { original } }) => {
return (
<div onClick={(e) => e.stopPropagation()}>
<CopyToClipboard
text={original.nwid}
onCopy={() => {
toast.success(
t("commonToast.copyToClipboard.success", { element: original.nwid }),
);
}}
title={t("commonToast.copyToClipboard.title")}
>
<div className="cursor-pointer flex items-center justify-center">
{original.nwid}
<CopyIcon />
</div>
</CopyToClipboard>
</div>
);
},
}),
// columnHelper.accessor("nwid", {
// cell: (info) => info.getValue(),
// header: () => <span>{t("networkId")}</span>,
// // footer: (info) => info.column.id,
// }),
columnHelper.accessor("networkMembers", {
header: () => <span>{t("header.members")}</span>,
header: () => <span>{t("commonTable.header.members")}</span>,
cell: (info) => {
const data = info.getValue();
return data.length;
Expand Down Expand Up @@ -137,7 +161,7 @@ export const OrganizationNetworkTable = ({ tableData = [] }) => {
value={globalFilter ?? ""}
onChange={(value) => setGlobalFilter(String(value))}
className="font-lg border-block border p-2 shadow"
placeholder={t("search.networkSearchPlaceholder")}
placeholder={t("commonTable.search.networkSearchPlaceholder")}
/>
</div>
<div className="overflow-auto rounded-lg border border-base-200/50">
Expand Down
10 changes: 5 additions & 5 deletions src/locales/en/common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,11 @@
"deletedSuccessfully": "Deleted successfully",
"errorOccurred": "An unknown error occurred",
"organizationDeleted": "Organization deleted successfully",
"sentSuccessfully": "Sent successfully"
"sentSuccessfully": "Sent successfully",
"copyToClipboard": {
"title": "copy to clipboard",
"success": "{element} copied to clipboard"
}
},
"sidebar": {
"navigation": "Home",
Expand Down Expand Up @@ -153,10 +157,6 @@
"yesAction": "Yes, delete it",
"noAction": "No, keep it"
},
"copyToClipboard": {
"title": "copy to clipboard",
"success": "{element} copied to clipboard"
},
"privatePublicSwitch": {
"accessControllMessage": "Your network is now {authType}",
"privateCardTitle": "Private",
Expand Down
Loading
Loading