fixed styles.module.scss + text wrap in ticket table

open-schools · May 10, 2024 · 56d1bf6 · 56d1bf6
1 parent 2b902fa
commit 56d1bf6
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 15 deletions.
diff --git a/apps/schools/domains/ticket/components/currentTicket/styles/styles.module.scss b/apps/schools/domains/ticket/components/currentTicket/styles/styles.module.scss
@@ -8,7 +8,8 @@
   }
 
   .leftBlock {
-    max-width: 600px;
+    max-width: 800px;
+    width: 100%;
 
     .commentsBlock {
       margin-top: 40px;
@@ -24,7 +25,7 @@
       .sendMessageBlock {
         display: flex;
         flex-direction: column;
-        max-width: 600px;
+        max-width: 800px;
         width: 100%;
         gap: 12px;
 
@@ -43,7 +44,7 @@
           min-height: 64px;
           max-height: 300px;
           width: auto;
-          max-width: 600px;
+          max-width: 800px;
           border-radius: 12px;
         }
       }
@@ -100,12 +101,14 @@
   }
 
   .rightBlock {
+    width: auto;
+    margin-right: 30px;
     display: flex;
     flex-direction: column;
     gap: 82px;
     min-width: 560px;
 
-    @media (max-width: 1440px) {
+    @media (max-width: 1080px) {
       min-width: 125px;
     }
 
@@ -116,9 +119,9 @@
     }
 
     .image {
-      @media (max-width: 1440px) {
+      @media (max-width: 1080px) {
         display: none;
       }
     }
   }
-}
+}
diff --git a/apps/schools/domains/ticket/components/ticketList/index.tsx b/apps/schools/domains/ticket/components/ticketList/index.tsx
@@ -6,17 +6,11 @@ import { Table } from '@domains/common/components/table'
 import { createSearchTextForRequest } from '@domains/common/utils/searchText'
 import { RowType, TableType } from './interfaces'
 import { searchTicketsColumns, StatusDictionary } from './constants'
-import {
-    useGetAllJoinCircleQueriesQuery,
-    useGetAllTicketsQuery,
-    useGetOrganizationAnalyticsQuery,
-    useGetTicketsAnalyticsQuery,
-} from '@domains/organization/redux/organizationApi'
+import { useGetAllTicketsQuery, useGetTicketsAnalyticsQuery } from '@domains/organization/redux/organizationApi'
 import EmptyWrapper from '@domains/common/components/containers/EmptyWrapper'
 import { mapReturnedData } from '@domains/common/redux/utils'
 import { HighlightText } from '@domains/common/components/table/forming'
 import { isReactElement } from '@domains/common/utils/react'
-import { sumObjectValues } from '@domains/common/utils/sumObjectValues'
 import { CloseCircleOutlined, SearchOutlined } from '@ant-design/icons'
 import { Input } from '@domains/common/components/input'
 import { BubbleFilter } from '@domains/common/components/bubbleFilter'
@@ -26,7 +20,6 @@ import { parseAsArrayOf, parseAsString } from 'next-usequerystate'
 import { AppRoutes, RoutePath } from '@domains/common/constants/routerEnums'
 import Image from 'next/image'
 import dot from '@public/icons/dot.svg'
-import { filterTextShaper } from '@domains/common/utils/filterTextShaper'
 
 export function TicketList() {
     const [inputText, setInputText] = useState('')
@@ -78,6 +71,9 @@ export function TicketList() {
     const reformattedData = mapReturnedData(tickets, (query) => {
         const transformedQuery = structuredClone(query) as unknown as TableType
         transformedQuery.content = query.last_comment.value
+        if (transformedQuery.content.length > 200) {
+            transformedQuery.content = transformedQuery.content.slice(0, 200) + '…'
+        }
         transformedQuery.sender = 'Семья ' + query.sender?.name
         return transformedQuery
     })

diff --git a/apps/schools/domains/ticket/components/ticketList/styles/styles.module.scss b/apps/schools/domains/ticket/components/ticketList/styles/styles.module.scss
@@ -64,6 +64,11 @@
   left: 24px;
 }
 
+.text-overflow {
+  text-overflow: ellipsis;
+  line-break: auto;
+}
+
 .cross {
   font-size: 100%;
   position: absolute;
@@ -80,4 +85,4 @@
 
 .tags {
   border-radius: 8px;
-}
+}