Skip to content

Commit 94c35df

Browse files
committed
Promote alphaJiraIntegration flag to beta as jiraIntegration (#7886)
1 parent bf1ae96 commit 94c35df

File tree

7 files changed

+15
-16
lines changed

7 files changed

+15
-16
lines changed

clients/admin-ui/src/features/integrations/add-integration/SelectIntegrationType.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export const useIntegrationFilters = () => {
2626
entraMonitor,
2727
newIntegrationManagement,
2828
webMonitor,
29-
alphaJiraIntegration,
29+
jiraIntegration,
3030
},
3131
} = useFlags();
3232

@@ -63,7 +63,7 @@ export const useIntegrationFilters = () => {
6363
);
6464
}
6565

66-
if (!alphaJiraIntegration) {
66+
if (!jiraIntegration) {
6767
staticIntegrations = staticIntegrations.filter(
6868
(integration) =>
6969
integration.placeholder.connection_type !==
@@ -99,7 +99,7 @@ export const useIntegrationFilters = () => {
9999
connectionTypes,
100100
awsMonitor,
101101
entraMonitor,
102-
alphaJiraIntegration,
102+
jiraIntegration,
103103
newIntegrationManagement,
104104
]);
105105

clients/admin-ui/src/features/privacy-requests/RequestDetails.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ type RequestDetailsProps = {
2020
const RequestDetails = ({ subjectRequest }: RequestDetailsProps) => {
2121
const { plus: hasPlus } = useFeatures();
2222
const {
23-
flags: { alphaJiraIntegration },
23+
flags: { jiraIntegration },
2424
} = useFlags();
2525
const {
2626
id,
@@ -111,7 +111,7 @@ const RequestDetails = ({ subjectRequest }: RequestDetailsProps) => {
111111
</Form.Item>
112112
</Form>
113113
<RequestAttachments subjectRequest={subjectRequest} />
114-
{hasPlus && alphaJiraIntegration && (
114+
{hasPlus && jiraIntegration && (
115115
<RequestJiraTickets subjectRequest={subjectRequest} />
116116
)}
117117
</div>

clients/admin-ui/src/features/privacy-requests/dashboard/hooks/usePrivacyRequestsFilters.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@ const usePrivacyRequestsFilters = ({
4343
const { flags } = useFlags();
4444
const allowedStatusFilterOptions = [...SubjectRequestStatusMap.keys()].filter(
4545
(status) =>
46-
status !== PrivacyRequestStatus.PENDING_EXTERNAL ||
47-
flags.alphaJiraIntegration,
46+
status !== PrivacyRequestStatus.PENDING_EXTERNAL || flags.jiraIntegration,
4847
);
4948

5049
const [filters, setFilters] = useQueryStates(

clients/admin-ui/src/features/privacy-requests/dashboard/list-item/components/Header.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export const Header = ({ privacyRequest, primaryIdentity }: HeaderProps) => {
5252
</Flex>
5353
)}
5454
{/* Only the first ticket is shown — at most one Jira ticket per request is supported today */}
55-
{flags.alphaJiraIntegration && privacyRequest.jira_tickets?.[0] && (
55+
{flags.jiraIntegration && privacyRequest.jira_tickets?.[0] && (
5656
<Flex gap={4} align="center">
5757
<Typography.Link
5858
href={privacyRequest.jira_tickets[0].ticket_url}

clients/admin-ui/src/flags.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,11 @@
9898
"test": false,
9999
"production": false
100100
},
101-
"alphaJiraIntegration": {
102-
"label": "Alpha Jira integration",
101+
"jiraIntegration": {
102+
"label": "Jira integration",
103103
"description": "Enable Jira DSR integration for creating and managing Jira issues from privacy requests",
104104
"development": true,
105-
"test": false,
105+
"test": true,
106106
"production": false
107107
},
108108
"alphaPurposeBasedAccessControl": {

clients/admin-ui/src/pages/integrations/[id].tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ const IntegrationDetailView: NextPage = () => {
3232
const oauthHandled = useRef(false);
3333

3434
const {
35-
flags: { alphaJiraIntegration },
35+
flags: { jiraIntegration },
3636
} = useFlags();
3737

3838
const {
@@ -124,7 +124,7 @@ const IntegrationDetailView: NextPage = () => {
124124
if (
125125
!!connection &&
126126
connection.connection_type === ConnectionType.JIRA_TICKET &&
127-
!alphaJiraIntegration
127+
!jiraIntegration
128128
) {
129129
router.push(INTEGRATION_MANAGEMENT_ROUTE);
130130
}

clients/admin-ui/src/pages/integrations/index.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ const IntegrationListView: NextPage = () => {
8888
const oauthHandled = useRef(false);
8989

9090
const {
91-
flags: { newIntegrationManagement, alphaJiraIntegration },
91+
flags: { newIntegrationManagement, jiraIntegration },
9292
} = useFlags();
9393

9494
useEffect(() => {
@@ -138,12 +138,12 @@ const IntegrationListView: NextPage = () => {
138138
if (!newIntegrationManagement) {
139139
types = types.filter((type) => type !== ConnectionType.SAAS);
140140
}
141-
if (!alphaJiraIntegration) {
141+
if (!jiraIntegration) {
142142
types = types.filter((type) => type !== ConnectionType.JIRA_TICKET);
143143
}
144144

145145
return types;
146-
}, [newIntegrationManagement, alphaJiraIntegration]);
146+
}, [newIntegrationManagement, jiraIntegration]);
147147

148148
const { data, isLoading, error } = useGetAllDatastoreConnectionsQuery({
149149
connection_type: connectionTypesToQuery,

0 commit comments

Comments
 (0)