Merge branch 'develop' into improved-forwarding-ui

test/components/structures/MessagePanel-test.js

@@ -77,7 +77,7 @@ describe('MessagePanel', function() {
         DMRoomMap.makeShared();
     });
 
-    afterEach(function() {
+    afterEach(function () {
         clock.uninstall();
     });
 
@@ -88,7 +88,21 @@ describe('MessagePanel', function() {
             events.push(test_utils.mkMessage(
                 {
                     event: true, room: "!room:id", user: "@user:id",
-                    ts: ts0 + i*1000,
+                    ts: ts0 + i * 1000,
+                }));
+        }
+        return events;
+    }
+
+    // Just to avoid breaking Dateseparator tests that might run at 00hrs
+    function mkOneDayEvents() {
+        const events = [];
+        const ts0 = Date.parse('09 May 2004 00:12:00 GMT');
+        for (let i = 0; i < 10; i++) {
+            events.push(test_utils.mkMessage(
+                {
+                    event: true, room: "!room:id", user: "@user:id",
+                    ts: ts0 + i * 1000,
                 }));
         }
         return events;
@@ -104,7 +118,7 @@ describe('MessagePanel', function() {
         let i = 0;
         events.push(test_utils.mkMessage({
             event: true, room: "!room:id", user: "@user:id",
-            ts: ts0 + ++i*1000,
+            ts: ts0 + ++i * 1000,
         }));
 
         for (i = 0; i < 10; i++) {
@@ -151,7 +165,7 @@ describe('MessagePanel', function() {
                     },
                     getMxcAvatarUrl: () => 'mxc://avatar.url/image.png',
                 },
-                ts: ts0 + i*1000,
+                ts: ts0 + i * 1000,
                 mship: 'join',
                 prevMship: 'join',
                 name: 'A user',
@@ -250,7 +264,6 @@ describe('MessagePanel', function() {
             }),
         ];
     }
-
     function isReadMarkerVisible(rmContainer) {
         return rmContainer && rmContainer.children.length > 0;
     }
@@ -437,4 +450,17 @@ describe('MessagePanel', function() {
         // read marker should be hidden given props and at the last event
         expect(isReadMarkerVisible(rm)).toBeFalsy();
     });
+
+    it('should render Date separators for the events', function () {
+        const events = mkOneDayEvents();
+        const res = mount(
+            <WrappedMessagePanel
+                className="cls"
+                events={events}
+            />,
+        );
+        const Dates = res.find(sdk.getComponent('messages.DateSeparator'));
+       
+        expect(Dates.length).toEqual(1);
+    });
 });

test/utils/arrays-test.ts

@@ -21,7 +21,9 @@ import {
     arrayHasDiff,
     arrayHasOrderChange,
     arrayMerge,
+    arrayRescale,
     arraySeed,
+    arraySmoothingResample,
     arrayTrimFill,
     arrayUnion,
     ArrayUtil,
@@ -29,9 +31,9 @@ import {
 } from "../../src/utils/arrays";
 import {objectFromEntries} from "../../src/utils/objects";
 
-function expectSample(i: number, input: number[], expected: number[]) {
+function expectSample(i: number, input: number[], expected: number[], smooth = false) {
     console.log(`Resample case index: ${i}`); // for debugging test failures
-    const result = arrayFastResample(input, expected.length);
+    const result = (smooth ? arraySmoothingResample : arrayFastResample)(input, expected.length);
     expect(result).toBeDefined();
     expect(result).toHaveLength(expected.length);
     expect(result).toEqual(expected);
@@ -65,6 +67,47 @@ describe('arrays', () => {
         });
     });
 
+    describe('arraySmoothingResample', () => {
+        it('should downsample', () => {
+            // Dev note: these aren't great samples, but they demonstrate the bare minimum. Ideally
+            // we'd be feeding a thousand values in and seeing what a curve of 250 values looks like,
+            // but that's not really feasible to manually verify accuracy.
+            [
+                {input: [4, 4, 1, 4, 4, 1, 4, 4, 1], output: [3, 3, 3, 3]}, // Odd -> Even
+                {input: [4, 4, 1, 4, 4, 1, 4, 4, 1], output: [3, 3, 3]}, // Odd -> Odd
+                {input: [4, 4, 1, 4, 4, 1, 4, 4], output: [3, 3, 3]}, // Even -> Odd
+                {input: [4, 4, 1, 4, 4, 1, 4, 4], output: [3, 3]}, // Even -> Even
+            ].forEach((c, i) => expectSample(i, c.input, c.output, true));
+        });
+
+        it('should upsample', () => {
+            [
+                {input: [2, 0, 2], output: [2, 2, 0, 0, 2, 2]}, // Odd -> Even
+                {input: [2, 0, 2], output: [2, 2, 0, 0, 2]}, // Odd -> Odd
+                {input: [2, 0], output: [2, 2, 2, 0, 0]}, // Even -> Odd
+                {input: [2, 0], output: [2, 2, 2, 0, 0, 0]}, // Even -> Even
+            ].forEach((c, i) => expectSample(i, c.input, c.output, true));
+        });
+
+        it('should maintain sample', () => {
+            [
+                {input: [2, 0, 2], output: [2, 0, 2]}, // Odd
+                {input: [2, 0], output: [2, 0]}, // Even
+            ].forEach((c, i) => expectSample(i, c.input, c.output, true));
+        });
+    });
+
+    describe('arrayRescale', () => {
+        it('should rescale', () => {
+            const input = [8, 9, 1, 0, 2, 7, 10];
+            const output = [80, 90, 10, 0, 20, 70, 100];
+            const result = arrayRescale(input, 0, 100);
+            expect(result).toBeDefined();
+            expect(result).toHaveLength(output.length);
+            expect(result).toEqual(output);
+        });
+    });
+
     describe('arrayTrimFill', () => {
         it('should shrink arrays', () => {
             const input = [1, 2, 3];