5710 add breadcrumbs to tasks lists #7757
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
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
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
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 |
|---|---|---|
|
|
@@ -13,19 +13,25 @@ import { Selectors } from '@mm-selectors/index'; | |
| import { TelemetryService } from '@mm-services/telemetry.service'; | ||
| import { TourService } from '@mm-services/tour.service'; | ||
| import { GlobalActions } from '@mm-actions/global'; | ||
| import { LineageModelGeneratorService } from '@mm-services/lineage-model-generator.service'; | ||
| import { UserContactService } from '@mm-services/user-contact.service'; | ||
| import { SessionService } from '@mm-services/session.service'; | ||
|
|
||
| @Component({ | ||
| templateUrl: './tasks.component.html', | ||
| }) | ||
| export class TasksComponent implements OnInit, OnDestroy { | ||
| constructor( | ||
| private store: Store, | ||
| private changesService: ChangesService, | ||
| private contactTypesService: ContactTypesService, | ||
| private rulesEngineService: RulesEngineService, | ||
| private telemetryService: TelemetryService, | ||
| private tourService: TourService, | ||
| private route: ActivatedRoute, | ||
| private lineageModelGeneratorService: LineageModelGeneratorService, | ||
| private userContactService: UserContactService, | ||
| private sessionService: SessionService, | ||
| ) { | ||
| this.tasksActions = new TasksActions(store); | ||
| this.globalActions = new GlobalActions(store); | ||
|
|
@@ -41,6 +47,7 @@ export class TasksComponent implements OnInit, OnDestroy { | |
| hasTasks; | ||
| loading; | ||
| tasksDisabled; | ||
| currentLevel; | ||
|
|
||
| private tasksLoaded; | ||
| private debouncedReload; | ||
|
|
@@ -96,7 +103,10 @@ export class TasksComponent implements OnInit, OnDestroy { | |
| this.error = false; | ||
| this.hasTasks = false; | ||
| this.loading = true; | ||
| this.debouncedReload = _debounce(this.refreshTasks.bind(this), 1000, {maxWait: 10 * 1000}); | ||
|
|
||
| this.currentLevel = this.sessionService.isOnlineOnly() ? Promise.resolve() : this.getCurrentLineageLevel(); | ||
|
|
||
| this.refreshTasks(); | ||
|
|
||
| this.tourService.startIfNeeded(this.route.snapshot); | ||
|
|
@@ -118,50 +128,91 @@ export class TasksComponent implements OnInit, OnDestroy { | |
|
|
||
| private hydrateEmissions(taskDocs) { | ||
| return taskDocs.map(taskDoc => { | ||
| const emission = {...taskDoc.emission}; | ||
| const dueDate = moment(emission.dueDate, 'YYYY-MM-DD'); | ||
| emission.date = new Date(dueDate.valueOf()); | ||
| emission.overdue = dueDate.isBefore(moment()); | ||
| emission.owner = taskDoc.owner; | ||
| emission.forId = taskDoc.forId ? taskDoc.forId : taskDoc.owner; | ||
| return emission; | ||
| }); | ||
| } | ||
|
|
||
| private async refreshTasks() { | ||
| try { | ||
| const telemetryData: any = { | ||
| start: Date.now(), | ||
| }; | ||
|
|
||
| const isEnabled = await this.rulesEngineService.isEnabled(); | ||
| this.tasksDisabled = !isEnabled; | ||
| const taskDocs = isEnabled ? await this.rulesEngineService.fetchTaskDocsForAllContacts() : []; | ||
|
|
||
| this.hasTasks = taskDocs.length > 0; | ||
| this.loading = false; | ||
|
|
||
| const hydratedTasks = await this.hydrateEmissions(taskDocs) || []; | ||
| const subjects = await this.getLineagesFromTaskDocs(hydratedTasks); | ||
| if (subjects?.size) { | ||
| const userLineageLevel = await this.currentLevel; | ||
| for (const task of hydratedTasks) { | ||
|
There was a problem hiding this comment. In theory the Another option is to await 1 time first and send over the currentLevel to the And the @jkuester @elvisdorkenoo what do you think? There was a problem hiding this comment. Yeah I like the second option, it would make me passing over |
||
| task.lineage = await this.getTaskLineage(subjects, task, userLineageLevel); | ||
|
There was a problem hiding this comment. Pretty sure we don't need to await this call. There was a problem hiding this comment. and you can use for each as in the sample here. |
||
| } | ||
| } | ||
|
|
||
| this.tasksActions.setTasksList(hydratedTasks); | ||
|
|
||
| if (!this.tasksLoaded) { | ||
| this.tasksActions.setTasksLoaded(true); | ||
| } | ||
|
|
||
| telemetryData.end = Date.now(); | ||
| const telemetryEntryName = !this.tasksLoaded ? `tasks:load` : `tasks:refresh`; | ||
| this.telemetryService.record(telemetryEntryName, telemetryData.end - telemetryData.start); | ||
|
|
||
| } catch (exception) { | ||
| console.error('Error getting tasks for all contacts', exception); | ||
| this.error = true; | ||
| this.loading = false; | ||
| this.hasTasks = false; | ||
| this.tasksActions.setTasksList([]); | ||
| } | ||
| } | ||
|
|
||
| listTrackBy(index, task) { | ||
| return task?._id; | ||
| } | ||
|
|
||
| private getCurrentLineageLevel() { | ||
| return this.userContactService.get().then(user => user?.parent?.name); | ||
| } | ||
|
|
||
| private getLineagesFromTaskDocs(taskDocs) { | ||
| const ids = [...new Set(taskDocs.map(task => task.forId))]; | ||
| return this.lineageModelGeneratorService | ||
| .reportSubjects(ids) | ||
| .then(subjects => new Map(subjects.map(subject => [subject._id, subject.lineage]))); | ||
| } | ||
|
|
||
| private getTaskLineage(subjects, task, userLineageLevel) { | ||
| if (!subjects?.size) { | ||
| return; | ||
| } | ||
|
There was a problem hiding this comment. Minor, but this check is unnecessary since you have done it already above. |
||
| const lineage = subjects | ||
| .get(task.forId) | ||
| ?.map(lineage => lineage?.name); | ||
| return this.cleanAndRemoveCurrentLineage(lineage, userLineageLevel); | ||
| } | ||
|
|
||
| private async cleanAndRemoveCurrentLineage(lineage, userLineageLevel) { | ||
| if(!lineage?.length){ | ||
| return; | ||
| } | ||
| lineage = lineage.filter(level => level); | ||
| const item = lineage[lineage.length - 1]; | ||
| if (item === userLineageLevel) { | ||
| lineage.pop(); | ||
| } | ||
| return lineage; | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are we sure that we are not going to inadvertently trigger some additional logic by setting the
forIdtoowner?I am not sure exactly what the difference is between the two fields anyway, but I am a little worried that this could have unintended consequences...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@elvisdorkenoo - To play safe, you can:
emission.owneralready defined and available.emission.forIdand don't default it totask.ownerbecause it's already expose inemission.owner.getLineagesFromTaskDocscheck for both properties:const ids = [...new Set(taskDocs.map(task => task.forId || task.owner))];There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
task => task.forId || task.owneris actually what I've before changing it this way when I got the confirmation that when it's set, task.forId always equals task.owner. But yeah let's play it safe.