fix mergedPrivilegeStore

This commit is contained in:
ArtChaos189 2023-06-08 17:01:40 +03:00
parent 51a6fed49a
commit e18b086b3c
3 changed files with 8 additions and 5 deletions

@ -24,7 +24,7 @@ export const useCombinedPrivileges = () => {
if (privilegies) {
mergedPrivileges.push(...privilegies.Шаблонизатор, ...examplePrivileges);
addMergedPrivileges(mergedPrivileges, isError, errorMessage);
}
return { mergedPrivileges, isError, errorMessage };
};

@ -1,7 +1,8 @@
import { GridColDef } from "@mui/x-data-grid";
import DataGrid from "@kitUI/datagrid";
import { Typography } from "@mui/material";
import { mergedPrivilegeStore } from "@root/stores/mergedPrivileges";
import { useCombinedPrivileges } from "@root/hooks/useCombinedPrivileges.hook";
import { addMergedPrivileges } from "@root/stores/mergedPrivileges";
const columns: GridColDef[] = [
{ field: "id", headerName: "id", width: 40 },
@ -12,7 +13,7 @@ const columns: GridColDef[] = [
];
export default function Privileges() {
const { mergedPrivileges, isError, errorMessage } = mergedPrivilegeStore();
const { mergedPrivileges, isError, errorMessage } = useCombinedPrivileges();
const privilegesGridData = mergedPrivileges.map((privilege) => ({
id: privilege.privilegeId,
name: privilege.name,
@ -21,6 +22,8 @@ export default function Privileges() {
price: privilege.price,
}));
addMergedPrivileges(mergedPrivileges, isError, errorMessage);
return (
<>
{isError ? (

@ -36,7 +36,7 @@ export const mergedPrivilegeStore = create<MergedPrivilegeType>()(
export const addMergedPrivileges = (newPrivileges: mergedPrivilege[], isError: boolean, errorMessage: string) => {
mergedPrivilegeStore.setState((state) => ({
mergedPrivileges: [...state.mergedPrivileges, ...newPrivileges],
mergedPrivileges: [...newPrivileges],
isError: isError,
errorMessage: errorMessage,
}));