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.",
"Public space": "Public space",
"Private space": "Private space",
" invites you": " invites you",
From 7ccc429beaa1c49d4d94b7f1f68c8b115fd5a53f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 23 Jul 2021 15:47:11 +0100
Subject: [PATCH 02/11] Change spaces beta feedback to not be so beta-centric
---
res/css/_components.scss | 2 +-
...css => _GenericFeatureFeedbackDialog.scss} | 4 +-
src/components/views/beta/BetaCard.tsx | 2 +
.../views/dialogs/BetaFeedbackDialog.tsx | 98 +++++------------
.../dialogs/GenericFeatureFeedbackDialog.tsx | 101 ++++++++++++++++++
.../views/spaces/SpaceCreateMenu.tsx | 14 ++-
src/i18n/strings/en_EN.json | 17 +--
src/settings/Settings.tsx | 1 +
8 files changed, 151 insertions(+), 88 deletions(-)
rename res/css/views/dialogs/{_BetaFeedbackDialog.scss => _GenericFeatureFeedbackDialog.scss} (90%)
create mode 100644 src/components/views/dialogs/GenericFeatureFeedbackDialog.tsx
diff --git a/res/css/_components.scss b/res/css/_components.scss
index f9e3ab1160..95040ce855 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -67,7 +67,6 @@
@import "./views/dialogs/_AddExistingToSpaceDialog.scss";
@import "./views/dialogs/_AddressPickerDialog.scss";
@import "./views/dialogs/_Analytics.scss";
-@import "./views/dialogs/_BetaFeedbackDialog.scss";
@import "./views/dialogs/_BugReportDialog.scss";
@import "./views/dialogs/_ChangelogDialog.scss";
@import "./views/dialogs/_ChatCreateOrReuseChatDialog.scss";
@@ -81,6 +80,7 @@
@import "./views/dialogs/_EditCommunityPrototypeDialog.scss";
@import "./views/dialogs/_FeedbackDialog.scss";
@import "./views/dialogs/_ForwardDialog.scss";
+@import "./views/dialogs/_GenericFeatureFeedbackDialog.scss";
@import "./views/dialogs/_GroupAddressPicker.scss";
@import "./views/dialogs/_HostSignupDialog.scss";
@import "./views/dialogs/_IncomingSasDialog.scss";
diff --git a/res/css/views/dialogs/_BetaFeedbackDialog.scss b/res/css/views/dialogs/_GenericFeatureFeedbackDialog.scss
similarity index 90%
rename from res/css/views/dialogs/_BetaFeedbackDialog.scss
rename to res/css/views/dialogs/_GenericFeatureFeedbackDialog.scss
index 9f5f6b512e..f83eed9c53 100644
--- a/res/css/views/dialogs/_BetaFeedbackDialog.scss
+++ b/res/css/views/dialogs/_GenericFeatureFeedbackDialog.scss
@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-.mx_BetaFeedbackDialog {
- .mx_BetaFeedbackDialog_subheading {
+.mx_GenericFeatureFeedbackDialog {
+ .mx_GenericFeatureFeedbackDialog_subheading {
color: $primary-fg-color;
font-size: $font-14px;
line-height: $font-20px;
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/BetaFeedbackDialog.tsx b/src/components/views/dialogs/BetaFeedbackDialog.tsx
index 917004dbc7..788832119f 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 "./FeedbackDialog";
+
+// XXX: Keep this around for re-use in future Betas
interface IProps extends IDialogProps {
featureId: string;
@@ -38,74 +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 extraData = SettingsStore.getBetaInfo(featureId)?.extraSettings.reduce((o, k) => {
+ o[k] = SettingsStore.getValue(k);
+ return o;
+ }, {});
- 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={extraData}
+ >
+ {
+ 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 a5d864b140..279ae1165b 100644
--- a/src/components/views/spaces/SpaceCreateMenu.tsx
+++ b/src/components/views/spaces/SpaceCreateMenu.tsx
@@ -33,7 +33,8 @@ import { ICreateRoomStateEvent } from "matrix-js-sdk/src/@types/requests";
import RoomAliasField from "../elements/RoomAliasField";
import SdkConfig from "../../../SdkConfig";
import Modal from "../../../Modal";
-import BetaFeedbackDialog from "../dialogs/BetaFeedbackDialog";
+import GenericFeatureFeedbackDialog from "../dialogs/GenericFeatureFeedbackDialog";
+import SettingsStore from "../../../settings/SettingsStore";
const SpaceCreateMenuType = ({ title, description, className, onClick }) => {
return (
@@ -74,8 +75,15 @@ const SpaceFeedbackPrompt = ({ onClick }: { onClick?: () => void }) => {
{ _t("Spaces are a new feature.") } {
if (onClick) onClick();
- Modal.createTrackedDialog("Beta Feedback", "feature_spaces", BetaFeedbackDialog, {
- featureId: "feature_spaces",
+ 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: {
+ "feature_spaces.all_rooms": SettingsStore.getValue("feature_spaces.all_rooms"),
+ "feature_spaces.space_member_dms": SettingsStore.getValue("feature_spaces.space_member_dms"),
+ "feature_spaces.space_dm_badges": SettingsStore.getValue("feature_spaces.space_dm_badges"),
+ },
});
}}>
{ _t("Give feedback.") }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 5199346d90..89ea7e3a71 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1009,6 +1009,8 @@
"Description": "Description",
"Please enter a name for the space": "Please enter a name for the space",
"Spaces are a new feature.": "Spaces are a new feature.",
+ "Spaces feedback": "Spaces feedback",
+ "Thank you for trying Spaces. Your feedback will help inform the next versions.": "Thank you for trying Spaces. Your feedback will help inform the next versions.",
"Give feedback.": "Give feedback.",
"Create a space": "Create a space",
"Spaces are a new way to group rooms and people. To join an existing space you'll need an invite.": "Spaces are a new way to group rooms and people. To join an existing space you'll need an invite.",
@@ -2134,15 +2136,8 @@
"Invite anyway and never warn me again": "Invite anyway and never warn me again",
"Invite anyway": "Invite anyway",
"Close dialog": "Close dialog",
- "Beta feedback": "Beta feedback",
- "Thank you for your feedback, we really appreciate it.": "Thank you for your feedback, we really appreciate it.",
- "Done": "Done",
"%(featureName)s beta feedback": "%(featureName)s beta feedback",
- "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.",
"To leave the beta, visit your settings.": "To leave the beta, visit your settings.",
- "Feedback": "Feedback",
- "You may contact me if you have any follow up questions": "You may contact me if you have any follow up questions",
- "Send feedback": "Send feedback",
"Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.",
"Preparing to send logs": "Preparing to send logs",
"Logs sent": "Logs sent",
@@ -2279,8 +2274,10 @@
"Comment": "Comment",
"There are two ways you can provide feedback and help us improve %(brand)s.": "There are two ways you can provide feedback and help us improve %(brand)s.",
"PRO TIP: If you start a bug, please submit 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",
@@ -2288,6 +2285,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",
@@ -2825,7 +2826,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 f0bdb2e0e5..8fbace9cad 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
From 1d1a396c1f4b8aafb4b1f522596ba6947bd82c35 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 23 Jul 2021 15:51:59 +0100
Subject: [PATCH 03/11] get rid of spurious hr
---
res/css/structures/_SpaceRoomView.scss | 12 ------------
src/components/structures/SpaceRoomView.tsx | 1 -
2 files changed, 13 deletions(-)
diff --git a/res/css/structures/_SpaceRoomView.scss b/res/css/structures/_SpaceRoomView.scss
index b1c09350cf..ca97262742 100644
--- a/res/css/structures/_SpaceRoomView.scss
+++ b/res/css/structures/_SpaceRoomView.scss
@@ -332,12 +332,6 @@ $SpaceRoomViewInnerWidth: 428px;
word-wrap: break-word;
}
- > hr {
- border: none;
- height: 1px;
- background-color: $groupFilterPanel-bg-color;
- }
-
.mx_SearchBox {
margin: 0 0 20px;
}
@@ -514,12 +508,6 @@ $SpaceRoomViewInnerWidth: 428px;
margin-top: 18px;
margin-bottom: 12px;
- > hr {
- border: none;
- border-top: 1px solid $input-border-color;
- margin-bottom: 12px;
- }
-
> div {
display: flex;
flex-direction: row;
diff --git a/src/components/structures/SpaceRoomView.tsx b/src/components/structures/SpaceRoomView.tsx
index 699c42c871..1187a16d17 100644
--- a/src/components/structures/SpaceRoomView.tsx
+++ b/src/components/structures/SpaceRoomView.tsx
@@ -428,7 +428,6 @@ const SpaceLanding = ({ space }) => {