Skip to content

Fix model mutation on edit dialog open #6170

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

Draft
bastianjoel wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Fix model mutation on edit dialog open #6170

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
f5b92f6
Add test
bastianjoel May 11, 2026
57abdd7
Fix model mutation on edit dialog open
bastianjoel May 11, 2026
a107702
Add annotations to skipped tests
bastianjoel May 11, 2026
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
5 changes: 3 additions & 2 deletions ...on-detail/pages/motion-view/components/motion-detail-diff/motion-detail-diff.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import { MatMenuTrigger } from '@angular/material/menu';
import { TooltipPosition } from '@angular/material/tooltip';
import { TranslateService } from '@ngx-translate/core';
import { Id } from 'src/app/domain/definitions/key-types';
import { MotionChangeRecommendation } from 'src/app/domain/models/motions/motion-change-recommendation';
import { LineNumberingMode } from 'src/app/domain/models/motions/motions.constants';
import { BaseMeetingComponent } from 'src/app/site/pages/meetings/base/base-meeting.component';
import { ViewMotion } from 'src/app/site/pages/meetings/pages/motions';
Expand Down Expand Up @@ -491,8 +492,8 @@ export class MotionDetailDiffComponent extends BaseMeetingComponent implements A
$event.preventDefault();
this.changeRecommendationMenu.closeMenu();

const recoModel = new MotionChangeRecommendation(reco.getModel());
if (this.motion.text) {
const recoModel = reco.getModel();
const motionText = this.diff.extractMotionLineRange(
this.lineNumberingService.insertLineNumbers({
html: this.motion.text,
Expand All @@ -517,7 +518,7 @@ export class MotionDetailDiffComponent extends BaseMeetingComponent implements A
from: reco.getLineFrom(),
to: reco.getLineTo()
},
changeRecommendation: reco.getModel(),
changeRecommendation: recoModel,
firstLine: reco.motion.firstLine
};
this.dialog.openContentChangeRecommendationDialog(data);
Expand Down
21 changes: 21 additions & 0 deletions packages/openslides-motion-diff/src/diff/index.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -824,6 +824,7 @@ describe(`MotionDiffService`, () => {
expect(diff).toBe(expected);
});

// TODO: https://github.com/OpenSlides/openslides-client/issues/5856
it.skip(`handles inserted text within nested lists`, () => {
const before =
`<ul><li><span class="os-line-number line-number-1" data-line-number="1" contenteditable="false">&nbsp;</span>Ebene 1` +
Expand All @@ -847,6 +848,7 @@ describe(`MotionDiffService`, () => {
expect(diff).toBe(expected);
});

// TODO: https://github.com/OpenSlides/openslides-client/issues/5863
it.skip(`handles changed text within nested lists (part 2)`, () => {
const before = `<ul><li>Ebene 1` +
`<ul><li>Ebene 2.1` +
Expand Down Expand Up @@ -1795,6 +1797,25 @@ describe(`MotionDiffService`, () => {
`<P class="os-split-before merge-before">${noMarkup(2)}first<ins> as</ins></p>`
);
});

// TODO: https://github.com/OpenSlides/openslides-client/issues/5912
it.skip(`test change within text formatting`, () => {
const inHtml = `<p>${noMarkup(1)}Test <strong>foo, test<br class="os-line-break">${noMarkup(2)}Test</strong></p>`;

expect(
getChangeDiff(
inHtml,
new TestChangeRecommendation({
line_from: 1,
line_to: 1,
text: `<p>Test <strong>foo</strong></p>`
}),
85
)
).toBe(
`<p>${noMarkup(1)}Test <strong>foo<del>, test</del><br class="os-line-break">${noMarkup(2)}Test</strong></p>`
);
});
});

describe(`getTextRemainderAfterLastChange`, () => {
Expand Down
Loading