Merge pull request #5734 from beyondessential/master

merge: release-2024-25 master -> dev
beyondessential · Jun 19, 2024 · 92bb784 · 92bb784
2 parents e2e210d + 1ecff74
commit 92bb784
Show file tree

Hide file tree

Showing 27 changed files with 89 additions and 40 deletions.
diff --git a/packages/admin-panel/src/api/TupaiaApi.js b/packages/admin-panel/src/api/TupaiaApi.js
@@ -5,6 +5,7 @@
 
 import { saveAs } from 'file-saver';
 import { parse } from 'content-disposition-header';
+import { logout } from '../authentication';
 
 import { verifyResponseStatus, stringifyQuery } from '@tupaia/utils';
 

diff --git a/packages/admin-panel/src/api/mutations/useLogin.js b/packages/admin-panel/src/api/mutations/useLogin.js
@@ -25,7 +25,6 @@ export const useLogin = homeLink => {
     {
       onSuccess: async () => {
         await queryClient.invalidateQueries();
-        console.log(from, homeLink);
         if (from) {
           navigate(from, {
             state: null,

diff --git a/packages/admin-panel/src/api/mutations/useLogout.js b/packages/admin-panel/src/api/mutations/useLogout.js
@@ -6,12 +6,13 @@
 import { useMutation, useQueryClient } from 'react-query';
 import { post } from '../../VizBuilderApp/api';
 
-export const useLogout = () => {
+export const useLogout = onSuccess => {
   const queryClient = useQueryClient();
 
   return useMutation('logout', () => post('logout'), {
     onSuccess: () => {
       queryClient.invalidateQueries();
+      if (onSuccess) onSuccess();
     },
   });
 };
diff --git a/packages/admin-panel/src/authentication/actions.js b/packages/admin-panel/src/authentication/actions.js
@@ -6,6 +6,6 @@
 import { LOGOUT } from './constants';
 
 // workaround for resetting redux state on logout, until we move everything to react-query and hooks
-export const logout = dispatch => {
-  dispatch({ type: LOGOUT });
-};
+export const logout = () => ({
+  type: LOGOUT,
+});
diff --git a/packages/admin-panel/src/layout/navigation/TopNavbar.jsx b/packages/admin-panel/src/layout/navigation/TopNavbar.jsx
@@ -3,12 +3,14 @@
  * Copyright (c) 2017 - 2024 Beyond Essential Systems Pty Ltd
  */
 import React from 'react';
+import { connect } from 'react-redux';
 import styled from 'styled-components';
 import PropTypes from 'prop-types';
 import { UserButton } from './UserButton';
 import { HomeLink } from './HomeLink';
 import { useUser } from '../../api/queries';
 import { useLogout } from '../../api/mutations';
+import { logout as logoutAction } from '../../authentication';
 
 const Wrapper = styled.div`
   background-color: ${props => props.theme.palette.secondary.main};
@@ -28,9 +30,9 @@ const Wrapper = styled.div`
   }
 `;
 
-export const TopNavbar = ({ logo, homeLink, displayLogoutButton, disableHomeLink }) => {
+const TopNavbarComponent = ({ logo, homeLink, displayLogoutButton, disableHomeLink, onLogout }) => {
   const { isLoggedIn } = useUser();
-  const { mutate: logout } = useLogout();
+  const { mutate: logout } = useLogout(onLogout);
   return (
     <Wrapper>
       <HomeLink logo={logo} homeLink={homeLink} disableHomeLink={disableHomeLink} />
@@ -39,17 +41,18 @@ export const TopNavbar = ({ logo, homeLink, displayLogoutButton, disableHomeLink
   );
 };
 
-TopNavbar.propTypes = {
+TopNavbarComponent.propTypes = {
   logo: PropTypes.shape({
     url: PropTypes.string.isRequired,
     alt: PropTypes.string.isRequired,
   }),
   homeLink: PropTypes.string,
   displayLogoutButton: PropTypes.bool,
   disableHomeLink: PropTypes.bool,
+  onLogout: PropTypes.func.isRequired,
 };
 
-TopNavbar.defaultProps = {
+TopNavbarComponent.defaultProps = {
   logo: {
     url: '/admin-panel-logo-white.svg',
     alt: 'Tupaia Admin Panel Logo',
@@ -58,3 +61,9 @@ TopNavbar.defaultProps = {
   displayLogoutButton: true,
   disableHomeLink: false,
 };
+
+const mapDispatchToProps = dispatch => ({
+  onLogout: () => dispatch(logoutAction()),
+});
+
+export const TopNavbar = connect(null, mapDispatchToProps)(TopNavbarComponent);
diff --git a/packages/admin-panel/src/layout/navigation/UserProfileInfo.jsx b/packages/admin-panel/src/layout/navigation/UserProfileInfo.jsx
@@ -4,13 +4,15 @@
  */
 import React from 'react';
 import styled from 'styled-components';
+import { connect } from 'react-redux';
 import { Link } from 'react-router-dom';
 import PropTypes from 'prop-types';
 import { Avatar, Divider, Typography } from '@material-ui/core';
 import { Tooltip } from '@tupaia/ui-components';
 import { UserButton } from './UserButton';
 import { useUser } from '../../api/queries';
 import { useLogout } from '../../api/mutations';
+import { logout as logoutAction } from '../../authentication';
 
 const Wrapper = styled.div`
   padding-inline: 1.25rem;
@@ -29,9 +31,9 @@ const UserEmail = styled(Typography)`
   margin-block-end: 0.9rem;
 `;
 
-export const UserProfileInfo = ({ profileLink, isFullWidth }) => {
+const UserProfileInfoComponent = ({ profileLink, isFullWidth, onLogout }) => {
   const { isLoggedIn, data: user, isLoading } = useUser();
-  const { mutate: logout } = useLogout();
+  const { mutate: logout } = useLogout(onLogout);
 
   if (isLoading) return null;
 
@@ -70,14 +72,21 @@ export const UserProfileInfo = ({ profileLink, isFullWidth }) => {
   );
 };
 
-UserProfileInfo.propTypes = {
+UserProfileInfoComponent.propTypes = {
   profileLink: PropTypes.shape({
     label: PropTypes.string.isRequired,
     to: PropTypes.string.isRequired,
   }),
   isFullWidth: PropTypes.bool.isRequired,
+  onLogout: PropTypes.func.isRequired,
 };
 
-UserProfileInfo.defaultProps = {
+UserProfileInfoComponent.defaultProps = {
   profileLink: null,
 };
+
+const mapDispatchToProps = dispatch => ({
+  onLogout: () => dispatch(logoutAction()),
+});
+
+export const UserProfileInfo = connect(null, mapDispatchToProps)(UserProfileInfoComponent);
diff --git a/packages/lesmis/src/routes/LesmisAdminRedirect.jsx b/packages/lesmis/src/routes/LesmisAdminRedirect.jsx
@@ -4,15 +4,26 @@
  *
  */
 import React from 'react';
-import { Navigate, Outlet } from 'react-router-dom';
+import { Navigate, Outlet, useLocation } from 'react-router-dom';
 import { useUser } from '@tupaia/admin-panel';
-import { hasAdminPanelAccess } from '../utils';
+import { hasAdminPanelAccess, useAdminPanelUrl, useUrlParams } from '../utils';
 
 export const LesmisAdminRedirect = () => {
-  const { data: user } = useUser();
+  const adminUrl = useAdminPanelUrl();
+  const { data: user, isLoading } = useUser();
   const userHasAdminPanelAccess = hasAdminPanelAccess(user);
+  const location = useLocation();
+  const { locale } = useUrlParams();
+
+  if (isLoading) {
+    return null;
+  }
   if (!userHasAdminPanelAccess) {
-    return <Navigate to="/not-authorised" replace />;
+    return <Navigate to={`/${locale}/not-authorised`} replace />;
+  }
+
+  if (location.pathname === adminUrl) {
+    return <Navigate to={`${adminUrl}/survey-responses`} replace />;
   }
 
   return <Outlet />;

diff --git a/packages/lesmis/src/views/AdminPanel/routes/entities/getEntitiesPageConfig.js b/packages/lesmis/src/views/AdminPanel/routes/entities/getEntitiesPageConfig.js
@@ -59,7 +59,7 @@ export const getEntitiesPageConfig = translate => {
   const IMPORT_CONFIG = getImportConfigs(translate, entities.importConfig);
   return {
     ...entities,
-    title: translate('admin.entities'),
+    label: translate('admin.entities'),
     columns: FIELDS,
     importConfig: IMPORT_CONFIG,
     nestedViews: [

diff --git a/packages/lesmis/src/views/AdminPanel/routes/entities/getEntitiesTabRoutes.js b/packages/lesmis/src/views/AdminPanel/routes/entities/getEntitiesTabRoutes.js
@@ -7,6 +7,6 @@ import { getEntitiesPageConfig } from './getEntitiesPageConfig';
 
 export const getEntitiesTabRoutes = translate => ({
   ...entitiesTabRoutes,
-  title: translate('admin.entities'),
+  label: translate('admin.entities'),
   childViews: [getEntitiesPageConfig(translate)],
 });
diff --git a/packages/lesmis/src/views/AdminPanel/routes/surveyResponses/getSurveyResponsesTabRoutes.js b/packages/lesmis/src/views/AdminPanel/routes/surveyResponses/getSurveyResponsesTabRoutes.js
@@ -13,7 +13,7 @@ const approvedSurveyResponses = (translate, adminUrl) => {
   return {
     ...configs,
     reduxId: 'approvedSurveyResponses', // This is used to store the data in the redux store
-    title: translate('admin.approved'),
+    label: translate('admin.approved'),
     path,
     baseFilter: { approval_status: { comparisonValue: 'approved' } },
     columns: COLUMNS.filter(column => column.type !== 'delete'),
@@ -27,7 +27,7 @@ const rejectedSurveyResponses = (translate, adminUrl) => {
   return {
     ...configs,
     reduxId: 'rejectedSurveyResponses', // This is used to store the data in the redux store
-    title: translate('admin.rejected'),
+    label: translate('admin.rejected'),
     path,
     baseFilter: { approval_status: { comparisonValue: 'rejected' } },
     columns: COLUMNS.filter(column => column.type !== 'delete'),
@@ -61,7 +61,7 @@ const draftSurveyResponses = (translate, adminUrl) => {
   return {
     ...configs,
     reduxId: 'pendingSurveyResponses', // This is used to store the data in the redux store
-    title: translate('admin.review'),
+    label: translate('admin.review'),
     path,
     default: true,
     baseFilter: { approval_status: { comparisonValue: 'pending' } },
@@ -85,7 +85,7 @@ const nonApprovalSurveyResponses = (translate, adminUrl) => {
   return {
     ...configs,
     path,
-    title: translate('admin.approvalNotRequired'),
+    label: translate('admin.approvalNotRequired'),
     baseFilter: { approval_status: { comparisonValue: 'not_required' } },
     columns: NON_APPROVAL_COLUMNS,
   };

diff --git a/packages/lesmis/src/views/AdminPanel/routes/surveys/getDataElementsPageConfig.js b/packages/lesmis/src/views/AdminPanel/routes/surveys/getDataElementsPageConfig.js
@@ -87,7 +87,7 @@ export const getDataElementsPageConfig = translate => {
 
   return {
     ...dataElements,
-    title: translate('admin.dataElements'),
+    label: translate('admin.dataElements'),
     columns: [
       ...DATA_ELEMENT_FIELDS,
       ...getButtonsConfig(DATA_ELEMENT_FIELDS, 'dataElement', translate),

diff --git a/packages/lesmis/src/views/AdminPanel/routes/surveys/getQuestionPageConfig.js b/packages/lesmis/src/views/AdminPanel/routes/surveys/getQuestionPageConfig.js
@@ -98,13 +98,13 @@ export const getQuestionPageConfig = translate => {
 
   return {
     ...questions,
-    title: translate('admin.questions'),
+    label: translate('admin.questions'),
     columns: QUESTION_COLUMNS,
     editorConfig: EDITOR_CONFIG,
     nestedViews: [
       {
         ...questions.nestedViews[0],
-        title: translate('admin.options'),
+        label: translate('admin.options'),
         columns: OPTION_COLUMNS,
       },
     ],

diff --git a/packages/lesmis/src/views/AdminPanel/routes/surveys/getSurveysPageConfig.js b/packages/lesmis/src/views/AdminPanel/routes/surveys/getSurveysPageConfig.js
@@ -414,15 +414,15 @@ export const getSurveysPageConfig = translate => {
 
   return {
     ...surveys,
-    title: translate('admin.surveys'),
+    label: translate('admin.surveys'),
     columns: SURVEY_COLUMNS,
     importConfig: IMPORT_CONFIG,
     deleteConfig: getDeleteConfigs(translate),
     editorConfig: getBaseEditorConfigs(translate),
     nestedViews: [
       {
         ...surveys.nestedViews[0],
-        title: translate('admin.questions'),
+        label: translate('admin.questions'),
         columns: QUESTION_COLUMNS,
       },
     ],

diff --git a/packages/lesmis/src/views/AdminPanel/routes/surveys/getSyncGroupsPageConfig.js b/packages/lesmis/src/views/AdminPanel/routes/surveys/getSyncGroupsPageConfig.js
@@ -88,7 +88,7 @@ export const getSyncGroupsPageConfig = translate => {
 
   return {
     ...syncGroups,
-    title: translate('admin.syncGroups'),
+    label: translate('admin.syncGroups'),
     columns: COLUMNS,
     editorConfig,
     createConfig,

diff --git a/packages/lesmis/src/views/AdminPanel/routes/users/getPermissionsPageConfig.jsx b/packages/lesmis/src/views/AdminPanel/routes/users/getPermissionsPageConfig.jsx
@@ -103,7 +103,7 @@ export const getPermissionsPageConfig = translate => {
   const deleteConfig = getDeleteConfigs(translate);
   return {
     ...permissions,
-    title: translate('admin.permissions'),
+    label: translate('admin.permissions'),
     columns: FIELDS,
     editorConfig,
     createConfig,

diff --git a/packages/lesmis/src/views/AdminPanel/routes/users/getUsersPageConfig.jsx b/packages/lesmis/src/views/AdminPanel/routes/users/getUsersPageConfig.jsx
@@ -159,7 +159,7 @@ export const getUsersPageConfig = translate => {
 
   return {
     ...users,
-    title: translate('admin.users'),
+    label: translate('admin.users'),
     columns: COLUMNS,
     editorConfig,
     importConfig,

diff --git a/packages/lesmis/src/views/AdminPanel/routes/visualisations/getDashboardItemsPageConfig.jsx b/packages/lesmis/src/views/AdminPanel/routes/visualisations/getDashboardItemsPageConfig.jsx
@@ -123,7 +123,7 @@ export const getDashboardItemsPageConfig = (translate, adminUrl, isBESAdmin) =>
 
   return {
     ...dashboardItems,
-    title: translate('admin.dashboardItems'),
+    label: translate('admin.dashboardItems'),
     columns,
     importConfig,
     editorConfig,

diff --git a/...ages/lesmis/src/views/AdminPanel/routes/visualisations/getDashboardRelationsPageConfig.js b/...ages/lesmis/src/views/AdminPanel/routes/visualisations/getDashboardRelationsPageConfig.js
@@ -112,7 +112,7 @@ export const getDashboardRelationsPageConfig = translate => {
 
   return {
     ...dashboardRelations,
-    title: translate('admin.dashboardRelations'),
+    label: translate('admin.dashboardRelations'),
     endpoint: dashboardRelations.endpoint,
     columns: FIELDS,
     createConfig,

diff --git a/packages/lesmis/src/views/AdminPanel/routes/visualisations/getDashboardsPageConfig.js b/packages/lesmis/src/views/AdminPanel/routes/visualisations/getDashboardsPageConfig.js
@@ -129,7 +129,7 @@ export const getDashboardsPageConfig = translate => {
 
   return {
     ...dashboards,
-    title: translate('admin.dashboards'),
+    label: translate('admin.dashboards'),
     columns: COLUMNS,
     createConfig,
     editorConfig,
@@ -138,7 +138,7 @@ export const getDashboardsPageConfig = translate => {
     nestedViews: [
       {
         ...dashboards.nestedViews[0],
-        title: translate('admin.dashboardRelations'),
+        label: translate('admin.dashboardRelations'),
         columns: RELATION_COLUMNS,
       },
     ],

diff --git a/packages/lesmis/src/views/AdminPanel/routes/visualisations/getDataTablesPageConfig.js b/packages/lesmis/src/views/AdminPanel/routes/visualisations/getDataTablesPageConfig.js
diff --git a/...esmis/src/views/AdminPanel/routes/visualisations/getMapOverlayGroupRelationsPageConfig.js b/...esmis/src/views/AdminPanel/routes/visualisations/getMapOverlayGroupRelationsPageConfig.js
@@ -91,7 +91,7 @@ export const getMapOverlayGroupRelationsPageConfig = translate => {
 
   return {
     ...mapOverlayGroupRelations,
-    title: translate('admin.mapOverlayGroupRelations'),
+    label: translate('admin.mapOverlayGroupRelations'),
     columns: COLUMNS,
     editorConfig,
     createConfig,

diff --git a/packages/lesmis/src/views/AdminPanel/routes/visualisations/getMapOverlayGroupsPageConfig.js b/packages/lesmis/src/views/AdminPanel/routes/visualisations/getMapOverlayGroupsPageConfig.js
@@ -109,14 +109,14 @@ export const getMapOverlayGroupsPageConfig = translate => {
 
   return {
     ...mapOverlayGroups,
-    title: translate('admin.mapOverlayGroups'),
+    label: translate('admin.mapOverlayGroups'),
     columns: COLUMNS,
     editorConfig,
     createConfig,
     nestedViews: [
       {
         ...mapOverlayGroups.nestedViews[0],
-        title: translate('admin.mapOverlayGroupRelations'),
+        label: translate('admin.mapOverlayGroupRelations'),
         columns: RELATION_COLUMNS,
       },
     ],

diff --git a/packages/lesmis/src/views/AdminPanel/routes/visualisations/getMapOverlaysPageConfig.jsx b/packages/lesmis/src/views/AdminPanel/routes/visualisations/getMapOverlaysPageConfig.jsx
@@ -189,7 +189,7 @@ export const getMapOverlaysPageConfig = (translate, adminUrl, isBESAdmin) => {
   const deleteConfig = getDeleteConfigs(translate);
   return {
     ...mapOverlays,
-    title: translate('admin.mapOverlays'),
+    label: translate('admin.mapOverlays'),
     columns: COLUMNS,
     importConfig,
     LinksComponent: renderNewMapOverlayVizButton,

diff --git a/packages/tupaia-web/src/features/EnlargedDashboardItem/EnlargedDashboardVisual.tsx b/packages/tupaia-web/src/features/EnlargedDashboardItem/EnlargedDashboardVisual.tsx
@@ -69,6 +69,7 @@ const ExportDate = styled(Typography)`
   font-size: 0.75rem;
   padding-block: 1rem 0.3rem;
 `;
+
 interface EnlargedDashboardVisualProps {
   entityName?: Entity['name'];
   isPreview?: boolean;
@@ -178,6 +179,7 @@ export const EnlargedDashboardVisual = ({
             isExport: isPreview,
             reportCode: currentDashboardItem?.reportCode,
             config: mergedConfig,
+            isEnabled: true,
           }}
         >
           <DashboardItemContent />