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

Jump to bottom

fix: S/A user has email but always validate no email #5482

Merged
merged 1 commit into from
Oct 17, 2024
+25 −13
Merged

fix: S/A user has email but always validate no email #5482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions libs/sdk-ui-dashboard/src/_staging/automation/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {
isFilter,
isFilterContextItem,
IUser,
IWorkspaceUser,
} from "@gooddata/sdk-model";
import omit from "lodash/omit.js";
import isEqual from "lodash/isEqual.js";
Expand Down Expand Up @@ -146,6 +147,15 @@ export const areAutomationsEqual = (
);
};

export const convertCurrentUserToAutomationRecipient = (
users: IWorkspaceUser[],
user: IUser,
): IAutomationRecipient => {
const foundUser = users.find((u) => u.login === user.login);

return convertUserToAutomationRecipient(foundUser ?? user);
};

export const convertUserToAutomationRecipient = (user: IUser): IAutomationRecipient => {
return {
id: user.login,
Expand Down
17 changes: 9 additions & 8 deletions ...rc/presentation/scheduledEmail/DefaultScheduledEmailDialog/hooks/useEditScheduledEmail.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import {
isExportDefinitionDashboardRequestPayload,
IInsight,
IAutomationMetadataObject,
IUser,
IFilter,
INotificationChannelMetadataObject,
isAutomationUserRecipient,
Expand All @@ -25,13 +24,14 @@ import {
ExtendedDashboardWidget,
selectCurrentUser,
selectTimezone,
selectUsers,
} from "../../../../model/index.js";
import { normalizeTime } from "@gooddata/sdk-ui-kit";
import { WidgetAttachmentType } from "../types.js";
import { toModifiedISOString } from "../../DefaultScheduledEmailManagementDialog/utils.js";
import {
areAutomationsEqual,
convertUserToAutomationRecipient,
convertCurrentUserToAutomationRecipient,
getAutomationVisualizationFilters,
isCsvVisualizationAutomation,
isCsvVisualizationExportDefinition,
Expand Down Expand Up @@ -81,7 +81,8 @@ export function useEditScheduledEmail(props: IUseEditScheduledEmailProps) {
const areDashboardFiltersChanged = !!dashboardFilters;

const currentUser = useDashboardSelector(selectCurrentUser);
const defaultRecipient = convertUserToAutomationRecipient(currentUser);
const users = useDashboardSelector(selectUsers);
const defaultRecipient = convertCurrentUserToAutomationRecipient(users, currentUser);

const firstChannel = notificationChannels[0]?.id;

Expand All @@ -95,15 +96,15 @@ export function useEditScheduledEmail(props: IUseEditScheduledEmailProps) {
notificationChannel: firstChannel,
insight,
widget,
user: currentUser,
recipient: defaultRecipient,
widgetFilters,
}
: {
timezone,
dashboardId: dashboardId!,
notificationChannel: firstChannel,
title: dashboardTitle,
user: currentUser,
recipient: defaultRecipient,
dashboardFilters,
},
),
Expand Down Expand Up @@ -463,7 +464,7 @@ function newAutomationMetadataObjectDefinition({
title,
insight,
widget,
user,
recipient,
dashboardFilters,
widgetFilters,
}: {
Expand All @@ -473,7 +474,7 @@ function newAutomationMetadataObjectDefinition({
title?: string;
insight?: IInsight;
widget?: ExtendedDashboardWidget;
user: IUser;
recipient: IAutomationRecipient;
dashboardFilters?: FilterContextItem[];
widgetFilters?: IFilter[];
}): IAutomationMetadataObjectDefinition {
Expand Down Expand Up @@ -510,7 +511,7 @@ function newAutomationMetadataObjectDefinition({
subject: "",
},
exportDefinitions: [{ ...exportDefinition }],
recipients: [convertUserToAutomationRecipient(user)],
recipients: [recipient],
notificationChannel,
dashboard: dashboardId,
};
Expand Down
7 changes: 4 additions & 3 deletions ...rd/src/presentation/widget/insight/configuration/InsightAlertConfig/hooks/useEditAlert.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import {
transformAlertByValue,
} from "../utils.js";
import { AlertMetric } from "../../../types.js";
import { selectCurrentUser, useDashboardSelector } from "../../../../../../model/index.js";
import { convertUserToAutomationRecipient } from "../../../../../../_staging/automation/index.js";
import { selectCurrentUser, selectUsers, useDashboardSelector } from "../../../../../../model/index.js";
import { convertCurrentUserToAutomationRecipient } from "../../../../../../_staging/automation/index.js";
import { isEmail } from "../../../../../scheduledEmail/DefaultScheduledEmailDialog/utils/validate.js";

export interface IUseEditAlertProps {
Expand All @@ -48,6 +48,7 @@ export const useEditAlert = ({
const [updatedAlert, setUpdatedAlert] = useState<IAutomationMetadataObject>(alert);
const [warningMessage, setWarningMessage] = useState<string | undefined>(undefined);
const currentUser = useDashboardSelector(selectCurrentUser);
const users = useDashboardSelector(selectUsers);
const intl = useIntl();

const selectedDestination = destinations.find(
Expand Down Expand Up @@ -107,7 +108,7 @@ export const useEditAlert = ({
*/
const updatedRecipients =
selectedDestination?.allowedRecipients === "CREATOR"
? [convertUserToAutomationRecipient(currentUser)]
? [convertCurrentUserToAutomationRecipient(users, currentUser)]
: undefined;

setUpdatedAlert((alert) => transformAlertByDestination(alert, destinationId, updatedRecipients));
Expand Down
4 changes: 2 additions & 2 deletions .../presentation/widget/insight/configuration/InsightAlertConfig/hooks/useInsightAlerting.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import { createDefaultAlert, getSupportedInsightMeasuresByInsight } from "../uti
import { messages } from "../messages.js";
import { useSaveAlertToBackend } from "./useSaveAlertToBackend.js";
import { fillMissingTitles, useBackendStrict, useWorkspaceStrict } from "@gooddata/sdk-ui";
import { convertUserToAutomationRecipient } from "../../../../../../_staging/automation/index.js";
import { convertCurrentUserToAutomationRecipient } from "../../../../../../_staging/automation/index.js";
import { useMetricsAndFacts } from "../../../../../../_staging/sharedHooks/useMetricsAndFacts.js";
import { DEFAULT_MAX_RECIPIENTS } from "../../../../../scheduledEmail/DefaultScheduledEmailDialog/constants.js";

Expand Down Expand Up @@ -164,7 +164,7 @@ export const useInsightWidgetAlerting = ({ widget, closeInsightWidgetMenu }: IIn
supportedMeasures,
defaultMeasure,
defaultNotificationChannelId,
convertUserToAutomationRecipient(currentUser),
convertCurrentUserToAutomationRecipient(users, currentUser),
metricsAndFacts?.metrics ?? [],
),
);
Expand Down