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.

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

KLO-117 : Add domain names in router details and listing screen #94

Merged
merged 3 commits into from
Feb 20, 2024
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
263 changes: 153 additions & 110 deletions src/apps/console/components/console-list-components.tsx
Original file line number Diff line number Diff line change
@@ -1,143 +1,186 @@
import { ReactNode } from 'react';
import {ReactNode, useState} from 'react';
import Tooltip from '~/components/atoms/tooltip';
import { cn } from '~/components/utils';
import {cn, titleCase} from '~/components/utils';
import {CopyrightFill, CopySimple} from "@jengaicons/react";
import useClipboard from "~/lib/client/hooks/use-clipboard";
import {toast} from "~/components/molecule/toast";

interface IBase {
className?: string;
action?: ReactNode;
className?: string;
action?: ReactNode;
}

const BaseStyle = 'flex flex-row items-center gap-xl';

const ListSecondary = ({
className,
action,
title,
avatar,
subtitle,
}: {
className?: string;
action?: ReactNode;
title?: ReactNode;
subtitle?: ReactNode;
avatar?: ReactNode;
className,
action,
title,
avatar,
subtitle,
}: {
className?: string;
action?: ReactNode;
title?: ReactNode;
subtitle?: ReactNode;
avatar?: ReactNode;
}) => {
return (
<div className={cn(BaseStyle, className)}>
<div className="flex flex-row items-center gap-xl flex-1 truncate">
{avatar}
<div className="flex flex-col gap-sm flex-1 truncate">
{title && (
<div className="bodySm truncate text-text-soft pulsable">
{title}
</div>
)}
return (
<div className={cn(BaseStyle, className)}>
<div className="flex flex-row items-center gap-xl flex-1 truncate">
{avatar}
<div className="flex flex-col gap-sm flex-1 truncate">
{title && (
<div className="bodySm truncate text-text-soft pulsable">
{title}
</div>
)}

{subtitle && (
<div className="bodyMd-medium truncate pulsable">{subtitle}</div>
)}
{subtitle && (
<div className="bodyMd-medium truncate pulsable">{subtitle}</div>
)}
</div>
</div>
{action}
</div>
</div>
{action}
</div>
);
);
};

const ListBody = ({
data,
className = '',
action,
}: {
data: ReactNode;
data,
className = '',
action,
}: {
data: ReactNode;
} & IBase) => {
return (
<div
className={cn('bodyMd text-text-strong truncate', BaseStyle, className)}
>
<div className="flex-1 truncate pulsable">{data}</div>
{action}
</div>
);
return (
<div
className={cn('bodyMd text-text-strong truncate', BaseStyle, className)}
>
<div className="flex-1 truncate pulsable">{data}</div>
{action}
</div>
);
};

const ListItem = ({
data,
subtitle,
className = '',
action,
}: {
data?: ReactNode;
subtitle?: ReactNode;
data,
subtitle,
className = '',
action,
}: {
data?: ReactNode;
subtitle?: ReactNode;
} & IBase) => {
return (
<div className={cn(BaseStyle, className)}>
<div className="flex flex-col flex-1 truncate">
{data && (
<div className="flex-1 bodyMd-medium text-text-strong truncate pulsable">
{data}
</div>
)}
{subtitle && (
<div className="pulsable bodyMd text-text-soft truncate">
{subtitle}
</div>
)}
</div>
{action}
</div>
);
return (
<div className={cn(BaseStyle, className)}>
<div className="flex flex-col flex-1 truncate">
{data && (
<div className="flex-1 bodyMd-medium text-text-strong truncate pulsable">
{data}
</div>
)}
{subtitle && (
<div className="pulsable bodyMd text-text-soft truncate">
{subtitle}
</div>
)}
</div>
{action}
</div>
);
};

const ListTitle = ({
className,
action,
title,
avatar,
subtitle,
}: {
className?: string;
action?: ReactNode;
title?: ReactNode;
subtitle?: ReactNode;
avatar?: ReactNode;
className,
action,
title,
avatar,
subtitle,
}: {
className?: string;
action?: ReactNode;
title?: ReactNode;
subtitle?: ReactNode;
avatar?: ReactNode;
}) => {
return (
<div className={cn(BaseStyle, className)}>
<div className="flex flex-row items-center gap-xl flex-1 truncate">
{avatar}
<div className="flex flex-col gap-sm flex-1 truncate">
{title && (
<div className="bodyMd-semibold text-text-default truncate pulsable">
<Tooltip.Root
className="!w-fit !max-w-fit"
side="top"
content={<div className="bodySm text-text-strong">{title}</div>}
>
<span className="w-fit">{title}</span>
</Tooltip.Root>
return (
<div className={cn(BaseStyle, className)}>
<div className="flex flex-row items-center gap-xl flex-1 truncate">
{avatar}
<div className="flex flex-col gap-sm flex-1 truncate">
{title && (
<div className="bodyMd-semibold text-text-default truncate pulsable">
<Tooltip.Root
className="!w-fit !max-w-fit"
side="top"
content={<div className="bodySm text-text-strong">{title}</div>}
>
<span className="w-fit">{title}</span>
</Tooltip.Root>
</div>
)}

{subtitle && (
<div className="bodySm text-text-soft truncate pulsable">
{subtitle}
</div>
)}
</div>
</div>
)}
{action}
</div>
);
};

const ListDomainItem = ({
data,
value,
}: {
data: ReactNode;
value: string;
}) => {
const [_, setCopyIcon] = useState(<CopySimple/>);
const {copy} = useClipboard({
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggestion (llm): Using an underscore as a variable name for the state variable returned from useState is unconventional when the variable is actually used. Consider using a more descriptive name for the state variable that holds the current icon.

onSuccess: () => {
setTimeout(() => {
setCopyIcon(<CopyrightFill/>);
toast.success(`${titleCase("domain name")} copied successfully`);
}, 1000);
// toast.success('Copied to clipboard');
},
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nitpick (llm): It appears there's a commented-out line of code left in the changes. If this line is no longer needed, it's best to remove it to keep the codebase clean and maintainable.

});

{subtitle && (
<div className="bodySm text-text-soft truncate pulsable">
{subtitle}
return (
<div
onClick={(event) => {
event.preventDefault()
copy(value);
}}
className="flex flex-row gap-md items-center select-none group cursor-pointer"
>
<div className="flex flex-col flex-1">
{data && (
<div className="bodyMd-medium text-text-soft truncate pulsable">
{data}
</div>
)}
</div>
)}
<span className="invisible group-hover:visible">
<CopySimple size={10}/>
</span>
</div>
</div>
{action}
</div>
);
);
};

const listFlex = ({ key }: { key: string }) => ({
key,
className: 'basis-full',
render: () => <div />,
const listFlex = ({key}: { key: string }) => ({
key,
className: 'basis-full',
render: () => <div/>,
});

const listClass = {
title: 'w-[180px] min-w-[180px] max-w-[180px] mr-2xl',
author: 'w-[180px] min-w-[180px] max-w-[180px]',
title: 'w-[180px] min-w-[180px] max-w-[180px] mr-2xl',
author: 'w-[180px] min-w-[180px] max-w-[180px]',
};
export { ListBody, ListItem, ListTitle, ListSecondary, listFlex, listClass };
export {ListBody, ListItem, ListTitle, ListSecondary, listFlex, ListDomainItem, listClass};
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
ListItem,
ListTitle,
listClass,
listFlex,
listFlex, ListDomainItem,
} from '~/console/components/console-list-components';
import DeleteDialog from '~/console/components/delete-dialog';
import Grid from '~/console/components/grid';
Expand All @@ -26,6 +26,7 @@ import { useConsoleApi } from '~/console/server/gql/api-provider';
import { useReload } from '~/root/lib/client/helpers/reloader';
import { toast } from '~/components/molecule/toast';
import HandleRouter from './handle-router';
import {CopyButton} from "~/console/components/commons";

const RESOURCE_NAME = 'domain';
type BaseType = ExtractNodeType<IRouters>;
Expand Down Expand Up @@ -104,6 +105,21 @@ const GridView = ({ items, onAction }: IResource) => {
/>
),
},
{
key: generateKey(keyPrefix, name),
className: listClass.author,
render: () => (
item.spec.domains.map((domain) => {
return (
<ListDomainItem
key={generateKey(keyPrefix, id + domain)}
data={domain}
value={domain}
/>
)
})
),
},
{
key: generateKey(keyPrefix, updateInfo.author),
render: () => (
Expand Down Expand Up @@ -141,6 +157,20 @@ const ListView = ({ items, onAction }: IResource) => {
render: () => <ListTitle title={name} />,
},
status,
{
key: generateKey(keyPrefix, name),
render: () => (
item.spec.domains.map((domain) => {
return (
<ListDomainItem
key={generateKey(keyPrefix, id + domain)}
data={domain}
value={domain}
/>
)
})
),
},
listFlex({ key: 'flex-1' }),
{
key: generateKey(keyPrefix, updateInfo.author),
Expand Down
1 change: 1 addition & 0 deletions src/generated/gql/sdl.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -2927,6 +2927,7 @@ type Mutation {
infra_updateHelmRelease(clusterName: String!, release: HelmReleaseIn!): HelmRelease
infra_updateNodePool(clusterName: String!, pool: NodePoolIn!): NodePool
infra_updateProviderSecret(secret: CloudProviderSecretIn!): CloudProviderSecret
infra_upgradeHelmKloudliteAgent(clusterName: String!): Boolean!
oAuth_addLogin(code: String!, provider: String!, state: String!): Boolean!
oAuth_login(code: String!, provider: String!, state: String): Session!
}
Expand Down
Loading
Loading