Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2024-12-22 19:07:54 +01:00
Code Issues Projects Releases Wiki Activity

fix: make the conflcit email template button conditionally render (#5931)

Browse Source 
Makes the schedule conflict email button conditional to having the link
present.

Closes #
[1-1950](https://linear.app/unleash/issue/1-1950/modify-the-template-to-make-the-new-button-conditional)

Signed-off-by: andreas-unleash <andreas@getunleash.ai>
This commit is contained in:
andreas-unleash 2024-01-17 15:26:07 +02:00 committed by GitHub
parent 1deee10317
commit 60813acb09
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/component/feature/FeatureStrategy/FeatureStrategyConstraints/FeatureStrategyConstraints.tsx
View File

@ -1,5 +1,5 @@
import { IConstraint, IFeatureStrategy } from 'interfaces/strategy';
import React, { useEffect, useMemo } from 'react';
import React, { useEffect } from 'react';
import {
UPDATE_FEATURE_STRATEGY,
CREATE_FEATURE_STRATEGY,

2
frontend/src/component/feature/FeatureView/FeatureMetrics/FeatureMetricsHours/FeatureMetricsHours.tsx
View File

@ -3,8 +3,6 @@ import GeneralSelect, {
IGeneralSelectProps,
} from 'component/common/GeneralSelect/GeneralSelect';
import { subWeeks, subMonths, differenceInHours } from 'date-fns';
import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig';
import { useUiFlag } from 'hooks/useUiFlag';
import { usePlausibleTracker } from 'hooks/usePlausibleTracker';
import { useExtendedFeatureMetrics } from '../useExtendedFeatureMetrics';

6
src/lib/services/email-service.ts
View File

@ -146,7 +146,7 @@ export class EmailService {
async sendScheduledChangeConflictEmail(
recipient: string,
conflictScope: 'flag' | 'strategy',
conflictingChangeRequestId: number,
conflictingChangeRequestId: number | undefined,
changeRequests: {
id: number;
scheduledAt: string;
@ -173,7 +173,9 @@ export class EmailService {
? `${this.config.server.unleashUrl}/projects/${project}/archive?sort=archivedAt&search=${flagName}`
: false;
const conflictingChangeRequestLink = `${this.config.server.unleashUrl}/projects/${project}/change-requests/${conflictingChangeRequestId}`;
const conflictingChangeRequestLink = conflictingChangeRequestId
? `${this.config.server.unleashUrl}/projects/${project}/change-requests/${conflictingChangeRequestId}`
: false;
const bodyHtml = await this.compileTemplate(
'scheduled-change-conflict',

4
src/mailtemplates/scheduled-change-conflict/scheduled-change-conflict.html.mustache
View File

@ -442,7 +442,9 @@
<li><a class="changeRequestLink" href="{{{ link }}}" target="_blank" rel="noopener noreferrer">#{{id}} {{#title}}- {{.}}{{/title}} (scheduled for {{scheduledAt}})</a></li>
</ul>
{{/changeRequests}}
<a class="buttonStyle" href="{{{ conflictingChangeRequestLink }}} target="_blank" rel="noopener noreferrer">Open change request</a>
{{#conflictingChangeRequestLink}}
<a class="buttonStyle" href="{{{ conflictingChangeRequestLink }}}" target="_blank" rel="noopener noreferrer">Open change request</a>
{{/conflictingChangeRequestLink}}
</td>
</tr>
</table>

4
src/mailtemplates/scheduled-change-conflict/scheduled-change-conflict.plain.mustache
View File

@ -8,4 +8,6 @@ For you, this concerns change requests:
- # {{id}} - {{#title}}- {{.}}{{/title}} (scheduled for {{scheduledAt}}) ({{link}})
{{/changeRequests}}
Open Change request: {{conflictingChangeRequestLink}}
{{#conflictingChangeRequestLink}}
Open Change request: {{conflictingChangeRequestLink}}
{{/conflictingChangeRequestLink}}