Merge pull request #1104 from MR-MKZ/master

[Update]: add sort by expiration date feature. #348
Gozargah · Jul 19, 2024 · a0e1de9 · a0e1de9
2 parents df028eb + 326dacf
commit a0e1de9
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/app/dashboard/src/components/UsersTable.tsx b/app/dashboard/src/components/UsersTable.tsx
@@ -511,9 +511,8 @@ export const UsersTable: FC<UsersTableProps> = (props) => {
               minW="150px"
               cursor={"pointer"}
             >
-              <HStack spacing={0} position="relative">
+              <HStack position="relative" gap={"5px"}>
                 <Text
-                  position="absolute"
                   _dark={{
                     bg: "gray.750",
                   }}
@@ -523,17 +522,23 @@ export const UsersTable: FC<UsersTableProps> = (props) => {
                   userSelect="none"
                   pointerEvents="none"
                   zIndex={1}
-                  w="100%"
                 >
                   {t("usersTable.status")}
                   {filters.status ? ": " + filters.status : ""}
                 </Text>
+                <Text>/</Text>
+                <Sort sort={filters.sort} column="expire" />
+                <HStack onClick={handleSort.bind(null, "expire")}>
+                  <Text>Sort by expire</Text>
+                </HStack>
                 <Select
                   fontSize="xs"
                   fontWeight="extrabold"
                   textTransform="uppercase"
                   cursor="pointer"
+                  position={"absolute"}
                   p={0}
+                  left={"-40px"}
                   border={0}
                   h="auto"
                   w="auto"