Merge pull request #5627 from beyondessential/master

merge: Hotfix 2024-19-1 master-> dev
beyondessential · May 8, 2024 · 0ffd7c0 · 0ffd7c0
2 parents b6c3c2d + 6f8923b
commit 0ffd7c0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/packages/tupaia-web-server/src/app/createApp.ts b/packages/tupaia-web-server/src/app/createApp.ts
@@ -97,6 +97,7 @@ export async function createApp(db: TupaiaDatabase = new TupaiaDatabase()) {
     // Forward everything else to webConfigApi
     .use('dashboards', forwardRequest(WEB_CONFIG_API_URL, { authHandlerProvider }))
     .use('export/surveyDataDownload', forwardRequest(WEB_CONFIG_API_URL, { authHandlerProvider }))
+    .use('export/chart', forwardRequest(WEB_CONFIG_API_URL, { authHandlerProvider }))
     .use('landingPage/:landingPageUrl', forwardRequest(WEB_CONFIG_API_URL, { authHandlerProvider }))
     .use('login/oneTimeLogin', forwardRequest(WEB_CONFIG_API_URL, { authHandlerProvider }))
     .use('logout', forwardRequest(WEB_CONFIG_API_URL, { authHandlerProvider }))

diff --git a/packages/tupaia-web/src/features/EnlargedDashboardItem/ExportDashboardItem.tsx b/packages/tupaia-web/src/features/EnlargedDashboardItem/ExportDashboardItem.tsx
@@ -31,6 +31,7 @@ const ExportContentContainer = styled.div`
   flex-grow: 1;
   text-align: left;
   margin-bottom: 1rem;
+  min-width: 40rem; // so that when the loader shows things don't shrink too much
   ${({ theme }) => theme.breakpoints.up('sm')} {
     display: grid;
     grid-template-columns: 3fr 7fr;
@@ -63,7 +64,6 @@ export const ExportDashboardItem = ({ entityName }: { entityName?: Entity['name'
   const { isExportMode, isExporting, exportError } = useContext(ExportDashboardItemContext);
   const { handleExport, cancelExport } = useExportDashboardItem(entityName, exportRef);
   if (!isExportMode) return null;
-
   const exportOptions = [
     {
       label: 'PNG',