{ _t("Teammates might not be able to view or join any private rooms you make.") }
-
{ _t("We're working on this as part of the beta, but just want to let you know.") }
+
{ _t("We're working on this, but just want to let you know.") }
-
;
};
@@ -741,7 +712,6 @@ const SpaceSetupPrivateInvite = ({ space, onFinished }) => {
value={buttonLabel}
/>
-
;
};
diff --git a/src/components/views/beta/BetaCard.tsx b/src/components/views/beta/BetaCard.tsx
index ec662d831b..c2ba869ab4 100644
--- a/src/components/views/beta/BetaCard.tsx
+++ b/src/components/views/beta/BetaCard.tsx
@@ -27,6 +27,8 @@ import BetaFeedbackDialog from "../dialogs/BetaFeedbackDialog";
import SdkConfig from "../../../SdkConfig";
import SettingsFlag from "../elements/SettingsFlag";
+// XXX: Keep this around for re-use in future Betas
+
interface IProps {
title?: string;
featureId: string;
diff --git a/src/components/views/dialogs/AddExistingSubspaceDialog.tsx b/src/components/views/dialogs/AddExistingSubspaceDialog.tsx
index a6dbf9dd42..7fef2c2d9d 100644
--- a/src/components/views/dialogs/AddExistingSubspaceDialog.tsx
+++ b/src/components/views/dialogs/AddExistingSubspaceDialog.tsx
@@ -21,7 +21,6 @@ import { _t } from '../../../languageHandler';
import BaseDialog from "./BaseDialog";
import AccessibleButton from "../elements/AccessibleButton";
import MatrixClientContext from "../../../contexts/MatrixClientContext";
-import { SpaceFeedbackPrompt } from "../../structures/SpaceRoomView";
import { AddExistingToSpace, defaultSpacesRenderer, SubspaceSelector } from "./AddExistingToSpaceDialog";
interface IProps {
@@ -61,8 +60,6 @@ const AddExistingSubspaceDialog: React.FC = ({ space, onCreateSubspaceCl
spacesRenderer={defaultSpacesRenderer}
/>
-
- onFinished(false)} />
;
};
diff --git a/src/components/views/dialogs/AddExistingToSpaceDialog.tsx b/src/components/views/dialogs/AddExistingToSpaceDialog.tsx
index 9b64af0c80..cf4f369d09 100644
--- a/src/components/views/dialogs/AddExistingToSpaceDialog.tsx
+++ b/src/components/views/dialogs/AddExistingToSpaceDialog.tsx
@@ -35,7 +35,6 @@ import StyledCheckbox from "../elements/StyledCheckbox";
import MatrixClientContext from "../../../contexts/MatrixClientContext";
import { sortRooms } from "../../../stores/room-list/algorithms/tag-sorting/RecentAlgorithm";
import ProgressBar from "../elements/ProgressBar";
-import { SpaceFeedbackPrompt } from "../../structures/SpaceRoomView";
import DecoratedRoomAvatar from "../avatars/DecoratedRoomAvatar";
import QueryMatcher from "../../../autocomplete/QueryMatcher";
import TruncatedList from "../elements/TruncatedList";
@@ -446,8 +445,6 @@ const AddExistingToSpaceDialog: React.FC = ({ space, onCreateRoomClick,
dmsRenderer={defaultDmsRenderer}
/>
-
- onFinished(false)} />
;
};
diff --git a/src/components/views/dialogs/BetaFeedbackDialog.tsx b/src/components/views/dialogs/BetaFeedbackDialog.tsx
index 34218a3399..c5fba52b51 100644
--- a/src/components/views/dialogs/BetaFeedbackDialog.tsx
+++ b/src/components/views/dialogs/BetaFeedbackDialog.tsx
@@ -14,22 +14,18 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-import React, { useState } from "react";
+import React from "react";
-import QuestionDialog from './QuestionDialog';
import { _t } from '../../../languageHandler';
-import Field from "../elements/Field";
-import SdkConfig from "../../../SdkConfig";
import { IDialogProps } from "./IDialogProps";
import SettingsStore from "../../../settings/SettingsStore";
-import { submitFeedback } from "../../../rageshake/submit-rageshake";
-import StyledCheckbox from "../elements/StyledCheckbox";
-import Modal from "../../../Modal";
-import InfoDialog from "./InfoDialog";
import AccessibleButton from "../elements/AccessibleButton";
import defaultDispatcher from "../../../dispatcher/dispatcher";
import { Action } from "../../../dispatcher/actions";
import { UserTab } from "./UserSettingsDialog";
+import GenericFeatureFeedbackDialog from "./GenericFeatureFeedbackDialog";
+
+// XXX: Keep this around for re-use in future Betas
interface IProps extends IDialogProps {
featureId: string;
@@ -38,77 +34,28 @@ interface IProps extends IDialogProps {
const BetaFeedbackDialog: React.FC = ({ featureId, onFinished }) => {
const info = SettingsStore.getBetaInfo(featureId);
- const [comment, setComment] = useState("");
- const [canContact, setCanContact] = useState(false);
-
- const sendFeedback = async (ok: boolean) => {
- if (!ok) return onFinished(false);
-
- const extraData = SettingsStore.getBetaInfo(featureId)?.extraSettings.reduce((o, k) => {
- o[k] = SettingsStore.getValue(k);
- return o;
- }, {});
-
- submitFeedback(SdkConfig.get().bug_report_endpoint_url, info.feedbackLabel, comment, canContact, extraData);
- onFinished(true);
-
- Modal.createTrackedDialog("Beta Dialog Sent", featureId, InfoDialog, {
- title: _t("Beta feedback"),
- description: _t("Thank you for your feedback, we really appreciate it."),
- button: _t("Done"),
- hasCloseButton: false,
- fixedWidth: false,
- });
- };
-
- return (
-
- { _t(info.feedbackSubheading) }
-
- { _t("Your platform and username will be noted to help us use your feedback as much as we can.") }
-
- {
- onFinished(false);
- defaultDispatcher.dispatch({
- action: Action.ViewUserSettings,
- initialTabId: UserTab.Labs,
- });
- }}
- >
- { _t("To leave the beta, visit your settings.") }
-
-
-
- {
- setComment(ev.target.value);
- }}
- autoFocus={true}
- />
-
- setCanContact((e.target as HTMLInputElement).checked)}
- >
- { _t("You may contact me if you have any follow up questions") }
-
- }
- button={_t("Send feedback")}
- buttonDisabled={!comment}
- onFinished={sendFeedback}
- />);
+ subheading={_t(info.feedbackSubheading)}
+ onFinished={onFinished}
+ rageshakeLabel={info.feedbackLabel}
+ rageshakeData={Object.fromEntries((SettingsStore.getBetaInfo(featureId)?.extraSettings || []).map(k => {
+ return SettingsStore.getValue(k);
+ }))}
+ >
+ {
+ onFinished(false);
+ defaultDispatcher.dispatch({
+ action: Action.ViewUserSettings,
+ initialTabId: UserTab.Labs,
+ });
+ }}
+ >
+ { _t("To leave the beta, visit your settings.") }
+
+ ;
};
export default BetaFeedbackDialog;
diff --git a/src/components/views/dialogs/GenericFeatureFeedbackDialog.tsx b/src/components/views/dialogs/GenericFeatureFeedbackDialog.tsx
new file mode 100644
index 0000000000..d68569b126
--- /dev/null
+++ b/src/components/views/dialogs/GenericFeatureFeedbackDialog.tsx
@@ -0,0 +1,101 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, { useState } from "react";
+
+import QuestionDialog from './QuestionDialog';
+import { _t } from '../../../languageHandler';
+import Field from "../elements/Field";
+import SdkConfig from "../../../SdkConfig";
+import { IDialogProps } from "./IDialogProps";
+import { submitFeedback } from "../../../rageshake/submit-rageshake";
+import StyledCheckbox from "../elements/StyledCheckbox";
+import Modal from "../../../Modal";
+import InfoDialog from "./InfoDialog";
+
+interface IProps extends IDialogProps {
+ title: string;
+ subheading: string;
+ rageshakeLabel: string;
+ rageshakeData?: Record;
+}
+
+const GenericFeatureFeedbackDialog: React.FC = ({
+ title,
+ subheading,
+ children,
+ rageshakeLabel,
+ rageshakeData = {},
+ onFinished,
+}) => {
+ const [comment, setComment] = useState("");
+ const [canContact, setCanContact] = useState(false);
+
+ const sendFeedback = async (ok: boolean) => {
+ if (!ok) return onFinished(false);
+
+ submitFeedback(SdkConfig.get().bug_report_endpoint_url, rageshakeLabel, comment, canContact, rageshakeData);
+ onFinished(true);
+
+ Modal.createTrackedDialog("Feedback Sent", rageshakeLabel, InfoDialog, {
+ title,
+ description: _t("Thank you for your feedback, we really appreciate it."),
+ button: _t("Done"),
+ hasCloseButton: false,
+ fixedWidth: false,
+ });
+ };
+
+ return (
+
+ { subheading }
+
+ { _t("Your platform and username will be noted to help us use your feedback as much as we can.") }
+
+ { children }
+
+
+ {
+ setComment(ev.target.value);
+ }}
+ autoFocus={true}
+ />
+
+ setCanContact((e.target as HTMLInputElement).checked)}
+ >
+ { _t("You may contact me if you have any follow up questions") }
+
+ }
+ button={_t("Send feedback")}
+ buttonDisabled={!comment}
+ onFinished={sendFeedback}
+ />);
+};
+
+export default GenericFeatureFeedbackDialog;
diff --git a/src/components/views/spaces/SpaceCreateMenu.tsx b/src/components/views/spaces/SpaceCreateMenu.tsx
index 16c8ec6fb5..406028dbc7 100644
--- a/src/components/views/spaces/SpaceCreateMenu.tsx
+++ b/src/components/views/spaces/SpaceCreateMenu.tsx
@@ -26,15 +26,14 @@ import createRoom from "../../../createRoom";
import MatrixClientContext from "../../../contexts/MatrixClientContext";
import SpaceBasicSettings, { SpaceAvatar } from "./SpaceBasicSettings";
import AccessibleButton from "../elements/AccessibleButton";
-import { BetaPill } from "../beta/BetaCard";
-import defaultDispatcher from "../../../dispatcher/dispatcher";
-import { Action } from "../../../dispatcher/actions";
-import { UserTab } from "../dialogs/UserSettingsDialog";
import Field from "../elements/Field";
import withValidation from "../elements/Validation";
-import { SpaceFeedbackPrompt } from "../../structures/SpaceRoomView";
import { HistoryVisibility, Preset } from "matrix-js-sdk/src/@types/partials";
import RoomAliasField from "../elements/RoomAliasField";
+import SdkConfig from "../../../SdkConfig";
+import Modal from "../../../Modal";
+import GenericFeatureFeedbackDialog from "../dialogs/GenericFeatureFeedbackDialog";
+import SettingsStore from "../../../settings/SettingsStore";
const SpaceCreateMenuType = ({ title, description, className, onClick }) => {
return (
@@ -65,6 +64,34 @@ const nameToAlias = (name: string, domain: string): string => {
return `#${localpart}:${domain}`;
};
+// XXX: Temporary for the Spaces release only
+export const SpaceFeedbackPrompt = ({ onClick }: { onClick?: () => void }) => {
+ if (!SdkConfig.get().bug_report_endpoint_url) return null;
+
+ return
+ { _t("Spaces are a new feature.") }
+ {
+ if (onClick) onClick();
+ Modal.createTrackedDialog("Spaces Feedback", "", GenericFeatureFeedbackDialog, {
+ title: _t("Spaces feedback"),
+ subheading: _t("Thank you for trying Spaces. " +
+ "Your feedback will help inform the next versions."),
+ rageshakeLabel: "spaces-feedback",
+ rageshakeData: Object.fromEntries([
+ "feature_spaces.all_rooms",
+ "feature_spaces.space_member_dms",
+ "feature_spaces.space_dm_badges",
+ ].map(k => [k, SettingsStore.getValue(k)])),
+ });
+ }}
+ >
+ { _t("Give feedback.") }
+
+
debug logs to help us track down the problem.": "PRO TIP: If you start a bug, please submit debug logs to help us track down the problem.",
+ "Feedback": "Feedback",
"Report a bug": "Report a bug",
"Please view existing bugs on Github first. No match? Start a new one.": "Please view existing bugs on Github first. No match? Start a new one.",
+ "Send feedback": "Send feedback",
"You don't have permission to do this": "You don't have permission to do this",
"Sending": "Sending",
"Sent": "Sent",
@@ -2302,6 +2301,10 @@
"Forward message": "Forward message",
"Message preview": "Message preview",
"Search for rooms or people": "Search for rooms or people",
+ "Thank you for your feedback, we really appreciate it.": "Thank you for your feedback, we really appreciate it.",
+ "Done": "Done",
+ "Your platform and username will be noted to help us use your feedback as much as we can.": "Your platform and username will be noted to help us use your feedback as much as we can.",
+ "You may contact me if you have any follow up questions": "You may contact me if you have any follow up questions",
"Confirm abort of host creation": "Confirm abort of host creation",
"Are you sure you wish to abort creation of the host? The process cannot be continued.": "Are you sure you wish to abort creation of the host? The process cannot be continued.",
"Abort": "Abort",
@@ -2813,7 +2816,6 @@
"Search names and descriptions": "Search names and descriptions",
"If you can't find the room you're looking for, ask for an invite or create a new room.": "If you can't find the room you're looking for, ask for an invite or create a new room.",
"Create room": "Create room",
- "Spaces are a beta feature.": "Spaces are a beta feature.",
"Private space": "Private space",
" invites you": " invites you",
"To view %(spaceName)s, turn on the Spaces beta": "To view %(spaceName)s, turn on the Spaces beta",
@@ -2840,7 +2842,7 @@
"Me and my teammates": "Me and my teammates",
"A private space for you and your teammates": "A private space for you and your teammates",
"Teammates might not be able to view or join any private rooms you make.": "Teammates might not be able to view or join any private rooms you make.",
- "We're working on this as part of the beta, but just want to let you know.": "We're working on this as part of the beta, but just want to let you know.",
+ "We're working on this, but just want to let you know.": "We're working on this, but just want to let you know.",
"Failed to invite the following users to your space: %(csvUsers)s": "Failed to invite the following users to your space: %(csvUsers)s",
"Inviting...": "Inviting...",
"Invite your teammates": "Invite your teammates",
diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
index 5aa49df8a1..64edd4c202 100644
--- a/src/settings/Settings.tsx
+++ b/src/settings/Settings.tsx
@@ -124,6 +124,7 @@ export interface ISetting {
// not use this for new settings.
invertedSettingName?: string;
+ // XXX: Keep this around for re-use in future Betas
betaInfo?: {
title: string; // _td
caption: string; // _td
diff --git a/src/utils/objects.ts b/src/utils/objects.ts
index c2ee6ce100..e3b7b6cf59 100644
--- a/src/utils/objects.ts
+++ b/src/utils/objects.ts
@@ -141,21 +141,3 @@ export function objectKeyChanges(a: O, b: O): (keyof O)[] {
export function objectClone(obj: O): O {
return JSON.parse(JSON.stringify(obj));
}
-
-/**
- * Converts a series of entries to an object.
- * @param entries The entries to convert.
- * @returns The converted object.
- */
-// NOTE: Deprecated once we have Object.fromEntries() support.
-// @ts-ignore - return type is complaining about non-string keys, but we know better
-export function objectFromEntries(entries: Iterable<[K, V]>): {[k: K]: V} {
- const obj: {
- // @ts-ignore - same as return type
- [k: K]: V;} = {};
- for (const e of entries) {
- // @ts-ignore - same as return type
- obj[e[0]] = e[1];
- }
- return obj;
-}
diff --git a/test/utils/arrays-test.ts b/test/utils/arrays-test.ts
index cf9a5f0089..277260bf29 100644
--- a/test/utils/arrays-test.ts
+++ b/test/utils/arrays-test.ts
@@ -29,7 +29,6 @@ import {
ArrayUtil,
GroupedArray,
} from "../../src/utils/arrays";
-import { objectFromEntries } from "../../src/utils/objects";
function expectSample(i: number, input: number[], expected: number[], smooth = false) {
console.log(`Resample case index: ${i}`); // for debugging test failures
@@ -336,7 +335,7 @@ describe('arrays', () => {
expect(result).toBeDefined();
expect(result.value).toBeDefined();
- const asObject = objectFromEntries(result.value.entries());
+ const asObject = Object.fromEntries(result.value.entries());
expect(asObject).toMatchObject(output);
});
});
diff --git a/test/utils/objects-test.ts b/test/utils/objects-test.ts
index 154fa3604f..b360fbd1d1 100644
--- a/test/utils/objects-test.ts
+++ b/test/utils/objects-test.ts
@@ -18,7 +18,6 @@ import {
objectClone,
objectDiff,
objectExcluding,
- objectFromEntries,
objectHasDiff,
objectKeyChanges,
objectShallowClone,
@@ -242,21 +241,4 @@ describe('objects', () => {
expect(result.test.third).not.toBe(a.test.third);
});
});
-
- describe('objectFromEntries', () => {
- it('should create an object from an array of entries', () => {
- const output = { a: 1, b: 2, c: 3 };
- const result = objectFromEntries(Object.entries(output));
- expect(result).toBeDefined();
- expect(result).toMatchObject(output);
- });
-
- it('should maintain pointers in values', () => {
- const output = { a: {}, b: 2, c: 3 };
- const result = objectFromEntries(Object.entries(output));
- expect(result).toBeDefined();
- expect(result).toMatchObject(output);
- expect(result['a']).toBe(output.a);
- });
- });
});