Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add CR id to plausible events #6035

Merged
merged 5 commits into from
Jan 30, 2024
Merged

feat: add CR id to plausible events #6035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
108c780
feat: add conflict count to cr metrics
sjaanus Jan 25, 2024
42c1422
Fix
sjaanus Jan 25, 2024
dc0a198
conflict-cr: use CR ids that are unique across Unleash installations
thomasheartman Jan 26, 2024
f436505
Chore: add missing import
thomasheartman Jan 26, 2024
a5c664c
Rever conflict
sjaanus Jan 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions frontend/src/component/changeRequest/ChangeRequestOverview/ChangeRequestOverview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ import {
ChangeRequestRejectScheduledDialogue,
} from './ChangeRequestScheduledDialogs/changeRequestScheduledDialogs';
import { ScheduleChangeRequestDialog } from './ChangeRequestScheduledDialogs/ScheduleChangeRequestDialog';
import { usePlausibleTracker } from 'hooks/usePlausibleTracker';
import { PlausibleChangeRequestState } from '../changeRequest.types';

const StyledAsideBox = styled(Box)(({ theme }) => ({
Expand Down Expand Up @@ -105,7 +104,6 @@ export const ChangeRequestOverview: FC = () => {
const { isChangeRequestConfiguredForReview } =
useChangeRequestsEnabled(projectId);
const scheduleChangeRequests = useUiFlag('scheduledConfigurationChanges');
const { trackEvent } = usePlausibleTracker();

if (!changeRequest) {
return null;
Expand Down
4 changes: 4 additions & 0 deletions frontend/src/hooks/api/actions/useChangeRequestApi/useChangeRequestApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import useAPI from '../useApi/useApi';
import { usePlausibleTracker } from '../../../usePlausibleTracker';
import { PlausibleChangeRequestState } from 'component/changeRequest/changeRequest.types';
import { getUniqueChangeRequestId } from 'utils/unique-change-request-id';
import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig';

export interface IChangeSchema {
feature: string | null;
Expand Down Expand Up @@ -30,6 +32,7 @@ export const useChangeRequestApi = () => {
const { makeRequest, createRequest, errors, loading } = useAPI({
propagateErrors: true,
});
const { uiConfig } = useUiConfig();

const addChange = async (
project: string,
Expand Down Expand Up @@ -72,6 +75,7 @@ export const useChangeRequestApi = () => {
props: {
eventType: payload.state,
previousState,
id: getUniqueChangeRequestId(uiConfig, changeRequestId),
},
});

Expand Down
10 changes: 10 additions & 0 deletions frontend/src/utils/unique-change-request-id.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { IUiConfig } from 'interfaces/uiConfig';

export const getUniqueChangeRequestId = (
uiConfig: Pick<IUiConfig, 'baseUriPath' | 'versionInfo'>,
changeRequestId: number,
) => {
return `${
uiConfig.baseUriPath || uiConfig.versionInfo?.instanceId
}/change-requests/${changeRequestId}?version=${uiConfig.versionInfo}`;
};
Loading