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

fix: add helper text to editable cell, change trash button to bookmark #180

Merged
merged 4 commits into from
Feb 11, 2023
Merged
Show file tree
Hide file tree
Changes from 3 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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Improvements

- [#180](https://github.com/alleslabs/celatone-frontend/pull/180) Add helper text to editable cell, Change trash button to bookmark button
- [#171](https://github.com/alleslabs/celatone-frontend/pull/171) Change gql query for better speed, remove unwrap and default values, and better handle data rendering
- [#177](https://github.com/alleslabs/celatone-frontend/pull/177) Handle instantiate render: tx hash, proposal, genesis, and data not available case
- [#176](https://github.com/alleslabs/celatone-frontend/pull/176) Adjust contract table fraction, limit tag render, full ellipsis contract desc/name length
Expand Down
54 changes: 29 additions & 25 deletions src/lib/components/table/EditableCell.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -97,42 +97,46 @@ export const EditableCell = ({
onMouseOver={handleMouseEnter}
onMouseOut={handleMouseOut}
position="relative"
zIndex={2}
w="full"
>
{isEditCellOpen ? (
<Flex
ref={editCellRef}
alignItems="center"
gap={1}
direction="column"
position="absolute"
top="-28px"
zIndex="sticky"
top="-32px"
left="-16px"
bg="pebble.800"
p={3}
borderRadius="8px"
zIndex="sticky"
onClick={(e) => e.stopPropagation()}
ref={editCellRef}
>
<Input
size="sm"
value={inputValue}
onChange={handleChange}
width="full"
minWidth="300px"
maxLength={maxLength}
autoFocus
onKeyDown={(e) => {
if (e.key === "Enter") handleSave();
else if (e.key === "Escape") handleCancel();
}}
/>
<Button size="sm" onClick={handleSave} variant="ghost-gray">
<Icon as={MdCheck} color="success.main" />
</Button>
<Button onClick={handleCancel} size="sm" variant="ghost-gray">
<Icon as={MdClose} color="error.light" />
</Button>
<Flex alignItems="center" gap={1}>
<Input
size="sm"
value={inputValue}
onChange={handleChange}
width="full"
minW="472px"
minH="40px"
maxLength={maxLength}
autoFocus
onKeyDown={(e) => {
if (e.key === "Enter") handleSave();
else if (e.key === "Escape") handleCancel();
}}
/>
<Button size="sm" onClick={handleSave} variant="ghost-gray">
<Icon boxSize={6} as={MdCheck} color="success.main" />
</Button>
<Button onClick={handleCancel} size="sm" variant="ghost-gray">
<Icon boxSize={6} as={MdClose} color="error.light" />
</Button>
</Flex>
<Text fontSize="body3" color="text.dark" ml={4} mt={2}>
Your input will be stored in this device only.
evilpeach marked this conversation as resolved.
Show resolved Hide resolved
</Text>
</Flex>
) : (
<Flex
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ export const ContractTable = observer(({ codeId }: ContractTableProps) => {
{!codeContracts?.length ? (
<NoContracts />
) : (
<TableContainer>
<TableContainer overflow="visible">
<Grid templateColumns={templateColumnsStyle} minW="min-content">
<TableHeader borderTopStyle="none">Contract Address</TableHeader>
<TableHeader>Contract Name</TableHeader>
Expand Down
24 changes: 4 additions & 20 deletions src/lib/pages/codes/components/CodesTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import { MdSearchOff } from "react-icons/md";
import { useInternalNavigate } from "lib/app-provider";
import { InstantiateButton } from "lib/components/button";
import { ExplorerLink } from "lib/components/ExplorerLink";
import { RemoveCodeModal } from "lib/components/modal/code/RemoveCode";
import { SaveOrRemoveCodeModal } from "lib/components/modal/code/SaveOrRemoveCode";
import { PermissionChip } from "lib/components/PermissionChip";
import { DisconnectedState } from "lib/components/state/DisconnectedState";
Expand All @@ -36,13 +35,11 @@ interface CodesTableProps {
tableName: string;
codes: CodeInfo[];
action?: ReactNode;
isRemovable?: boolean;
isSearching: boolean;
}

interface CodesRowProps {
code: CodeInfo;
isRemovable: boolean;
}

interface OtherTBodyProps {
Expand Down Expand Up @@ -119,7 +116,7 @@ const CodeTableHead = () => {
);
};

const CodeTableRow = ({ code, isRemovable }: CodesRowProps) => {
const CodeTableRow = ({ code }: CodesRowProps) => {
const navigate = useInternalNavigate();
const goToCodeDetails = () => {
navigate({ pathname: `/code/${code.id}` });
Expand Down Expand Up @@ -178,11 +175,7 @@ const CodeTableRow = ({ code, isRemovable }: CodesRowProps) => {
permissionAddresses={code.permissionAddresses}
codeId={code.id}
/>
{isRemovable ? (
<RemoveCodeModal codeId={code.id} name={code.name} />
) : (
<SaveOrRemoveCodeModal codeInfo={code} />
)}
<SaveOrRemoveCodeModal codeInfo={code} />
</HStack>
</Flex>
</TableRowNoBorder>
Expand All @@ -193,16 +186,14 @@ const CodeTableRow = ({ code, isRemovable }: CodesRowProps) => {
const NormalRender = ({
codes,
tableName,
isRemovable = false,
}: Pick<CodesTableProps, "codes" | "tableName" | "isRemovable">) => {
}: Pick<CodesTableProps, "codes" | "tableName">) => {
return (
<TableContainer mb={20} position="relative">
<CodeTableHead />
{codes.map((code) => (
<CodeTableRow
key={`row-${tableName}-${code.id}-${code.name}-${code.uploader}`}
code={code}
isRemovable={isRemovable}
/>
))}
</TableContainer>
Expand All @@ -214,7 +205,6 @@ function CodesTable({
tableName,
codes,
action,
isRemovable,
isSearching,
}: CodesTableProps) {
const { address } = useWallet();
Expand All @@ -223,13 +213,7 @@ function CodesTable({
if (!address && type === "stored") return <Unconnected />;
if (codes.length === 0 && isSearching) return <NotMatched />;
if (codes.length === 0) return <Empty type={type} />;
return (
<NormalRender
isRemovable={isRemovable}
codes={codes}
tableName={tableName}
/>
);
return <NormalRender codes={codes} tableName={tableName} />;
};

return (
Expand Down
2 changes: 0 additions & 2 deletions src/lib/pages/codes/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ const Codes = observer(() => {
tableName="My Saved Codes"
codes={saved}
action={<SaveCodeButton />}
isRemovable
isSearching={!!keyword}
/>
</TabPanel>
Expand All @@ -114,7 +113,6 @@ const Codes = observer(() => {
codes={saved}
action={<SaveCodeButton />}
isSearching={!!keyword}
isRemovable
/>
</TabPanel>
</TabPanels>
Expand Down