-
Notifications
You must be signed in to change notification settings - Fork 94
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Nu-7330] Use activities endpoint to compute ranges in counts window (#…
…7333) (#7372) Co-authored-by: Piotr Rudnicki <[email protected]> (cherry picked from commit 237ae88)
- Loading branch information
Showing
6 changed files
with
101 additions
and
54 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
68 changes: 68 additions & 0 deletions
68
designer/client/src/components/modals/CalculateCounts/useActivityHistory.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| import { useEffect, useState } from "react"; | ||
| import { useTranslation } from "react-i18next"; | ||
| import HttpService from "../../../http/HttpService"; | ||
| import { DATE_FORMAT } from "../../../config"; | ||
| import { Range } from "./CountsRangesButtons"; | ||
| import moment from "moment"; | ||
| import { ActivityTypesRelatedToExecutions } from "../../toolbars/activities/types"; | ||
|
|
||
| function displayableNameOfPredefinedActivityType(predefinedActivityType: ActivityTypesRelatedToExecutions) { | ||
| switch (predefinedActivityType) { | ||
| case ActivityTypesRelatedToExecutions.ScenarioCanceled: | ||
| return "Cancel"; | ||
| case ActivityTypesRelatedToExecutions.ScenarioDeployed: | ||
| return "Deployment"; | ||
| case ActivityTypesRelatedToExecutions.PerformedScheduledExecution: | ||
| return "Scheduled deployment"; | ||
| case ActivityTypesRelatedToExecutions.PerformedSingleExecution: | ||
| return "Run now"; | ||
| default: | ||
| return "Unknown activity type"; | ||
| } | ||
| } | ||
| /* | ||
| In the context of batch processing, the information about a performed deployment does not provide meaningful insights for range calculations. | ||
| This is because batch processes do not execute immediately after a deployment action. To address this, deployment-related activities | ||
| (of type `ScenarioDeployed`) are excluded when computing ranges for batch processes. | ||
| Additionally, the `Cancel` activity type (`ScenarioCanceled`) plays a role in determining count ranges during internal processing, | ||
| but it is not relevant to the end user. As a result, activities with this type are filtered out at the end of the computation process | ||
| (handled using the `isOmitted` variable). | ||
| */ | ||
| export function useActivityHistory(processName: string, processingMode: string): Range[] { | ||
| const { t } = useTranslation(); | ||
| const [activities, setActivities] = useState<Range[]>([]); | ||
|
|
||
| useEffect(() => { | ||
| HttpService.fetchActivitiesRelatedToExecutions(processName) | ||
| .then((activities) => | ||
| processingMode.includes("batch") | ||
| ? activities.filter((activity) => activity.type !== ActivityTypesRelatedToExecutions.ScenarioDeployed) | ||
| : activities, | ||
| ) | ||
| .then((activities) => | ||
| activities.map((current, i, all) => { | ||
| const from = moment(current.date); | ||
| const to = all[i - 1]?.date; | ||
| const isOmitted = current.type === ActivityTypesRelatedToExecutions.ScenarioCanceled; | ||
| return { | ||
| from: () => from, | ||
| to: () => (to ? moment(to) : moment().add(1, "day").startOf("day")), | ||
| name: t("calculateCounts.range.prevAction", "{{activity}} {{date}}", { | ||
| activity: displayableNameOfPredefinedActivityType(current.type), | ||
| date: from.format(DATE_FORMAT), | ||
| }), | ||
| isOmitted, | ||
| }; | ||
| }), | ||
| ) | ||
| .then((res) => res.filter((activity) => !activity.isOmitted)) | ||
| .then((res) => { | ||
| res[0].name = t("calculateCounts.range.lastAction", "Latest Run"); | ||
| return res; | ||
| }) | ||
| .then(setActivities); | ||
| }, [t, processName]); | ||
|
|
||
| return activities; | ||
| } |
34 changes: 0 additions & 34 deletions
34
designer/client/src/components/modals/CalculateCounts/useDeployHistory.ts
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters