From 4cbf1f5371e0ab4ad3e3ebd85b003da4539bf7a7 Mon Sep 17 00:00:00 2001 From: binwiederhier Date: Sat, 11 Feb 2023 20:38:13 -0500 Subject: [PATCH] Derp --- web/public/config.js | 2 +- web/src/components/SubscribeDialog.js | 5 ++--- web/src/components/UpgradeDialog.js | 11 ++++------- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/web/public/config.js b/web/public/config.js index 3113ff48..8d1ed4cd 100644 --- a/web/public/config.js +++ b/web/public/config.js @@ -12,5 +12,5 @@ var config = { enable_signup: true, enable_payments: true, enable_reservations: true, - disallowed_topics: ["docs", "static", "file", "app", "account", "settings", "pricing", "signup", "login", "reset-password"] + disallowed_topics: ["docs", "static", "file", "app", "account", "settings", "signup", "login"] }; diff --git a/web/src/components/SubscribeDialog.js b/web/src/components/SubscribeDialog.js index 365078c1..b24501bc 100644 --- a/web/src/components/SubscribeDialog.js +++ b/web/src/components/SubscribeDialog.js @@ -17,7 +17,7 @@ import DialogFooter from "./DialogFooter"; import {useTranslation} from "react-i18next"; import session from "../app/Session"; import routes from "./routes"; -import accountApi, {Role} from "../app/AccountApi"; +import accountApi, {Permission, Role} from "../app/AccountApi"; import ReserveTopicSelect from "./ReserveTopicSelect"; import {AccountContext} from "./App"; import {TopicReservedError, UnauthorizedError} from "../app/errors"; @@ -67,7 +67,7 @@ const SubscribePage = (props) => { const [error, setError] = useState(""); const [reserveTopicVisible, setReserveTopicVisible] = useState(false); const [anotherServerVisible, setAnotherServerVisible] = useState(false); - const [everyone, setEveryone] = useState("deny-all"); + const [everyone, setEveryone] = useState(Permission.DENY_ALL); const baseUrl = (anotherServerVisible) ? props.baseUrl : config.base_url; const topic = props.topic; const existingTopicUrls = props.subscriptions.map(s => topicUrl(s.baseUrl, s.topic)); @@ -99,7 +99,6 @@ const SubscribePage = (props) => { console.log(`[SubscribeDialog] Reserving topic ${topic} with everyone access ${everyone}`); try { await accountApi.upsertReservation(topic, everyone); - // Account sync later after it was added } catch (e) { console.log(`[SubscribeDialog] Error reserving topic`, e); if (e instanceof UnauthorizedError) { diff --git a/web/src/components/UpgradeDialog.js b/web/src/components/UpgradeDialog.js index 10e51b83..247131c3 100644 --- a/web/src/components/UpgradeDialog.js +++ b/web/src/components/UpgradeDialog.js @@ -33,13 +33,10 @@ const UpgradeDialog = (props) => { const fullScreen = useMediaQuery(theme.breakpoints.down('sm')); useEffect(() => { - (async () => { - try { - setTiers(await accountApi.billingTiers()); - } catch (e) { - setError(e.message); - } - })(); + const fetchTiers = async () => { + setTiers(await accountApi.billingTiers()); + } + fetchTiers(); // Dangle }, []); if (!tiers) {