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 getPrivilegeId = (privilegeId: string): string | undefined => {
const privilege = mergedPrivileges.find((privilege) => privilege.privilegeId === privilegeId);
return privilege?._id;
};
if (privilegies) {
mergedPrivileges.push(...privilegies.Шаблонизатор, ...examplePrivileges);
}
return { mergedPrivileges, isError, errorMessage };
return { mergedPrivileges, isError, errorMessage, getPrivilegeId };
};

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

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