Open platform to collect and prioritize feedback
refactor: introduce FiderContext (#737)
Guilherme Oenningf4da9c35d347
diff --git a/public/components/common/EnvironmentInfo.tsx b/public/components/common/EnvironmentInfo.tsxindex 82eec0ccb..983d04237 100644--- a/public/components/common/EnvironmentInfo.tsx+++ b/public/components/common/EnvironmentInfo.tsx@@ -1,17 +1,19 @@import React from "react";-import { Fider } from "@fider/services";+import { useFider } from "@fider/hooks";export const EnvironmentInfo = () => {- if (Fider.isProduction()) {+ const fider = useFider();++ if (fider.isProduction()) {return null;}return (<div className="c-env-info">- Env: {Fider.settings.environment} | Compiler: {Fider.settings.compiler} | Version: {Fider.settings.version} |- BuildTime: {Fider.settings.buildTime || "N/A"} |- {!Fider.isSingleHostMode() && `TenantID: ${Fider.session.tenant.id}`} |{" "}- {Fider.session.isAuthenticated && `UserID: ${Fider.session.user.id}`}+ Env: {fider.settings.environment} | Compiler: {fider.settings.compiler} | Version: {fider.settings.version} |+ BuildTime: {fider.settings.buildTime || "N/A"} |+ {!fider.isSingleHostMode() && `TenantID: ${fider.session.tenant.id}`} |{" "}+ {fider.session.isAuthenticated && `UserID: ${fider.session.user.id}`}</div>);};diff --git a/public/components/common/Logo.tsx b/public/components/common/Logo.tsxindex 57dba7d7a..89b4b07ef 100644--- a/public/components/common/Logo.tsx+++ b/public/components/common/Logo.tsx@@ -1,5 +1,7 @@import React from "react";-import { Fider, uploadedImageURL } from "@fider/services";+import { uploadedImageURL } from "@fider/services";+import { useFider } from "@fider/hooks";+import { Tenant } from "@fider/models";type Size = 24 | 50 | 100 | 200;@@ -8,8 +10,7 @@ interface TenantLogoProps {useFiderIfEmpty?: boolean;}-export const TenantLogoURL = (size: Size): string | undefined => {- const tenant = Fider.session.tenant;+export const TenantLogoURL = (tenant: Tenant, size: Size): string | undefined => {if (tenant && tenant.logoBlobKey) {return uploadedImageURL(tenant.logoBlobKey, size);}@@ -17,9 +18,11 @@ export const TenantLogoURL = (size: Size): string | undefined => {};export const TenantLogo = (props: TenantLogoProps) => {- const tenant = Fider.session.tenant;+ const fider = useFider();++ const tenant = fider.session.tenant;if (tenant && tenant.logoBlobKey) {- return <img src={TenantLogoURL(props.size)} alt={tenant.name} />;+ return <img src={TenantLogoURL(fider.session.tenant, props.size)} alt={tenant.name} />;} else if (props.useFiderIfEmpty) {return <img src="https://getfider.com/images/logo-100x100.png" alt="Fider" />;}diff --git a/public/components/common/TenantStatusInfo.tsx b/public/components/common/TenantStatusInfo.tsxindex 97d03f305..d94d1a364 100644--- a/public/components/common/TenantStatusInfo.tsx+++ b/public/components/common/TenantStatusInfo.tsx@@ -1,10 +1,12 @@import React from "react";-import { Fider } from "@fider/services";import { TenantStatus } from "@fider/models";import { Message } from "./Message";+import { useFider } from "@fider/hooks";export const TenantStatusInfo = () => {- if (!Fider.isBillingEnabled() || Fider.session.tenant.status !== TenantStatus.Locked) {+ const fider = useFider();++ if (!fider.isBillingEnabled() || fider.session.tenant.status !== TenantStatus.Locked) {return null;}diff --git a/public/hooks/index.ts b/public/hooks/index.tsnew file mode 100644index 000000000..6bbdf7bdf--- /dev/null+++ b/public/hooks/index.ts@@ -0,0 +1 @@+export * from "./use-fider";diff --git a/public/hooks/use-fider.ts b/public/hooks/use-fider.tsnew file mode 100644index 000000000..32559beec--- /dev/null+++ b/public/hooks/use-fider.ts@@ -0,0 +1,4 @@+import { useContext } from "react";+import { FiderContext } from "@fider/services";++export const useFider = () => useContext(FiderContext);diff --git a/public/index.tsx b/public/index.tsxindex c1e7bdbf0..8b741fb2b 100644--- a/public/index.tsx+++ b/public/index.tsx@@ -3,7 +3,7 @@ import ReactDOM from "react-dom";import { resolveRootComponent } from "@fider/router";import { Header, Footer, Loader } from "@fider/components/common";import { ErrorBoundary } from "@fider/components";-import { classSet, Fider, actions, navigator } from "@fider/services";+import { classSet, Fider, FiderContext, actions, navigator } from "@fider/services";import { IconContext } from "react-icons";const Loading = () => (@@ -55,11 +55,13 @@ window.addEventListener("error", (evt: ErrorEvent) => {});ReactDOM.render(<ErrorBoundary onError={logProductionError}>- <IconContext.Provider value={{ className: "icon" }}>- {config.showHeader && <Header />}- <Suspense fallback={<Loading />}>{React.createElement(config.component, fider.session.props)}</Suspense>- {config.showHeader && <Footer />}- </IconContext.Provider>+ <FiderContext.Provider value={fider}>+ <IconContext.Provider value={{ className: "icon" }}>+ {config.showHeader && <Header />}+ <Suspense fallback={<Loading />}>{React.createElement(config.component, fider.session.props)}</Suspense>+ {config.showHeader && <Footer />}+ </IconContext.Provider>+ </FiderContext.Provider></ErrorBoundary>,document.getElementById("root"));diff --git a/public/pages/Administration/components/BillingPlanPanel.tsx b/public/pages/Administration/components/BillingPlanPanel.tsxindex 29bed4b45..45507c3a2 100644--- a/public/pages/Administration/components/BillingPlanPanel.tsx+++ b/public/pages/Administration/components/BillingPlanPanel.tsx@@ -2,6 +2,7 @@ import React from "react";import { Segment, Button, Moment, Modal, ButtonClickEvent } from "@fider/components";import { BillingPlan, InvoiceDue } from "@fider/models";import { Fider, actions, classSet, currencySymbol } from "@fider/services";+import { useFider } from "@fider/hooks";interface BillingPlanOptionProps {tenantUserCount: number;@@ -13,7 +14,9 @@ interface BillingPlanOptionProps {}const BillingPlanOption = (props: BillingPlanOptionProps) => {- const billing = Fider.session.tenant.billing!;+ const fider = useFider();++ const billing = fider.session.tenant.billing!;const isSelected = billing.stripePlanID === props.plan.id && !billing.subscriptionEndsAt;const className = classSet({ "l-plan": true, selected: isSelected });diff --git a/public/services/fider.ts b/public/services/fider.tsindex 877eb287c..eea4c8c11 100644--- a/public/services/fider.ts+++ b/public/services/fider.ts@@ -1,3 +1,4 @@+import { createContext } from "react";import { CurrentUser, SystemSettings, Tenant } from "@fider/models";export class FiderSession {@@ -68,3 +69,5 @@ export class FiderImpl {}export let Fider = new FiderImpl();++export const FiderContext = createContext<FiderImpl>(Fider);