github/karma
1
0
Fork 0
mirror of https://github.com/prymitive/karma synced 2026-05-07 03:26:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "chore(ui): avoid full grid repack on new alerts"

Browse Source 
This reverts commit d896fa72b2.

This causes issues with grid rendering - when alert is removed space it was using is not reclaimed.
This commit is contained in:
Łukasz Mierzwa
2018-09-15 23:29:51 +01:00
parent f8d4803391
commit abdce3bec6
2 changed files with 8 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ui/src/Components/Grid/AlertGrid/index.js
View File

@@ -68,11 +68,9 @@ const AlertGrid = observer(
});
componentDidUpdate() {
// whenever grid component re-renders we need to ensure that new grid
// elements are packed correctly, but we don't need to do a full repack
if (this.masonryComponentReference.ref !== false) {
this.masonryComponentReference.ref.forceUpdate();
}
// whenever grid component re-renders we need to ensure that grid elements
// are packed correctly
this.masonryRepack();
}
render() {

28
ui/src/Components/Grid/AlertGrid/index.test.js
View File

@@ -76,27 +76,16 @@ describe("<AlertGrid />", () => {
expect(alertGroups).toHaveLength(80);
});
it("calls masonryUpdate() after update`", () => {
const tree = ShallowAlertGrid();
const instance = tree.instance();
// it's a shallow render so we don't really have masonry mounted, fake it
instance.masonryComponentReference.ref = {
forceUpdate: jest.fn()
};
instance.componentDidUpdate();
expect(
instance.masonryComponentReference.ref.forceUpdate
).toHaveBeenCalled();
});
it("masonryRepack() calls forcePack() on the masonry instance`", () => {
it("calls masonryRepack() after update`", () => {
const tree = ShallowAlertGrid();
const instance = tree.instance();
const repackSpy = jest.spyOn(instance, "masonryRepack");
// it's a shallow render so we don't really have masonry mounted, fake it
instance.masonryComponentReference.ref = {
forcePack: jest.fn()
};
instance.masonryRepack();
instance.componentDidUpdate();
expect(repackSpy).toHaveBeenCalled();
expect(instance.masonryComponentReference.ref.forcePack).toHaveBeenCalled();
});
@@ -105,15 +94,8 @@ describe("<AlertGrid />", () => {
const instance = tree.instance();
const repackSpy = jest.spyOn(instance, "masonryRepack");
instance.masonryComponentReference.ref = false;
instance.masonryRepack();
expect(repackSpy).toHaveBeenCalled();
});
it("componentDidUpdate() doesn't crash when masonryComponentReference.ref=false`", () => {
const tree = ShallowAlertGrid();
const instance = tree.instance();
instance.masonryComponentReference.ref = false;
instance.componentDidUpdate();
expect(repackSpy).toHaveBeenCalled();
});
it("calling storeMasonryRef() saves the ref in local store", () => {