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

fix(frontend): align data grid toggle action #102

Merged
merged 2 commits into from
Sep 30, 2024
Merged

fix(frontend): align data grid toggle action #102

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
357da9b
fix(frontend): align data grid toggle action
marrouchi Sep 29, 2024
6981884
Update frontend/src/components/languages/index.tsx
marrouchi Sep 30, 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
1 change: 0 additions & 1 deletion api/src/user/schemas/user.schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ export class UserStub extends BaseSchema {

@Prop({
type: String,
unique: true,
required: true,
})
password: string;
Expand Down
49 changes: 31 additions & 18 deletions frontend/src/app-components/tables/DataGrid.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,34 +6,47 @@
* 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
*/

import { styled } from "@mui/material";
import { useTheme } from "@mui/material";
import {
DataGridProps,
gridClasses,
GridColDef,
GridValidRowModel,
DataGrid as MuiDataGrid,
} from "@mui/x-data-grid";

import { renderHeader } from "./columns/renderHeader";
import { styledPaginationSlots } from "./DataGridStyledPagination";
import { NoDataOverlay } from "./NoDataOverlay";

const StyledDataGrid = styled(MuiDataGrid)(({ theme }) => ({
"& .MuiDataGrid-overlayWrapper": {
height: "fit-content",
},
export const StyledDataGrid = <T extends GridValidRowModel = any>(
props: DataGridProps<T>,
) => {
const theme = useTheme();
const { sx, ...otherProps } = props;

[`& .${gridClasses.row}`]: {
"&:hover": {
backgroundColor: theme.palette.background.default,
"@media (hover: none)": {
backgroundColor: theme.palette.background.default,
},
},
},
}));
return (
<MuiDataGrid
{...otherProps}
sx={{
"& .MuiDataGrid-overlayWrapper": {
height: "fit-content",
},
[`& .${gridClasses.row}`]: {
"&:hover": {
backgroundColor: theme.palette.background.default,
"@media (hover: none)": {
backgroundColor: theme.palette.background.default,
},
},
},
...sx,
}}
/>
);
};

export const DataGrid = ({
export const DataGrid = <T extends GridValidRowModel = any>({
columns,
rows = [],
autoHeight = true,
Expand All @@ -46,8 +59,8 @@ export const DataGrid = ({
showColumnVerticalBorder = false,
sx = { border: "none" },
...rest
}: DataGridProps) => {
const styledColumns: GridColDef[] = columns.map((col) => ({
}: DataGridProps<T>) => {
const styledColumns: GridColDef<T>[] = columns.map((col) => ({
disableColumnMenu: true,
renderHeader,
headerAlign: "left",
Expand All @@ -56,7 +69,7 @@ export const DataGrid = ({
}));

return (
<StyledDataGrid
<StyledDataGrid<T>
autoHeight={autoHeight}
disableRowSelectionOnClick={disableRowSelectionOnClick}
slots={slots}
Expand Down
64 changes: 44 additions & 20 deletions frontend/src/components/contents/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import { faAlignLeft } from "@fortawesome/free-solid-svg-icons";
import AddIcon from "@mui/icons-material/Add";
import ArrowBackIcon from "@mui/icons-material/ArrowBack";
import { Button, Chip, Grid, Paper, Typography } from "@mui/material";
import { Button, Chip, Grid, Paper, Switch, Typography } from "@mui/material";
import Link from "next/link";
import { useRouter } from "next/router";
import { useTranslation } from "react-i18next";
Expand All @@ -24,13 +24,14 @@ import { renderHeader } from "@/app-components/tables/columns/renderHeader";
import { DataGrid } from "@/app-components/tables/DataGrid";
import { useDelete } from "@/hooks/crud/useDelete";
import { useFind } from "@/hooks/crud/useFind";
import { useGet } from "@/hooks/crud/useGet";
import { useGet, useGetFromCache } from "@/hooks/crud/useGet";
import { useUpdate } from "@/hooks/crud/useUpdate";
import { getDisplayDialogs, useDialog } from "@/hooks/useDialog";
import { useHasPermission } from "@/hooks/useHasPermission";
import { useSearch } from "@/hooks/useSearch";
import { useToast } from "@/hooks/useToast";
import { PageHeader } from "@/layout/content/PageHeader";
import { EntityType } from "@/services/types";
import { EntityType, Format } from "@/services/types";
import { IContentType } from "@/types/content-type.types";
import { IContent } from "@/types/content.types";
import { PermissionAction } from "@/types/permission.types";
Expand Down Expand Up @@ -62,17 +63,26 @@ export const Contents = () => {
entity: EntityType.CONTENT_TYPE,
});
const { dataGridProps } = useFind(
{ entity: EntityType.CONTENT },
{ entity: EntityType.CONTENT, format: Format.FULL },
{
params: searchPayload,
},
);
const { mutateAsync: updateContent } = useUpdate(EntityType.CONTENT, {
onError: (error) => {
toast.error(error.message || t("message.internal_server_error"));
},
onSuccess() {
toast.success(t("message.success_save"));
},
});
const { mutateAsync: deleteContent } = useDelete(EntityType.CONTENT, {
onSuccess: () => {
deleteDialogCtl.closeDialog();
toast.success(t("message.item_delete_success"));
},
});
const getEntityFromCache = useGetFromCache(EntityType.CONTENT_TYPE);
const actionColumns = useActionColumns<IContent>(
EntityType.CONTENT,
[
Expand Down Expand Up @@ -108,7 +118,7 @@ export const Contents = () => {

<PageHeader
icon={faAlignLeft}
chip={<Chip label={data?.name} variant="title" />}
chip={<Chip label={data?.name} size="medium" variant="title" />}
title={t("title.content")}
>
<Grid justifyContent="flex-end" gap={1} container alignItems="center">
Expand Down Expand Up @@ -143,7 +153,7 @@ export const Contents = () => {

<Grid padding={2} container>
<Grid item width="100%">
<DataGrid
<DataGrid<IContent>
{...dataGridProps}
disableColumnFilter
showCellVerticalBorder={false}
Expand All @@ -155,25 +165,39 @@ export const Contents = () => {
field: "entity",
headerName: t("label.entity"),
flex: 1,
valueGetter: (row) => row["name"],
valueGetter: (row: IContent) => {
const contentType = getEntityFromCache(row.id);

return contentType?.name;
},
},
{
maxWidth: 120,
field: "status",
headerName: t("label.status"),
resizable: false,
disableColumnMenu: true,
renderHeader,
headerAlign: "left",
renderCell: (params) => (
<Grid container>
<Grid item xs={12}>
<Chip
label={t(
params.row.status
? "label.enabled"
: "label.disabled",
)}
variant={params.row.status ? "enabled" : "disabled"}
/>
</Grid>
</Grid>
<Switch
checked={params.value}
color="primary"
inputProps={{ "aria-label": "primary checkbox" }}
disabled={
!hasPermission(
EntityType.CONTENT,
PermissionAction.UPDATE,
)
}
onChange={() => {
updateContent({
id: params.row.id,
params: {
status: !params.row.status,
},
});
}}
/>
),
},
{
Expand Down
3 changes: 3 additions & 0 deletions frontend/src/components/context-vars/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,9 @@ export const ContextVars = () => {
checked={params.value}
color="primary"
inputProps={{ "aria-label": "primary checkbox" }}
disabled={
!hasPermission(EntityType.CONTEXT_VAR, PermissionAction.UPDATE)
}
onChange={() => {
updateContextVar({
id: params.row.id,
Expand Down
34 changes: 20 additions & 14 deletions frontend/src/components/languages/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import { Flag } from "@mui/icons-material";
import AddIcon from "@mui/icons-material/Add";
import { Button, Grid, Paper } from "@mui/material";
import { Button, Grid, Paper, Switch } from "@mui/material";
import { GridColDef } from "@mui/x-data-grid";
import { useTranslation } from "react-i18next";
import { useQueryClient } from "react-query";
Expand Down Expand Up @@ -92,13 +92,6 @@ export const Languages = () => {
const actionColumns = useActionColumns<ILanguage>(
EntityType.LANGUAGE,
[
{
label: ActionColumnLabel.Toggle,
action: (row) => toggleDefault(row),
requires: [PermissionAction.UPDATE],
getState: (row) => row.isDefault,
helperText: t("button.mark_as_default"),
},
{
label: ActionColumnLabel.Edit,
action: (row) => editDialogCtl.openDialog(row),
Expand Down Expand Up @@ -133,21 +126,34 @@ export const Languages = () => {
},
{
flex: 1,
field: "isDefault",
headerName: t("label.is_default"),
field: "isRTL",
headerName: t("label.is_rtl"),
disableColumnMenu: true,
renderHeader,
headerAlign: "left",
valueGetter: (value) => (value ? t("label.yes") : t("label.no")),
},
{
flex: 1,
field: "isRTL",
headerName: t("label.is_rtl"),
maxWidth: 120,
field: "isDefault",
headerName: t("label.is_default"),
disableColumnMenu: true,
renderHeader,
headerAlign: "left",
valueGetter: (value) => (value ? t("label.yes") : t("label.no")),
renderCell: (params) => (
<Switch
checked={params.value}
color="primary"
inputProps={{ "aria-label": "primary checkbox" }}
disabled={
params.value ||
!hasPermission(EntityType.LANGUAGE, PermissionAction.UPDATE)
}
onChange={() => {
toggleDefault(params.row);
}}
/>
),
},
{
minWidth: 140,
Expand Down
48 changes: 23 additions & 25 deletions frontend/src/components/users/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import { faUsers } from "@fortawesome/free-solid-svg-icons";
import PersonAddAlt1Icon from "@mui/icons-material/PersonAddAlt1";
import { Button, Grid, Paper } from "@mui/material";
import { Button, Grid, Paper, Switch } from "@mui/material";
import { GridColDef } from "@mui/x-data-grid";
import { useTranslation } from "react-i18next";

Expand All @@ -23,6 +23,7 @@ import { buildRenderPicture } from "@/app-components/tables/columns/renderPictur
import { DataGrid } from "@/app-components/tables/DataGrid";
import { useFind } from "@/hooks/crud/useFind";
import { useUpdate } from "@/hooks/crud/useUpdate";
import { useAuth } from "@/hooks/useAuth";
import { useConfig } from "@/hooks/useConfig";
import { getDisplayDialogs, useDialog } from "@/hooks/useDialog";
import { useHasPermission } from "@/hooks/useHasPermission";
Expand All @@ -42,6 +43,7 @@ export const Users = () => {
const { ssoEnabled } = useConfig();
const { t } = useTranslation();
const { toast } = useToast();
const { user } = useAuth();
const { mutateAsync: updateUser } = useUpdate(EntityType.USER, {
onError: (error) => {
toast.error(error.message || t("message.internal_server_error"));
Expand Down Expand Up @@ -136,33 +138,29 @@ export const Users = () => {
maxWidth: 120,
field: "state",
headerName: t("label.status"),
resizable: false,
disableColumnMenu: true,
renderHeader,
headerAlign: "left",
renderCell: (params) => (
<Grid justifyContent="center" alignItems="center">
<Button
variant="contained"
color={params.row.state ? "success" : "error"}
sx={{
paddingX: 2,
paddingY: 1,
}}
onClick={() => {
updateUser({
id: params.row.id,
params: {
state: !params.row.state,
},
});
}}
disabled={ssoEnabled}
>
{t(params.row.state ? "label.enabled" : "label.disabled")}
</Button>
</Grid>
<Switch
checked={params.value}
color="primary"
inputProps={{ "aria-label": "primary checkbox" }}
disabled={
params.row.id === user?.id ||
ssoEnabled ||
!hasPermission(EntityType.USER, PermissionAction.UPDATE)
}
onChange={() => {
updateUser({
id: params.row.id,
params: {
state: !params.row.state,
},
});
}}
/>
),
headerAlign: "center",
renderHeader,
},
{
minWidth: 140,
Expand Down