observable shortcut to current tenant

Recidiviz · Dec 22, 2020 · 776ca47 · 776ca47
1 parent a4afdf0
commit 776ca47
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 6 deletions.
diff --git a/spotlight-client/src/DataStore/RootStore.ts b/spotlight-client/src/DataStore/RootStore.ts
@@ -16,6 +16,7 @@
 // =============================================================================
 
 import { Auth0ClientOptions } from "@auth0/auth0-spa-js";
+import { computed, makeObservable } from "mobx";
 import TenantStore from "./TenantStore";
 import UserStore from "./UserStore";
 
@@ -47,6 +48,8 @@ export default class RootStore {
   userStore: UserStore;
 
   constructor() {
+    makeObservable(this, { tenant: computed });
+
     this.tenantStore = new TenantStore({ rootStore: this });
 
     this.userStore = new UserStore({
@@ -55,4 +58,8 @@ export default class RootStore {
       rootStore: this,
     });
   }
+
+  get tenant(): TenantStore["currentTenant"] {
+    return this.tenantStore.currentTenant;
+  }
 }
diff --git a/spotlight-client/src/PageExplore/PageExplore.tsx b/spotlight-client/src/PageExplore/PageExplore.tsx
@@ -24,7 +24,7 @@ import withRouteSync from "../withRouteSync";
 import getUrlForResource from "../routerUtils/getUrlForResource";
 
 const PageExplore: React.FC<RouteComponentProps> = () => {
-  const tenant = useDataStore().tenantStore.currentTenant;
+  const { tenant } = useDataStore();
 
   return (
     <article>

diff --git a/spotlight-client/src/PageMetric/PageMetric.tsx b/spotlight-client/src/PageMetric/PageMetric.tsx
@@ -25,7 +25,7 @@ import withRouteSync from "../withRouteSync";
 type PageMetricProps = RouteComponentProps & { metricTypeId?: MetricTypeId };
 
 const PageMetric: React.FC<PageMetricProps> = ({ metricTypeId }) => {
-  const tenant = useDataStore().tenantStore.currentTenant;
+  const { tenant } = useDataStore();
 
   // if this component is used properly as a route component,
   // this should never be true;

diff --git a/spotlight-client/src/PageNarrative/PageNarrative.tsx b/spotlight-client/src/PageNarrative/PageNarrative.tsx
@@ -27,7 +27,7 @@ type PageNarrativeProps = RouteComponentProps & {
 };
 
 const PageNarrative: React.FC<PageNarrativeProps> = ({ narrativeTypeId }) => {
-  const tenant = useDataStore().tenantStore.currentTenant;
+  const { tenant } = useDataStore();
 
   // if this component is used properly as a route component,
   // this should never be true;

diff --git a/spotlight-client/src/PageNarrativeList/PageNarrativeList.tsx b/spotlight-client/src/PageNarrativeList/PageNarrativeList.tsx
@@ -24,7 +24,7 @@ import { useDataStore } from "../StoreProvider";
 import withRouteSync from "../withRouteSync";
 
 const PageNarrativeList: React.FC<RouteComponentProps> = () => {
-  const tenant = useDataStore().tenantStore.currentTenant;
+  const { tenant } = useDataStore();
 
   const systemNarratives = tenant?.systemNarratives;
 

diff --git a/spotlight-client/src/PageTenant/PageTenant.tsx b/spotlight-client/src/PageTenant/PageTenant.tsx
@@ -26,7 +26,7 @@ type PageTenantProps = RouteComponentProps & { tenantId?: TenantId };
 
 const PageTenant: React.FC<PageTenantProps> = () => {
   // tenant may be briefly undefined during initial page load
-  const tenant = useDataStore().tenantStore.currentTenant;
+  const { tenant } = useDataStore();
 
   return (
     <article>

diff --git a/spotlight-client/src/SiteNavigation/SiteNavigation.tsx b/spotlight-client/src/SiteNavigation/SiteNavigation.tsx
@@ -81,7 +81,7 @@ function getNavLinkProps({ matchPartial }: { matchPartial: boolean }) {
 }
 
 const SiteNavigation: React.FC = () => {
-  const tenant = useDataStore().tenantStore.currentTenant;
+  const { tenant } = useDataStore();
 
   return (
     <NavContainer>