Fix: issue-2151 Clicking links in column description open the edit panel and then navigates to the link (#2237)

This commit is contained in:
Shailesh Parmar 2022-01-17 12:42:36 +05:30 committed by GitHub
parent b4983764e5
commit 94cd991462
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 89 additions and 85 deletions

View File

@ -398,29 +398,32 @@ const DashboardDetails = ({
{chart.chartType}
</td>
<td className="tw-group tableBody-cell tw-relative">
<NonAdminAction
html={getHtmlForNonAdminAction(Boolean(owner))}
isOwner={hasEditAccess()}
position="top">
<div className="tw-inline-block">
<div
className="tw-cursor-pointer hover:tw-underline tw-flex"
data-testid="description"
onClick={() =>
handleUpdateChart(chart, index)
}>
<div>
{chart.description ? (
<RichTextEditorPreviewer
markdown={chart.description}
/>
) : (
<span className="tw-no-description">
No description added
</span>
)}
</div>
<button className="tw-self-start tw-w-8 tw-h-auto tw-opacity-0 tw-ml-1 group-hover:tw-opacity-100 focus:tw-outline-none">
<div className="tw-inline-block">
<div
className="tw-cursor-pointer tw-flex"
data-testid="description">
<div>
{chart.description ? (
<RichTextEditorPreviewer
markdown={chart.description}
/>
) : (
<span className="tw-no-description">
No description added
</span>
)}
</div>
<NonAdminAction
html={getHtmlForNonAdminAction(
Boolean(owner)
)}
isOwner={hasEditAccess()}
position="top">
<button
className="tw-self-start tw-w-8 tw-h-auto tw-opacity-0 tw-ml-1 group-hover:tw-opacity-100 focus:tw-outline-none"
onClick={() =>
handleUpdateChart(chart, index)
}>
<SVGIcons
alt="edit"
icon="icon-edit"
@ -428,9 +431,9 @@ const DashboardDetails = ({
width="10px"
/>
</button>
</div>
</NonAdminAction>
</div>
</NonAdminAction>
</div>
</td>
<td
className="tw-group tw-relative tableBody-cell"

View File

@ -476,36 +476,36 @@ const EntityTable = ({
)}
{cell.column.id === 'description' && (
<div>
<NonAdminAction
html={getHtmlForNonAdminAction(Boolean(owner))}
isOwner={hasEditAccess}
position="top">
<div className="tw-inline-block">
<div
className={classNames('tw-flex', {
'tw-cursor-pointer hover:tw-underline':
!isReadOnly,
})}
data-testid="description"
id={`column-description-${index}`}
onClick={() => {
if (!isReadOnly) {
handleEditColumn(row.original, row.id);
}
}}>
<div>
{cell.value ? (
<RichTextEditorPreviewer
markdown={cell.value}
/>
) : (
<span className="tw-no-description">
No description added
</span>
<div className="tw-inline-block">
<div
className="tw-flex"
data-testid="description"
id={`column-description-${index}`}>
<div>
{cell.value ? (
<RichTextEditorPreviewer
markdown={cell.value}
/>
) : (
<span className="tw-no-description">
No description added
</span>
)}
</div>
{!isReadOnly ? (
<NonAdminAction
html={getHtmlForNonAdminAction(
Boolean(owner)
)}
</div>
{!isReadOnly ? (
<button className="tw-self-start tw-w-8 tw-h-auto tw-opacity-0 tw-ml-1 group-hover:tw-opacity-100 focus:tw-outline-none">
isOwner={hasEditAccess}
position="top">
<button
className="tw-self-start tw-w-8 tw-h-auto tw-opacity-0 tw-ml-1 group-hover:tw-opacity-100 focus:tw-outline-none"
onClick={() => {
if (!isReadOnly) {
handleEditColumn(row.original, row.id);
}
}}>
<SVGIcons
alt="edit"
icon="icon-edit"
@ -513,10 +513,10 @@ const EntityTable = ({
width="10px"
/>
</button>
) : null}
</div>
</NonAdminAction>
) : null}
</div>
</NonAdminAction>
</div>
{checkIfJoinsAvailable(row.original.name) && (
<div
className="tw-mt-3"

View File

@ -350,9 +350,8 @@ const PipelineDetails = ({
</td>
<td className="tw-group tableBody-cell tw-relative">
<div
className="tw-cursor-pointer hover:tw-underline tw-flex"
data-testid="description"
onClick={() => handleUpdateTask(task, index)}>
className="tw-cursor-pointer tw-flex"
data-testid="description">
<div>
{task.description ? (
<RichTextEditorPreviewer
@ -364,7 +363,9 @@ const PipelineDetails = ({
</span>
)}
</div>
<button className="tw-self-start tw-w-8 tw-h-auto tw-opacity-0 tw-ml-1 group-hover:tw-opacity-100 focus:tw-outline-none">
<button
className="tw-self-start tw-w-8 tw-h-auto tw-opacity-0 tw-ml-1 group-hover:tw-opacity-100 focus:tw-outline-none"
onClick={() => handleUpdateTask(task, index)}>
<SVGIcons
alt="edit"
icon="icon-edit"

View File

@ -366,28 +366,28 @@ const TagsPage = () => {
<td className="tableBody-cell">
<p>{tag.name}</p>
</td>
<td
className="tw-group tableBody-cell"
onClick={() => {
setIsEditTag(true);
setEditTag(tag);
}}>
<NonAdminAction
position="left"
title={TITLE_FOR_NON_ADMIN_ACTION}>
<div className="tw-cursor-pointer hover:tw-underline tw-flex">
<div>
{tag.description ? (
<RichTextEditorPreviewer
markdown={tag.description}
/>
) : (
<span className="tw-no-description">
No description added
</span>
)}
</div>
<button className="tw-self-start tw-w-8 tw-h-auto tw-opacity-0 tw-ml-1 group-hover:tw-opacity-100 focus:tw-outline-none">
<td className="tw-group tableBody-cell">
<div className="tw-cursor-pointer tw-flex">
<div>
{tag.description ? (
<RichTextEditorPreviewer
markdown={tag.description}
/>
) : (
<span className="tw-no-description">
No description added
</span>
)}
</div>
<NonAdminAction
position="left"
title={TITLE_FOR_NON_ADMIN_ACTION}>
<button
className="tw-self-start tw-w-8 tw-h-auto tw-opacity-0 tw-ml-1 group-hover:tw-opacity-100 focus:tw-outline-none"
onClick={() => {
setIsEditTag(true);
setEditTag(tag);
}}>
<SVGIcons
alt="edit"
data-testid="editTagDescription"
@ -396,8 +396,8 @@ const TagsPage = () => {
width="10px"
/>
</button>
</div>
</NonAdminAction>
</NonAdminAction>
</div>
<div className="tw-mt-1">
<span className="tw-text-grey-muted tw-mr-1">
Usage: