Fix glossary ui bugs (#7330)

This commit is contained in:
Ashish Gupta 2022-09-08 17:19:18 +05:30 committed by GitHub
parent da351fdd3e
commit 108fca2c7e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 61 additions and 31 deletions

View File

@ -18,7 +18,7 @@
} }
.edit-input { .edit-input {
padding: 1rem 0; padding: 0 0 8px;
} }
.icon-buttons { .icon-buttons {

View File

@ -290,7 +290,12 @@ const GlossaryDetails = ({ permissions, glossary, updateGlossary }: props) => {
size="small" size="small"
type="text" type="text"
onClick={() => setShowRevieweModal(true)}> onClick={() => setShowRevieweModal(true)}>
<SVGIcons alt="edit" icon={Icons.EDIT} title="Edit" width="16px" /> <SVGIcons
alt="edit"
icon={Icons.IC_EDIT_PRIMARY}
title="Edit"
width="16px"
/>
</ButtonAntd> </ButtonAntd>
</Tooltip> </Tooltip>
); );
@ -313,7 +318,12 @@ const GlossaryDetails = ({ permissions, glossary, updateGlossary }: props) => {
size="small" size="small"
type="text" type="text"
onClick={handleSelectOwnerDropdown}> onClick={handleSelectOwnerDropdown}>
<SVGIcons alt="edit" icon={Icons.EDIT} title="Edit" width="16px" /> <SVGIcons
alt="edit"
icon={Icons.IC_EDIT_PRIMARY}
title="Edit"
width="16px"
/>
</ButtonAntd> </ButtonAntd>
</Tooltip> </Tooltip>
{listVisible && ( {listVisible && (
@ -399,26 +409,24 @@ const GlossaryDetails = ({ permissions, glossary, updateGlossary }: props) => {
<div <div
className="tw-w-full tw-h-full tw-flex tw-flex-col" className="tw-w-full tw-h-full tw-flex tw-flex-col"
data-testid="glossary-details"> data-testid="glossary-details">
<div className="tw-flex tw-flex-wrap tw-group tw-mb-5" data-testid="tags"> <div
{!isTagEditable && ( className="tw-flex tw-items-center tw-flex-wrap tw-group tw-mb-5"
data-testid="tags">
{!isTagEditable && glossary?.tags && glossary.tags.length > 0 && (
<> <>
{glossary?.tags && glossary.tags.length > 0 && ( <SVGIcons
<> alt="icon-tag"
<SVGIcons className="tw-mx-1"
alt="icon-tag" icon="icon-tag-grey"
className="tw-mx-1" width="16"
icon="icon-tag-grey" />
width="16" <TagsViewer tags={glossary.tags} />
/>
<TagsViewer tags={glossary.tags} />
</>
)}
</> </>
)} )}
<div className="tw-inline-block" onClick={handleTagContainerClick}> <div className="tw-inline-block" onClick={handleTagContainerClick}>
<TagsContainer <TagsContainer
buttonContainerClass="tw--mt-0" buttonContainerClass="tw-mt-0"
containerClass="tw-flex tw-items-center tw-gap-2" containerClass="tw-flex tw-items-center tw-gap-2"
dropDownHorzPosRight={false} dropDownHorzPosRight={false}
editable={isTagEditable} editable={isTagEditable}
@ -436,7 +444,7 @@ const GlossaryDetails = ({ permissions, glossary, updateGlossary }: props) => {
}}> }}>
{glossary?.tags && glossary?.tags.length ? ( {glossary?.tags && glossary?.tags.length ? (
<button <button
className=" tw-ml-1 focus:tw-outline-none" className=" tw-ml-1 focus:tw-outline-none flex-center"
disabled={!(permissions.EditTags || permissions.EditAll)}> disabled={!(permissions.EditTags || permissions.EditAll)}>
<SVGIcons <SVGIcons
alt="edit" alt="edit"
@ -481,7 +489,10 @@ const GlossaryDetails = ({ permissions, glossary, updateGlossary }: props) => {
</div> </div>
</div> </div>
<div className="tw-w-3/12 tw-px-2"> <div className="tw-w-3/12 tw-px-2">
<Card action={ownerAction()} heading="Owner"> <Card
action={ownerAction()}
className="shadow-custom"
heading="Owner">
<div className="tw-flex tw-items-center"> <div className="tw-flex tw-items-center">
{glossary.owner && getEntityName(glossary.owner) && ( {glossary.owner && getEntityName(glossary.owner) && (
<div className="tw-inline-block tw-mr-2"> <div className="tw-inline-block tw-mr-2">
@ -505,7 +516,7 @@ const GlossaryDetails = ({ permissions, glossary, updateGlossary }: props) => {
</Card> </Card>
<Card <Card
action={AddReviewerButton()} action={AddReviewerButton()}
className="tw-mt-4" className="tw-mt-4 shadow-custom"
heading="Reviewer"> heading="Reviewer">
<div>{getReviewerTabData()}</div> <div>{getReviewerTabData()}</div>
</Card> </Card>

View File

@ -329,12 +329,17 @@ const GlossaryTermsV1 = ({
placement="topRight" placement="topRight"
title={permissions.EditAll ? 'Add Reviewer' : NO_PERMISSION_FOR_ACTION}> title={permissions.EditAll ? 'Add Reviewer' : NO_PERMISSION_FOR_ACTION}>
<Button <Button
className="tw-p-0" className="tw-p-0 flex-center"
data-testid="add-new-reviewer" data-testid="add-new-reviewer"
disabled={!permissions.EditAll} disabled={!permissions.EditAll}
type="text" type="text"
onClick={() => setShowRevieweModal(true)}> onClick={() => setShowRevieweModal(true)}>
<SVGIcons alt="edit" icon={Icons.EDIT} title="Edit" width="16px" /> <SVGIcons
alt="edit"
icon={Icons.IC_EDIT_PRIMARY}
title="Edit"
width="16px"
/>
</Button> </Button>
</Tooltip> </Tooltip>
); );
@ -534,13 +539,9 @@ const GlossaryTermsV1 = ({
</Col> </Col>
<Col className="tw-px-10" flex="25%"> <Col className="tw-px-10" flex="25%">
<Card <Card
className="glossary-card right-card" className="glossary-card right-card tw-border tw-border-border-gray"
extra={addReviewerButton()} extra={addReviewerButton()}
title={ title={<Text>Reviewer</Text>}>
<Text strong className="p-bt-3">
Reviewer
</Text>
}>
<div>{getReviewerTabData()}</div> <div>{getReviewerTabData()}</div>
</Card> </Card>
</Col> </Col>

View File

@ -27,7 +27,7 @@ const Card = ({ children, heading, action, className }: CardProps) => {
return ( return (
<div <div
className={classNames( className={classNames(
'tw-bg-white tw-border tw-border-border-gray tw-rounded-md tw-shadow-box tw-w-full', 'tw-bg-white tw-border tw-border-border-gray tw-rounded-md tw-w-full',
className className
)} )}
data-testid={`${lowerCase(heading)}-card-container`}> data-testid={`${lowerCase(heading)}-card-container`}>

View File

@ -273,7 +273,7 @@ const ActivityFeedSettingsPage: React.FC = () => {
disabled={!createPermission} disabled={!createPermission}
type="text" type="text"
onClick={handleResetClick}> onClick={handleResetClick}>
Reset all Reset to default
</Button> </Button>
</Tooltip> </Tooltip>
</Space> </Space>

View File

@ -64,6 +64,10 @@
margin-top: 6rem; margin-top: 6rem;
} }
.shadow-custom {
box-shadow: 1px 1px 8px rgb(0 0 0 / 6%);
}
.opacity-60 { .opacity-60 {
opacity: 0.6; opacity: 0.6;
} }

View File

@ -12,7 +12,19 @@
*/ */
.glossary-card { .glossary-card {
box-shadow: 1px 1px 3px rgba(0, 0, 0, 0.12); box-shadow: 1px 1px 8px rgb(0 0 0 / 6%);
.ant-card-body {
padding: 8px 14px;
}
.ant-card-head {
.ant-card-head-wrapper {
padding: 0;
.ant-card-head-title {
padding: 10px 0;
}
}
}
} }
.m-r-1 { .m-r-1 {

View File

@ -16,6 +16,8 @@
body { body {
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
overflow: hidden;
background: #f8f9fa;
} }
a { a {
color: #2eaadc; color: #2eaadc;