Merge branch 'dev' into sync-dev-staging-oct-23

wri · Oct 23, 2024 · c2fe025 · c2fe025
2 parents 9ab3852 + 56e8a2c
commit c2fe025
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 11 deletions.
diff --git a/deployment/ckan/Dockerfile b/deployment/ckan/Dockerfile
@@ -68,4 +68,8 @@ RUN ckan config-tool ${CKAN_INI} "ckan.plugins = ${CKAN__PLUGINS}"
 RUN ckan config-tool ${CKAN_INI} "ckan.auth.create_user_via_web = false"
 RUN ckan config-tool ${CKAN_INI} "ckan.root_path = /private-admin/{{LANG}}"
 
+USER root
+
+RUN chown -R ckan:ckan ${APP_DIR}/src/
+
 USER ckan
diff --git a/deployment/frontend/next-sitemap.config.js b/deployment/frontend/next-sitemap.config.js
@@ -18,6 +18,5 @@ module.exports = {
                 allow: '/',
             },
         ]
-
   },
-}
+}
diff --git a/deployment/frontend/src/components/datasets/visualizations/VisualizationTabs.tsx b/deployment/frontend/src/components/datasets/visualizations/VisualizationTabs.tsx
@@ -7,6 +7,7 @@ export function VisualizationTabs({
 }: {
     tabs: { name: string; enabled: boolean }[]
 }) {
+    const singleTab = tabs.filter((tab) => tab.enabled).length === 1
     return (
         <>
             {tabs.map((tab, i) => (
@@ -18,7 +19,8 @@ export function VisualizationTabs({
                                 selected
                                     ? 'border-b-wri-dark-blue text-wri-dark-blue'
                                     : 'border-transparent text-gray-500 hover:border-gray-300 hover:text-gray-700 border-zinc-300',
-                                tab.enabled ? '' : 'hidden'
+                                tab.enabled ? '' : 'hidden',
+                                singleTab ? 'cursor-text' : 'cursor-pointer'
                             )}
                         >
                             {tab.name}

diff --git a/deployment/frontend/src/pages/index.tsx b/deployment/frontend/src/pages/index.tsx
@@ -105,22 +105,37 @@ export default function Home(
                 <div className="col-span-2">
                     <div className="default-home-container w-full border-t-[4px] border-stone-900" />
                     <h3 className="pt-1 font-acumin text-2xl font-bold leading-loose text-stone-900">
-                        About the Data Explorer
+                        About Data Explorer
                     </h3>
                 </div>
                 <div className="col-span-3 flex flex-col gap-y-4">
                     <div
                         className={`w-full font-acumin text-xl font-light leading-loose text-neutral-700  md:overflow-hidden md:max-h-[100vh] transition duration-300 ease-in-out h-auto`}
                     >
                         <p>
-                            This page is managed by the{' '}
+                            WRI believes that good data is the foundation of
+                            good decision-making. Data Explorer is the central
+                            repository for WRI data, making it freely available
+                            in line with{' '}
                             <a
-                                href="https://www.wri.org/data/data-lab"
+                                href="https://www.wri.org/data/open-data-commitment"
                                 className=" text-blue-600 underline"
                                 target="_blank"
                             >
+                                our Open Data Commitment
+                            </a>
+                            {'. '}
+                            We are still in the process of adding more datasets
+                            — check back regularly for updates. This page is
+                            managed by the{' '}
+                            <a
+                                href="https://www.wri.org/data/data-lab"
+                                className="text-blue-600 underline"
+                            >
+                                {' '}
                                 Data Lab
-                            </a>{' '}
+                            </a>
+                            {'. '}
                             If you are not able to find the data you're looking
                             for or have other feedback to share, please reach
                             out to{' '}
@@ -136,6 +151,7 @@ export default function Home(
                     </div>
                 </div>
             </main>
+
             <main className="flex min-h-screen flex-col items-center justify-center gap-y-8 bg-neutral-50 py-20">
                 <div className="topics-carousel relative !ml-auto w-full max-w-[94.5vw] py-10">
                     <h3 className="font-acumin text-2xl font-bold leading-loose text-stone-900">
@@ -194,10 +210,10 @@ export default function Home(
                         <h1 className="font-bold text-[2rem] ml-2">
                             Recently Updated
                         </h1>
-                    <Recent
-                        datasets={recentlyUpdated.datasets}
-                        title="Recently updated"
-                    />
+                        <Recent
+                            datasets={recentlyUpdated.datasets}
+                            title="Recently updated"
+                        />
                     </div>
                 )}
             </main>
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,6 +18,5 @@ module.exports = { @@
                     allow: '/',
                 },
             ]
       },
-    }
+    }