useCombinedPrivileges : getPrivilegeId create

This commit is contained in:
ArtChaos189 2023-06-16 00:27:38 +03:00
parent f8b6afdd18
commit 41ab08c5b5
3 changed files with 16 additions and 16 deletions

@ -22,9 +22,15 @@ export const useCombinedPrivileges = () => {
const mergedPrivileges: mergedPrivilege[] = []; const mergedPrivileges: mergedPrivilege[] = [];
const getPrivilegeId = (privilegeId: string): string | undefined => {
const privilege = mergedPrivileges.find((privilege) => privilege.privilegeId === privilegeId);
return privilege?._id;
};
if (privilegies) { if (privilegies) {
mergedPrivileges.push(...privilegies.Шаблонизатор, ...examplePrivileges); mergedPrivileges.push(...privilegies.Шаблонизатор, ...examplePrivileges);
} }
return { mergedPrivileges, isError, errorMessage }; return { mergedPrivileges, isError, errorMessage, getPrivilegeId };
}; };

@ -31,12 +31,12 @@ export default function Tariffs() {
amount: tariff.privilegies[0].amount, amount: tariff.privilegies[0].amount,
isFront: false, isFront: false,
privilegeId: tariff.privilegies[0].privilegeId, privilegeId: tariff.privilegies[0].privilegeId,
customPricePerUnit: tariff.price customPricePerUnit: tariff.price,
} };
updateTariff(toFrontTariff) updateTariff(toFrontTariff);
} }
}) });
// data.data.tariffs.forEach(async (t:any) => { // data.data.tariffs.forEach(async (t:any) => {
// if (t._id) { // if (t._id) {
@ -73,24 +73,21 @@ export default function Tariffs() {
> >
<Typography variant="h6">Список привелегий</Typography> <Typography variant="h6">Список привелегий</Typography>
<Privileges /> <Privileges />
<ChangePriceModal /> <ChangePriceModal />
<CreateTariff /> <CreateTariff />
<Typography variant="h6" mt="20px">
<Typography variant="h6" mt="20px">Список тарифов</Typography> Список тарифов
</Typography>
<TariffsDG <TariffsDG
selectedTariffs={selectedTariffs} selectedTariffs={selectedTariffs}
handleSelectionChange={(selectionModel) => setSelectedTariffs(selectionModel)} handleSelectionChange={(selectionModel) => setSelectedTariffs(selectionModel)}
getTariffs={getTariffs} getTariffs={getTariffs}
/> />
<Cart selectedTariffs={selectedTariffs} /> <Cart selectedTariffs={selectedTariffs} />
</Container> </Container>
); );

@ -21,10 +21,9 @@ import { Tariff_FRONTEND } from "@root/model/tariff";
interface Props { interface Props {
selectedTariffs: GridSelectionModel; selectedTariffs: GridSelectionModel;
handleSelectionChange: (selectionModel: GridSelectionModel) => void; handleSelectionChange: (selectionModel: GridSelectionModel) => void;
getTariffs: () => void getTariffs: () => void;
} }
export default function TariffsDG({ selectedTariffs, handleSelectionChange, getTariffs }: Props) { export default function TariffsDG({ selectedTariffs, handleSelectionChange, getTariffs }: Props) {
const { token } = authStore(); const { token } = authStore();
@ -35,7 +34,6 @@ export default function TariffsDG({ selectedTariffs, handleSelectionChange, getT
const [changingTariff, setChangingTariff] = useState<Tariff_FRONTEND | undefined>(); const [changingTariff, setChangingTariff] = useState<Tariff_FRONTEND | undefined>();
const [errorDelete, setErrorDelete] = useState(false); const [errorDelete, setErrorDelete] = useState(false);
const tariffDeleteDataGrid = async (tarifIid: string) => { const tariffDeleteDataGrid = async (tarifIid: string) => {
if (exampleTariffs.find((tariff) => tariff.id === tarifIid)) { if (exampleTariffs.find((tariff) => tariff.id === tarifIid)) {
deleteTariffs(tarifIid); deleteTariffs(tarifIid);
@ -97,7 +95,6 @@ export default function TariffsDG({ selectedTariffs, handleSelectionChange, getT
enqueueSnackbar(`Not deleted: ${notDeleted.join(", ")}`); enqueueSnackbar(`Not deleted: ${notDeleted.join(", ")}`);
}; };
const columns: GridColDef[] = [ const columns: GridColDef[] = [
{ field: "id", headerName: "ID", width: 100 }, { field: "id", headerName: "ID", width: 100 },
{ field: "name", headerName: "Название тарифа", width: 150 }, { field: "name", headerName: "Название тарифа", width: 150 },