diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/Teams.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/Teams.spec.ts index d55de5810a5..a67e6ea00ec 100644 --- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/Teams.spec.ts +++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/Teams.spec.ts @@ -283,8 +283,6 @@ test.describe('Teams Page', () => { teamDetails.updatedName ); - await page.locator('[role="tablist"] [data-icon="right"]').click(); - // Click on edit description button await page.locator('[data-testid="edit-description"]').click(); await page.waitForLoadState('domcontentloaded'); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamDetailsV1.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamDetailsV1.tsx index fdc04b5a3df..a368e2999b3 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamDetailsV1.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamDetailsV1.tsx @@ -11,12 +11,11 @@ * limitations under the License. */ -import { DownOutlined, PlusOutlined, RightOutlined } from '@ant-design/icons'; +import { PlusOutlined } from '@ant-design/icons'; import { Avatar, Button, Col, - Collapse, Modal, Row, Space, @@ -911,6 +910,12 @@ const TeamDetailsV1 = ({ ] ); + const editDescriptionPermission = useMemo( + () => + (entityPermissions.EditAll || entityPermissions.EditDescription) && + !isTeamDeleted, + [entityPermissions, isTeamDeleted] + ); const teamsCollapseHeader = useMemo( () => ( <> @@ -983,6 +988,17 @@ const TeamDetailsV1 = ({ updateTeamHandler={updateTeamHandler} /> +
+ +
), [ @@ -999,6 +1015,8 @@ const TeamDetailsV1 = ({ updateTeamHandler, afterDeleteAction, getDeleteMessagePostFix, + editDescriptionPermission, + onDescriptionUpdate, ] ); @@ -1077,13 +1095,6 @@ const TeamDetailsV1 = ({ ] ); - const editDescriptionPermission = useMemo( - () => - (entityPermissions.EditDescription || entityPermissions.EditAll) && - !isTeamDeleted, - [entityPermissions, isTeamDeleted] - ); - if (isTeamMemberLoading > 0) { return ; } @@ -1108,39 +1119,9 @@ const TeamDetailsV1 = ({ - ( - - {isActive ? : } - - )} - expandIconPosition="end"> - - - - + {teamsCollapseHeader} diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/teams.less b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/teams.less index cbb733a6808..d9b0d75a04f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/teams.less +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/teams.less @@ -85,7 +85,6 @@ } .teams-profile-container { - background: @user-profile-background; .collapse-panel-container { padding: 20px; }