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.

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

fix: 334 bug archived read mode allows to move nodes but not persisted #336

Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,9 @@ export class ConnectionsViewObject {
"_" +
editorView.isTemporaryDisableFilteringOfItemsInViewEnabled() +
"_" +
editorView.getLevelOfDetail();
editorView.getLevelOfDetail() +
"_" +
editorView.trainrunSectionPreviewLineView.getVariantIsWritable();

connection.getPath().forEach((p) => {
key += p.toString();
Expand Down
12 changes: 6 additions & 6 deletions src/app/view/editor-main-view/data-views/data.view.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ describe("Editor-DataView", () => {

const cvo = new ConnectionsViewObject(editorView, con, node, false, false);
expect(cvo.key).toBe(
"#2@false_15_9_false_(832,144)_(774.4,144)_(793.6,144)_(736,144)_false_false_false_0(832,144)(774.4,144)(793.6,144)(736,144)",
"#2@false_15_9_false_(832,144)_(774.4,144)_(793.6,144)_(736,144)_false_false_false_0_false(832,144)(774.4,144)(793.6,144)(736,144)",
);
});

Expand All @@ -200,10 +200,10 @@ describe("Editor-DataView", () => {
const node = nodeService.getNodeFromId(2);

const cvo1 = new NodeViewObject(editorView, node, false);
expect(cvo1.key).toBe("#2@736_64_ZUE_6_5_96_124_false_2_false_true_false_0");
expect(cvo1.key).toBe("#2@736_64_ZUE_6_5_96_124_false_2_false_true_false_0_false");

const cvo2 = new NodeViewObject(editorView, node, true);
expect(cvo2.key).toBe("#2@736_64_ZUE_6_5_96_124_false_2_true_true_false_0");
expect(cvo2.key).toBe("#2@736_64_ZUE_6_5_96_124_false_2_true_true_false_0_false");
});

it("NodeViewObject - 001", () => {
Expand All @@ -213,7 +213,7 @@ describe("Editor-DataView", () => {
const note = noteService.getNoteFromId(3);
const cvo1 = new NoteViewObject(editorView, note);
expect(cvo1.key).toBe(
"#3@1312_160_64_192_<p><em>Folgendes</em></p>spannend<p><strong>FETT</strong>_Frabcodierter Text_false_0_false_false_0",
"#3@1312_160_64_192_<p><em>Folgendes</em></p>spannend<p><strong>FETT</strong>_Frabcodierter Text_false_0_false_false_0_false",
);
});

Expand All @@ -234,7 +234,7 @@ describe("Editor-DataView", () => {
false,
);
expect(cvo1.key).toBe(
"#3@1234_false_0_39_49_1_21_39_0_39_141_39_0_39_0_20_0_S_20_7/24_4_1_0_S_20_7/24_20_0_false_false_false_false_false_false_false_false_true_true_true_false_false_true_true_0_2_true_true_true_1_false_true_true_0_false_true_true(130,80)(194,80)(254,80)(318,80)",
"#3@1234_false_0_39_49_1_21_39_0_39_141_39_0_39_0_20_0_S_20_7/24_4_1_0_S_20_7/24_20_0_false_false_false_false_false_false_false_false_true_true_true_false_false_true_true_0_false_2_true_true_true_1_false_true_true_0_false_true_true(130,80)(194,80)(254,80)(318,80)",
);
});

Expand All @@ -245,7 +245,7 @@ describe("Editor-DataView", () => {
const trans = nodeService.getNodeFromId(1).getTransitions()[0];
const cvo1 = new TransitionViewObject(editorView, trans, false);
expect(cvo1.key).toBe(
"#0@false_false_IC_60_7/24_1_3_0_IC_60_7/24_60_false_false_(320,48)(324,48)(412,48)(416,48)",
"#0@false_false_IC_60_7/24_1_3_0_IC_60_7/24_60_false_false_false(320,48)(324,48)(412,48)(416,48)",
);
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@ export class NodeViewObject {
"_" +
editorView.isTemporaryDisableFilteringOfItemsInViewEnabled() +
"_" +
editorView.getLevelOfDetail()
editorView.getLevelOfDetail() +
"_" +
editorView.trainrunSectionPreviewLineView.getVariantIsWritable()
);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ export class NoteViewObject {
"_" +
editorView.isTemporaryDisableFilteringOfItemsInViewEnabled() +
"_" +
editorView.getLevelOfDetail()
editorView.getLevelOfDetail() +
"_" +
editorView.trainrunSectionPreviewLineView.getVariantIsWritable()
);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,9 @@ export class TrainrunSectionViewObject {
"_" +
editorView.checkFilterNode(d.getTargetNode()) +
"_" +
editorView.getLevelOfDetail();
editorView.getLevelOfDetail() +
"_" +
editorView.trainrunSectionPreviewLineView.getVariantIsWritable();

cumulativeTravelTimeData.forEach((data) => {
key += "_" + data.node.getId();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ export class TransitionViewObject {
editorView.isTemporaryDisableFilteringOfItemsInViewEnabled() +
"_" +
isMuted +
"_";
"_" +
editorView.trainrunSectionPreviewLineView.getVariantIsWritable();

transition.getPath().forEach((p) => {
key += p.toString();
Expand Down