Merge pull request #1331 from openedx/eahmadjaved/ENT-9590

fix: disabale dropdowns while loading data on analyticsV2
openedx · Oct 9, 2024 · fdacee1 · fdacee1
2 parents 25db621 + 6c4d7ec
commit fdacee1
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/components/AdvanceAnalyticsV2/AnalyticsV2Page.jsx b/src/components/AdvanceAnalyticsV2/AnalyticsV2Page.jsx
@@ -43,7 +43,7 @@ const AnalyticsV2Page = ({ enterpriseId }) => {
                 id="advance.analytics.data.refresh.msg"
                 defaultMessage="Data updated on {date}"
                 description="Data refresh message"
-                values={{ date: data?.lastUpdatedAt || '' }}
+                values={{ date: data?.lastUpdatedAt || currentDate }}
               />
             </span>
           </div>
@@ -64,6 +64,7 @@ const AnalyticsV2Page = ({ enterpriseId }) => {
                 value={startDate || data?.minEnrollmentDate}
                 min={data?.minEnrollmentDate}
                 onChange={(e) => setStartDate(e.target.value)}
+                disabled={isFetching}
               />
             </Form.Group>
           </div>
@@ -81,6 +82,7 @@ const AnalyticsV2Page = ({ enterpriseId }) => {
                 value={endDate || currentDate}
                 max={currentDate}
                 onChange={(e) => setEndDate(e.target.value)}
+                disabled={isFetching}
               />
             </Form.Group>
           </div>
@@ -97,6 +99,7 @@ const AnalyticsV2Page = ({ enterpriseId }) => {
                 as="select"
                 value={granularity}
                 onChange={(e) => setGranularity(e.target.value)}
+                disabled={isFetching}
               >
                 <option value={GRANULARITY.DAILY}>
                   {intl.formatMessage({
@@ -142,6 +145,7 @@ const AnalyticsV2Page = ({ enterpriseId }) => {
                 as="select"
                 value={calculation}
                 onChange={(e) => setCalculation(e.target.value)}
+                disabled={isFetching}
               >
                 <option value={CALCULATION.TOTAL}>
                   {intl.formatMessage({