Skip to content

Commit ca70144

Browse files
authored
ref(shared-views): Don't show ellipsis menu and remove editable view title in nav (with sharing enabled) (#89551)
1 parent 1550223 commit ca70144

File tree

1 file changed

+43
-23
lines changed

1 file changed

+43
-23
lines changed

static/app/views/nav/secondary/sections/issues/issueViews/issueViewNavItemContent.tsx

Lines changed: 43 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import {Fragment, useEffect, useState} from 'react';
2+
import {css} from '@emotion/react';
23
import styled from '@emotion/styled';
34
import {motion, Reorder, useDragControls} from 'framer-motion';
45

@@ -72,15 +73,16 @@ export function IssueViewNavItemContent({
7273
const organization = useOrganization();
7374
const location = useLocation();
7475
const navigate = useNavigate();
76+
const {projects} = useProjects();
77+
78+
const hasIssueViewSharing = organization.features.includes('issue-view-sharing');
7579

7680
const controls = useDragControls();
7781

7882
const baseUrl = `/organizations/${organization.slug}/issues`;
7983
const [isEditing, setIsEditing] = useState(false);
8084
const {hasUnsavedChanges, changedParams} = useIssueViewUnsavedChanges();
8185

82-
const {projects} = useProjects();
83-
8486
useEffect(() => {
8587
if (isActive) {
8688
if (Object.keys(location.query).length === 0) {
@@ -159,16 +161,20 @@ export function IssueViewNavItemContent({
159161
trailingItems={
160162
<TrailingItemsWrapper
161163
onClickCapture={e => {
162-
e.preventDefault();
164+
if (!hasIssueViewSharing) {
165+
e.preventDefault();
166+
}
163167
}}
164168
>
165169
<IssueViewNavQueryCount view={view} isActive={isActive} />
166-
<IssueViewNavEllipsisMenu
167-
isLastView={isLastView}
168-
setIsEditing={setIsEditing}
169-
view={view}
170-
sectionRef={sectionRef}
171-
/>
170+
{!hasIssueViewSharing && (
171+
<IssueViewNavEllipsisMenu
172+
isLastView={isLastView}
173+
setIsEditing={setIsEditing}
174+
view={view}
175+
sectionRef={sectionRef}
176+
/>
177+
)}
172178
</TrailingItemsWrapper>
173179
}
174180
onPointerDown={e => {
@@ -185,14 +191,19 @@ export function IssueViewNavItemContent({
185191
}
186192
}}
187193
analyticsItemName="issues_view_starred"
194+
hasIssueViewSharing={hasIssueViewSharing}
188195
>
189-
<IssueViewNavEditableTitle
190-
view={view}
191-
isEditing={isEditing}
192-
setIsEditing={setIsEditing}
193-
isDragging={!!isDragging}
194-
isActive={isActive}
195-
/>
196+
{hasIssueViewSharing ? (
197+
view.label
198+
) : (
199+
<IssueViewNavEditableTitle
200+
view={view}
201+
isEditing={isEditing}
202+
setIsEditing={setIsEditing}
203+
isDragging={!!isDragging}
204+
isActive={isActive}
205+
/>
206+
)}
196207
{isActive && hasUnsavedChanges && changedParams && (
197208
<Tooltip
198209
title={constructUnsavedTooltipTitle(changedParams)}
@@ -261,15 +272,19 @@ const TrailingItemsWrapper = styled('div')`
261272
margin-right: ${space(0.25)};
262273
`;
263274

264-
const StyledSecondaryNavItem = styled(SecondaryNav.Item)`
275+
const StyledSecondaryNavItem = styled(SecondaryNav.Item)<{hasIssueViewSharing: boolean}>`
265276
position: relative;
266277
padding-right: ${space(0.5)};
267278
268279
/* Hide the ellipsis menu if the item is not hovered */
269280
:not(:hover) {
270-
[data-ellipsis-menu-trigger]:not([aria-expanded='true']) {
271-
${p => p.theme.visuallyHidden}
272-
}
281+
${p =>
282+
!p.hasIssueViewSharing &&
283+
css`
284+
[data-ellipsis-menu-trigger]:not([aria-expanded='true']) {
285+
${p.theme.visuallyHidden}
286+
}
287+
`}
273288
274289
[data-drag-icon] {
275290
${p => p.theme.visuallyHidden}
@@ -278,9 +293,14 @@ const StyledSecondaryNavItem = styled(SecondaryNav.Item)`
278293
279294
/* Hide the query count if the ellipsis menu is not expanded */
280295
:hover {
281-
[data-issue-view-query-count] {
282-
${p => p.theme.visuallyHidden}
283-
}
296+
${p =>
297+
!p.hasIssueViewSharing &&
298+
css`
299+
[data-issue-view-query-count] {
300+
${p.theme.visuallyHidden}
301+
}
302+
`}
303+
284304
[data-project-icon] {
285305
${p => p.theme.visuallyHidden}
286306
}

0 commit comments

Comments
 (0)