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

Update view Timestamp logic to fix setAmendmentState problem #4412

Merged
merged 3 commits into from
Dec 4, 2024
Merged

Update view Timestamp logic to fix setAmendmentState problem #4412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf999fd
Rm strange, broken distinctUntilChanged timestamp logic
reiterl Nov 27, 2024
4735ccf
Change timestamp of updatedModels on changeModels.
reiterl Nov 28, 2024
ad7f68b
Compare state ids in getViewModelListObservableFor
reiterl Dec 3, 2024
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
3 changes: 3 additions & 0 deletions client/src/app/gateways/repositories/base-repository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,9 @@ export abstract class BaseRepository<V extends BaseViewModel, M extends BaseMode
this.tapViewModels(Object.values(this.viewModelStore));
if (changedModels) {
await this.initChangeBasedResorting(newModels, updatedModels, newViewModels, updatedViewModels);
for (const viewModel of updatedViewModels) {
viewModel.viewModelUpdateTimestamp = Date.now();
}
Comment on lines +348 to +350
Copy link
Member

@bastianjoel bastianjoel Dec 9, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is done on model level (line 729) in base-repository.ts. Doing it here again is unnecessary. Remove it.

}
},
type: PipelineActionType.General,
Expand Down
3 changes: 2 additions & 1 deletion ...ages/motions/services/common/amendment-controller.service/amendment-controller.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ export class AmendmentControllerService {
(prev, curr) =>
prev?.length === curr?.length &&
Math.max(...prev.map(e => e.viewModelUpdateTimestamp)) ===
Math.max(...curr.map(e => e.viewModelUpdateTimestamp))
Math.max(...curr.map(e => e.viewModelUpdateTimestamp)) &&
prev?.map(e => e.state_id).equals(curr?.map(e => e.state_id))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess the problem is, that entries get replaced by older entries while the array size stays the same. Probably it would be better to check for the ids of the entries.

                    prev?.map(e => e.id).equals(curr?.map(e => e.id))

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also this should be done in motion-change-recommendation-controller.service.ts too.

)
);
}
Expand Down
Loading