put vis tool button behind flag (#3376)

datacommonsorg · Sep 1, 2023 · ff96847 · ff96847
1 parent ce1120e
commit ff96847
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 11 deletions.
diff --git a/server/app_env/production.py b/server/app_env/production.py
@@ -17,4 +17,5 @@
 
 class Config(_base.Config):
   GA_ACCOUNT = 'G-KWSES5WXZE'
-  HIDE_REVAMP_CHANGES = True
+  HIDE_REVAMP_CHANGES = True
+  LOGO_PATH = '/images/dc-logo-old.svg'
diff --git a/server/app_env/staging.py b/server/app_env/staging.py
@@ -17,4 +17,5 @@
 
 class Config(_base.Config):
   GA_ACCOUNT = 'G-HV2XYYS1JD'
-  HIDE_REVAMP_CHANGES = True
+  HIDE_REVAMP_CHANGES = True
+  LOGO_PATH = '/images/dc-logo-old.svg'
diff --git a/server/templates/tools/map.html b/server/templates/tools/map.html
@@ -33,6 +33,7 @@
 {% endblock %}
 
 {% block content %}
+  <div id="metadata" class="d-none" data-hide-vis-link="{{ config['HIDE_REVAMP_CHANGES'] }}"></div>
   <div id="main-pane"></div>
   <script>
     infoConfig = {{info_json|tojson|safe}};

diff --git a/server/templates/tools/scatter.html b/server/templates/tools/scatter.html
@@ -29,6 +29,7 @@
 {% endblock %}
 
 {% block content %}
+<div id="metadata" class="d-none" data-hide-vis-link="{{ config['HIDE_REVAMP_CHANGES'] }}"></div>
 <div id="main-pane"></div>
 <script>
   infoConfig = {{info_json|tojson|safe}};

diff --git a/server/templates/tools/timeline.html b/server/templates/tools/timeline.html
@@ -29,6 +29,7 @@
 {% endblock %}
 
 {% block content %}
+<div id="metadata" class="d-none" data-hide-vis-link="{{ config['HIDE_REVAMP_CHANGES'] }}"></div>
 <div id="main-pane"></div>
 <script>
   infoConfig = {{info_json|tojson|safe}};

diff --git a/static/images/dc-logo-old.svg b/static/images/dc-logo-old.svg
diff --git a/static/js/tools/map/title.tsx b/static/js/tools/map/title.tsx
@@ -25,15 +25,19 @@ import { ifShowChart } from "./util";
 
 export function Title(): JSX.Element {
   const { statVar, placeInfo } = useContext(Context);
+  const hideVisLink =
+    document.getElementById("metadata")?.dataset?.hideVisLink === "True";
 
   return (
     <>
       {!ifShowChart(statVar.value, placeInfo.value) && (
         <div className="app-header">
           <h1 className="mb-4">Map Explorer</h1>
-          <a href="/tools/visualization#visType%3Dmap">
-            Go back to the new Data Commons
-          </a>
+          {!hideVisLink && (
+            <a href="/tools/visualization#visType%3Dmap">
+              Go back to the new Data Commons
+            </a>
+          )}
         </div>
       )}
     </>

diff --git a/static/js/tools/scatter/app.tsx b/static/js/tools/scatter/app.tsx
@@ -51,6 +51,8 @@ function App(): JSX.Element {
   const showInfo = !showChart && !showChooseStatVarMessage;
   const [isSvModalOpen, updateSvModalOpen] = useState(false);
   const toggleSvModalCallback = () => updateSvModalOpen(!isSvModalOpen);
+  const hideVisLink =
+    document.getElementById("metadata")?.dataset?.hideVisLink === "True";
   return (
     <>
       <StatVarChooser
@@ -63,9 +65,11 @@ function App(): JSX.Element {
             <Row>
               <div className="app-header">
                 <h1 className="mb-4">Scatter Plot Explorer</h1>
-                <a href="/tools/visualization#visType%3Dscatter">
-                  Go back to the new Data Commons
-                </a>
+                {!hideVisLink && (
+                  <a href="/tools/visualization#visType%3Dscatter">
+                    Go back to the new Data Commons
+                  </a>
+                )}
               </div>
             </Row>
           )}

diff --git a/static/js/tools/timeline/page.tsx b/static/js/tools/timeline/page.tsx
@@ -157,6 +157,8 @@ class Page extends Component<unknown, PageStateType> {
       svToSvInfo[sv] =
         sv in this.state.statVarInfo ? this.state.statVarInfo[sv] : {};
     }
+    const hideVisLink =
+      document.getElementById("metadata")?.dataset?.hideVisLink === "True";
 
     return (
       <>
@@ -177,9 +179,11 @@ class Page extends Component<unknown, PageStateType> {
             {numPlaces === 0 && (
               <div className="app-header">
                 <h1 className="mb-4">Timelines Explorer</h1>
-                <a href="/tools/visualization#visType%3Dtimeline">
-                  Go back to the new Data Commons
-                </a>
+                {!hideVisLink && (
+                  <a href="/tools/visualization#visType%3Dtimeline">
+                    Go back to the new Data Commons
+                  </a>
+                )}
               </div>
             )}
             <Card id="place-search">