diff --git a/src/frontend/src/api/OrganisationService.ts b/src/frontend/src/api/OrganisationService.ts index 57f31c2676..aac8b53f9e 100644 --- a/src/frontend/src/api/OrganisationService.ts +++ b/src/frontend/src/api/OrganisationService.ts @@ -48,6 +48,7 @@ export const OrganisationDataService: Function = (url: string) => { const getOrganisationDataResponse = await API.get(url); const response: GetOrganisationDataModel = getOrganisationDataResponse.data; dispatch(OrganisationAction.GetOrganisationsData(response)); + dispatch(OrganisationAction.GetOrganisationDataLoading(false)); } catch (error) { dispatch(OrganisationAction.GetOrganisationDataLoading(false)); if (error.response.status === 401) { @@ -67,6 +68,7 @@ export const MyOrganisationDataService: Function = (url: string) => { const getMyOrganisationDataResponse = await API.get(url); const response: GetOrganisationDataModel[] = getMyOrganisationDataResponse.data; dispatch(OrganisationAction.GetMyOrganisationsData(response)); + dispatch(OrganisationAction.GetMyOrganisationDataLoading(false)); } catch (error) { dispatch(OrganisationAction.GetMyOrganisationDataLoading(false)); } diff --git a/src/frontend/src/components/GenerateBasemap.jsx b/src/frontend/src/components/GenerateBasemap.jsx index f20ef0b1f7..1fe5656a1a 100644 --- a/src/frontend/src/components/GenerateBasemap.jsx +++ b/src/frontend/src/components/GenerateBasemap.jsx @@ -253,7 +253,7 @@ const GenerateBasemap = ({ projectInfo }) => { component={CoreModules.Paper} className="scrollbar fmtm-overflow-y-auto fmtm-max-h-[38vh] lg:fmtm-max-h-[45vh] sm:fmtm-mb-5" > - + {/* Id */} diff --git a/src/frontend/src/components/ProjectDetailsV2/MapControlComponent.tsx b/src/frontend/src/components/ProjectDetailsV2/MapControlComponent.tsx index 453794f563..94cfcd836f 100644 --- a/src/frontend/src/components/ProjectDetailsV2/MapControlComponent.tsx +++ b/src/frontend/src/components/ProjectDetailsV2/MapControlComponent.tsx @@ -10,18 +10,22 @@ const MapControlComponent = ({ map }) => { { id: 'add', icon: , + title: 'Zoom In', }, { id: 'minus', icon: , + title: 'Zoom Out', }, { id: 'currentLocation', icon: , + title: 'My Location', }, { id: 'taskBoundries', icon: , + title: 'Zoom to Project', }, ]; const dispatch = CoreModules.useAppDispatch(); @@ -61,6 +65,7 @@ const MapControlComponent = ({ map }) => {
handleOnClick(btn.id)} + title={btn.title} > {btn.icon}
diff --git a/src/frontend/src/components/ProjectDetailsV2/TaskSectionPopup.tsx b/src/frontend/src/components/ProjectDetailsV2/TaskSectionPopup.tsx index 782a718bbe..ed51b1b5a7 100644 --- a/src/frontend/src/components/ProjectDetailsV2/TaskSectionPopup.tsx +++ b/src/frontend/src/components/ProjectDetailsV2/TaskSectionPopup.tsx @@ -66,24 +66,30 @@ const TaskSectionPopup = ({ taskId, body, feature }: TaskSectionPopupPropType) = taskModalStatus ? '' : 'fmtm-hidden' } fmtm-cursor-pointer fmtm-flex fmtm-items-center fmtm-gap-3`} > - { - dispatch(ProjectActions.ToggleGenerateMbTilesModalStatus(true)); - dispatch(ProjectActions.ToggleTaskModalStatus(false)); - }} - /> - navigate(`/project-submissions/${params.id}?tab=table&task_id=${taskId}`)} - /> - dispatch(ProjectActions.ToggleTaskModalStatus(false))} - /> +
+ { + dispatch(ProjectActions.ToggleGenerateMbTilesModalStatus(true)); + dispatch(ProjectActions.ToggleTaskModalStatus(false)); + }} + /> +
+
+ navigate(`/project-submissions/${params.id}?tab=table&task_id=${taskId}`)} + /> +
+
+ dispatch(ProjectActions.ToggleTaskModalStatus(false))} + /> +
diff --git a/src/frontend/src/components/QrcodeComponent.jsx b/src/frontend/src/components/QrcodeComponent.jsx index 2f2dfdc156..5f318e8b67 100755 --- a/src/frontend/src/components/QrcodeComponent.jsx +++ b/src/frontend/src/components/QrcodeComponent.jsx @@ -22,6 +22,7 @@ const TasksComponent = ({ qrcode, taskId }) => { disabled={qrcode == '' ? true : false} aria-label="download qrcode" className={` ${qrcode === '' ? 'fmtm-cursor-not-allowed fmtm-opacity-50' : 'fmtm-cursor-pointer'}`} + title="Download QR Code" > diff --git a/src/frontend/src/views/Organisation.tsx b/src/frontend/src/views/Organisation.tsx index 8f183dcf1f..f93b23accd 100644 --- a/src/frontend/src/views/Organisation.tsx +++ b/src/frontend/src/views/Organisation.tsx @@ -177,6 +177,7 @@ const Organisation = () => {
{ /> {activeTab === 0 ? ( - !organisationDataLoading ? ( + organisationDataLoading ? ( { ) ) : null} {activeTab === 1 ? ( - !myOrganisationDataLoading ? ( + myOrganisationDataLoading ? (