Adjust field name and test id for more clear
This commit is contained in:
@@ -87,7 +87,7 @@ export default class MenuComponent extends React.Component {
|
||||
{typeof item.icon === 'string' ? <Icon type={item.icon} /> : item.icon}
|
||||
</div>
|
||||
)}
|
||||
<div className={`text testid:menu-item-${item.id}`}>{item.text}</div>
|
||||
<div className={`text testid:menu-item-${item.testClassId}`}>{item.text}</div>
|
||||
</div>
|
||||
);
|
||||
} else if (item.type == 'react-element') {
|
||||
@@ -135,7 +135,7 @@ export default class MenuComponent extends React.Component {
|
||||
<Emojione type={item.emoji} />
|
||||
</div>
|
||||
)}
|
||||
<div className={`text testid:menu-item-${item.id}`}>{item.text}</div>
|
||||
<div className={`text testid:menu-item-${item.testClassId}`}>{item.text}</div>
|
||||
<div className="more">
|
||||
{item.rightIcon && <Icon type={item.rightIcon} />}
|
||||
{item.submenu && !item.submenu_replace && <Icon type="angle-right" />}
|
||||
|
||||
@@ -63,7 +63,7 @@ export default class Menu extends React.Component {
|
||||
this.props.menu,
|
||||
elementRect,
|
||||
this.props.position,
|
||||
{},
|
||||
undefined,
|
||||
this.props.testClassId
|
||||
);
|
||||
this.setState({ isMenuOpen: true }, () => this.open = true);
|
||||
|
||||
@@ -210,7 +210,7 @@ export default class MenusBodyLayer extends React.Component {
|
||||
: 'skew_in_right_nobounce'
|
||||
: 'fade_in'
|
||||
}
|
||||
testClassId={item.dataMenuId}
|
||||
testClassId={item.menuTestClassId}
|
||||
/>
|
||||
</div>
|
||||
</OutsideClickHandler>
|
||||
|
||||
@@ -57,7 +57,7 @@ class MenusManager extends Observable {
|
||||
|
||||
this.notify();
|
||||
}
|
||||
async openMenu(menu, domRect, positionType, options, dataMenuId) {
|
||||
async openMenu(menu, domRect, positionType, options, menuTestClassId) {
|
||||
this.isOpen = 1;
|
||||
if(typeof menu === 'function') {
|
||||
menu = await menu();
|
||||
@@ -85,7 +85,7 @@ class MenusManager extends Observable {
|
||||
level: 0,
|
||||
id: Number.unid(),
|
||||
allowClickOut: options.allowClickOut !== undefined ? options.allowClickOut : true,
|
||||
dataMenuId,
|
||||
menuTestClassId,
|
||||
});
|
||||
this.last_opened_id = Number.unid();
|
||||
this.notify();
|
||||
|
||||
@@ -38,7 +38,7 @@ export default (props: { driveItem: DriveItem & { user?: UserType }}) => {
|
||||
|
||||
return (
|
||||
<div
|
||||
className="flex items-center p-2 hover:bg-zinc-50 dark:hover:bg-zinc-800 rounded-md cursor-pointer"
|
||||
className="flex items-center p-2 hover:bg-zinc-50 dark:hover:bg-zinc-800 rounded-md cursor-pointer testid:drive-item-result"
|
||||
onClick={() => {history.push(RouterServices.generateRouteFromState({companyId: company, itemId: file.id})); openDoc(file)}}
|
||||
>
|
||||
<FileResultMedia file={file} className="w-16 h-16 mr-3" />
|
||||
@@ -55,7 +55,7 @@ export default (props: { driveItem: DriveItem & { user?: UserType }}) => {
|
||||
{extension?.toLocaleUpperCase()} • {formatDate(parseInt(file?.last_modified))} •{' '}
|
||||
{formatSize(file?.size)}
|
||||
</Text.Info>
|
||||
<ResultContext user={file.user} />
|
||||
<ResultContext user={file.user} testClassId="search-result-context" />
|
||||
</div>
|
||||
{!file.is_directory && (
|
||||
<div
|
||||
|
||||
@@ -2,9 +2,10 @@
|
||||
import UsersService from '@features/users/services/current-user-service';
|
||||
import { UserType } from '@features/users/types/user';
|
||||
|
||||
export default ({ user }: { user?: UserType }) => {
|
||||
export default ({ user, testClassId }: { user?: UserType; testClassId?: string }) => {
|
||||
const testId = testClassId ? `testid:${testClassId}` : ''
|
||||
return (
|
||||
<div className="flex overflow-hidden whitespace-nowrap text-ellipsis testid:result-context">
|
||||
<div className={`flex overflow-hidden whitespace-nowrap text-ellipsis ${testId}`}>
|
||||
{!!user && <>{UsersService.getFullName(user)}</>}
|
||||
</div>
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user