Merge pull request gooddata#5123 from gooddata/jsc/f1

fix: scheduling filters title style
hackerstanislav · Jul 15, 2024 · 995316a · 995316a
2 parents 186efe6 + 98585be
commit 995316a
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 29 deletions.
diff --git a/...heduledEmail/DefaultScheduledEmailDialog/components/Attachments/AttachmentFiltersList.tsx b/...heduledEmail/DefaultScheduledEmailDialog/components/Attachments/AttachmentFiltersList.tsx
@@ -24,7 +24,9 @@ export const AttachmentFiltersList: React.FC<IAttachmentFiltersListProps> = ({ f
 const FilterListItem: React.FC<{ title: string; subtitle: string }> = ({ title, subtitle }) => {
     return (
         <div className="gd-attachment-filters-list-item">
-            <div className="gd-attachment-filters-list-item-title">{title}</div>
+            <div className="gd-attachment-filters-list-item-title" title={subtitle}>
+                {title}
+            </div>
             <div className="gd-attachment-filters-list-item-subtitle" title={subtitle}>
                 {subtitle}
             </div>

diff --git a/...ntation/scheduledEmail/DefaultScheduledEmailDialog/components/Attachments/Attachments.tsx b/...ntation/scheduledEmail/DefaultScheduledEmailDialog/components/Attachments/Attachments.tsx
@@ -5,7 +5,7 @@ import { FilterContextItem, IAutomationMetadataObject } from "@gooddata/sdk-mode
 import { Message } from "@gooddata/sdk-ui-kit";
 import { AttachmentFilters, AttachmentFilterType } from "./AttachmentFilters.js";
 import { useAttachmentDashboardFilters } from "../../hooks/useAttachmentDashboardFilters.js";
-import { getAutomationDashboardFilters } from "../../utils/getAutomationFilters.js";
+import { getAutomationDashboardFilters } from "../../utils/automationFilters.js";
 
 export interface IAttachmentsProps {
     dashboardTitle: string;

diff --git a/...rc/presentation/scheduledEmail/DefaultScheduledEmailDialog/hooks/useEditScheduledEmail.ts b/...rc/presentation/scheduledEmail/DefaultScheduledEmailDialog/hooks/useEditScheduledEmail.ts
@@ -15,7 +15,7 @@ import { Alignment, normalizeTime } from "@gooddata/sdk-ui-kit";
 import { IScheduledEmailDialogProps } from "../../types.js";
 import { toModifiedISOString } from "../../DefaultScheduledEmailManagementDialog/utils.js";
 import { useAttachmentDashboardFilters } from "./useAttachmentDashboardFilters.js";
-import { getAutomationDashboardFilters } from "../utils/getAutomationFilters.js";
+import { getAutomationDashboardFilters, isDashboardAutomation } from "../utils/automationFilters.js";
 
 export function useEditScheduledEmail(props: IScheduledEmailDialogProps) {
     const { editSchedule, webhooks } = props;
@@ -89,9 +89,7 @@ export function useEditScheduledEmail(props: IScheduledEmailDialogProps) {
                 dashboardTitle,
                 filters,
             });
-            const dashboardExportDefinitionExists = state.exportDefinitions?.some((exportDefinition) =>
-                isExportDefinitionDashboardContent(exportDefinition.requestPayload.content),
-            );
+            const dashboardExportDefinitionExists = isDashboardAutomation(state);
             const updatedExportDefinitions = dashboardExportDefinitionExists
                 ? state.exportDefinitions?.map((exportDefinition) =>
                       isExportDefinitionDashboardContent(exportDefinition.requestPayload.content)

diff --git a/...tation/scheduledEmail/DefaultScheduledEmailDialog/hooks/useSaveScheduledEmailToBackend.ts b/...tation/scheduledEmail/DefaultScheduledEmailDialog/hooks/useSaveScheduledEmailToBackend.ts
@@ -11,7 +11,7 @@ import { useUpdateScheduledEmail } from "./useUpdateScheduledEmail.js";
 import { IScheduledEmailDialogProps } from "../../types.js";
 import { IntlShape, useIntl } from "react-intl";
 import omit from "lodash/omit.js";
-import { getAutomationDashboardFilters } from "../utils/getAutomationFilters.js";
+import { getAutomationDashboardFilters } from "../utils/automationFilters.js";
 
 export function useSaveScheduledEmailToBackend(
     automation: IAutomationMetadataObject | IAutomationMetadataObjectDefinition,

diff --git a/...rd/src/presentation/scheduledEmail/DefaultScheduledEmailDialog/utils/automationFilters.ts b/...rd/src/presentation/scheduledEmail/DefaultScheduledEmailDialog/utils/automationFilters.ts
@@ -0,0 +1,52 @@
+// (C) 2024 GoodData Corporation
+
+import {
+    FilterContextItem,
+    IAutomationMetadataObject,
+    IAutomationMetadataObjectDefinition,
+    IFilter,
+    isExportDefinitionDashboardContent,
+    isExportDefinitionVisualizationObjectContent,
+    isFilter,
+    isFilterContextItem,
+} from "@gooddata/sdk-model";
+
+export const isDashboardAutomation = (
+    automation: IAutomationMetadataObject | IAutomationMetadataObjectDefinition | undefined,
+) => {
+    if (!automation) {
+        return false;
+    }
+
+    return automation?.exportDefinitions?.some((exportDefinition) => {
+        return isExportDefinitionDashboardContent(exportDefinition.requestPayload.content);
+    });
+};
+
+export const getAutomationDashboardFilters = (
+    automation: IAutomationMetadataObject | IAutomationMetadataObjectDefinition | undefined,
+): FilterContextItem[] | undefined => {
+    if (!automation) {
+        return undefined;
+    }
+
+    return automation.exportDefinitions
+        ?.find((exportDefinition) => {
+            return isExportDefinitionDashboardContent(exportDefinition.requestPayload.content);
+        })
+        ?.requestPayload?.content.filters?.filter(isFilterContextItem);
+};
+
+export const getAutomationVisualizationFilters = (
+    automation: IAutomationMetadataObject | IAutomationMetadataObjectDefinition | undefined,
+): IFilter[] | undefined => {
+    if (!automation) {
+        return undefined;
+    }
+
+    return automation.exportDefinitions
+        ?.find((exportDefinition) => {
+            return isExportDefinitionVisualizationObjectContent(exportDefinition.requestPayload.content);
+        })
+        ?.requestPayload?.content.filters?.filter(isFilter);
+};
diff --git a/...src/presentation/scheduledEmail/DefaultScheduledEmailDialog/utils/getAutomationFilters.ts b/...src/presentation/scheduledEmail/DefaultScheduledEmailDialog/utils/getAutomationFilters.ts
diff --git a/libs/sdk-ui-dashboard/styles/scss/scheduled_mail.scss b/libs/sdk-ui-dashboard/styles/scss/scheduled_mail.scss
@@ -281,6 +281,9 @@ $min-content-height: 110px;
         }
 
         .gd-attachment-filters-list-item-title {
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            overflow: hidden;
             color: kit-variables.$gd-color-link;
             font-size: 12px;
             font-style: normal;