Merge branch 'develop' into weeman1337/pillify-permalinks

weeman1337 · weeman1337 · commit b373ef88401b · 2023-03-16T04:02:45.000+01:00
diff --git a/cypress/e2e/polls/pollHistory.spec.ts b/cypress/e2e/polls/pollHistory.spec.ts
@@ -88,8 +88,6 @@ describe("Poll history", () => {
         cy.startHomeserver("default").then((data) => {
             homeserver = data;
 
-            cy.enableLabsFeature("feature_poll_history");
-
             cy.initTestUser(homeserver, "Tom");
         });
     });
diff --git a/src/components/views/dialogs/GenericFeatureFeedbackDialog.tsx b/src/components/views/dialogs/GenericFeatureFeedbackDialog.tsx
@@ -29,7 +29,7 @@ interface IProps {
     title: string;
     subheading: string;
     rageshakeLabel: string;
-    rageshakeData?: Record<string, string>;
+    rageshakeData?: Record<string, any>;
     children?: ReactNode;
     onFinished(sendFeedback?: boolean): void;
 }
diff --git a/src/components/views/dialogs/RoomSettingsDialog.tsx b/src/components/views/dialogs/RoomSettingsDialog.tsx
@@ -164,16 +164,14 @@ export default class RoomSettingsDialog extends React.Component<IProps, IState>
             );
         }
 
-        if (SettingsStore.getValue("feature_poll_history")) {
-            tabs.push(
-                new Tab(
-                    ROOM_POLL_HISTORY_TAB,
-                    _td("Polls history"),
-                    "mx_RoomSettingsDialog_pollsIcon",
-                    <PollHistoryTab roomId={this.props.roomId} onFinished={() => this.props.onFinished(true)} />,
-                ),
-            );
-        }
+        tabs.push(
+            new Tab(
+                ROOM_POLL_HISTORY_TAB,
+                _td("Polls history"),
+                "mx_RoomSettingsDialog_pollsIcon",
+                <PollHistoryTab roomId={this.props.roomId} onFinished={() => this.props.onFinished(true)} />,
+            ),
+        );
 
         if (SettingsStore.getValue(UIFeature.AdvancedSettings)) {
             tabs.push(
diff --git a/src/components/views/right_panel/RoomSummaryCard.tsx b/src/components/views/right_panel/RoomSummaryCard.tsx
@@ -327,8 +327,6 @@ const RoomSummaryCard: React.FC<IProps> = ({ room, permalinkCreator, onClose })
     const pinningEnabled = useFeatureEnabled("feature_pinning");
     const pinCount = usePinnedEvents(pinningEnabled ? room : undefined)?.length;
 
-    const isPollHistoryEnabled = useFeatureEnabled("feature_poll_history");
-
     return (
         <BaseCard header={header} className="mx_RoomSummaryCard" onClose={onClose}>
             <Group title={_t("About")} className="mx_RoomSummaryCard_aboutGroup">
@@ -341,7 +339,7 @@ const RoomSummaryCard: React.FC<IProps> = ({ room, permalinkCreator, onClose })
                         {_t("Files")}
                     </Button>
                 )}
-                {!isVideoRoom && isPollHistoryEnabled && (
+                {!isVideoRoom && (
                     <Button className="mx_RoomSummaryCard_icon_poll" onClick={onRoomPollHistoryClick}>
                         {_t("Polls history")}
                     </Button>
diff --git a/src/components/views/spaces/SpaceCreateMenu.tsx b/src/components/views/spaces/SpaceCreateMenu.tsx
@@ -140,7 +140,7 @@ export const SpaceFeedbackPrompt: React.FC<{
                         rageshakeData: Object.fromEntries(
                             ["Spaces.allRoomsInHome", "Spaces.enabledMetaSpaces"].map((k) => [
                                 k,
-                                String(SettingsStore.getValue(k)),
+                                SettingsStore.getValue(k),
                             ]),
                         ),
                     });
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
@@ -960,8 +960,6 @@
     "Use new room breadcrumbs": "Use new room breadcrumbs",
     "Right panel stays open": "Right panel stays open",
     "Defaults to room member list.": "Defaults to room member list.",
-    "Polls history": "Polls history",
-    "View a list of polls in a room. (Under active development)": "View a list of polls in a room. (Under active development)",
     "Jump to date (adds /jumptodate and jump to date headers)": "Jump to date (adds /jumptodate and jump to date headers)",
     "Requires your server to support MSC3030": "Requires your server to support MSC3030",
     "Send read receipts": "Send read receipts",
@@ -2236,6 +2234,7 @@
     "Not encrypted": "Not encrypted",
     "About": "About",
     "Files": "Files",
+    "Polls history": "Polls history",
     "Pinned": "Pinned",
     "Export chat": "Export chat",
     "Share room": "Share room",
diff --git a/src/rageshake/rageshake.ts b/src/rageshake/rageshake.ts
@@ -64,15 +64,17 @@ export class ConsoleLogger {
             warn: "W",
             error: "E",
         } as const;
-        Object.keys(consoleFunctionsToLevels).forEach((fnName: keyof typeof consoleFunctionsToLevels) => {
-            const level = consoleFunctionsToLevels[fnName];
-            const originalFn = consoleObj[fnName].bind(consoleObj);
-            this.originalFunctions[fnName] = originalFn;
-            consoleObj[fnName] = (...args) => {
-                this.log(level, ...args);
-                originalFn(...args);
-            };
-        });
+        (Object.keys(consoleFunctionsToLevels) as [keyof typeof consoleFunctionsToLevels]).forEach(
+            (fnName: keyof typeof consoleFunctionsToLevels) => {
+                const level = consoleFunctionsToLevels[fnName];
+                const originalFn = consoleObj[fnName].bind(consoleObj);
+                this.originalFunctions[fnName] = originalFn;
+                consoleObj[fnName] = (...args) => {
+                    this.log(level, ...args);
+                    originalFn(...args);
+                };
+            },
+        );
     }
 
     public bypassRageshake(fnName: LogFunctionName, ...args: (Error | DOMException | object | string)[]): void {
@@ -261,6 +263,8 @@ export class IndexedDBLogStore {
         // Returns: a string representing the concatenated logs for this ID.
         // Stops adding log fragments when the size exceeds maxSize
         function fetchLogs(id: string, maxSize: number): Promise<string> {
+            if (!db) return Promise.reject("DB unavailable");
+
             const objectStore = db.transaction("logs", "readonly").objectStore("logs");
 
             return new Promise((resolve, reject) => {
@@ -287,6 +291,8 @@ export class IndexedDBLogStore {
 
         // Returns: A sorted array of log IDs. (newest first)
         function fetchLogIds(): Promise<string[]> {
+            if (!db) return Promise.reject("DB unavailable");
+
             // To gather all the log IDs, query for all records in logslastmod.
             const o = db.transaction("logslastmod", "readonly").objectStore("logslastmod");
             return selectQuery(o, undefined, (cursor) => {
@@ -305,6 +311,8 @@ export class IndexedDBLogStore {
         }
 
         function deleteLogs(id: string): Promise<void> {
+            if (!db) return Promise.reject("DB unavailable");
+
             return new Promise<void>((resolve, reject) => {
                 const txn = db.transaction(["logs", "logslastmod"], "readwrite");
                 const o = txn.objectStore("logs");
diff --git a/src/rageshake/submit-rageshake.ts b/src/rageshake/submit-rageshake.ts
@@ -88,7 +88,7 @@ async function collectBugReport(opts: IOpts = {}, gzipLogs = true): Promise<Form
                 keys.push(`curve25519:${client.getDeviceCurve25519Key()}`);
             }
             body.append("device_keys", keys.join(", "));
-            body.append("cross_signing_key", client.getCrossSigningId());
+            body.append("cross_signing_key", client.getCrossSigningId() ?? "n/a");
 
             // add cross-signing status information
             const crossSigning = client.crypto.crossSigningInfo;
@@ -99,7 +99,7 @@ async function collectBugReport(opts: IOpts = {}, gzipLogs = true): Promise<Form
                 "cross_signing_supported_by_hs",
                 String(await client.doesServerSupportUnstableFeature("org.matrix.e2e_cross_signing")),
             );
-            body.append("cross_signing_key", crossSigning.getId());
+            body.append("cross_signing_key", crossSigning.getId() ?? "n/a");
             body.append(
                 "cross_signing_privkey_in_secret_storage",
                 String(!!(await crossSigning.isStoredInSecretStorage(secretStorage))),
@@ -108,15 +108,15 @@ async function collectBugReport(opts: IOpts = {}, gzipLogs = true): Promise<Form
             const pkCache = client.getCrossSigningCacheCallbacks();
             body.append(
                 "cross_signing_master_privkey_cached",
-                String(!!(pkCache && (await pkCache.getCrossSigningKeyCache("master")))),
+                String(!!(pkCache && (await pkCache?.getCrossSigningKeyCache?.("master")))),
             );
             body.append(
                 "cross_signing_self_signing_privkey_cached",
-                String(!!(pkCache && (await pkCache.getCrossSigningKeyCache("self_signing")))),
+                String(!!(pkCache && (await pkCache?.getCrossSigningKeyCache?.("self_signing")))),
             );
             body.append(
                 "cross_signing_user_signing_privkey_cached",
-                String(!!(pkCache && (await pkCache.getCrossSigningKeyCache("user_signing")))),
+                String(!!(pkCache && (await pkCache?.getCrossSigningKeyCache?.("user_signing")))),
             );
 
             body.append("secret_storage_ready", String(await client.isSecretStorageReady()));
@@ -163,14 +163,14 @@ async function collectBugReport(opts: IOpts = {}, gzipLogs = true): Promise<Form
             body.append("storageManager_usage", String(estimate.usage));
             if (estimate.usageDetails) {
                 Object.keys(estimate.usageDetails).forEach((k) => {
-                    body.append(`storageManager_usage_${k}`, String(estimate.usageDetails[k]));
+                    body.append(`storageManager_usage_${k}`, String(estimate.usageDetails![k]));
                 });
             }
         } catch (e) {}
     }
 
     if (window.Modernizr) {
-        const missingFeatures = Object.keys(window.Modernizr).filter(
+        const missingFeatures = (Object.keys(window.Modernizr) as [keyof ModernizrStatic]).filter(
             (key: keyof ModernizrStatic) => window.Modernizr[key] === false,
         );
         if (missingFeatures.length > 0) {
@@ -253,7 +253,7 @@ export async function downloadBugReport(opts: IOpts = {}): Promise<void> {
             await new Promise<void>((resolve) => {
                 const reader = new FileReader();
                 reader.addEventListener("loadend", (ev) => {
-                    tape.append(`log-${i++}.log`, new TextDecoder().decode(ev.target.result as ArrayBuffer));
+                    tape.append(`log-${i++}.log`, new TextDecoder().decode(reader.result as ArrayBuffer));
                     resolve();
                 });
                 reader.readAsArrayBuffer(value as Blob);
@@ -288,7 +288,7 @@ export async function submitFeedback(
     label: string,
     comment: string,
     canContact = false,
-    extraData: Record<string, string> = {},
+    extraData: Record<string, any> = {},
 ): Promise<void> {
     let version: string | undefined;
     try {
@@ -302,14 +302,18 @@ export async function submitFeedback(
 
     body.append("app", "element-web");
     body.append("version", version || "UNKNOWN");
-    body.append("platform", PlatformPeg.get().getHumanReadableName());
-    body.append("user_id", MatrixClientPeg.get()?.getUserId());
+    body.append("platform", PlatformPeg.get()?.getHumanReadableName() ?? "n/a");
+    body.append("user_id", MatrixClientPeg.get()?.getUserId() ?? "n/a");
 
     for (const k in extraData) {
         body.append(k, JSON.stringify(extraData[k]));
     }
 
-    await submitReport(SdkConfig.get().bug_report_endpoint_url, body, () => {});
+    const bugReportEndpointUrl = SdkConfig.get().bug_report_endpoint_url;
+
+    if (bugReportEndpointUrl) {
+        await submitReport(bugReportEndpointUrl, body, () => {});
+    }
 }
 
 function submitReport(endpoint: string, body: FormData, progressCallback: (str: string) => void): Promise<string> {
diff --git a/src/resizer/distributors/collapse.ts b/src/resizer/distributors/collapse.ts
@@ -21,7 +21,7 @@ import Sizer from "../sizer";
 
 export interface ICollapseConfig extends IConfig {
     toggleSize: number;
-    onCollapsed?(collapsed: boolean, id: string, element: HTMLElement): void;
+    onCollapsed?(collapsed: boolean, id: string | null, element: HTMLElement): void;
     isItemCollapsed(element: HTMLElement): boolean;
 }
 
@@ -45,7 +45,7 @@ export default class CollapseDistributor extends FixedDistributor<ICollapseConfi
         return new CollapseItem(resizeHandle, resizer, sizer, container);
     }
 
-    private readonly toggleSize: number;
+    private readonly toggleSize: number | undefined;
     private isCollapsed: boolean;
 
     public constructor(item: CollapseItem) {
@@ -55,7 +55,7 @@ export default class CollapseDistributor extends FixedDistributor<ICollapseConfi
     }
 
     public resize(newSize: number): void {
-        const isCollapsedSize = newSize < this.toggleSize;
+        const isCollapsedSize = !!this.toggleSize && newSize < this.toggleSize;
         if (isCollapsedSize !== this.isCollapsed) {
             this.isCollapsed = isCollapsedSize;
             this.item.notifyCollapsed(isCollapsedSize);
diff --git a/src/resizer/distributors/percentage.ts b/src/resizer/distributors/percentage.ts
@@ -21,9 +21,9 @@ import { IConfig } from "../resizer";
 class PercentageSizer extends Sizer {
     public start(item: HTMLElement): void {
         if (this.vertical) {
-            item.style.minHeight = null;
+            item.style.minHeight = "";
         } else {
-            item.style.minWidth = null;
+            item.style.minWidth = "";
         }
     }
 
diff --git a/src/resizer/item.ts b/src/resizer/item.ts
@@ -44,14 +44,16 @@ export default class ResizeItem<C extends IConfig = IConfig> {
 
     private advance(forwards: boolean): ResizeItem | undefined {
         // opposite direction from fromResizeHandle to get back to handle
-        let handle = this.reverse ? this.domNode.previousElementSibling : this.domNode.nextElementSibling;
+        let handle: Element | null | undefined = this.reverse
+            ? this.domNode.previousElementSibling
+            : this.domNode.nextElementSibling;
         const moveNext = forwards !== this.reverse; // xor
         // iterate at least once to avoid infinite loop
         do {
             if (moveNext) {
-                handle = handle.nextElementSibling;
+                handle = handle?.nextElementSibling;
             } else {
-                handle = handle.previousElementSibling;
+                handle = handle?.previousElementSibling;
             }
         } while (handle && !this.resizer.isResizeHandle(<HTMLElement>handle));
 
@@ -105,6 +107,9 @@ export default class ResizeItem<C extends IConfig = IConfig> {
     }
 
     public first(): ResizeItem | undefined {
+        if (!this.domNode.parentElement?.children) {
+            return;
+        }
         const firstHandle = Array.from(this.domNode.parentElement.children).find((el) => {
             return this.resizer.isResizeHandle(<HTMLElement>el);
         });
@@ -114,6 +119,9 @@ export default class ResizeItem<C extends IConfig = IConfig> {
     }
 
     public last(): ResizeItem | undefined {
+        if (!this.domNode.parentElement?.children) {
+            return;
+        }
         const lastHandle = Array.from(this.domNode.parentElement.children)
             .reverse()
             .find((el) => {
diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
@@ -363,14 +363,6 @@ export const SETTINGS: { [setting: string]: ISetting } = {
         description: _td("Defaults to room member list."),
         default: false,
     },
-    "feature_poll_history": {
-        isFeature: true,
-        labsGroup: LabGroup.Rooms,
-        supportedLevels: LEVELS_FEATURE,
-        displayName: _td("Polls history"),
-        description: _td("View a list of polls in a room. (Under active development)"),
-        default: false,
-    },
     "feature_jump_to_date": {
         isFeature: true,
         labsGroup: LabGroup.Messaging,
diff --git a/test/components/views/dialogs/RoomSettingsDialog-test.tsx b/test/components/views/dialogs/RoomSettingsDialog-test.tsx
@@ -89,10 +89,6 @@ describe("<RoomSettingsDialog />", () => {
 
     describe("poll history", () => {
         beforeEach(() => {
-            jest.spyOn(SettingsStore, "getValue").mockImplementation(
-                (settingName) => settingName === "feature_poll_history",
-            );
-
             mockClient.getOrCreateFilter.mockResolvedValue("filterId");
         });
         it("renders poll history tab", () => {
diff --git a/test/components/views/dialogs/__snapshots__/RoomSettingsDialog-test.tsx.snap b/test/components/views/dialogs/__snapshots__/RoomSettingsDialog-test.tsx.snap
@@ -62,6 +62,21 @@ NodeList [
       Notifications
     </span>
   </div>,
+  <div
+    class="mx_AccessibleButton mx_TabbedView_tabLabel "
+    data-testid="settings-tab-ROOM_POLL_HISTORY_TAB"
+    role="button"
+    tabindex="0"
+  >
+    <span
+      class="mx_TabbedView_maskedIcon mx_RoomSettingsDialog_pollsIcon"
+    />
+    <span
+      class="mx_TabbedView_tabLabel_text"
+    >
+      Polls history
+    </span>
+  </div>,
 ]
 `;
 
diff --git a/test/components/views/right_panel/RoomSummaryCard-test.tsx b/test/components/views/right_panel/RoomSummaryCard-test.tsx
@@ -134,15 +134,13 @@ describe("<RoomSummaryCard />", () => {
     });
 
     describe("poll history", () => {
-        it("renders poll history option when feature is enabled", () => {
-            featureEnabledSpy.mockImplementation((feature) => feature === "feature_poll_history");
+        it("renders poll history option", () => {
             const { getByText } = getComponent();
 
             expect(getByText("Polls history")).toBeInTheDocument();
         });
 
         it("opens poll history dialog on button click", () => {
-            featureEnabledSpy.mockImplementation((feature) => feature === "feature_poll_history");
             const { getByText } = getComponent();
 
             fireEvent.click(getByText("Polls history"));
diff --git a/test/components/views/right_panel/__snapshots__/RoomSummaryCard-test.tsx.snap b/test/components/views/right_panel/__snapshots__/RoomSummaryCard-test.tsx.snap
@@ -83,6 +83,13 @@ exports[`<RoomSummaryCard /> renders the room summary 1`] = `
         >
           Files
         </div>
+        <div
+          class="mx_AccessibleButton mx_BaseCard_Button mx_RoomSummaryCard_Button mx_RoomSummaryCard_icon_poll"
+          role="button"
+          tabindex="0"
+        >
+          Polls history
+        </div>
         <div
           class="mx_AccessibleButton mx_BaseCard_Button mx_RoomSummaryCard_Button mx_RoomSummaryCard_icon_export"
           role="button"

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ interface IProps {`
`29`	`29`	`title: string;`
`30`	`30`	`subheading: string;`
`31`	`31`	`rageshakeLabel: string;`
`32`		`- rageshakeData?: Record<string, string>;`
	`32`	`+ rageshakeData?: Record<string, any>;`
`33`	`33`	`children?: ReactNode;`
`34`	`34`	`onFinished(sendFeedback?: boolean): void;`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,9 @@ import { IConfig } from "../resizer";`
`21`	`21`	`class PercentageSizer extends Sizer {`
`22`	`22`	`public start(item: HTMLElement): void {`
`23`	`23`	`if (this.vertical) {`
`24`		`- item.style.minHeight = null;`
	`24`	`+ item.style.minHeight = "";`
`25`	`25`	`} else {`
`26`		`- item.style.minWidth = null;`
	`26`	`+ item.style.minWidth = "";`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`