Skip to content

Show the environment ID at the environment list page #1253

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

Merged
pipecd-bot merged 1 commit into from
Dec 15, 2020
Merged

Show the environment ID at the environment list page #1253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 15 additions & 12 deletions pkg/app/web/src/components/environment-list-item.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import {
DialogContent,
DialogTitle,
IconButton,
ListItem,
ListItemSecondaryAction,
ListItemText,
makeStyles,
Menu,
MenuItem,
TableCell,
TableRow,
TextField,
Typography,
} from "@material-ui/core";
import { MoreVert as MoreVertIcon } from "@material-ui/icons";
import { EntityId } from "@reduxjs/toolkit";
Expand Down Expand Up @@ -83,22 +83,25 @@ export const EnvironmentListItem: FC<Props> = memo(

return (
<>
<ListItem key={`env-${env.id}`} divider dense className={classes.item}>
<ListItemText
primary={env.name}
secondary={env.desc || TEXT_NO_DESCRIPTION}
/>
{/** TODO: Remove this style after implemented editing environment's desc API */}
<ListItemSecondaryAction style={{ display: "none" }}>
<TableRow key={`env-${env.id}`} className={classes.item}>
<TableCell>
<Typography variant="subtitle2" component="span">
{env.name}
</Typography>
</TableCell>
<TableCell colSpan={2}>{env.desc || TEXT_NO_DESCRIPTION}</TableCell>
<TableCell>{env.id}</TableCell>
<TableCell align="right" style={{ height: 61 }}>
<IconButton
edge="end"
aria-label="open menu"
onClick={handleClickMenu}
style={{ display: "none" }}
>
<MoreVertIcon />
</IconButton>
</ListItemSecondaryAction>
</ListItem>
</TableCell>
</TableRow>

<Menu
id="env-menu"
Expand Down
47 changes: 28 additions & 19 deletions pkg/app/web/src/pages/settings/environment.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,13 @@ import {
Button,
Divider,
Drawer,
List,
makeStyles,
Paper,
Table,
TableBody,
TableCell,
TableContainer,
TableHead,
TableRow,
Toolbar,
} from "@material-ui/core";
import { Add as AddIcon } from "@material-ui/icons";
Expand All @@ -22,18 +27,8 @@ import {
import { selectProjectName } from "../../modules/me";
import { AppDispatch } from "../../store";

const useStyles = makeStyles((theme) => ({
main: {
overflow: "auto",
},
listItem: {
backgroundColor: theme.palette.background.paper,
},
}));

export const SettingsEnvironmentPage: FC = memo(
function SettingsEnvironmentPage() {
const classes = useStyles();
const dispatch = useDispatch<AppDispatch>();
const [isOpenForm, setIsOpenForm] = useState(false);
const projectName = useSelector<AppState, string>((state) =>
Expand Down Expand Up @@ -66,13 +61,27 @@ export const SettingsEnvironmentPage: FC = memo(
</Toolbar>
<Divider />

<div className={classes.main}>
<List disablePadding>
{envIds.map((envId) => (
<EnvironmentListItem id={envId} key={`env-list-item-${envId}`} />
))}
</List>
</div>
<TableContainer component={Paper} square>
<Table aria-label="environment list" size="small" stickyHeader>
<TableHead>
<TableRow>
<TableCell>Name</TableCell>
<TableCell colSpan={2}>Description</TableCell>
<TableCell>ID</TableCell>
<TableCell align="right" />
</TableRow>
</TableHead>

<TableBody>
{envIds.map((envId) => (
<EnvironmentListItem
id={envId}
key={`env-list-item-${envId}`}
/>
))}
</TableBody>
</Table>
</TableContainer>

<Drawer anchor="right" open={isOpenForm} onClose={handleClose}>
<AddEnvForm
Expand Down