Skip to content

Commit 53dfbb4

Browse files
authored
Merge branch 'master' into master
2 parents 48759f4 + 5ade2fd commit 53dfbb4

File tree

3 files changed

+14
-8
lines changed

3 files changed

+14
-8
lines changed

CONTRIBUTING.md

+2
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,8 @@ To build a Docker image of the project, please ensure you have `Docker` installe
117117
make docker
118118
```
119119

120+
You can also refer to this "<a href="https://www.youtube.com/live/lsw9KA__iu4?si=o8gpZdSHcqO2OKxE">Training: contributing to Sistent</a>" and this <a href="https://www.youtube.com/live/yiXkxbibLUU?si=Dybj5qr0VLhLWEpl">Websites call</a> where experienced contributors have taught how to use sistent in your project or Meshery
121+
120122
### UI Lint Rules
121123

122124
Layer5 uses ES-Lint to maintain code quality & consistency in our UI Code.

src/custom/CatalogDesignTable/DesignTableColumnConfig.tsx

+11-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { Theme } from '@mui/material';
22
import { MUIDataTableColumn, MUIDataTableMeta } from 'mui-datatables';
3+
import { Typography } from '../../base';
34
import { PLAYGROUND_MODES } from '../../constants/constants';
45
import { ChainIcon, CopyIcon, KanvasIcon, PublishIcon } from '../../icons';
56
import Download from '../../icons/Download/Download';
@@ -9,7 +10,7 @@ import { Pattern } from '../CustomCatalog/CustomCard';
910
import { ConditionalTooltip } from '../Helpers/CondtionalTooltip';
1011
import { ColView } from '../Helpers/ResponsiveColumns/responsive-coulmns.tsx';
1112
import { DataTableEllipsisMenu } from '../ResponsiveDataTable';
12-
import { UserTableAvatarInfo } from '../UsersTable';
13+
import AuthorCell from './AuthorCell';
1314
import { getColumnValue } from './helper';
1415
import { L5DeleteIcon, NameDiv } from './style';
1516

@@ -103,14 +104,13 @@ export const createDesignsColumnsConfig = ({
103104
const lastName = getColumnValue(tableMeta as TableMeta, 'last_name');
104105
const avatar_url = getColumnValue(tableMeta as TableMeta, 'avatar_url');
105106
const user_id = getColumnValue(tableMeta as TableMeta, 'user_id');
106-
const userEmail = getColumnValue(tableMeta as TableMeta, 'email');
107107

108108
return (
109-
<UserTableAvatarInfo
110-
userEmail={userEmail}
109+
<AuthorCell
111110
userId={user_id}
112-
userName={`${firstName} ${lastName}`}
113-
profileUrl={avatar_url}
111+
avatarUrl={avatar_url}
112+
firstName={firstName}
113+
lastName={lastName}
114114
/>
115115
);
116116
}
@@ -165,7 +165,11 @@ export const createDesignsColumnsConfig = ({
165165
options: {
166166
filter: false,
167167
sort: false,
168-
searchable: false
168+
searchable: false,
169+
customBodyRender: (_, tableMeta: MUIDataTableMeta) => {
170+
const userEmail = getColumnValue(tableMeta as TableMeta, 'email');
171+
return <Typography variant="body2">{userEmail}</Typography>;
172+
}
169173
}
170174
},
171175

src/custom/UsersTable/UserTableAvatarInfo.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ const UserTableAvatarInfo: React.FC<UserTableAvatarInfoProps> = ({
3838
</Grid>
3939
<Grid item xs>
4040
{userName}
41-
<Typography variant="body2" color={theme.palette.background.brand?.disabled}>
41+
<Typography variant="body2" color={theme.palette.text.disabled}>
4242
{userEmail}
4343
</Typography>
4444
</Grid>

0 commit comments

Comments
 (0)