Client:TableRow:Refactoring.

This commit is contained in:
Vlada Gazizova 2024-08-08 10:37:19 +03:00
parent fef074e0f0
commit c6dd338bb7
2 changed files with 22 additions and 87 deletions

View File

@ -41,7 +41,6 @@ const RoomsRowDataComponent = (props) => {
const { const {
roomColumnTypeIsEnabled, roomColumnTypeIsEnabled,
roomColumnOwnerIsEnabled, roomColumnOwnerIsEnabled,
roomColumnQuickButtonsIsEnabled,
roomColumnTagsIsEnabled, roomColumnTagsIsEnabled,
roomColumnActivityIsEnabled, roomColumnActivityIsEnabled,
roomQuotaColumnIsEnable, roomQuotaColumnIsEnable,
@ -63,6 +62,11 @@ const RoomsRowDataComponent = (props) => {
} = props; } = props;
const lastColumn = getLastColumn(tableStorageName); const lastColumn = getLastColumn(tableStorageName);
const quickButtonsComponentNode = (
<StyledQuickButtonsContainer>
{quickButtonsComponent}
</StyledQuickButtonsContainer>
);
return ( return (
<> <>
@ -85,13 +89,7 @@ const RoomsRowDataComponent = (props) => {
<StyledBadgesContainer showHotkeyBorder={showHotkeyBorder}> <StyledBadgesContainer showHotkeyBorder={showHotkeyBorder}>
{badgesComponent} {badgesComponent}
</StyledBadgesContainer> </StyledBadgesContainer>
{lastColumn === "Name" ? ( {lastColumn === "Name" ? quickButtonsComponentNode : <></>}
<StyledQuickButtonsContainer>
{quickButtonsComponent}
</StyledQuickButtonsContainer>
) : (
<></>
)}
</TableCell> </TableCell>
{roomColumnTypeIsEnabled ? ( {roomColumnTypeIsEnabled ? (
@ -111,13 +109,7 @@ const RoomsRowDataComponent = (props) => {
sideColor={theme.filesSection.tableView.row.sideColor} sideColor={theme.filesSection.tableView.row.sideColor}
{...props} {...props}
/> />
{lastColumn === "Type" ? ( {lastColumn === "Type" ? quickButtonsComponentNode : <></>}
<StyledQuickButtonsContainer>
{quickButtonsComponent}
</StyledQuickButtonsContainer>
) : (
<></>
)}
</TableCell> </TableCell>
) : ( ) : (
<div /> <div />
@ -136,13 +128,7 @@ const RoomsRowDataComponent = (props) => {
sideColor={theme.filesSection.tableView.row.sideColor} sideColor={theme.filesSection.tableView.row.sideColor}
{...props} {...props}
/> />
{lastColumn === "Tags" ? ( {lastColumn === "Tags" ? quickButtonsComponentNode : <></>}
<StyledQuickButtonsContainer>
{quickButtonsComponent}
</StyledQuickButtonsContainer>
) : (
<></>
)}
</TableCell> </TableCell>
) : ( ) : (
<div /> <div />
@ -165,13 +151,7 @@ const RoomsRowDataComponent = (props) => {
sideColor={theme.filesSection.tableView.row.sideColor} sideColor={theme.filesSection.tableView.row.sideColor}
{...props} {...props}
/> />
{lastColumn === "Owner" ? ( {lastColumn === "Owner" ? quickButtonsComponentNode : <></>}
<StyledQuickButtonsContainer>
{quickButtonsComponent}
</StyledQuickButtonsContainer>
) : (
<></>
)}
</TableCell> </TableCell>
) : ( ) : (
<div /> <div />
@ -194,13 +174,7 @@ const RoomsRowDataComponent = (props) => {
sideColor={theme.filesSection.tableView.row.sideColor} sideColor={theme.filesSection.tableView.row.sideColor}
{...props} {...props}
/> />
{lastColumn === "Activity" ? ( {lastColumn === "Activity" ? quickButtonsComponentNode : <></>}
<StyledQuickButtonsContainer>
{quickButtonsComponent}
</StyledQuickButtonsContainer>
) : (
<></>
)}
</TableCell> </TableCell>
) : ( ) : (
<div /> <div />
@ -213,13 +187,7 @@ const RoomsRowDataComponent = (props) => {
type="room" type="room"
isReadOnly={!item?.security?.EditRoom} isReadOnly={!item?.security?.EditRoom}
/> />
{lastColumn === "Storage" ? ( {lastColumn === "Storage" ? quickButtonsComponentNode : <></>}
<StyledQuickButtonsContainer>
{quickButtonsComponent}
</StyledQuickButtonsContainer>
) : (
<></>
)}
</TableCell> </TableCell>
) : ( ) : (
<div /> <div />
@ -232,7 +200,6 @@ export default inject(({ currentQuotaStore, tableStore }) => {
const { const {
roomColumnTypeIsEnabled, roomColumnTypeIsEnabled,
roomColumnOwnerIsEnabled, roomColumnOwnerIsEnabled,
roomColumnQuickButtonsIsEnabled,
roomColumnTagsIsEnabled, roomColumnTagsIsEnabled,
roomColumnActivityIsEnabled, roomColumnActivityIsEnabled,
roomQuotaColumnIsEnable, roomQuotaColumnIsEnable,
@ -244,7 +211,6 @@ export default inject(({ currentQuotaStore, tableStore }) => {
roomQuotaColumnIsEnable, roomQuotaColumnIsEnable,
roomColumnTypeIsEnabled, roomColumnTypeIsEnabled,
roomColumnOwnerIsEnabled, roomColumnOwnerIsEnabled,
roomColumnQuickButtonsIsEnabled,
roomColumnTagsIsEnabled, roomColumnTagsIsEnabled,
roomColumnActivityIsEnabled, roomColumnActivityIsEnabled,
showStorageInfo, showStorageInfo,

View File

@ -60,6 +60,11 @@ const RowDataComponent = (props) => {
} = props; } = props;
const lastColumn = getLastColumn(tableStorageName); const lastColumn = getLastColumn(tableStorageName);
const quickButtonsComponentNode = (
<StyledQuickButtonsContainer>
{quickButtonsComponent}
</StyledQuickButtonsContainer>
);
return ( return (
<> <>
@ -82,13 +87,7 @@ const RowDataComponent = (props) => {
<StyledBadgesContainer showHotkeyBorder={showHotkeyBorder}> <StyledBadgesContainer showHotkeyBorder={showHotkeyBorder}>
{badgesComponent} {badgesComponent}
</StyledBadgesContainer> </StyledBadgesContainer>
{lastColumn === "Name" ? ( {lastColumn === "Name" ? quickButtonsComponentNode : <></>}
<StyledQuickButtonsContainer>
{quickButtonsComponent}
</StyledQuickButtonsContainer>
) : (
<></>
)}
</TableCell> </TableCell>
{authorColumnIsEnabled ? ( {authorColumnIsEnabled ? (
@ -106,13 +105,7 @@ const RowDataComponent = (props) => {
sideColor={theme.filesSection.tableView.row.sideColor} sideColor={theme.filesSection.tableView.row.sideColor}
{...props} {...props}
/> />
{lastColumn === "Author" ? ( {lastColumn === "Author" ? quickButtonsComponentNode : <></>}
<StyledQuickButtonsContainer>
{quickButtonsComponent}
</StyledQuickButtonsContainer>
) : (
<></>
)}
</TableCell> </TableCell>
) : ( ) : (
<div /> <div />
@ -136,13 +129,7 @@ const RowDataComponent = (props) => {
sideColor={theme.filesSection.tableView.row.sideColor} sideColor={theme.filesSection.tableView.row.sideColor}
{...props} {...props}
/> />
{lastColumn === "Created" ? ( {lastColumn === "Created" ? quickButtonsComponentNode : <></>}
<StyledQuickButtonsContainer>
{quickButtonsComponent}
</StyledQuickButtonsContainer>
) : (
<></>
)}
</TableCell> </TableCell>
) : ( ) : (
<div /> <div />
@ -163,13 +150,7 @@ const RowDataComponent = (props) => {
sideColor={theme.filesSection.tableView.row.sideColor} sideColor={theme.filesSection.tableView.row.sideColor}
{...props} {...props}
/> />
{lastColumn === "Modified" ? ( {lastColumn === "Modified" ? quickButtonsComponentNode : <></>}
<StyledQuickButtonsContainer>
{quickButtonsComponent}
</StyledQuickButtonsContainer>
) : (
<></>
)}
</TableCell> </TableCell>
) : ( ) : (
<div /> <div />
@ -190,13 +171,7 @@ const RowDataComponent = (props) => {
sideColor={theme.filesSection.tableView.row.sideColor} sideColor={theme.filesSection.tableView.row.sideColor}
{...props} {...props}
/> />
{lastColumn === "Size" ? ( {lastColumn === "Size" ? quickButtonsComponentNode : <></>}
<StyledQuickButtonsContainer>
{quickButtonsComponent}
</StyledQuickButtonsContainer>
) : (
<></>
)}
</TableCell> </TableCell>
) : ( ) : (
<div /> <div />
@ -219,13 +194,7 @@ const RowDataComponent = (props) => {
sideColor={theme.filesSection.tableView.row.sideColor} sideColor={theme.filesSection.tableView.row.sideColor}
{...props} {...props}
/> />
{lastColumn === "Type" ? ( {lastColumn === "Type" ? quickButtonsComponentNode : <></>}
<StyledQuickButtonsContainer>
{quickButtonsComponent}
</StyledQuickButtonsContainer>
) : (
<></>
)}
</TableCell> </TableCell>
) : ( ) : (
<div /> <div />