Skip to content

Commit 702fba7

Browse files
committed
[fix] Qa
1 parent eca31fd commit 702fba7

File tree

2 files changed

+15
-8
lines changed

2 files changed

+15
-8
lines changed

src/js/netjsongraph.util.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1286,7 +1286,8 @@ class NetJSONGraphUtil {
12861286
return;
12871287
}
12881288
const id = self.config.bookmarkableActions.id;
1289-
const nodeId = fragments[id]?.get("nodeId");
1289+
const fragmentParams = fragments[id] && fragments[id].get ? fragments[id] : null;
1290+
const nodeId = fragmentParams.get("nodeId");
12901291
if (nodeId === node.id) {
12911292
self.indexedNode = self.indexedNode || {};
12921293
self.indexedNode[nodeId] = node;
@@ -1299,7 +1300,8 @@ class NetJSONGraphUtil {
12991300
}
13001301
const id = self.config.bookmarkableActions.id;
13011302
const fragments = self.utils.parseUrlFragments();
1302-
const nodeId = fragments[id]?.get("nodeId");
1303+
const fragmentParams = fragments[id] && fragments[id].get ? fragments[id] : null;
1304+
const nodeId = fragmentParams.get("nodeId");
13031305
if (!self.indexedNode || !self.indexedNode[nodeId]) {
13041306
return;
13051307
}

test/netjsongraph.util.test.js

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ describe("Test URL fragment utilities", () => {
216216
config: {
217217
bookmarkableActions: {enabled: true, id: "geoMap"},
218218
},
219-
utils: utils,
219+
utils,
220220
};
221221
const params = {
222222
componentSubType: "effectScatter",
@@ -239,10 +239,10 @@ describe("Test URL fragment utilities", () => {
239239
bookmarkableActions: {enabled: true, id: "geo"},
240240
},
241241
indexedNode: undefined,
242-
utils: utils,
242+
utils,
243243
};
244244
const params = {
245-
data:{node: {id: "node-2"}},
245+
data: {node: {id: "node-2"}},
246246
};
247247

248248
utils.addActionToUrl(self, params);
@@ -314,13 +314,18 @@ describe("Test URL fragment utilities", () => {
314314
},
315315
emit(event) {
316316
const h = this.handlers[event];
317-
if (h) h();
317+
if (h) {
318+
h()
319+
};
318320
},
319321
};
322+
const delay = (ms) => new Promise((resolve) => {
323+
setTimeout(resolve, ms);
324+
});
320325

321326
const asyncOnReady = async () => {
322327
recorder.push("onReady-start");
323-
await new Promise((r) => setTimeout(r, 20));
328+
await delay(20);
324329
recorder.push("onReady-done");
325330
};
326331

@@ -337,7 +342,7 @@ describe("Test URL fragment utilities", () => {
337342
});
338343
emitter.emit("onReady");
339344
emitter.emit("applyUrlFragmentState");
340-
await new Promise((r) => setTimeout(r, 40));
345+
await delay(40);
341346
expect(recorder).toEqual([
342347
"onReady-start",
343348
"onReady-done",

0 commit comments

Comments
 (0)