Merge branch 'dev' into 'main'

Users: replacing table with dataGrid &&

See merge request frontend/admin!14

src/kitUI/Cart/Cart.tsx

@@ -91,12 +91,9 @@ export default function Cart({ selectedTariffs }: Props) {
         const cartTariffs = tariffs.filter(tariff => selectedTariffs.includes(tariff.id));
         const cartItems = cartTariffs.map(tariff => createCartItem(tariff));
 
-        const loyaltyValue = parseInt(loyaltyField);
+        let loyaltyValue = parseInt(loyaltyField);
 
-        if (!isFinite(loyaltyValue)) {
+        if (!isFinite(loyaltyValue)) loyaltyValue = 0;
-            setErrorMessage("Лояльность не число");
-            return;
-        }
 
         const cartData = calcCartData({
             user: testUser,

src/pages/dashboard/Content/Support/Chat/Chat.tsx

@@ -62,25 +62,29 @@ export default function Chat() {
     }, [messageApiPage, messagesPerPage, ticketId]);
 
     useEffect(function subscribeToMessages() {
-        if (!ticketId || !token) return;
+==== BASE ====
+        if (!ticketId) return;
 
-        const unsubscribe = subscribeToTicketMessages({
+        if (!token) return;
-            ticketId,
+
-            accessToken: token,
+      const unsubscribe = subscribeToTicketMessages({
-            onMessage(event) {
+        ticketId,
-                try {
+        accessToken: token,
-                    const newMessage = JSON.parse(event.data) as TicketMessage;
+        onMessage(event) {
-                    console.log("SSE: parsed newMessage:", newMessage);
+          try {
-                    addOrUpdateMessages([newMessage]);
+            const newMessage = JSON.parse(event.data) as TicketMessage;
-                } catch (error) {
+            console.log("SSE: parsed newMessage:", newMessage);
-                    console.log("SSE: couldn't parse:", event.data);
+            addOrUpdateMessages([newMessage]);
-                    console.log("Error parsing message SSE", error);
+          } catch (error) {
-                }
+            console.log("SSE: couldn't parse:", event.data);
-            },
+            console.log("Error parsing message SSE", error);
-            onError(event) {
+          }
-                console.log("SSE Error:", event);
+        },
-            },
+        onError(event) {
-        });
+          console.log("SSE Error:", event);
+        },
+      });
+==== BASE ====
 
         return () => {
             unsubscribe();

src/pages/dashboard/Content/Tariffs/CreateTariff.tsx

@@ -19,7 +19,7 @@ export default function CreateTariff() {
 
     function handleCreateTariffClick() {
         const amount = Number(amountField);
-        const customPricePerUnit = Number(customPriceField);
+        const customPrice = Number(customPriceField);
 
         if (isNaN(amount) || !privilege) return;
 
@@ -28,7 +28,7 @@ export default function CreateTariff() {
             name: nameField,
             amount,
             privilege,
-            customPricePerUnit: customPricePerUnit ? customPricePerUnit : undefined,
+            customPricePerUnit: customPrice ? customPrice / amount : undefined,
         };
 
         addTariffs([newTariff]);
@@ -117,7 +117,7 @@ export default function CreateTariff() {
             />
             <CustomTextField
                 id="tariff-custom-price"
-                label="Кастомная цена за единицу (не обязательно)"
+                label="Кастомная цена (не обязательно)"
                 value={customPriceField}
                 setValue={e => setCustomPriceField(e.target.value)}
                 type="number"