+
{(planComposedStatus === 'Accepted' ||
planComposedStatus === 'PurchasedPlan') &&
}
{(planComposedStatus === 'AwaitingApproval' ||
@@ -86,7 +80,6 @@ export const Controls = () => {
planComposedStatus === 'UnquotedDraft') && (
<>
-
)}
diff --git a/src/pages/Plan/modals/SendRequestModal.tsx b/src/pages/Plan/modals/SendRequestModal.tsx
index 7b5135a60..123763485 100644
--- a/src/pages/Plan/modals/SendRequestModal.tsx
+++ b/src/pages/Plan/modals/SendRequestModal.tsx
@@ -10,17 +10,23 @@ import {
Notification,
Skeleton,
SM,
+ Span,
useToast,
XL,
} from '@appquality/unguess-design-system';
+import { useState } from 'react';
import { Trans, useTranslation } from 'react-i18next';
import { useParams } from 'react-router-dom';
import { appTheme } from 'src/app/theme';
-import { useGetPlansByPidRulesEvaluationQuery } from 'src/features/api';
+import {
+ useGetPlansByPidRulesEvaluationQuery,
+ usePutPlansByPidWatchersMutation,
+} from 'src/features/api';
import { useRequestQuotation } from 'src/features/modules/useRequestQuotation';
import { useValidateForm } from 'src/features/planModules';
import { getModuleBySlug } from '../modules/Factory';
import { PurchasablePlanRulesGuide } from './PurchasablePlanRules';
+import { Watchers } from './Watchers';
const SendRequestModal = ({
onQuit,
@@ -31,10 +37,12 @@ const SendRequestModal = ({
}) => {
const { planId } = useParams();
const { t } = useTranslation();
+ const [updateWatchers] = usePutPlansByPidWatchersMutation();
const { isRequestingQuote, handleQuoteRequest } = useRequestQuotation();
const { data, isLoading } = useGetPlansByPidRulesEvaluationQuery({
pid: planId || '',
});
+ const [watchers, setWatchers] = useState
([]);
const isFailed = isPurchasable && data && data.failed.length > 0;
const { addToast } = useToast();
@@ -43,8 +51,14 @@ const SendRequestModal = ({
const { validateForm } = useValidateForm();
+ if (!planId) return null;
+
const handleConfirm = async () => {
try {
+ await updateWatchers({
+ pid: planId,
+ body: { users: watchers.map((id) => ({ id })) },
+ }).unwrap();
await validateForm();
await handleQuoteRequest();
} catch (e) {
@@ -137,6 +151,8 @@ const SendRequestModal = ({
)}
+ *
+
{t('__PLAN_PAGE_MODAL_SEND_REQUEST_TITLE_HINT')}
@@ -154,6 +170,19 @@ const SendRequestModal = ({
{t('__PLAN_PAGE_MODAL_SEND_REQUEST_DATES_HINT')}
+
+
+
+ {t('__PLAN_PAGE_MODAL_SEND_REQUEST_WATCHERS_DESCRIPTION')}
+
+
+
+ {t('__PLAN_PAGE_MODAL_SEND_REQUEST_WATCHERS_HINT')}
+
+
)}
@@ -171,6 +200,7 @@ const SendRequestModal = ({
-
+
);
};
diff --git a/src/pages/Profile/parts/common.tsx b/src/pages/Profile/parts/common.tsx
index d7d2f432d..6d75c52f1 100644
--- a/src/pages/Profile/parts/common.tsx
+++ b/src/pages/Profile/parts/common.tsx
@@ -10,6 +10,14 @@ export const StyledCardHeader = styled.div`
align-items: center;
gap: ${({ theme }) => theme.space.xs};
`;
+
+export const StyledNotificationsCardHeaderWrapper = styled(StyledCardHeader)`
+ display: flex;
+ flex-direction: column;
+ align-items: flex-start;
+ gap: ${({ theme }) => theme.space.sm};
+`;
+
export const StyledContainerCard = styled(ContainerCard)`
padding: ${({ theme }) => theme.space.md};
padding-bottom: ${({ theme }) => theme.space.lg};
diff --git a/src/pages/Profile/valuesType.ts b/src/pages/Profile/valuesType.ts
index a436ec8f3..c265f73c7 100644
--- a/src/pages/Profile/valuesType.ts
+++ b/src/pages/Profile/valuesType.ts
@@ -8,6 +8,11 @@ export type ProfileFormValues = {
companySizeId: number;
};
+export type NotificationSettingsFormValues = {
+ activitySetupUpdates: boolean;
+ activityProgress: boolean;
+};
+
export type PasswordFormValues = {
currentPassword: string;
newPassword: string;
diff --git a/src/pages/Video/Actions.tsx b/src/pages/Video/Actions.tsx
index 9381b14ec..dd0974bd3 100644
--- a/src/pages/Video/Actions.tsx
+++ b/src/pages/Video/Actions.tsx
@@ -106,7 +106,7 @@ const Actions = () => {
-
+
{t('__OBSERVATIONS_DRAWER_TOTAL')}: {observations.length}
{observations && severities && severities.length > 0 && (
diff --git a/src/pages/Video/components/EditTagModal.tsx b/src/pages/Video/components/EditTagModal.tsx
new file mode 100644
index 000000000..2d191b548
--- /dev/null
+++ b/src/pages/Video/components/EditTagModal.tsx
@@ -0,0 +1,192 @@
+import {
+ Button,
+ Input,
+ Label,
+ MD,
+ Message,
+ Notification,
+ Paragraph,
+ SM,
+ TooltipModal,
+ useToast,
+} from '@appquality/unguess-design-system';
+import { useEffect, useRef, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { useParams } from 'react-router-dom';
+import analytics from 'src/analytics';
+import { appTheme } from 'src/app/theme';
+import { ReactComponent as SaveIcon } from 'src/assets/icons/save.svg';
+import {
+ GetCampaignsByCidVideoTagsApiResponse,
+ usePatchCampaignsByCidVideoTagsAndTagIdMutation,
+} from 'src/features/api';
+
+interface EditModalProps {
+ tag: GetCampaignsByCidVideoTagsApiResponse[number]['tags'][number];
+ closeModal: () => void;
+ title: string;
+ label: string;
+ description: string;
+ type: 'theme' | 'extraTag';
+}
+
+export const EditTagModal = ({
+ closeModal,
+ tag,
+ title,
+ label,
+ description,
+ type,
+}: EditModalProps) => {
+ // Extract both the current title and the usage number in parentheses in two variables
+
+ const [newName, setNewName] = useState(tag.name);
+ const inputRef = useRef(null);
+ const [error, setError] = useState(null);
+ const [patchVideoTag] = usePatchCampaignsByCidVideoTagsAndTagIdMutation({});
+ const { addToast } = useToast();
+ const { t } = useTranslation();
+ const { campaignId } = useParams();
+
+ useEffect(() => {
+ if (newName.trim() === '') {
+ setError(
+ t('__VIDEO_PAGE_ACTIONS_OBSERVATION_FORM_FIELD_TITLE_REQUIRED_ERROR')
+ );
+ } else {
+ setError(null);
+ }
+ }, [newName]);
+
+ const handleSubmit = async () => {
+ analytics.track('tagUpdateSubmitted', {
+ tagId: tag.id.toString(),
+ tagType: type,
+ associatedObservations: tag.usageNumber,
+ submissionTime: Date.now(),
+ });
+
+ if (error) return;
+ // Update the title in the form
+ try {
+ await patchVideoTag({
+ cid: campaignId?.toString() || '0',
+ tagId: tag.id.toString(),
+ body: {
+ newTagName: newName,
+ },
+ }).unwrap();
+ closeModal();
+ addToast(
+ ({ close }) => (
+
+ ),
+ { placement: 'top' }
+ );
+ } catch (err: any) {
+ analytics.track('tagUpdateFailed', {
+ tagId: tag.id.toString(),
+ tagType: type,
+ attemptedTagName: newName,
+ errorType: err.status === 409 ? 'duplicate' : 'other',
+ errorMessage: err.message,
+ associatedObservations: tag.usageNumber,
+ });
+
+ // Handle error (e.g., show error toast)
+ // if status code is 409, conflict with another already saved name, show specific error
+ if (err.status === 409) {
+ setError(
+ t('__VIDEO_PAGE_ACTIONS_OBSERVATION_FORM_FIELD_TITLE_DUPLICATE_ERROR')
+ );
+ } else {
+ addToast(
+ ({ close }) => (
+
+ ),
+ { placement: 'top' }
+ );
+ }
+ }
+ };
+ const handleClick = () => {
+ inputRef.current?.focus();
+ };
+
+ return (
+ <>
+
+
+ {title}
+
+
+
+
+ setNewName(e.target.value)}
+ onKeyDown={(e) => {
+ if (e.key === 'Enter') {
+ handleSubmit();
+ }
+ }}
+ />
+ {error ? (
+
+ {error}
+
+ ) : (
+
+ {t('__VIDEO_PAGE_DROPDOWN_EDIT_MODAL_INPUT_HELPER_TEXT')}
+
+ )}
+
+
+ {description}
+
+
+