Make app loader on top bar smaller

openforis · Sep 27, 2023 · 4bc1188 · 4bc1188
1 parent cec0322
commit 4bc1188
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 25 deletions.
diff --git a/webapp/components/Spinner.js b/webapp/components/Spinner.js
@@ -0,0 +1,17 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+import { CircularProgress } from '@mui/material'
+
+export const Spinner = (props) => {
+  const { size } = props
+
+  return <CircularProgress size={size} />
+}
+
+Spinner.propTypes = {
+  size: PropTypes.number,
+}
+
+Spinner.defaultProps = {
+  size: 40,
+}
diff --git a/webapp/components/index.js b/webapp/components/index.js
@@ -36,3 +36,4 @@ export { RadioButtonGroup } from './RadioButtonGroup'
 export { ResizableModal } from './ResizableModal'
 export { Slider } from './Slider'
 export { Split } from './Split'
+export { Spinner } from './Spinner'
diff --git a/webapp/views/App/Header/Header.js b/webapp/views/App/Header/Header.js
@@ -16,9 +16,9 @@ import { TestId } from '@webapp/utils/testId'
 
 import { appModuleUri, homeModules } from '@webapp/app/appModules'
 
+import { Spinner } from '@webapp/components'
 import { usePrevious } from '@webapp/components/hooks'
 import ProfilePicture from '@webapp/components/profilePicture'
-import ProgressBar from '@webapp/components/progressBar'
 import ButtonPublishSurvey from '@webapp/components/buttonPublishSurvey'
 import { LabelWithTooltip } from '@webapp/components/form/LabelWithTooltip'
 import { SurveyPreferredLanguageSelector } from '@webapp/components/survey/SurveyPreferredLanguageSelector'
@@ -61,30 +61,28 @@ const Header = () => {
       <Breadcrumbs />
 
       <div className="header__survey">
-        {Survey.isValid(surveyInfo) &&
-          (appSaving ? (
-            <ProgressBar className="progress-bar-striped" progress={100} showText={false} />
-          ) : (
-            <>
-              <Link
-                data-testid={TestId.header.surveyTitle}
-                to={appModuleUri(homeModules.surveyInfo)}
-                className="btn-s btn-transparent"
-              >
-                <LabelWithTooltip className="header__survey-title" label={surveyTitle} />
-              </Link>
-              <CycleSelector
-                selectedCycle={surveyCycleKey}
-                onChange={(cycle) => {
-                  const surveyId = Survey.getIdSurveyInfo(surveyInfo)
-                  const userUpdated = User.assocPrefSurveyCycle(surveyId, cycle)(user)
-                  dispatch(UserActions.updateUserPrefs({ user: userUpdated }))
-                }}
-              />
-              <SurveyPreferredLanguageSelector />
-              {canEditSurvey && Survey.isDraft(surveyInfo) && <ButtonPublishSurvey className="btn-secondary" />}
-            </>
-          ))}
+        {Survey.isValid(surveyInfo) && (
+          <>
+            <Link
+              data-testid={TestId.header.surveyTitle}
+              to={appModuleUri(homeModules.surveyInfo)}
+              className="btn-s btn-transparent"
+            >
+              <LabelWithTooltip className="header__survey-title" label={surveyTitle} />
+            </Link>
+            <CycleSelector
+              selectedCycle={surveyCycleKey}
+              onChange={(cycle) => {
+                const surveyId = Survey.getIdSurveyInfo(surveyInfo)
+                const userUpdated = User.assocPrefSurveyCycle(surveyId, cycle)(user)
+                dispatch(UserActions.updateUserPrefs({ user: userUpdated }))
+              }}
+            />
+            <SurveyPreferredLanguageSelector />
+            {canEditSurvey && Survey.isDraft(surveyInfo) && <ButtonPublishSurvey className="btn-secondary" />}
+            <div className="header__loader-wrapper">{appSaving && <Spinner size={25} />}</div>
+          </>
+        )}
       </div>
 
       {/* Placeholder to make the header symmetric */}

diff --git a/webapp/views/App/Header/Header.scss b/webapp/views/App/Header/Header.scss
@@ -56,6 +56,13 @@
   line-height: normal;
 }
 
+.header__loader-wrapper {
+  display: flex;
+  align-items: center;
+  width: 3rem;
+  margin-left: 10px;
+}
+
 .header__btn-user {
   max-height: $headerHeight - 1px;
   margin-right: 20px;