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

chore: remove RUM calls #280

Merged
merged 3 commits into from
May 21, 2024
Merged

chore: remove RUM calls #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8fec7c8
chore: remove RUM calls
audrey-kho May 20, 2024
4665e16
Merge branch 'main' into remove-rum
audrey-kho May 20, 2024
258b8b2
Merge branch 'main' into remove-rum
audrey-kho May 21, 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
7 changes: 2 additions & 5 deletions web-src/src/components/ConsentDialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import { useIntl } from 'react-intl';

import { intlMessages } from './App.l10n.js';
import { LegalTermsLink } from './LegalTermsLink.js';
import { sampleRUM } from '../rum.js';
import { log } from '../helpers/MetricsHelper.js';
import ConsentHero from '../assets/consent-hero.png';

Expand All @@ -46,8 +45,7 @@ export function ConsentDialog({ onConsentChange }) {
}, [setOpen]);

const handleAgree = () => {
log('consent:agree');
sampleRUM('genai:consent:agree', { source: 'ConsentDialog#handleAgree' });
log('consent:agree', { source: 'ConsentDialog#handleAgree' });
settingsApi.set({
groupId: EXC_SHELL_GROUP_ID,
level: SettingsLevel.USERORG,
Expand All @@ -59,8 +57,7 @@ export function ConsentDialog({ onConsentChange }) {
};

const handleCancel = () => {
log('consent:cancel');
sampleRUM('genai:consent:cancel', { source: 'ConsentDialog#handleCancel' });
log('consent:cancel', { source: 'ConsentDialog#handleCancel' });
setOpen(false);
onConsentChange(false);
};
Expand Down
4 changes: 1 addition & 3 deletions web-src/src/components/FavoriteVariantCard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ import { useApplicationContext } from './ApplicationProvider.js';
import { useShellContext } from './ShellProvider.js';
import { toHTML, toText } from '../helpers/PromptExporter.js';
import { generateImagePrompt } from '../helpers/ImageHelper.js';
import { sampleRUM } from '../rum.js';
import { VariantImagesView } from './VariantImagesView.js';
import { log } from '../helpers/MetricsHelper.js';
import ExpressNoAccessInfo from './ExpressNoAccessInfo.js';
Expand Down Expand Up @@ -136,8 +135,7 @@ export function FavoriteVariantCard({
isQuiet
UNSAFE_className="hover-cursor-pointer"
onPress={() => {
log('prompt:copyfavorite');
sampleRUM('genai:prompt:copyfavorite', { source: 'FavoriteCard#onPress' });
log('prompt:copyfavorite', { source: 'FavoriteCard#onPress' });
navigator.clipboard.writeText(toText(variant.content));
ToastQueue.positive(
formatMessage(intlMessages.favoritesView.copyTextSuccessToast),
Expand Down
7 changes: 2 additions & 5 deletions web-src/src/components/GenerateButton.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import { LegalTermsLink } from './LegalTermsLink.js';
import { useSaveResults } from '../state/SaveResultsHook.js';
import { createVariants } from '../helpers/ResultsParser.js';
import { log } from '../helpers/MetricsHelper.js';
import { sampleRUM } from '../rum.js';
import { contentFragmentState } from '../state/ContentFragmentState.js';
import { RUN_MODE_CF } from '../state/RunMode.js';
import { FIREFALL_ACTION_TYPES } from '../services/FirefallService.js';
Expand Down Expand Up @@ -121,17 +120,15 @@ export function GenerateButton() {
if (runMode !== RUN_MODE_CF) {
await saveResults();
}
log('prompt:generate:variations:generated', { variations: variants.length, queryId });
sampleRUM('genai:prompt:generatedvariations', { source: 'GenerateButton#generateResults', target: variants.length });
log('prompt:generate:variations:generated', { source: 'GenerateButton#generateResults', variations: variants.length, queryId });
} catch (error) {
console.error(error);
throw error;
}
}, [firefallService, prompt, parameters, temperature]);

const handleGenerate = useCallback(() => {
log('prompt:generate');
sampleRUM('genai:prompt:generate', { source: 'GenerateButton#handleGenerate' });
log('prompt:generate', { source: 'GenerateButton#handleGenerate' });
setGenerationInProgress(true);
setIsOpenPromptEditor(false);

Expand Down
30 changes: 13 additions & 17 deletions web-src/src/components/PromptResultCard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ import { parametersState } from '../state/ParametersState.js';
import { resultsState } from '../state/ResultsState.js';
import { useSaveResults } from '../state/SaveResultsHook.js';
import { useVariantImages } from '../state/VariantImagesHook.js';
import { sampleRUM } from '../rum.js';
import { log } from '../helpers/MetricsHelper.js';
import { toHTML, toText } from '../helpers/PromptExporter.js';
import { generateImagePrompt } from '../helpers/ImageHelper.js';
Expand Down Expand Up @@ -348,18 +347,17 @@ export function PromptResultCard({ result, ...props }) {
}
<TooltipTrigger delay={0}>
<ActionButton
isQuiet
UNSAFE_className="hover-cursor-pointer"
onPress={() => {
log('prompt:copy', { variant: selectedVariant.id });
sampleRUM('genai:prompt:copy', { source: 'ResultCard#onPress' });
navigator.clipboard.writeText(toText(selectedVariant.content));
ToastQueue.positive(
formatMessage(intlMessages.promptResultCard.copyTextSuccessToast),
{ timeout: 1000 },
);
}}>
<CopyOutlineIcon/>
isQuiet
UNSAFE_className="hover-cursor-pointer"
onPress={() => {
log('prompt:copy', { source: 'ResultCard#onPress', variant: selectedVariant.id });
navigator.clipboard.writeText(toText(selectedVariant.content));
ToastQueue.positive(
formatMessage(intlMessages.promptResultCard.copyTextSuccessToast),
{ timeout: 1000 },
);
}}>
<CopyOutlineIcon />
</ActionButton>
<Tooltip>{formatMessage(intlMessages.promptResultCard.copyButtonTooltip)}</Tooltip>
</TooltipTrigger>
Expand Down Expand Up @@ -404,8 +402,7 @@ export function PromptResultCard({ result, ...props }) {
isDisabled={isFeedback(selectedVariant)}
UNSAFE_className="hover-cursor-pointer"
onPress={() => {
log('prompt:thumbsup', { variant: selectedVariant.id });
sampleRUM('genai:prompt:thumbsup', { source: 'ResultCard#onPress' });
log('prompt:thumbsup', { source: 'ResultCard#onPress', variant: selectedVariant.id });
sendFeedback(true, selectedVariant);
}}>
{isFeedback(selectedVariant) ? <ThumbsUpDisabledIcon /> : <ThumbsUpOutlineIcon />}
Expand All @@ -418,8 +415,7 @@ export function PromptResultCard({ result, ...props }) {
isDisabled={isFeedback(selectedVariant)}
UNSAFE_className="hover-cursor-pointer"
onPress={() => {
log('prompt:thumbsdown', { variant: selectedVariant.id });
sampleRUM('genai:prompt:thumbsdown', { source: 'ResultCard#onPress' });
log('prompt:thumbsdown', { source: 'ResultCard#onPress', variant: selectedVariant.id });
sendFeedback(false, selectedVariant);
}}>
{isFeedback(selectedVariant) ? <ThumbsDownDisabledIcon /> : <ThumbsDownOutlineIcon />}
Expand Down
5 changes: 2 additions & 3 deletions web-src/src/components/PromptTemplatesView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import { sessionState } from '../state/SessionState.js';
import { ViewType, viewTypeState } from '../state/ViewType.js';
import { lastUsedPromptTemplateIdState } from '../state/LastUsedPromptTemplateIdState.js';
import { log } from '../helpers/MetricsHelper.js';
import { sampleRUM } from '../rum.js';
import { formatTimestamp } from '../helpers/FormatHelper.js';
import { useApplicationContext } from './ApplicationProvider.js';

Expand Down Expand Up @@ -67,10 +66,10 @@ export function PromptTemplatesView() {
label,
});
if (id === NEW_PROMPT_TEMPLATE_ID) {
sampleRUM('genai:prompt:new', { source: 'HomePanel#handleSelect' });
log('prompt:new', { source: 'HomePanel#handleSelect' });
} else {
const promptType = isBundled ? 'isadobeselected' : 'iscustomselected';
sampleRUM(`genai:prompt:${promptType}`, { source: 'HomePanel#handleSelect' });
log(`prompt:${promptType}`, { source: 'HomePanel#handleSelect' });
}
setCurrentSession(createNewSession(label, description, template));
setViewType(ViewType.CurrentSession);
Expand Down
74 changes: 0 additions & 74 deletions web-src/src/rum.js
View file
Open in desktop

This file was deleted.

Loading